From 869b130f5a630e8e86b0eb2f8e0709ac8386b656 Mon Sep 17 00:00:00 2001 From: Tai Sakuma Date: Thu, 23 May 2024 09:25:48 -0400 Subject: [PATCH 1/7] Run codegen --- src/graphql/codegen/generated.ts | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/graphql/codegen/generated.ts b/src/graphql/codegen/generated.ts index 446eae2..f5ad604 100644 --- a/src/graphql/codegen/generated.ts +++ b/src/graphql/codegen/generated.ts @@ -69,7 +69,7 @@ export type MutationSchedule = { autoMode: MutationScheduleAutoMode; loadScript: Scalars['Boolean']['output']; queue: MutationScheduleQueue; - scheduler: MutationScheduler; + scheduler: MutationScheduleScheduler; }; export type MutationScheduleAutoMode = { @@ -100,17 +100,18 @@ export type MutationScheduleQueueRemoveArgs = { id: Scalars['Int']['input']; }; -export type MutationScheduler = { - __typename?: 'MutationScheduler'; +export type MutationScheduleScheduler = { + __typename?: 'MutationScheduleScheduler'; + loadScript: Scalars['Boolean']['output']; update: Scalars['Boolean']['output']; }; -export type MutationSchedulerUpdateArgs = { - input: MutationSchedulerInput; +export type MutationScheduleSchedulerUpdateArgs = { + input: MutationSchedulerUpdateInput; }; -export type MutationSchedulerInput = { +export type MutationSchedulerUpdateInput = { apiUrl?: InputMaybe; lengthMinutes?: InputMaybe; policy?: InputMaybe; @@ -255,7 +256,7 @@ export type QuerySchedule = { __typename?: 'QuerySchedule'; autoMode: QueryScheduleAutoMode; queue: QueryScheduleQueue; - scheduler: QueryScheduler; + scheduler: QueryScheduleScheduler; version: Scalars['String']['output']; }; @@ -270,8 +271,8 @@ export type QueryScheduleQueue = { items: Array; }; -export type QueryScheduler = { - __typename?: 'QueryScheduler'; +export type QueryScheduleScheduler = { + __typename?: 'QueryScheduleScheduler'; apiUrl: Scalars['String']['output']; lengthMinutes: Scalars['Int']['output']; policy: Scalars['String']['output']; From 98622b974903879a71eb8f017c7f023c357d1780 Mon Sep 17 00:00:00 2001 From: Tai Sakuma Date: Thu, 23 May 2024 10:25:42 -0400 Subject: [PATCH 2/7] Reorganize gql files to sub-folders --- src/graphql/codegen/generated.ts | 292 +++++++++--------- src/graphql/gql/mutations/{ => ctrl}/Exec.gql | 0 .../gql/mutations/{ => ctrl}/Interrupt.gql | 0 src/graphql/gql/mutations/{ => ctrl}/Kill.gql | 0 .../{ => ctrl}/LoadExampleScript.gql | 0 .../gql/mutations/{ => ctrl}/Reset.gql | 0 .../mutations/{ => ctrl}/RunAndContinue.gql | 0 .../mutations/{ => ctrl}/SendPdbCommand.gql | 0 .../gql/mutations/{ => ctrl}/Terminate.gql | 0 .../auto_mode}/AutoModeTurnOff.gql | 0 .../auto_mode}/AutoModeTurnOn.gql | 0 .../auto_mode}/ScheduleAutoModeChangeMode.gql | 0 .../queue}/ScheduleQueuePush.gql | 0 .../queue}/ScheduleQueueRemove.gql | 0 .../{ => schedule/scheduler}/LoadScript.gql | 0 .../queries/{ => ctrl}/ContinuousEnabled.gql | 0 .../gql/queries/{ => ctrl}/Exception.gql | 0 src/graphql/gql/queries/{ => ctrl}/RunNo.gql | 0 src/graphql/gql/queries/{ => ctrl}/Source.gql | 0 src/graphql/gql/queries/{ => ctrl}/State.gql | 0 .../gql/queries/{ => ctrl}/TraceIds.gql | 0 src/graphql/gql/queries/{ => rdb}/RDBRun.gql | 0 src/graphql/gql/queries/{ => rdb}/RDBRuns.gql | 0 src/graphql/gql/queries/{ => rdb}/Runs.gql | 0 .../auto_mode}/ScheduleAutoModeMode.gql | 0 .../auto_mode}/ScheduleAutoModeState.gql | 0 .../queue}/ScheduleQueueItems.gql | 0 27 files changed, 146 insertions(+), 146 deletions(-) rename src/graphql/gql/mutations/{ => ctrl}/Exec.gql (100%) rename src/graphql/gql/mutations/{ => ctrl}/Interrupt.gql (100%) rename src/graphql/gql/mutations/{ => ctrl}/Kill.gql (100%) rename src/graphql/gql/mutations/{ => ctrl}/LoadExampleScript.gql (100%) rename src/graphql/gql/mutations/{ => ctrl}/Reset.gql (100%) rename src/graphql/gql/mutations/{ => ctrl}/RunAndContinue.gql (100%) rename src/graphql/gql/mutations/{ => ctrl}/SendPdbCommand.gql (100%) rename src/graphql/gql/mutations/{ => ctrl}/Terminate.gql (100%) rename src/graphql/gql/mutations/{ => schedule/auto_mode}/AutoModeTurnOff.gql (100%) rename src/graphql/gql/mutations/{ => schedule/auto_mode}/AutoModeTurnOn.gql (100%) rename src/graphql/gql/mutations/{ => schedule/auto_mode}/ScheduleAutoModeChangeMode.gql (100%) rename src/graphql/gql/mutations/{ => schedule/queue}/ScheduleQueuePush.gql (100%) rename src/graphql/gql/mutations/{ => schedule/queue}/ScheduleQueueRemove.gql (100%) rename src/graphql/gql/mutations/{ => schedule/scheduler}/LoadScript.gql (100%) rename src/graphql/gql/queries/{ => ctrl}/ContinuousEnabled.gql (100%) rename src/graphql/gql/queries/{ => ctrl}/Exception.gql (100%) rename src/graphql/gql/queries/{ => ctrl}/RunNo.gql (100%) rename src/graphql/gql/queries/{ => ctrl}/Source.gql (100%) rename src/graphql/gql/queries/{ => ctrl}/State.gql (100%) rename src/graphql/gql/queries/{ => ctrl}/TraceIds.gql (100%) rename src/graphql/gql/queries/{ => rdb}/RDBRun.gql (100%) rename src/graphql/gql/queries/{ => rdb}/RDBRuns.gql (100%) rename src/graphql/gql/queries/{ => rdb}/Runs.gql (100%) rename src/graphql/gql/queries/{ => schedule/auto_mode}/ScheduleAutoModeMode.gql (100%) rename src/graphql/gql/queries/{ => schedule/auto_mode}/ScheduleAutoModeState.gql (100%) rename src/graphql/gql/queries/{ => schedule/queue}/ScheduleQueueItems.gql (100%) diff --git a/src/graphql/codegen/generated.ts b/src/graphql/codegen/generated.ts index f5ad604..7398d13 100644 --- a/src/graphql/codegen/generated.ts +++ b/src/graphql/codegen/generated.ts @@ -429,16 +429,6 @@ export type TraceNodeEdge = { node: TraceNode; }; -export type AutoModeTurnOffMutationVariables = Exact<{ [key: string]: never; }>; - - -export type AutoModeTurnOffMutation = { __typename?: 'Mutation', schedule: { __typename?: 'MutationSchedule', autoMode: { __typename?: 'MutationScheduleAutoMode', turnOff: boolean } } }; - -export type AutoModeTurnOnMutationVariables = Exact<{ [key: string]: never; }>; - - -export type AutoModeTurnOnMutation = { __typename?: 'Mutation', schedule: { __typename?: 'MutationSchedule', autoMode: { __typename?: 'MutationScheduleAutoMode', turnOn: boolean } } }; - export type ExecMutationVariables = Exact<{ [key: string]: never; }>; @@ -459,11 +449,6 @@ export type LoadExampleScriptMutationVariables = Exact<{ [key: string]: never; } export type LoadExampleScriptMutation = { __typename?: 'Mutation', ctrl: { __typename?: 'MutationCtrl', loadExampleScript: boolean } }; -export type LoadScriptMutationVariables = Exact<{ [key: string]: never; }>; - - -export type LoadScriptMutation = { __typename?: 'Mutation', schedule: { __typename?: 'MutationSchedule', loadScript: boolean } }; - export type ResetMutationVariables = Exact<{ statement?: InputMaybe; }>; @@ -476,6 +461,30 @@ export type RunAndContinueMutationVariables = Exact<{ [key: string]: never; }>; export type RunAndContinueMutation = { __typename?: 'Mutation', ctrl: { __typename?: 'MutationCtrl', runAndContinue: boolean } }; +export type SendPdbCommandMutationVariables = Exact<{ + command: Scalars['String']['input']; + promptNo: Scalars['Int']['input']; + traceNo: Scalars['Int']['input']; +}>; + + +export type SendPdbCommandMutation = { __typename?: 'Mutation', ctrl: { __typename?: 'MutationCtrl', sendPdbCommand: boolean } }; + +export type TerminateMutationVariables = Exact<{ [key: string]: never; }>; + + +export type TerminateMutation = { __typename?: 'Mutation', ctrl: { __typename?: 'MutationCtrl', terminate: boolean } }; + +export type AutoModeTurnOffMutationVariables = Exact<{ [key: string]: never; }>; + + +export type AutoModeTurnOffMutation = { __typename?: 'Mutation', schedule: { __typename?: 'MutationSchedule', autoMode: { __typename?: 'MutationScheduleAutoMode', turnOff: boolean } } }; + +export type AutoModeTurnOnMutationVariables = Exact<{ [key: string]: never; }>; + + +export type AutoModeTurnOnMutation = { __typename?: 'Mutation', schedule: { __typename?: 'MutationSchedule', autoMode: { __typename?: 'MutationScheduleAutoMode', turnOn: boolean } } }; + export type ScheduleAutoModeChangeModeMutationVariables = Exact<{ mode: Scalars['String']['input']; }>; @@ -497,19 +506,10 @@ export type ScheduleQueueRemoveMutationVariables = Exact<{ export type ScheduleQueueRemoveMutation = { __typename?: 'Mutation', schedule: { __typename?: 'MutationSchedule', queue: { __typename?: 'MutationScheduleQueue', remove: boolean } } }; -export type SendPdbCommandMutationVariables = Exact<{ - command: Scalars['String']['input']; - promptNo: Scalars['Int']['input']; - traceNo: Scalars['Int']['input']; -}>; - - -export type SendPdbCommandMutation = { __typename?: 'Mutation', ctrl: { __typename?: 'MutationCtrl', sendPdbCommand: boolean } }; - -export type TerminateMutationVariables = Exact<{ [key: string]: never; }>; +export type LoadScriptMutationVariables = Exact<{ [key: string]: never; }>; -export type TerminateMutation = { __typename?: 'Mutation', ctrl: { __typename?: 'MutationCtrl', terminate: boolean } }; +export type LoadScriptMutation = { __typename?: 'Mutation', schedule: { __typename?: 'MutationSchedule', loadScript: boolean } }; export type QContinuousEnabledQueryVariables = Exact<{ [key: string]: never; }>; @@ -521,6 +521,28 @@ export type ExceptionQueryVariables = Exact<{ [key: string]: never; }>; export type ExceptionQuery = { __typename?: 'Query', ctrl: { __typename?: 'QueryCtrl', exception?: string | null } }; +export type QRunNoQueryVariables = Exact<{ [key: string]: never; }>; + + +export type QRunNoQuery = { __typename?: 'Query', ctrl: { __typename?: 'QueryCtrl', runNo: number } }; + +export type SourceQueryVariables = Exact<{ + fileName?: InputMaybe; +}>; + + +export type SourceQuery = { __typename?: 'Query', ctrl: { __typename?: 'QueryCtrl', source: Array } }; + +export type QStateQueryVariables = Exact<{ [key: string]: never; }>; + + +export type QStateQuery = { __typename?: 'Query', ctrl: { __typename?: 'QueryCtrl', state: string } }; + +export type QTraceIdsQueryVariables = Exact<{ [key: string]: never; }>; + + +export type QTraceIdsQuery = { __typename?: 'Query', ctrl: { __typename?: 'QueryCtrl', traceIds: Array } }; + export type RdbRunQueryVariables = Exact<{ runNo: Scalars['Int']['input']; }>; @@ -538,11 +560,6 @@ export type RdbRunsQueryVariables = Exact<{ export type RdbRunsQuery = { __typename?: 'Query', rdb: { __typename?: 'QueryRDB', runs: { __typename?: 'RunNodeConnection', totalCount: number, pageInfo: { __typename?: 'PageInfo', startCursor?: string | null, endCursor?: string | null, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename?: 'RunNodeEdge', cursor: string, node: { __typename?: 'RunNode', id: number, runNo: number, state?: string | null, startedAt?: any | null, endedAt?: any | null, script?: string | null, exception?: string | null } }> } } }; -export type QRunNoQueryVariables = Exact<{ [key: string]: never; }>; - - -export type QRunNoQuery = { __typename?: 'Query', ctrl: { __typename?: 'QueryCtrl', runNo: number } }; - export type RunsQueryVariables = Exact<{ [key: string]: never; }>; @@ -563,23 +580,6 @@ export type QScheduleQueueItemsQueryVariables = Exact<{ [key: string]: never; }> export type QScheduleQueueItemsQuery = { __typename?: 'Query', schedule: { __typename?: 'QuerySchedule', queue: { __typename?: 'QueryScheduleQueue', items: Array<{ __typename?: 'ScheduleQueueItem', id: number, name: string, createdAt: any, script: string }> } } }; -export type SourceQueryVariables = Exact<{ - fileName?: InputMaybe; -}>; - - -export type SourceQuery = { __typename?: 'Query', ctrl: { __typename?: 'QueryCtrl', source: Array } }; - -export type QStateQueryVariables = Exact<{ [key: string]: never; }>; - - -export type QStateQuery = { __typename?: 'Query', ctrl: { __typename?: 'QueryCtrl', state: string } }; - -export type QTraceIdsQueryVariables = Exact<{ [key: string]: never; }>; - - -export type QTraceIdsQuery = { __typename?: 'Query', ctrl: { __typename?: 'QueryCtrl', traceIds: Array } }; - export type ContinuousEnabledSubscriptionVariables = Exact<{ [key: string]: never; }>; @@ -633,32 +633,6 @@ export type TraceIdsSubscriptionVariables = Exact<{ [key: string]: never; }>; export type TraceIdsSubscription = { __typename?: 'Subscription', ctrlTraceIds: Array }; -export const AutoModeTurnOffDocument = gql` - mutation AutoModeTurnOff { - schedule { - autoMode { - turnOff - } - } -} - `; - -export function useAutoModeTurnOffMutation() { - return Urql.useMutation(AutoModeTurnOffDocument); -}; -export const AutoModeTurnOnDocument = gql` - mutation AutoModeTurnOn { - schedule { - autoMode { - turnOn - } - } -} - `; - -export function useAutoModeTurnOnMutation() { - return Urql.useMutation(AutoModeTurnOnDocument); -}; export const ExecDocument = gql` mutation Exec { ctrl { @@ -703,17 +677,6 @@ export const LoadExampleScriptDocument = gql` export function useLoadExampleScriptMutation() { return Urql.useMutation(LoadExampleScriptDocument); }; -export const LoadScriptDocument = gql` - mutation LoadScript { - schedule { - loadScript - } -} - `; - -export function useLoadScriptMutation() { - return Urql.useMutation(LoadScriptDocument); -}; export const ResetDocument = gql` mutation Reset($statement: String) { ctrl { @@ -736,6 +699,54 @@ export const RunAndContinueDocument = gql` export function useRunAndContinueMutation() { return Urql.useMutation(RunAndContinueDocument); }; +export const SendPdbCommandDocument = gql` + mutation SendPdbCommand($command: String!, $promptNo: Int!, $traceNo: Int!) { + ctrl { + sendPdbCommand(command: $command, promptNo: $promptNo, traceNo: $traceNo) + } +} + `; + +export function useSendPdbCommandMutation() { + return Urql.useMutation(SendPdbCommandDocument); +}; +export const TerminateDocument = gql` + mutation Terminate { + ctrl { + terminate + } +} + `; + +export function useTerminateMutation() { + return Urql.useMutation(TerminateDocument); +}; +export const AutoModeTurnOffDocument = gql` + mutation AutoModeTurnOff { + schedule { + autoMode { + turnOff + } + } +} + `; + +export function useAutoModeTurnOffMutation() { + return Urql.useMutation(AutoModeTurnOffDocument); +}; +export const AutoModeTurnOnDocument = gql` + mutation AutoModeTurnOn { + schedule { + autoMode { + turnOn + } + } +} + `; + +export function useAutoModeTurnOnMutation() { + return Urql.useMutation(AutoModeTurnOnDocument); +}; export const ScheduleAutoModeChangeModeDocument = gql` mutation ScheduleAutoModeChangeMode($mode: String!) { schedule { @@ -780,27 +791,16 @@ export const ScheduleQueueRemoveDocument = gql` export function useScheduleQueueRemoveMutation() { return Urql.useMutation(ScheduleQueueRemoveDocument); }; -export const SendPdbCommandDocument = gql` - mutation SendPdbCommand($command: String!, $promptNo: Int!, $traceNo: Int!) { - ctrl { - sendPdbCommand(command: $command, promptNo: $promptNo, traceNo: $traceNo) - } -} - `; - -export function useSendPdbCommandMutation() { - return Urql.useMutation(SendPdbCommandDocument); -}; -export const TerminateDocument = gql` - mutation Terminate { - ctrl { - terminate +export const LoadScriptDocument = gql` + mutation LoadScript { + schedule { + loadScript } } `; -export function useTerminateMutation() { - return Urql.useMutation(TerminateDocument); +export function useLoadScriptMutation() { + return Urql.useMutation(LoadScriptDocument); }; export const QContinuousEnabledDocument = gql` query QContinuousEnabled { @@ -824,6 +824,50 @@ export const ExceptionDocument = gql` export function useExceptionQuery(options: Omit, 'query'>) { return Urql.useQuery({ query: ExceptionDocument, ...options }); }; +export const QRunNoDocument = gql` + query QRunNo { + ctrl { + runNo + } +} + `; + +export function useQRunNoQuery(options: Omit, 'query'>) { + return Urql.useQuery({ query: QRunNoDocument, ...options }); +}; +export const SourceDocument = gql` + query Source($fileName: String) { + ctrl { + source(fileName: $fileName) + } +} + `; + +export function useSourceQuery(options: Omit, 'query'>) { + return Urql.useQuery({ query: SourceDocument, ...options }); +}; +export const QStateDocument = gql` + query QState { + ctrl { + state + } +} + `; + +export function useQStateQuery(options: Omit, 'query'>) { + return Urql.useQuery({ query: QStateDocument, ...options }); +}; +export const QTraceIdsDocument = gql` + query QTraceIds { + ctrl { + traceIds + } +} + `; + +export function useQTraceIdsQuery(options: Omit, 'query'>) { + return Urql.useQuery({ query: QTraceIdsDocument, ...options }); +}; export const RdbRunDocument = gql` query RDBRun($runNo: Int!) { rdb { @@ -882,17 +926,6 @@ export const RdbRunsDocument = gql` export function useRdbRunsQuery(options: Omit, 'query'>) { return Urql.useQuery({ query: RdbRunsDocument, ...options }); }; -export const QRunNoDocument = gql` - query QRunNo { - ctrl { - runNo - } -} - `; - -export function useQRunNoQuery(options: Omit, 'query'>) { - return Urql.useQuery({ query: QRunNoDocument, ...options }); -}; export const RunsDocument = gql` query Runs { rdb { @@ -959,39 +992,6 @@ export const QScheduleQueueItemsDocument = gql` export function useQScheduleQueueItemsQuery(options: Omit, 'query'>) { return Urql.useQuery({ query: QScheduleQueueItemsDocument, ...options }); }; -export const SourceDocument = gql` - query Source($fileName: String) { - ctrl { - source(fileName: $fileName) - } -} - `; - -export function useSourceQuery(options: Omit, 'query'>) { - return Urql.useQuery({ query: SourceDocument, ...options }); -}; -export const QStateDocument = gql` - query QState { - ctrl { - state - } -} - `; - -export function useQStateQuery(options: Omit, 'query'>) { - return Urql.useQuery({ query: QStateDocument, ...options }); -}; -export const QTraceIdsDocument = gql` - query QTraceIds { - ctrl { - traceIds - } -} - `; - -export function useQTraceIdsQuery(options: Omit, 'query'>) { - return Urql.useQuery({ query: QTraceIdsDocument, ...options }); -}; export const ContinuousEnabledDocument = gql` subscription ContinuousEnabled { ctrlContinuousEnabled diff --git a/src/graphql/gql/mutations/Exec.gql b/src/graphql/gql/mutations/ctrl/Exec.gql similarity index 100% rename from src/graphql/gql/mutations/Exec.gql rename to src/graphql/gql/mutations/ctrl/Exec.gql diff --git a/src/graphql/gql/mutations/Interrupt.gql b/src/graphql/gql/mutations/ctrl/Interrupt.gql similarity index 100% rename from src/graphql/gql/mutations/Interrupt.gql rename to src/graphql/gql/mutations/ctrl/Interrupt.gql diff --git a/src/graphql/gql/mutations/Kill.gql b/src/graphql/gql/mutations/ctrl/Kill.gql similarity index 100% rename from src/graphql/gql/mutations/Kill.gql rename to src/graphql/gql/mutations/ctrl/Kill.gql diff --git a/src/graphql/gql/mutations/LoadExampleScript.gql b/src/graphql/gql/mutations/ctrl/LoadExampleScript.gql similarity index 100% rename from src/graphql/gql/mutations/LoadExampleScript.gql rename to src/graphql/gql/mutations/ctrl/LoadExampleScript.gql diff --git a/src/graphql/gql/mutations/Reset.gql b/src/graphql/gql/mutations/ctrl/Reset.gql similarity index 100% rename from src/graphql/gql/mutations/Reset.gql rename to src/graphql/gql/mutations/ctrl/Reset.gql diff --git a/src/graphql/gql/mutations/RunAndContinue.gql b/src/graphql/gql/mutations/ctrl/RunAndContinue.gql similarity index 100% rename from src/graphql/gql/mutations/RunAndContinue.gql rename to src/graphql/gql/mutations/ctrl/RunAndContinue.gql diff --git a/src/graphql/gql/mutations/SendPdbCommand.gql b/src/graphql/gql/mutations/ctrl/SendPdbCommand.gql similarity index 100% rename from src/graphql/gql/mutations/SendPdbCommand.gql rename to src/graphql/gql/mutations/ctrl/SendPdbCommand.gql diff --git a/src/graphql/gql/mutations/Terminate.gql b/src/graphql/gql/mutations/ctrl/Terminate.gql similarity index 100% rename from src/graphql/gql/mutations/Terminate.gql rename to src/graphql/gql/mutations/ctrl/Terminate.gql diff --git a/src/graphql/gql/mutations/AutoModeTurnOff.gql b/src/graphql/gql/mutations/schedule/auto_mode/AutoModeTurnOff.gql similarity index 100% rename from src/graphql/gql/mutations/AutoModeTurnOff.gql rename to src/graphql/gql/mutations/schedule/auto_mode/AutoModeTurnOff.gql diff --git a/src/graphql/gql/mutations/AutoModeTurnOn.gql b/src/graphql/gql/mutations/schedule/auto_mode/AutoModeTurnOn.gql similarity index 100% rename from src/graphql/gql/mutations/AutoModeTurnOn.gql rename to src/graphql/gql/mutations/schedule/auto_mode/AutoModeTurnOn.gql diff --git a/src/graphql/gql/mutations/ScheduleAutoModeChangeMode.gql b/src/graphql/gql/mutations/schedule/auto_mode/ScheduleAutoModeChangeMode.gql similarity index 100% rename from src/graphql/gql/mutations/ScheduleAutoModeChangeMode.gql rename to src/graphql/gql/mutations/schedule/auto_mode/ScheduleAutoModeChangeMode.gql diff --git a/src/graphql/gql/mutations/ScheduleQueuePush.gql b/src/graphql/gql/mutations/schedule/queue/ScheduleQueuePush.gql similarity index 100% rename from src/graphql/gql/mutations/ScheduleQueuePush.gql rename to src/graphql/gql/mutations/schedule/queue/ScheduleQueuePush.gql diff --git a/src/graphql/gql/mutations/ScheduleQueueRemove.gql b/src/graphql/gql/mutations/schedule/queue/ScheduleQueueRemove.gql similarity index 100% rename from src/graphql/gql/mutations/ScheduleQueueRemove.gql rename to src/graphql/gql/mutations/schedule/queue/ScheduleQueueRemove.gql diff --git a/src/graphql/gql/mutations/LoadScript.gql b/src/graphql/gql/mutations/schedule/scheduler/LoadScript.gql similarity index 100% rename from src/graphql/gql/mutations/LoadScript.gql rename to src/graphql/gql/mutations/schedule/scheduler/LoadScript.gql diff --git a/src/graphql/gql/queries/ContinuousEnabled.gql b/src/graphql/gql/queries/ctrl/ContinuousEnabled.gql similarity index 100% rename from src/graphql/gql/queries/ContinuousEnabled.gql rename to src/graphql/gql/queries/ctrl/ContinuousEnabled.gql diff --git a/src/graphql/gql/queries/Exception.gql b/src/graphql/gql/queries/ctrl/Exception.gql similarity index 100% rename from src/graphql/gql/queries/Exception.gql rename to src/graphql/gql/queries/ctrl/Exception.gql diff --git a/src/graphql/gql/queries/RunNo.gql b/src/graphql/gql/queries/ctrl/RunNo.gql similarity index 100% rename from src/graphql/gql/queries/RunNo.gql rename to src/graphql/gql/queries/ctrl/RunNo.gql diff --git a/src/graphql/gql/queries/Source.gql b/src/graphql/gql/queries/ctrl/Source.gql similarity index 100% rename from src/graphql/gql/queries/Source.gql rename to src/graphql/gql/queries/ctrl/Source.gql diff --git a/src/graphql/gql/queries/State.gql b/src/graphql/gql/queries/ctrl/State.gql similarity index 100% rename from src/graphql/gql/queries/State.gql rename to src/graphql/gql/queries/ctrl/State.gql diff --git a/src/graphql/gql/queries/TraceIds.gql b/src/graphql/gql/queries/ctrl/TraceIds.gql similarity index 100% rename from src/graphql/gql/queries/TraceIds.gql rename to src/graphql/gql/queries/ctrl/TraceIds.gql diff --git a/src/graphql/gql/queries/RDBRun.gql b/src/graphql/gql/queries/rdb/RDBRun.gql similarity index 100% rename from src/graphql/gql/queries/RDBRun.gql rename to src/graphql/gql/queries/rdb/RDBRun.gql diff --git a/src/graphql/gql/queries/RDBRuns.gql b/src/graphql/gql/queries/rdb/RDBRuns.gql similarity index 100% rename from src/graphql/gql/queries/RDBRuns.gql rename to src/graphql/gql/queries/rdb/RDBRuns.gql diff --git a/src/graphql/gql/queries/Runs.gql b/src/graphql/gql/queries/rdb/Runs.gql similarity index 100% rename from src/graphql/gql/queries/Runs.gql rename to src/graphql/gql/queries/rdb/Runs.gql diff --git a/src/graphql/gql/queries/ScheduleAutoModeMode.gql b/src/graphql/gql/queries/schedule/auto_mode/ScheduleAutoModeMode.gql similarity index 100% rename from src/graphql/gql/queries/ScheduleAutoModeMode.gql rename to src/graphql/gql/queries/schedule/auto_mode/ScheduleAutoModeMode.gql diff --git a/src/graphql/gql/queries/ScheduleAutoModeState.gql b/src/graphql/gql/queries/schedule/auto_mode/ScheduleAutoModeState.gql similarity index 100% rename from src/graphql/gql/queries/ScheduleAutoModeState.gql rename to src/graphql/gql/queries/schedule/auto_mode/ScheduleAutoModeState.gql diff --git a/src/graphql/gql/queries/ScheduleQueueItems.gql b/src/graphql/gql/queries/schedule/queue/ScheduleQueueItems.gql similarity index 100% rename from src/graphql/gql/queries/ScheduleQueueItems.gql rename to src/graphql/gql/queries/schedule/queue/ScheduleQueueItems.gql From 2b1ddd5942181908dbae96d356cdad9f2a5f79a6 Mon Sep 17 00:00:00 2001 From: Tai Sakuma Date: Thu, 23 May 2024 10:29:29 -0400 Subject: [PATCH 3/7] Remove an unused gql file --- src/graphql/codegen/generated.ts | 27 --------------------------- src/graphql/gql/queries/rdb/Runs.gql | 16 ---------------- 2 files changed, 43 deletions(-) delete mode 100644 src/graphql/gql/queries/rdb/Runs.gql diff --git a/src/graphql/codegen/generated.ts b/src/graphql/codegen/generated.ts index 7398d13..91ab5fa 100644 --- a/src/graphql/codegen/generated.ts +++ b/src/graphql/codegen/generated.ts @@ -560,11 +560,6 @@ export type RdbRunsQueryVariables = Exact<{ export type RdbRunsQuery = { __typename?: 'Query', rdb: { __typename?: 'QueryRDB', runs: { __typename?: 'RunNodeConnection', totalCount: number, pageInfo: { __typename?: 'PageInfo', startCursor?: string | null, endCursor?: string | null, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename?: 'RunNodeEdge', cursor: string, node: { __typename?: 'RunNode', id: number, runNo: number, state?: string | null, startedAt?: any | null, endedAt?: any | null, script?: string | null, exception?: string | null } }> } } }; -export type RunsQueryVariables = Exact<{ [key: string]: never; }>; - - -export type RunsQuery = { __typename?: 'Query', rdb: { __typename?: 'QueryRDB', runs: { __typename?: 'RunNodeConnection', edges: Array<{ __typename?: 'RunNodeEdge', node: { __typename?: 'RunNode', runNo: number, state?: string | null, startedAt?: any | null, endedAt?: any | null, script?: string | null, exception?: string | null } }> } } }; - export type QScheduleAutoModeModeQueryVariables = Exact<{ [key: string]: never; }>; @@ -926,28 +921,6 @@ export const RdbRunsDocument = gql` export function useRdbRunsQuery(options: Omit, 'query'>) { return Urql.useQuery({ query: RdbRunsDocument, ...options }); }; -export const RunsDocument = gql` - query Runs { - rdb { - runs { - edges { - node { - runNo - state - startedAt - endedAt - script - exception - } - } - } - } -} - `; - -export function useRunsQuery(options: Omit, 'query'>) { - return Urql.useQuery({ query: RunsDocument, ...options }); -}; export const QScheduleAutoModeModeDocument = gql` query QScheduleAutoModeMode { schedule { diff --git a/src/graphql/gql/queries/rdb/Runs.gql b/src/graphql/gql/queries/rdb/Runs.gql deleted file mode 100644 index fd05588..0000000 --- a/src/graphql/gql/queries/rdb/Runs.gql +++ /dev/null @@ -1,16 +0,0 @@ -query Runs { - rdb { - runs { - edges { - node { - runNo - state - startedAt - endedAt - script - exception - } - } - } - } -} From ea5c93e704fe095cf0619a71bf904e014443c7cd Mon Sep 17 00:00:00 2001 From: Tai Sakuma Date: Thu, 23 May 2024 10:43:24 -0400 Subject: [PATCH 4/7] Rename gql files --- src/graphql/codegen/generated.ts | 40 +++++++++---------- ...eAutoModeChangeMode.gql => ChangeMode.gql} | 0 .../{AutoModeTurnOff.gql => TurnOff.gql} | 0 .../{AutoModeTurnOn.gql => TurnOn.gql} | 0 .../queue/{ScheduleQueuePush.gql => Push.gql} | 0 .../{ScheduleQueueRemove.gql => Remove.gql} | 0 .../gql/queries/rdb/{RDBRun.gql => Run.gql} | 0 .../gql/queries/rdb/{RDBRuns.gql => Runs.gql} | 0 .../{ScheduleAutoModeMode.gql => Mode.gql} | 0 .../{ScheduleAutoModeState.gql => State.gql} | 0 .../{ScheduleQueueItems.gql => Items.gql} | 0 11 files changed, 20 insertions(+), 20 deletions(-) rename src/graphql/gql/mutations/schedule/auto_mode/{ScheduleAutoModeChangeMode.gql => ChangeMode.gql} (100%) rename src/graphql/gql/mutations/schedule/auto_mode/{AutoModeTurnOff.gql => TurnOff.gql} (100%) rename src/graphql/gql/mutations/schedule/auto_mode/{AutoModeTurnOn.gql => TurnOn.gql} (100%) rename src/graphql/gql/mutations/schedule/queue/{ScheduleQueuePush.gql => Push.gql} (100%) rename src/graphql/gql/mutations/schedule/queue/{ScheduleQueueRemove.gql => Remove.gql} (100%) rename src/graphql/gql/queries/rdb/{RDBRun.gql => Run.gql} (100%) rename src/graphql/gql/queries/rdb/{RDBRuns.gql => Runs.gql} (100%) rename src/graphql/gql/queries/schedule/auto_mode/{ScheduleAutoModeMode.gql => Mode.gql} (100%) rename src/graphql/gql/queries/schedule/auto_mode/{ScheduleAutoModeState.gql => State.gql} (100%) rename src/graphql/gql/queries/schedule/queue/{ScheduleQueueItems.gql => Items.gql} (100%) diff --git a/src/graphql/codegen/generated.ts b/src/graphql/codegen/generated.ts index 91ab5fa..86e8f78 100644 --- a/src/graphql/codegen/generated.ts +++ b/src/graphql/codegen/generated.ts @@ -475,6 +475,13 @@ export type TerminateMutationVariables = Exact<{ [key: string]: never; }>; export type TerminateMutation = { __typename?: 'Mutation', ctrl: { __typename?: 'MutationCtrl', terminate: boolean } }; +export type ScheduleAutoModeChangeModeMutationVariables = Exact<{ + mode: Scalars['String']['input']; +}>; + + +export type ScheduleAutoModeChangeModeMutation = { __typename?: 'Mutation', schedule: { __typename?: 'MutationSchedule', autoMode: { __typename?: 'MutationScheduleAutoMode', changeMode: boolean } } }; + export type AutoModeTurnOffMutationVariables = Exact<{ [key: string]: never; }>; @@ -485,13 +492,6 @@ export type AutoModeTurnOnMutationVariables = Exact<{ [key: string]: never; }>; export type AutoModeTurnOnMutation = { __typename?: 'Mutation', schedule: { __typename?: 'MutationSchedule', autoMode: { __typename?: 'MutationScheduleAutoMode', turnOn: boolean } } }; -export type ScheduleAutoModeChangeModeMutationVariables = Exact<{ - mode: Scalars['String']['input']; -}>; - - -export type ScheduleAutoModeChangeModeMutation = { __typename?: 'Mutation', schedule: { __typename?: 'MutationSchedule', autoMode: { __typename?: 'MutationScheduleAutoMode', changeMode: boolean } } }; - export type ScheduleQueuePushMutationVariables = Exact<{ input: ScheduleQueuePushInput; }>; @@ -716,6 +716,19 @@ export const TerminateDocument = gql` export function useTerminateMutation() { return Urql.useMutation(TerminateDocument); }; +export const ScheduleAutoModeChangeModeDocument = gql` + mutation ScheduleAutoModeChangeMode($mode: String!) { + schedule { + autoMode { + changeMode(mode: $mode) + } + } +} + `; + +export function useScheduleAutoModeChangeModeMutation() { + return Urql.useMutation(ScheduleAutoModeChangeModeDocument); +}; export const AutoModeTurnOffDocument = gql` mutation AutoModeTurnOff { schedule { @@ -742,19 +755,6 @@ export const AutoModeTurnOnDocument = gql` export function useAutoModeTurnOnMutation() { return Urql.useMutation(AutoModeTurnOnDocument); }; -export const ScheduleAutoModeChangeModeDocument = gql` - mutation ScheduleAutoModeChangeMode($mode: String!) { - schedule { - autoMode { - changeMode(mode: $mode) - } - } -} - `; - -export function useScheduleAutoModeChangeModeMutation() { - return Urql.useMutation(ScheduleAutoModeChangeModeDocument); -}; export const ScheduleQueuePushDocument = gql` mutation ScheduleQueuePush($input: ScheduleQueuePushInput!) { schedule { diff --git a/src/graphql/gql/mutations/schedule/auto_mode/ScheduleAutoModeChangeMode.gql b/src/graphql/gql/mutations/schedule/auto_mode/ChangeMode.gql similarity index 100% rename from src/graphql/gql/mutations/schedule/auto_mode/ScheduleAutoModeChangeMode.gql rename to src/graphql/gql/mutations/schedule/auto_mode/ChangeMode.gql diff --git a/src/graphql/gql/mutations/schedule/auto_mode/AutoModeTurnOff.gql b/src/graphql/gql/mutations/schedule/auto_mode/TurnOff.gql similarity index 100% rename from src/graphql/gql/mutations/schedule/auto_mode/AutoModeTurnOff.gql rename to src/graphql/gql/mutations/schedule/auto_mode/TurnOff.gql diff --git a/src/graphql/gql/mutations/schedule/auto_mode/AutoModeTurnOn.gql b/src/graphql/gql/mutations/schedule/auto_mode/TurnOn.gql similarity index 100% rename from src/graphql/gql/mutations/schedule/auto_mode/AutoModeTurnOn.gql rename to src/graphql/gql/mutations/schedule/auto_mode/TurnOn.gql diff --git a/src/graphql/gql/mutations/schedule/queue/ScheduleQueuePush.gql b/src/graphql/gql/mutations/schedule/queue/Push.gql similarity index 100% rename from src/graphql/gql/mutations/schedule/queue/ScheduleQueuePush.gql rename to src/graphql/gql/mutations/schedule/queue/Push.gql diff --git a/src/graphql/gql/mutations/schedule/queue/ScheduleQueueRemove.gql b/src/graphql/gql/mutations/schedule/queue/Remove.gql similarity index 100% rename from src/graphql/gql/mutations/schedule/queue/ScheduleQueueRemove.gql rename to src/graphql/gql/mutations/schedule/queue/Remove.gql diff --git a/src/graphql/gql/queries/rdb/RDBRun.gql b/src/graphql/gql/queries/rdb/Run.gql similarity index 100% rename from src/graphql/gql/queries/rdb/RDBRun.gql rename to src/graphql/gql/queries/rdb/Run.gql diff --git a/src/graphql/gql/queries/rdb/RDBRuns.gql b/src/graphql/gql/queries/rdb/Runs.gql similarity index 100% rename from src/graphql/gql/queries/rdb/RDBRuns.gql rename to src/graphql/gql/queries/rdb/Runs.gql diff --git a/src/graphql/gql/queries/schedule/auto_mode/ScheduleAutoModeMode.gql b/src/graphql/gql/queries/schedule/auto_mode/Mode.gql similarity index 100% rename from src/graphql/gql/queries/schedule/auto_mode/ScheduleAutoModeMode.gql rename to src/graphql/gql/queries/schedule/auto_mode/Mode.gql diff --git a/src/graphql/gql/queries/schedule/auto_mode/ScheduleAutoModeState.gql b/src/graphql/gql/queries/schedule/auto_mode/State.gql similarity index 100% rename from src/graphql/gql/queries/schedule/auto_mode/ScheduleAutoModeState.gql rename to src/graphql/gql/queries/schedule/auto_mode/State.gql diff --git a/src/graphql/gql/queries/schedule/queue/ScheduleQueueItems.gql b/src/graphql/gql/queries/schedule/queue/Items.gql similarity index 100% rename from src/graphql/gql/queries/schedule/queue/ScheduleQueueItems.gql rename to src/graphql/gql/queries/schedule/queue/Items.gql From 2629d17e24991ce0a3f7449638f56d84f8b25fab Mon Sep 17 00:00:00 2001 From: Tai Sakuma Date: Thu, 23 May 2024 10:47:45 -0400 Subject: [PATCH 5/7] Reorganize gql files for subscriptions --- src/graphql/codegen/generated.ts | 78 +++++++++---------- .../{ => ctrl}/ContinuousEnabled.gql | 0 .../gql/subscriptions/{ => ctrl}/Counter.gql | 0 .../subscriptions/{ => ctrl}/Prompting.gql | 0 .../gql/subscriptions/{ => ctrl}/RunNo.gql | 0 .../gql/subscriptions/{ => ctrl}/State.gql | 0 .../gql/subscriptions/{ => ctrl}/Stdout.gql | 0 .../gql/subscriptions/{ => ctrl}/TraceIds.gql | 0 .../auto_mode/Mode.gql} | 0 .../auto_mode/State.gql} | 0 .../queue/Items.gql} | 0 11 files changed, 39 insertions(+), 39 deletions(-) rename src/graphql/gql/subscriptions/{ => ctrl}/ContinuousEnabled.gql (100%) rename src/graphql/gql/subscriptions/{ => ctrl}/Counter.gql (100%) rename src/graphql/gql/subscriptions/{ => ctrl}/Prompting.gql (100%) rename src/graphql/gql/subscriptions/{ => ctrl}/RunNo.gql (100%) rename src/graphql/gql/subscriptions/{ => ctrl}/State.gql (100%) rename src/graphql/gql/subscriptions/{ => ctrl}/Stdout.gql (100%) rename src/graphql/gql/subscriptions/{ => ctrl}/TraceIds.gql (100%) rename src/graphql/gql/subscriptions/{ScheduleAutoModeMode.gql => schedule/auto_mode/Mode.gql} (100%) rename src/graphql/gql/subscriptions/{ScheduleAutoModeState.gql => schedule/auto_mode/State.gql} (100%) rename src/graphql/gql/subscriptions/{ScheduleQueueItems.gql => schedule/queue/Items.gql} (100%) diff --git a/src/graphql/codegen/generated.ts b/src/graphql/codegen/generated.ts index 86e8f78..424b95b 100644 --- a/src/graphql/codegen/generated.ts +++ b/src/graphql/codegen/generated.ts @@ -597,35 +597,35 @@ export type RunNoSubscriptionVariables = Exact<{ [key: string]: never; }>; export type RunNoSubscription = { __typename?: 'Subscription', ctrlRunNo: number }; -export type ScheduleAutoModeModeSubscriptionVariables = Exact<{ [key: string]: never; }>; +export type StateSubscriptionVariables = Exact<{ [key: string]: never; }>; -export type ScheduleAutoModeModeSubscription = { __typename?: 'Subscription', scheduleAutoModeMode: string }; +export type StateSubscription = { __typename?: 'Subscription', ctrlState: string }; -export type ScheduleAutoModeStateSubscriptionVariables = Exact<{ [key: string]: never; }>; +export type StdoutSubscriptionVariables = Exact<{ [key: string]: never; }>; -export type ScheduleAutoModeStateSubscription = { __typename?: 'Subscription', scheduleAutoModeState: string }; +export type StdoutSubscription = { __typename?: 'Subscription', ctrlStdout: string }; -export type SScheduleQueueItemsSubscriptionVariables = Exact<{ [key: string]: never; }>; +export type TraceIdsSubscriptionVariables = Exact<{ [key: string]: never; }>; -export type SScheduleQueueItemsSubscription = { __typename?: 'Subscription', scheduleQueueItems: Array<{ __typename?: 'ScheduleQueueItem', id: number, name: string, createdAt: any, script: string }> }; +export type TraceIdsSubscription = { __typename?: 'Subscription', ctrlTraceIds: Array }; -export type StateSubscriptionVariables = Exact<{ [key: string]: never; }>; +export type ScheduleAutoModeModeSubscriptionVariables = Exact<{ [key: string]: never; }>; -export type StateSubscription = { __typename?: 'Subscription', ctrlState: string }; +export type ScheduleAutoModeModeSubscription = { __typename?: 'Subscription', scheduleAutoModeMode: string }; -export type StdoutSubscriptionVariables = Exact<{ [key: string]: never; }>; +export type ScheduleAutoModeStateSubscriptionVariables = Exact<{ [key: string]: never; }>; -export type StdoutSubscription = { __typename?: 'Subscription', ctrlStdout: string }; +export type ScheduleAutoModeStateSubscription = { __typename?: 'Subscription', scheduleAutoModeState: string }; -export type TraceIdsSubscriptionVariables = Exact<{ [key: string]: never; }>; +export type SScheduleQueueItemsSubscriptionVariables = Exact<{ [key: string]: never; }>; -export type TraceIdsSubscription = { __typename?: 'Subscription', ctrlTraceIds: Array }; +export type SScheduleQueueItemsSubscription = { __typename?: 'Subscription', scheduleQueueItems: Array<{ __typename?: 'ScheduleQueueItem', id: number, name: string, createdAt: any, script: string }> }; export const ExecDocument = gql` @@ -1006,6 +1006,33 @@ export const RunNoDocument = gql` export function useRunNoSubscription(options: Omit, 'query'>, handler?: Urql.SubscriptionHandlerArg) { return Urql.useSubscription({ query: RunNoDocument, ...options }, handler); }; +export const StateDocument = gql` + subscription State { + ctrlState +} + `; + +export function useStateSubscription(options: Omit, 'query'>, handler?: Urql.SubscriptionHandlerArg) { + return Urql.useSubscription({ query: StateDocument, ...options }, handler); +}; +export const StdoutDocument = gql` + subscription Stdout { + ctrlStdout +} + `; + +export function useStdoutSubscription(options: Omit, 'query'>, handler?: Urql.SubscriptionHandlerArg) { + return Urql.useSubscription({ query: StdoutDocument, ...options }, handler); +}; +export const TraceIdsDocument = gql` + subscription TraceIds { + ctrlTraceIds +} + `; + +export function useTraceIdsSubscription(options: Omit, 'query'>, handler?: Urql.SubscriptionHandlerArg) { + return Urql.useSubscription({ query: TraceIdsDocument, ...options }, handler); +}; export const ScheduleAutoModeModeDocument = gql` subscription ScheduleAutoModeMode { scheduleAutoModeMode @@ -1037,31 +1064,4 @@ export const SScheduleQueueItemsDocument = gql` export function useSScheduleQueueItemsSubscription(options: Omit, 'query'>, handler?: Urql.SubscriptionHandlerArg) { return Urql.useSubscription({ query: SScheduleQueueItemsDocument, ...options }, handler); -}; -export const StateDocument = gql` - subscription State { - ctrlState -} - `; - -export function useStateSubscription(options: Omit, 'query'>, handler?: Urql.SubscriptionHandlerArg) { - return Urql.useSubscription({ query: StateDocument, ...options }, handler); -}; -export const StdoutDocument = gql` - subscription Stdout { - ctrlStdout -} - `; - -export function useStdoutSubscription(options: Omit, 'query'>, handler?: Urql.SubscriptionHandlerArg) { - return Urql.useSubscription({ query: StdoutDocument, ...options }, handler); -}; -export const TraceIdsDocument = gql` - subscription TraceIds { - ctrlTraceIds -} - `; - -export function useTraceIdsSubscription(options: Omit, 'query'>, handler?: Urql.SubscriptionHandlerArg) { - return Urql.useSubscription({ query: TraceIdsDocument, ...options }, handler); }; \ No newline at end of file diff --git a/src/graphql/gql/subscriptions/ContinuousEnabled.gql b/src/graphql/gql/subscriptions/ctrl/ContinuousEnabled.gql similarity index 100% rename from src/graphql/gql/subscriptions/ContinuousEnabled.gql rename to src/graphql/gql/subscriptions/ctrl/ContinuousEnabled.gql diff --git a/src/graphql/gql/subscriptions/Counter.gql b/src/graphql/gql/subscriptions/ctrl/Counter.gql similarity index 100% rename from src/graphql/gql/subscriptions/Counter.gql rename to src/graphql/gql/subscriptions/ctrl/Counter.gql diff --git a/src/graphql/gql/subscriptions/Prompting.gql b/src/graphql/gql/subscriptions/ctrl/Prompting.gql similarity index 100% rename from src/graphql/gql/subscriptions/Prompting.gql rename to src/graphql/gql/subscriptions/ctrl/Prompting.gql diff --git a/src/graphql/gql/subscriptions/RunNo.gql b/src/graphql/gql/subscriptions/ctrl/RunNo.gql similarity index 100% rename from src/graphql/gql/subscriptions/RunNo.gql rename to src/graphql/gql/subscriptions/ctrl/RunNo.gql diff --git a/src/graphql/gql/subscriptions/State.gql b/src/graphql/gql/subscriptions/ctrl/State.gql similarity index 100% rename from src/graphql/gql/subscriptions/State.gql rename to src/graphql/gql/subscriptions/ctrl/State.gql diff --git a/src/graphql/gql/subscriptions/Stdout.gql b/src/graphql/gql/subscriptions/ctrl/Stdout.gql similarity index 100% rename from src/graphql/gql/subscriptions/Stdout.gql rename to src/graphql/gql/subscriptions/ctrl/Stdout.gql diff --git a/src/graphql/gql/subscriptions/TraceIds.gql b/src/graphql/gql/subscriptions/ctrl/TraceIds.gql similarity index 100% rename from src/graphql/gql/subscriptions/TraceIds.gql rename to src/graphql/gql/subscriptions/ctrl/TraceIds.gql diff --git a/src/graphql/gql/subscriptions/ScheduleAutoModeMode.gql b/src/graphql/gql/subscriptions/schedule/auto_mode/Mode.gql similarity index 100% rename from src/graphql/gql/subscriptions/ScheduleAutoModeMode.gql rename to src/graphql/gql/subscriptions/schedule/auto_mode/Mode.gql diff --git a/src/graphql/gql/subscriptions/ScheduleAutoModeState.gql b/src/graphql/gql/subscriptions/schedule/auto_mode/State.gql similarity index 100% rename from src/graphql/gql/subscriptions/ScheduleAutoModeState.gql rename to src/graphql/gql/subscriptions/schedule/auto_mode/State.gql diff --git a/src/graphql/gql/subscriptions/ScheduleQueueItems.gql b/src/graphql/gql/subscriptions/schedule/queue/Items.gql similarity index 100% rename from src/graphql/gql/subscriptions/ScheduleQueueItems.gql rename to src/graphql/gql/subscriptions/schedule/queue/Items.gql From e9372d36bb97421ecdd2bb10a64ac483cd93149d Mon Sep 17 00:00:00 2001 From: Tai Sakuma Date: Thu, 23 May 2024 11:10:03 -0400 Subject: [PATCH 6/7] Rename GraphQL queries --- ...se-schedule-auto-mode-mode-subscription.ts | 12 ++-- ...e-schedule-auto-mode-state-subscription.ts | 6 +- .../use-schedule-queue-items-subscription.ts | 12 ++-- src/graphql/codegen/generated.ts | 60 +++++++++---------- .../gql/queries/schedule/auto_mode/Mode.gql | 2 +- .../gql/queries/schedule/queue/Items.gql | 2 +- .../subscriptions/schedule/auto_mode/Mode.gql | 2 +- .../schedule/auto_mode/State.gql | 2 +- .../subscriptions/schedule/queue/Items.gql | 2 +- 9 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/api/use-schedule-auto-mode-mode-subscription.ts b/src/api/use-schedule-auto-mode-mode-subscription.ts index f692b62..d47e220 100644 --- a/src/api/use-schedule-auto-mode-mode-subscription.ts +++ b/src/api/use-schedule-auto-mode-mode-subscription.ts @@ -1,8 +1,8 @@ import { computed } from "vue"; import type { ComputedRef } from "vue"; import { - useQScheduleAutoModeModeQuery, - useScheduleAutoModeModeSubscription, + useScheduleAutoModeModeQuery, + useScheduleAutoModeModeSSubscription, } from "@/graphql/codegen/generated"; // type AutoMode = "off" | "scheduler" | "queue"; @@ -10,16 +10,16 @@ import { interface _ScheduleAutoModeModeSubscription { autoModeMode: ComputedRef; error: ComputedRef; - subscription: ReturnType; - query: ReturnType; + subscription: ReturnType; + query: ReturnType; } type ScheduleAutoModeModeSubscription = _ScheduleAutoModeModeSubscription & PromiseLike<_ScheduleAutoModeModeSubscription>; export function useSubscribeScheduleAutoModeMode(): ScheduleAutoModeModeSubscription { - const query = useQScheduleAutoModeModeQuery({ requestPolicy: "network-only" }); - const subscription = useScheduleAutoModeModeSubscription(); + const query = useScheduleAutoModeModeQuery({ requestPolicy: "network-only" }); + const subscription = useScheduleAutoModeModeSSubscription(); const error = computed(() => subscription.error?.value || query.error?.value); diff --git a/src/api/use-schedule-auto-mode-state-subscription.ts b/src/api/use-schedule-auto-mode-state-subscription.ts index 6cf8f7a..59b174b 100644 --- a/src/api/use-schedule-auto-mode-state-subscription.ts +++ b/src/api/use-schedule-auto-mode-state-subscription.ts @@ -2,13 +2,13 @@ import { computed } from "vue"; import type { ComputedRef } from "vue"; import { useQScheduleAutoModeStateQuery, - useScheduleAutoModeStateSubscription, + useScheduleAutoModeStateSSubscription, } from "@/graphql/codegen/generated"; interface _ScheduleAutoModeStateSubscription { autoModeState: ComputedRef; error: ComputedRef; - subscription: ReturnType; + subscription: ReturnType; query: ReturnType; } @@ -17,7 +17,7 @@ type ScheduleAutoModeStateSubscription = _ScheduleAutoModeStateSubscription & export function useSubscribeScheduleAutoModeState(): ScheduleAutoModeStateSubscription { const query = useQScheduleAutoModeStateQuery({ requestPolicy: "network-only" }); - const subscription = useScheduleAutoModeStateSubscription(); + const subscription = useScheduleAutoModeStateSSubscription(); const error = computed(() => subscription.error?.value || query.error?.value); diff --git a/src/api/use-schedule-queue-items-subscription.ts b/src/api/use-schedule-queue-items-subscription.ts index 774e96b..e39d2d6 100644 --- a/src/api/use-schedule-queue-items-subscription.ts +++ b/src/api/use-schedule-queue-items-subscription.ts @@ -1,8 +1,8 @@ import { computed } from "vue"; import type { ComputedRef } from "vue"; import { - useQScheduleQueueItemsQuery, - useSScheduleQueueItemsSubscription, + useScheduleQueueItemsQuery, + useScheduleQueueItemsSSubscription, } from "@/graphql/codegen/generated"; import type { ScheduleQueueItem } from "@/graphql/codegen/generated"; @@ -10,16 +10,16 @@ interface _ScheduleQueueItemsSubscription { items: ComputedRef; loading: ComputedRef; error: ComputedRef; - subscription: ReturnType; - query: ReturnType; + subscription: ReturnType; + query: ReturnType; } type ScheduleQueueItemsSubscription = _ScheduleQueueItemsSubscription & PromiseLike<_ScheduleQueueItemsSubscription>; export function useSubscribeScheduleQueueItems(): ScheduleQueueItemsSubscription { - const query = useQScheduleQueueItemsQuery({ requestPolicy: "network-only" }); - const subscription = useSScheduleQueueItemsSubscription(); + const query = useScheduleQueueItemsQuery({ requestPolicy: "network-only" }); + const subscription = useScheduleQueueItemsSSubscription(); const loading = computed(() => query.fetching?.value); const error = computed(() => subscription.error?.value || query.error?.value); diff --git a/src/graphql/codegen/generated.ts b/src/graphql/codegen/generated.ts index 424b95b..09579d3 100644 --- a/src/graphql/codegen/generated.ts +++ b/src/graphql/codegen/generated.ts @@ -560,20 +560,20 @@ export type RdbRunsQueryVariables = Exact<{ export type RdbRunsQuery = { __typename?: 'Query', rdb: { __typename?: 'QueryRDB', runs: { __typename?: 'RunNodeConnection', totalCount: number, pageInfo: { __typename?: 'PageInfo', startCursor?: string | null, endCursor?: string | null, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename?: 'RunNodeEdge', cursor: string, node: { __typename?: 'RunNode', id: number, runNo: number, state?: string | null, startedAt?: any | null, endedAt?: any | null, script?: string | null, exception?: string | null } }> } } }; -export type QScheduleAutoModeModeQueryVariables = Exact<{ [key: string]: never; }>; +export type ScheduleAutoModeModeQueryVariables = Exact<{ [key: string]: never; }>; -export type QScheduleAutoModeModeQuery = { __typename?: 'Query', schedule: { __typename?: 'QuerySchedule', autoMode: { __typename?: 'QueryScheduleAutoMode', mode: string } } }; +export type ScheduleAutoModeModeQuery = { __typename?: 'Query', schedule: { __typename?: 'QuerySchedule', autoMode: { __typename?: 'QueryScheduleAutoMode', mode: string } } }; export type QScheduleAutoModeStateQueryVariables = Exact<{ [key: string]: never; }>; export type QScheduleAutoModeStateQuery = { __typename?: 'Query', schedule: { __typename?: 'QuerySchedule', autoMode: { __typename?: 'QueryScheduleAutoMode', state: string } } }; -export type QScheduleQueueItemsQueryVariables = Exact<{ [key: string]: never; }>; +export type ScheduleQueueItemsQueryVariables = Exact<{ [key: string]: never; }>; -export type QScheduleQueueItemsQuery = { __typename?: 'Query', schedule: { __typename?: 'QuerySchedule', queue: { __typename?: 'QueryScheduleQueue', items: Array<{ __typename?: 'ScheduleQueueItem', id: number, name: string, createdAt: any, script: string }> } } }; +export type ScheduleQueueItemsQuery = { __typename?: 'Query', schedule: { __typename?: 'QuerySchedule', queue: { __typename?: 'QueryScheduleQueue', items: Array<{ __typename?: 'ScheduleQueueItem', id: number, name: string, createdAt: any, script: string }> } } }; export type ContinuousEnabledSubscriptionVariables = Exact<{ [key: string]: never; }>; @@ -612,20 +612,20 @@ export type TraceIdsSubscriptionVariables = Exact<{ [key: string]: never; }>; export type TraceIdsSubscription = { __typename?: 'Subscription', ctrlTraceIds: Array }; -export type ScheduleAutoModeModeSubscriptionVariables = Exact<{ [key: string]: never; }>; +export type ScheduleAutoModeModeSSubscriptionVariables = Exact<{ [key: string]: never; }>; -export type ScheduleAutoModeModeSubscription = { __typename?: 'Subscription', scheduleAutoModeMode: string }; +export type ScheduleAutoModeModeSSubscription = { __typename?: 'Subscription', scheduleAutoModeMode: string }; -export type ScheduleAutoModeStateSubscriptionVariables = Exact<{ [key: string]: never; }>; +export type ScheduleAutoModeStateSSubscriptionVariables = Exact<{ [key: string]: never; }>; -export type ScheduleAutoModeStateSubscription = { __typename?: 'Subscription', scheduleAutoModeState: string }; +export type ScheduleAutoModeStateSSubscription = { __typename?: 'Subscription', scheduleAutoModeState: string }; -export type SScheduleQueueItemsSubscriptionVariables = Exact<{ [key: string]: never; }>; +export type ScheduleQueueItemsSSubscriptionVariables = Exact<{ [key: string]: never; }>; -export type SScheduleQueueItemsSubscription = { __typename?: 'Subscription', scheduleQueueItems: Array<{ __typename?: 'ScheduleQueueItem', id: number, name: string, createdAt: any, script: string }> }; +export type ScheduleQueueItemsSSubscription = { __typename?: 'Subscription', scheduleQueueItems: Array<{ __typename?: 'ScheduleQueueItem', id: number, name: string, createdAt: any, script: string }> }; export const ExecDocument = gql` @@ -921,8 +921,8 @@ export const RdbRunsDocument = gql` export function useRdbRunsQuery(options: Omit, 'query'>) { return Urql.useQuery({ query: RdbRunsDocument, ...options }); }; -export const QScheduleAutoModeModeDocument = gql` - query QScheduleAutoModeMode { +export const ScheduleAutoModeModeDocument = gql` + query ScheduleAutoModeMode { schedule { autoMode { mode @@ -931,8 +931,8 @@ export const QScheduleAutoModeModeDocument = gql` } `; -export function useQScheduleAutoModeModeQuery(options: Omit, 'query'>) { - return Urql.useQuery({ query: QScheduleAutoModeModeDocument, ...options }); +export function useScheduleAutoModeModeQuery(options: Omit, 'query'>) { + return Urql.useQuery({ query: ScheduleAutoModeModeDocument, ...options }); }; export const QScheduleAutoModeStateDocument = gql` query QScheduleAutoModeState { @@ -947,8 +947,8 @@ export const QScheduleAutoModeStateDocument = gql` export function useQScheduleAutoModeStateQuery(options: Omit, 'query'>) { return Urql.useQuery({ query: QScheduleAutoModeStateDocument, ...options }); }; -export const QScheduleQueueItemsDocument = gql` - query QScheduleQueueItems { +export const ScheduleQueueItemsDocument = gql` + query ScheduleQueueItems { schedule { queue { items { @@ -962,8 +962,8 @@ export const QScheduleQueueItemsDocument = gql` } `; -export function useQScheduleQueueItemsQuery(options: Omit, 'query'>) { - return Urql.useQuery({ query: QScheduleQueueItemsDocument, ...options }); +export function useScheduleQueueItemsQuery(options: Omit, 'query'>) { + return Urql.useQuery({ query: ScheduleQueueItemsDocument, ...options }); }; export const ContinuousEnabledDocument = gql` subscription ContinuousEnabled { @@ -1033,26 +1033,26 @@ export const TraceIdsDocument = gql` export function useTraceIdsSubscription(options: Omit, 'query'>, handler?: Urql.SubscriptionHandlerArg) { return Urql.useSubscription({ query: TraceIdsDocument, ...options }, handler); }; -export const ScheduleAutoModeModeDocument = gql` - subscription ScheduleAutoModeMode { +export const ScheduleAutoModeModeSDocument = gql` + subscription ScheduleAutoModeModeS { scheduleAutoModeMode } `; -export function useScheduleAutoModeModeSubscription(options: Omit, 'query'>, handler?: Urql.SubscriptionHandlerArg) { - return Urql.useSubscription({ query: ScheduleAutoModeModeDocument, ...options }, handler); +export function useScheduleAutoModeModeSSubscription(options: Omit, 'query'>, handler?: Urql.SubscriptionHandlerArg) { + return Urql.useSubscription({ query: ScheduleAutoModeModeSDocument, ...options }, handler); }; -export const ScheduleAutoModeStateDocument = gql` - subscription ScheduleAutoModeState { +export const ScheduleAutoModeStateSDocument = gql` + subscription ScheduleAutoModeStateS { scheduleAutoModeState } `; -export function useScheduleAutoModeStateSubscription(options: Omit, 'query'>, handler?: Urql.SubscriptionHandlerArg) { - return Urql.useSubscription({ query: ScheduleAutoModeStateDocument, ...options }, handler); +export function useScheduleAutoModeStateSSubscription(options: Omit, 'query'>, handler?: Urql.SubscriptionHandlerArg) { + return Urql.useSubscription({ query: ScheduleAutoModeStateSDocument, ...options }, handler); }; -export const SScheduleQueueItemsDocument = gql` - subscription SScheduleQueueItems { +export const ScheduleQueueItemsSDocument = gql` + subscription ScheduleQueueItemsS { scheduleQueueItems { id name @@ -1062,6 +1062,6 @@ export const SScheduleQueueItemsDocument = gql` } `; -export function useSScheduleQueueItemsSubscription(options: Omit, 'query'>, handler?: Urql.SubscriptionHandlerArg) { - return Urql.useSubscription({ query: SScheduleQueueItemsDocument, ...options }, handler); +export function useScheduleQueueItemsSSubscription(options: Omit, 'query'>, handler?: Urql.SubscriptionHandlerArg) { + return Urql.useSubscription({ query: ScheduleQueueItemsSDocument, ...options }, handler); }; \ No newline at end of file diff --git a/src/graphql/gql/queries/schedule/auto_mode/Mode.gql b/src/graphql/gql/queries/schedule/auto_mode/Mode.gql index ab6cecb..4a56f64 100644 --- a/src/graphql/gql/queries/schedule/auto_mode/Mode.gql +++ b/src/graphql/gql/queries/schedule/auto_mode/Mode.gql @@ -1,4 +1,4 @@ -query QScheduleAutoModeMode { +query ScheduleAutoModeMode { schedule { autoMode { mode diff --git a/src/graphql/gql/queries/schedule/queue/Items.gql b/src/graphql/gql/queries/schedule/queue/Items.gql index a2b908c..7cb7421 100644 --- a/src/graphql/gql/queries/schedule/queue/Items.gql +++ b/src/graphql/gql/queries/schedule/queue/Items.gql @@ -1,4 +1,4 @@ -query QScheduleQueueItems { +query ScheduleQueueItems { schedule { queue { items { diff --git a/src/graphql/gql/subscriptions/schedule/auto_mode/Mode.gql b/src/graphql/gql/subscriptions/schedule/auto_mode/Mode.gql index d2bda1a..5d0dd35 100644 --- a/src/graphql/gql/subscriptions/schedule/auto_mode/Mode.gql +++ b/src/graphql/gql/subscriptions/schedule/auto_mode/Mode.gql @@ -1,3 +1,3 @@ -subscription ScheduleAutoModeMode { +subscription ScheduleAutoModeModeS { scheduleAutoModeMode } diff --git a/src/graphql/gql/subscriptions/schedule/auto_mode/State.gql b/src/graphql/gql/subscriptions/schedule/auto_mode/State.gql index 7a4275d..91f7854 100644 --- a/src/graphql/gql/subscriptions/schedule/auto_mode/State.gql +++ b/src/graphql/gql/subscriptions/schedule/auto_mode/State.gql @@ -1,3 +1,3 @@ -subscription ScheduleAutoModeState { +subscription ScheduleAutoModeStateS { scheduleAutoModeState } diff --git a/src/graphql/gql/subscriptions/schedule/queue/Items.gql b/src/graphql/gql/subscriptions/schedule/queue/Items.gql index 71e404d..08669a5 100644 --- a/src/graphql/gql/subscriptions/schedule/queue/Items.gql +++ b/src/graphql/gql/subscriptions/schedule/queue/Items.gql @@ -1,4 +1,4 @@ -subscription SScheduleQueueItems { +subscription ScheduleQueueItemsS { scheduleQueueItems { id name From 18f684b00f5813e6956c1a11c90341dc909864b1 Mon Sep 17 00:00:00 2001 From: Tai Sakuma Date: Thu, 23 May 2024 12:03:15 -0400 Subject: [PATCH 7/7] Rename GraphQL queries --- .../use-continuous-enabled-subscription.ts | 12 +- src/api/use-run-no-subscription.ts | 10 +- src/api/use-state-subscription.ts | 10 +- src/api/use-trace_ids-subscription.ts | 12 +- src/components/exception/Exception.vue | 4 +- .../main/console-frame/ConsoleFrame.vue | 4 +- .../main/run-frame/top-bar/ActionFinished.vue | 4 +- .../run-frame/top-bar/ActionInitialized.vue | 8 +- .../main/run-frame/top-bar/ActionRunning.vue | 12 +- .../main/trace-frame/TraceAction.vue | 4 +- .../main/trace-frame/TraceFrame.vue | 4 +- .../main/trace-frame/code-editor/source.ts | 4 +- .../main/trace-frame/keyboard-shortcuts.ts | 4 +- .../main/trace-frame/script-editor/source.ts | 16 +- src/graphql/codegen/generated.ts | 296 +++++++++--------- src/graphql/gql/mutations/ctrl/Exec.gql | 2 +- src/graphql/gql/mutations/ctrl/Interrupt.gql | 2 +- src/graphql/gql/mutations/ctrl/Kill.gql | 2 +- .../gql/mutations/ctrl/LoadExampleScript.gql | 2 +- src/graphql/gql/mutations/ctrl/Reset.gql | 2 +- .../gql/mutations/ctrl/RunAndContinue.gql | 2 +- .../gql/mutations/ctrl/SendPdbCommand.gql | 2 +- src/graphql/gql/mutations/ctrl/Terminate.gql | 2 +- .../mutations/schedule/auto_mode/TurnOff.gql | 2 +- .../mutations/schedule/auto_mode/TurnOn.gql | 2 +- .../schedule/scheduler/LoadScript.gql | 6 +- .../gql/queries/ctrl/ContinuousEnabled.gql | 2 +- src/graphql/gql/queries/ctrl/Exception.gql | 2 +- src/graphql/gql/queries/ctrl/RunNo.gql | 2 +- src/graphql/gql/queries/ctrl/Source.gql | 2 +- src/graphql/gql/queries/ctrl/State.gql | 2 +- src/graphql/gql/queries/ctrl/TraceIds.gql | 2 +- src/graphql/gql/queries/rdb/Run.gql | 2 +- src/graphql/gql/queries/rdb/Runs.gql | 2 +- .../subscriptions/ctrl/ContinuousEnabled.gql | 2 +- .../gql/subscriptions/ctrl/Counter.gql | 2 +- .../gql/subscriptions/ctrl/Prompting.gql | 2 +- src/graphql/gql/subscriptions/ctrl/RunNo.gql | 2 +- src/graphql/gql/subscriptions/ctrl/State.gql | 2 +- src/graphql/gql/subscriptions/ctrl/Stdout.gql | 2 +- .../gql/subscriptions/ctrl/TraceIds.gql | 2 +- src/views/scratch/ScratchUrql.vue | 8 +- 42 files changed, 236 insertions(+), 232 deletions(-) diff --git a/src/api/use-continuous-enabled-subscription.ts b/src/api/use-continuous-enabled-subscription.ts index d866192..519eb52 100644 --- a/src/api/use-continuous-enabled-subscription.ts +++ b/src/api/use-continuous-enabled-subscription.ts @@ -1,23 +1,23 @@ import { computed } from "vue"; import type { ComputedRef } from "vue"; import { - useQContinuousEnabledQuery, - useContinuousEnabledSubscription, + useCtrlContinuousEnabledQuery, + useCtrlContinuousEnabledSSubscription, } from "@/graphql/codegen/generated"; interface _ContinuousEnabledSubscription { continuousEnabled: ComputedRef; error: ComputedRef; - subscription: ReturnType; - query: ReturnType; + subscription: ReturnType; + query: ReturnType; } type ContinuousEnabledSubscription = _ContinuousEnabledSubscription & PromiseLike<_ContinuousEnabledSubscription>; export function useSubscribeContinuousEnabled(): ContinuousEnabledSubscription { - const query = useQContinuousEnabledQuery({ requestPolicy: "network-only" }); - const subscription = useContinuousEnabledSubscription({}); + const query = useCtrlContinuousEnabledQuery({ requestPolicy: "network-only" }); + const subscription = useCtrlContinuousEnabledSSubscription({}); const error = computed(() => subscription.error?.value || query.error?.value); diff --git a/src/api/use-run-no-subscription.ts b/src/api/use-run-no-subscription.ts index ab26507..5090664 100644 --- a/src/api/use-run-no-subscription.ts +++ b/src/api/use-run-no-subscription.ts @@ -1,19 +1,19 @@ import { computed } from "vue"; import type { ComputedRef } from "vue"; -import { useQRunNoQuery, useRunNoSubscription } from "@/graphql/codegen/generated"; +import { useCtrlRunNoQuery, useCtrlRunNoSSubscription } from "@/graphql/codegen/generated"; interface _RunNoSubscription { runNo: ComputedRef; error: ComputedRef; - subscription: ReturnType; - query: ReturnType; + subscription: ReturnType; + query: ReturnType; } type RunNoSubscription = _RunNoSubscription & PromiseLike<_RunNoSubscription>; export function useSubscribeRunNo(): RunNoSubscription { - const query = useQRunNoQuery({ requestPolicy: "network-only" }); - const subscription = useRunNoSubscription({}); + const query = useCtrlRunNoQuery({ requestPolicy: "network-only" }); + const subscription = useCtrlRunNoSSubscription({}); const error = computed(() => subscription.error?.value || query.error?.value); diff --git a/src/api/use-state-subscription.ts b/src/api/use-state-subscription.ts index 21dbc90..01cf81d 100644 --- a/src/api/use-state-subscription.ts +++ b/src/api/use-state-subscription.ts @@ -1,19 +1,19 @@ import { computed } from "vue"; import type { ComputedRef } from "vue"; -import { useQStateQuery, useStateSubscription } from "@/graphql/codegen/generated"; +import { useCtrlStateQuery, useCtrlStateSSubscription } from "@/graphql/codegen/generated"; interface _StateSubscription { state: ComputedRef; error: ComputedRef; - subscription: ReturnType; - query: ReturnType; + subscription: ReturnType; + query: ReturnType; } type StateSubscription = _StateSubscription & PromiseLike<_StateSubscription>; export function useSubscribeState(): StateSubscription { - const query = useQStateQuery({ requestPolicy: "network-only" }); - const subscription = useStateSubscription({}); + const query = useCtrlStateQuery({ requestPolicy: "network-only" }); + const subscription = useCtrlStateSSubscription({}); const error = computed(() => subscription.error?.value || query.error?.value); diff --git a/src/api/use-trace_ids-subscription.ts b/src/api/use-trace_ids-subscription.ts index ccb3144..15b8104 100644 --- a/src/api/use-trace_ids-subscription.ts +++ b/src/api/use-trace_ids-subscription.ts @@ -1,22 +1,22 @@ import { computed } from "vue"; import type { ComputedRef } from "vue"; import { - useQTraceIdsQuery, - useTraceIdsSubscription, + useCtrlTraceIdsQuery, + useCtrlTraceIdsSSubscription, } from "@/graphql/codegen/generated"; interface _TraceIdsSubscription { traceIds: ComputedRef; error: ComputedRef; - subscription: ReturnType; - query: ReturnType; + subscription: ReturnType; + query: ReturnType; } type TraceIdsSubscription = _TraceIdsSubscription & PromiseLike<_TraceIdsSubscription>; export function useSubscribeTraceIds(): TraceIdsSubscription { - const query = useQTraceIdsQuery({ requestPolicy: "network-only" }); - const subscription = useTraceIdsSubscription({}); + const query = useCtrlTraceIdsQuery({ requestPolicy: "network-only" }); + const subscription = useCtrlTraceIdsSSubscription({}); const error = computed(() => subscription.error?.value || query.error?.value); diff --git a/src/components/exception/Exception.vue b/src/components/exception/Exception.vue index 9142477..58ceb38 100644 --- a/src/components/exception/Exception.vue +++ b/src/components/exception/Exception.vue @@ -10,7 +10,7 @@ diff --git a/src/components/main/run-frame/top-bar/ActionInitialized.vue b/src/components/main/run-frame/top-bar/ActionInitialized.vue index 4a2756b..0e1ea6b 100644 --- a/src/components/main/run-frame/top-bar/ActionInitialized.vue +++ b/src/components/main/run-frame/top-bar/ActionInitialized.vue @@ -31,8 +31,8 @@ import { storeToRefs } from "pinia"; import { useStore } from "@/plugins/pinia/stores/main"; import { - useExecMutation, - useRunAndContinueMutation, + useCtrlExecMutation, + useCtrlRunAndContinueMutation, } from "@/graphql/codegen/generated"; import RunInterConfirmationDialog from "./RunInterConfirmationDialog.vue"; @@ -41,8 +41,8 @@ import RunConfirmationDialog from "./RunConfirmationDialog.vue"; const store = useStore(); const { modified: editing } = storeToRefs(store); -const { executeMutation: executeExec } = useExecMutation(); -const { executeMutation: executeRunAndContinue } = useRunAndContinueMutation(); +const { executeMutation: executeExec } = useCtrlExecMutation(); +const { executeMutation: executeRunAndContinue } = useCtrlRunAndContinueMutation(); const dialogRun = ref(false); const dialogRunInter = ref(false); diff --git a/src/components/main/run-frame/top-bar/ActionRunning.vue b/src/components/main/run-frame/top-bar/ActionRunning.vue index c28d9b4..ff6de80 100644 --- a/src/components/main/run-frame/top-bar/ActionRunning.vue +++ b/src/components/main/run-frame/top-bar/ActionRunning.vue @@ -32,12 +32,12 @@ diff --git a/src/components/main/trace-frame/TraceAction.vue b/src/components/main/trace-frame/TraceAction.vue index a93e62e..e1d7a7d 100644 --- a/src/components/main/trace-frame/TraceAction.vue +++ b/src/components/main/trace-frame/TraceAction.vue @@ -41,7 +41,7 @@