From 852d4bba0ad24c4d991ecf8dec460220ffe626dc Mon Sep 17 00:00:00 2001 From: Ali BARIN Date: Fri, 6 Sep 2024 17:30:56 +0000 Subject: [PATCH] chore: remove redundant create step mutation --- .../backend/src/graphql/mutation-resolvers.js | 2 - .../src/graphql/mutations/create-step.js | 56 ------------------- packages/backend/src/graphql/schema.graphql | 12 ---- .../web/src/graphql/mutations/create-step.js | 19 ------- 4 files changed, 89 deletions(-) delete mode 100644 packages/backend/src/graphql/mutations/create-step.js delete mode 100644 packages/web/src/graphql/mutations/create-step.js diff --git a/packages/backend/src/graphql/mutation-resolvers.js b/packages/backend/src/graphql/mutation-resolvers.js index 60c8b8ea..fffc1b04 100644 --- a/packages/backend/src/graphql/mutation-resolvers.js +++ b/packages/backend/src/graphql/mutation-resolvers.js @@ -1,5 +1,4 @@ import createConnection from './mutations/create-connection.js'; -import createStep from './mutations/create-step.js'; import createUser from './mutations/create-user.ee.js'; import deleteFlow from './mutations/delete-flow.js'; import deleteRole from './mutations/delete-role.ee.js'; @@ -23,7 +22,6 @@ import deleteCurrentUser from './mutations/delete-current-user.ee.js'; const mutationResolvers = { createConnection, createFlow, - createStep, createUser, deleteCurrentUser, deleteFlow, diff --git a/packages/backend/src/graphql/mutations/create-step.js b/packages/backend/src/graphql/mutations/create-step.js deleted file mode 100644 index 05b8d364..00000000 --- a/packages/backend/src/graphql/mutations/create-step.js +++ /dev/null @@ -1,56 +0,0 @@ -import App from '../../models/app.js'; -import Flow from '../../models/flow.js'; - -const createStep = async (_parent, params, context) => { - const conditions = context.currentUser.can('update', 'Flow'); - const userFlows = context.currentUser.$relatedQuery('flows'); - const allFlows = Flow.query(); - const flowsQuery = conditions.isCreator ? userFlows : allFlows; - - const { input } = params; - - if (input.appKey && input.key) { - await App.checkAppAndAction(input.appKey, input.key); - } - - if (input.appKey && !input.key) { - await App.findOneByKey(input.appKey); - } - - const flow = await flowsQuery - .findOne({ - id: input.flow.id, - }) - .throwIfNotFound(); - - const previousStep = await flow - .$relatedQuery('steps') - .findOne({ - id: input.previousStep.id, - }) - .throwIfNotFound(); - - const step = await flow.$relatedQuery('steps').insertAndFetch({ - key: input.key, - appKey: input.appKey, - type: 'action', - position: previousStep.position + 1, - }); - - const nextSteps = await flow - .$relatedQuery('steps') - .where('position', '>=', step.position) - .whereNot('id', step.id); - - const nextStepQueries = nextSteps.map(async (nextStep, index) => { - await nextStep.$query().patchAndFetch({ - position: step.position + index + 1, - }); - }); - - await Promise.all(nextStepQueries); - - return step; -}; - -export default createStep; diff --git a/packages/backend/src/graphql/schema.graphql b/packages/backend/src/graphql/schema.graphql index 4958b2f0..de30c7a9 100644 --- a/packages/backend/src/graphql/schema.graphql +++ b/packages/backend/src/graphql/schema.graphql @@ -4,7 +4,6 @@ type Query { type Mutation { createConnection(input: CreateConnectionInput): Connection createFlow(input: CreateFlowInput): Flow - createStep(input: CreateStepInput): Step createUser(input: CreateUserInput): UserWithAcceptInvitationUrl deleteCurrentUser: Boolean deleteFlow(input: DeleteFlowInput): Boolean @@ -266,17 +265,6 @@ input DuplicateFlowInput { id: String! } -input CreateStepInput { - id: String - previousStepId: String - key: String - appKey: String - connection: StepConnectionInput - flow: StepFlowInput - parameters: JSONObject - previousStep: PreviousStepInput -} - input UpdateStepInput { id: String previousStepId: String diff --git a/packages/web/src/graphql/mutations/create-step.js b/packages/web/src/graphql/mutations/create-step.js deleted file mode 100644 index 9b77b3f3..00000000 --- a/packages/web/src/graphql/mutations/create-step.js +++ /dev/null @@ -1,19 +0,0 @@ -import { gql } from '@apollo/client'; -export const CREATE_STEP = gql` - mutation CreateStep($input: CreateStepInput) { - createStep(input: $input) { - id - type - key - appKey - parameters - iconUrl - position - webhookUrl - status - connection { - id - } - } - } -`;