diff --git a/packages/backend/src/graphql/types/execution-step.ts b/packages/backend/src/graphql/types/execution-step.ts index 5415c71..f48d306 100644 --- a/packages/backend/src/graphql/types/execution-step.ts +++ b/packages/backend/src/graphql/types/execution-step.ts @@ -4,6 +4,7 @@ import { GraphQLJSONObject } from 'graphql-type-json'; const executionStepType = new GraphQLObjectType({ name: 'ExecutionStep', fields: { + id: { type: GraphQLString }, executionId: { type: GraphQLString }, stepId: { type: GraphQLString }, status: { type: GraphQLString }, diff --git a/packages/backend/src/graphql/types/step.ts b/packages/backend/src/graphql/types/step.ts index 0dddef8..7646080 100644 --- a/packages/backend/src/graphql/types/step.ts +++ b/packages/backend/src/graphql/types/step.ts @@ -33,7 +33,6 @@ const stepType = new GraphQLObjectType({ parameters: { type: GraphQLJSONObject }, connection: { type: ConnectionType }, flow: { type: FlowType }, - output: { type: GraphQLJSONObject }, position: { type: GraphQLInt }, status: { type: GraphQLString }, executionSteps: { diff --git a/packages/web/src/components/PowerInput/data.ts b/packages/web/src/components/PowerInput/data.ts index 0c192b9..0e2fa21 100644 --- a/packages/web/src/components/PowerInput/data.ts +++ b/packages/web/src/components/PowerInput/data.ts @@ -39,6 +39,6 @@ export const processStepWithExecutions = (steps: IStep[]): any[] => { id: step.id, // TODO: replace with step.name once introduced name: `${index + 1}. ${step.appKey}`, - output: process(step.output, `step.${step.id}`), + output: process(step.executionSteps?.[0]?.dataOut || {}, `step.${step.id}`), })); }; diff --git a/packages/web/src/components/PowerInput/index.tsx b/packages/web/src/components/PowerInput/index.tsx index d2e3196..28b25bc 100644 --- a/packages/web/src/components/PowerInput/index.tsx +++ b/packages/web/src/components/PowerInput/index.tsx @@ -13,6 +13,7 @@ import { useSelected, useFocused, } from 'slate-react'; +import type { IExecutionStep, IStep } from '@automatisch/types'; import { serialize, diff --git a/packages/web/src/graphql/queries/get-step-with-test-executions.ts b/packages/web/src/graphql/queries/get-step-with-test-executions.ts index 813d764..0c23c0c 100644 --- a/packages/web/src/graphql/queries/get-step-with-test-executions.ts +++ b/packages/web/src/graphql/queries/get-step-with-test-executions.ts @@ -5,7 +5,13 @@ export const GET_STEP_WITH_TEST_EXECUTIONS = gql` getStepWithTestExecutions(stepId: $stepId) { id appKey - output + executionSteps { + id + executionId + stepId + status + dataOut + } } } -`; \ No newline at end of file +`;