Skip to content

The open alternative to Salesforce, designed for AI.

Make the workflow editor hooks core-only (#27852)

Thomas Trompetteaec8dbba02ed
diff --git a/packages/twenty-front/src/generated/graphql.ts b/packages/twenty-front/src/generated/graphql.ts
index 9a33ce6af16..3a3d24f946f 100644
--- a/packages/twenty-front/src/generated/graphql.ts
+++ b/packages/twenty-front/src/generated/graphql.ts
@@ -1422,13 +1422,6 @@ export type GetCoreWorkflowVersionsQuery = { __typename?: 'Query', coreWorkflowV
export type WorkflowDiffFragmentFragment = { __typename?: 'WorkflowVersionStepChanges', triggerDiff?: any | null, stepsDiff?: any | null };
-export type ActivateWorkflowVersionMutationVariables = Exact<{
- workflowVersionId: Scalars['UUID']['input'];
-}>;
-
-
-export type ActivateWorkflowVersionMutation = { __typename?: 'Mutation', activateWorkflowVersion: boolean };
-
export type ComputeStepOutputSchemaMutationVariables = Exact<{
input: ComputeStepOutputSchemaInput;
}>;
@@ -1436,62 +1429,6 @@ export type ComputeStepOutputSchemaMutationVariables = Exact<{
export type ComputeStepOutputSchemaMutation = { __typename?: 'Mutation', computeStepOutputSchema: any };
-export type CreateDraftFromWorkflowVersionMutationVariables = Exact<{
- input: CreateDraftFromWorkflowVersionInput;
-}>;
-
-
-export type CreateDraftFromWorkflowVersionMutation = { __typename?: 'Mutation', createDraftFromWorkflowVersion: { __typename?: 'WorkflowVersionDTO', id: any, name: string, status: string, trigger?: any | null, steps?: any | null, createdAt: string, updatedAt: string } };
-
-export type CreateWorkflowVersionEdgeMutationVariables = Exact<{
- input: CreateWorkflowVersionEdgeInput;
-}>;
-
-
-export type CreateWorkflowVersionEdgeMutation = { __typename?: 'Mutation', createWorkflowVersionEdge: { __typename?: 'WorkflowVersionStepChanges', triggerDiff?: any | null, stepsDiff?: any | null } };
-
-export type CreateWorkflowVersionStepMutationVariables = Exact<{
- input: CreateWorkflowVersionStepInput;
-}>;
-
-
-export type CreateWorkflowVersionStepMutation = { __typename?: 'Mutation', createWorkflowVersionStep: { __typename?: 'WorkflowVersionStepChanges', triggerDiff?: any | null, stepsDiff?: any | null } };
-
-export type DeactivateWorkflowVersionMutationVariables = Exact<{
- workflowVersionId: Scalars['UUID']['input'];
-}>;
-
-
-export type DeactivateWorkflowVersionMutation = { __typename?: 'Mutation', deactivateWorkflowVersion: boolean };
-
-export type DeleteWorkflowVersionEdgeMutationVariables = Exact<{
- input: CreateWorkflowVersionEdgeInput;
-}>;
-
-
-export type DeleteWorkflowVersionEdgeMutation = { __typename?: 'Mutation', deleteWorkflowVersionEdge: { __typename?: 'WorkflowVersionStepChanges', triggerDiff?: any | null, stepsDiff?: any | null } };
-
-export type DeleteWorkflowVersionStepMutationVariables = Exact<{
- input: DeleteWorkflowVersionStepInput;
-}>;
-
-
-export type DeleteWorkflowVersionStepMutation = { __typename?: 'Mutation', deleteWorkflowVersionStep: { __typename?: 'WorkflowVersionStepChanges', triggerDiff?: any | null, stepsDiff?: any | null } };
-
-export type DuplicateWorkflowMutationVariables = Exact<{
- input: DuplicateWorkflowInput;
-}>;
-
-
-export type DuplicateWorkflowMutation = { __typename?: 'Mutation', duplicateWorkflow: { __typename?: 'WorkflowVersionDTO', id: any, name: string, status: string, trigger?: any | null, steps?: any | null, createdAt: string, updatedAt: string, workflowId: any } };
-
-export type DuplicateWorkflowVersionStepMutationVariables = Exact<{
- input: DuplicateWorkflowVersionStepInput;
-}>;
-
-
-export type DuplicateWorkflowVersionStepMutation = { __typename?: 'Mutation', duplicateWorkflowVersionStep: { __typename?: 'WorkflowVersionStepChanges', triggerDiff?: any | null, stepsDiff?: any | null } };
-
export type RetryWorkflowRunMutationVariables = Exact<{
workflowRunId: Scalars['UUID']['input'];
}>;
@@ -1499,13 +1436,6 @@ export type RetryWorkflowRunMutationVariables = Exact<{
export type RetryWorkflowRunMutation = { __typename?: 'Mutation', retryWorkflowRun: { __typename: 'WorkflowRun', id: any, status: WorkflowRunStatusEnum } };
-export type RunWorkflowVersionMutationVariables = Exact<{
- input: RunWorkflowVersionInput;
-}>;
-
-
-export type RunWorkflowVersionMutation = { __typename?: 'Mutation', runWorkflowVersion: { __typename?: 'RunWorkflowVersion', workflowRunId: any } };
-
export type StopWorkflowRunMutationVariables = Exact<{
workflowRunId: Scalars['UUID']['input'];
}>;
@@ -1527,20 +1457,6 @@ export type UpdateWorkflowRunStepMutationVariables = Exact<{
export type UpdateWorkflowRunStepMutation = { __typename?: 'Mutation', updateWorkflowRunStep: { __typename?: 'WorkflowAction', id: any, name: string, type: WorkflowActionType, settings: any, valid: boolean, nextStepIds?: Array<any> | null, position?: { __typename?: 'WorkflowStepPosition', x: number, y: number } | null } };
-export type UpdateWorkflowVersionStepMutationVariables = Exact<{
- input: UpdateWorkflowVersionStepInput;
-}>;
-
-
-export type UpdateWorkflowVersionStepMutation = { __typename?: 'Mutation', updateWorkflowVersionStep: { __typename?: 'WorkflowAction', id: any, name: string, type: WorkflowActionType, settings: any, valid: boolean, nextStepIds?: Array<any> | null, position?: { __typename?: 'WorkflowStepPosition', x: number, y: number } | null } };
-
-export type UpdateWorkflowVersionTriggerMutationVariables = Exact<{
- input: UpdateWorkflowVersionTriggerInput;
-}>;
-
-
-export type UpdateWorkflowVersionTriggerMutation = { __typename?: 'Mutation', updateWorkflowVersionTrigger: { __typename?: 'WorkflowVersionTrigger', trigger?: any | null } };
-
export type WorkflowStepConnectedAccountHandleQueryVariables = Exact<{
connectedAccountId: Scalars['UUID']['input'];
}>;
@@ -1606,23 +1522,11 @@ export const GetCoreWorkflowsDocument = {"kind":"Document","definitions":[{"kind
export const GetCoreWorkflowsWithCurrentVersionsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetCoreWorkflowsWithCurrentVersions"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CoreWorkflowsWithCurrentVersionsInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"coreWorkflowsWithCurrentVersions"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"workflow"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"applicationId"}},{"kind":"Field","name":{"kind":"Name","value":"statuses"}},{"kind":"Field","name":{"kind":"Name","value":"lastPublishedCoreWorkflowVersionId"}}]}},{"kind":"Field","name":{"kind":"Name","value":"versions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"coreWorkflowId"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}},{"kind":"Field","name":{"kind":"Name","value":"currentVersion"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"coreWorkflowId"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"trigger"}},{"kind":"Field","name":{"kind":"Name","value":"steps"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]}}]} as unknown as DocumentNode<GetCoreWorkflowsWithCurrentVersionsQuery, GetCoreWorkflowsWithCurrentVersionsQueryVariables>;
export const GetCoreWorkflowVersionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetCoreWorkflowVersion"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"coreWorkflowVersionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","alias":{"kind":"Name","value":"coreWorkflowVersion"},"name":{"kind":"Name","value":"coreWorkflowVersionById"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"coreWorkflowVersionId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"coreWorkflowVersionId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceWorkflowVersionId"}},{"kind":"Field","name":{"kind":"Name","value":"coreWorkflowId"}},{"kind":"Field","name":{"kind":"Name","value":"trigger"}},{"kind":"Field","name":{"kind":"Name","value":"steps"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<GetCoreWorkflowVersionQuery, GetCoreWorkflowVersionQueryVariables>;
export const GetCoreWorkflowVersionsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetCoreWorkflowVersions"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"coreWorkflowId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","alias":{"kind":"Name","value":"coreWorkflowVersions"},"name":{"kind":"Name","value":"coreWorkflowVersionsByCoreWorkflowId"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"coreWorkflowId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"coreWorkflowId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"coreWorkflowId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]}}]} as unknown as DocumentNode<GetCoreWorkflowVersionsQuery, GetCoreWorkflowVersionsQueryVariables>;
-export const ActivateWorkflowVersionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"ActivateWorkflowVersion"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workflowVersionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activateWorkflowVersion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"workflowVersionId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workflowVersionId"}}}]}]}}]} as unknown as DocumentNode<ActivateWorkflowVersionMutation, ActivateWorkflowVersionMutationVariables>;
export const ComputeStepOutputSchemaDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"ComputeStepOutputSchema"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ComputeStepOutputSchemaInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"computeStepOutputSchema"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}]}]}}]} as unknown as DocumentNode<ComputeStepOutputSchemaMutation, ComputeStepOutputSchemaMutationVariables>;
-export const CreateDraftFromWorkflowVersionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateDraftFromWorkflowVersion"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateDraftFromWorkflowVersionInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createDraftFromWorkflowVersion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"trigger"}},{"kind":"Field","name":{"kind":"Name","value":"steps"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<CreateDraftFromWorkflowVersionMutation, CreateDraftFromWorkflowVersionMutationVariables>;
-export const CreateWorkflowVersionEdgeDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateWorkflowVersionEdge"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateWorkflowVersionEdgeInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createWorkflowVersionEdge"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"WorkflowDiffFragment"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"WorkflowDiffFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"WorkflowVersionStepChanges"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"triggerDiff"}},{"kind":"Field","name":{"kind":"Name","value":"stepsDiff"}}]}}]} as unknown as DocumentNode<CreateWorkflowVersionEdgeMutation, CreateWorkflowVersionEdgeMutationVariables>;
-export const CreateWorkflowVersionStepDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateWorkflowVersionStep"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateWorkflowVersionStepInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createWorkflowVersionStep"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"WorkflowDiffFragment"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"WorkflowDiffFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"WorkflowVersionStepChanges"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"triggerDiff"}},{"kind":"Field","name":{"kind":"Name","value":"stepsDiff"}}]}}]} as unknown as DocumentNode<CreateWorkflowVersionStepMutation, CreateWorkflowVersionStepMutationVariables>;
-export const DeactivateWorkflowVersionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeactivateWorkflowVersion"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workflowVersionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deactivateWorkflowVersion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"workflowVersionId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workflowVersionId"}}}]}]}}]} as unknown as DocumentNode<DeactivateWorkflowVersionMutation, DeactivateWorkflowVersionMutationVariables>;
-export const DeleteWorkflowVersionEdgeDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteWorkflowVersionEdge"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateWorkflowVersionEdgeInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteWorkflowVersionEdge"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"WorkflowDiffFragment"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"WorkflowDiffFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"WorkflowVersionStepChanges"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"triggerDiff"}},{"kind":"Field","name":{"kind":"Name","value":"stepsDiff"}}]}}]} as unknown as DocumentNode<DeleteWorkflowVersionEdgeMutation, DeleteWorkflowVersionEdgeMutationVariables>;
-export const DeleteWorkflowVersionStepDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteWorkflowVersionStep"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"DeleteWorkflowVersionStepInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteWorkflowVersionStep"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"WorkflowDiffFragment"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"WorkflowDiffFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"WorkflowVersionStepChanges"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"triggerDiff"}},{"kind":"Field","name":{"kind":"Name","value":"stepsDiff"}}]}}]} as unknown as DocumentNode<DeleteWorkflowVersionStepMutation, DeleteWorkflowVersionStepMutationVariables>;
-export const DuplicateWorkflowDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DuplicateWorkflow"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"DuplicateWorkflowInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"duplicateWorkflow"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"trigger"}},{"kind":"Field","name":{"kind":"Name","value":"steps"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"workflowId"}}]}}]}}]} as unknown as DocumentNode<DuplicateWorkflowMutation, DuplicateWorkflowMutationVariables>;
-export const DuplicateWorkflowVersionStepDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DuplicateWorkflowVersionStep"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"DuplicateWorkflowVersionStepInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"duplicateWorkflowVersionStep"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"WorkflowDiffFragment"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"WorkflowDiffFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"WorkflowVersionStepChanges"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"triggerDiff"}},{"kind":"Field","name":{"kind":"Name","value":"stepsDiff"}}]}}]} as unknown as DocumentNode<DuplicateWorkflowVersionStepMutation, DuplicateWorkflowVersionStepMutationVariables>;
export const RetryWorkflowRunDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"RetryWorkflowRun"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workflowRunId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"retryWorkflowRun"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"workflowRunId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workflowRunId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"__typename"}}]}}]}}]} as unknown as DocumentNode<RetryWorkflowRunMutation, RetryWorkflowRunMutationVariables>;
-export const RunWorkflowVersionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"RunWorkflowVersion"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"RunWorkflowVersionInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"runWorkflowVersion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"workflowRunId"}}]}}]}}]} as unknown as DocumentNode<RunWorkflowVersionMutation, RunWorkflowVersionMutationVariables>;
export const StopWorkflowRunDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"StopWorkflowRun"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workflowRunId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"stopWorkflowRun"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"workflowRunId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workflowRunId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"__typename"}}]}}]}}]} as unknown as DocumentNode<StopWorkflowRunMutation, StopWorkflowRunMutationVariables>;
export const SubmitFormStepDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SubmitFormStep"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"SubmitFormStepInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"submitFormStep"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}]}]}}]} as unknown as DocumentNode<SubmitFormStepMutation, SubmitFormStepMutationVariables>;
export const UpdateWorkflowRunStepDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateWorkflowRunStep"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateWorkflowRunStepInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateWorkflowRunStep"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"settings"}},{"kind":"Field","name":{"kind":"Name","value":"valid"}},{"kind":"Field","name":{"kind":"Name","value":"nextStepIds"}},{"kind":"Field","name":{"kind":"Name","value":"position"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"x"}},{"kind":"Field","name":{"kind":"Name","value":"y"}}]}}]}}]}}]} as unknown as DocumentNode<UpdateWorkflowRunStepMutation, UpdateWorkflowRunStepMutationVariables>;
-export const UpdateWorkflowVersionStepDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateWorkflowVersionStep"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateWorkflowVersionStepInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateWorkflowVersionStep"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"settings"}},{"kind":"Field","name":{"kind":"Name","value":"valid"}},{"kind":"Field","name":{"kind":"Name","value":"nextStepIds"}},{"kind":"Field","name":{"kind":"Name","value":"position"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"x"}},{"kind":"Field","name":{"kind":"Name","value":"y"}}]}}]}}]}}]} as unknown as DocumentNode<UpdateWorkflowVersionStepMutation, UpdateWorkflowVersionStepMutationVariables>;
-export const UpdateWorkflowVersionTriggerDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateWorkflowVersionTrigger"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateWorkflowVersionTriggerInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateWorkflowVersionTrigger"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"trigger"}}]}}]}}]} as unknown as DocumentNode<UpdateWorkflowVersionTriggerMutation, UpdateWorkflowVersionTriggerMutationVariables>;
export const WorkflowStepConnectedAccountHandleDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"WorkflowStepConnectedAccountHandle"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"connectedAccountId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"workflowStepConnectedAccountHandle"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"connectedAccountId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"connectedAccountId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"handle"}},{"kind":"Field","name":{"kind":"Name","value":"provider"}},{"kind":"Field","name":{"kind":"Name","value":"handleAliases"}}]}}]}}]} as unknown as DocumentNode<WorkflowStepConnectedAccountHandleQuery, WorkflowStepConnectedAccountHandleQueryVariables>;
export const TestHttpRequestDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"TestHttpRequest"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"TestHttpRequestInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"testHttpRequest"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}},{"kind":"Field","name":{"kind":"Name","value":"message"}},{"kind":"Field","name":{"kind":"Name","value":"result"}},{"kind":"Field","name":{"kind":"Name","value":"error"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"statusText"}},{"kind":"Field","name":{"kind":"Name","value":"headers"}}]}}]}}]} as unknown as DocumentNode<TestHttpRequestMutation, TestHttpRequestMutationVariables>;
export const UpdateWorkflowVersionPositionsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateWorkflowVersionPositions"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateWorkflowVersionPositionsInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateWorkflowVersionPositions"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}]}]}}]} as unknown as DocumentNode<UpdateWorkflowVersionPositionsMutation, UpdateWorkflowVersionPositionsMutationVariables>;
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow-versions/components/UseAsDraftWorkflowVersionSingleRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow-versions/components/UseAsDraftWorkflowVersionSingleRecordCommand.tsx
index 222bce58978..6df2c99dc0f 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow-versions/components/UseAsDraftWorkflowVersionSingleRecordCommand.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow-versions/components/UseAsDraftWorkflowVersionSingleRecordCommand.tsx
@@ -1,4 +1,3 @@
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
import { HeadlessConfirmationModalEngineCommandEffect } from '@/command-menu-item/engine-command/components/HeadlessConfirmationModalEngineCommandEffect';
import { HeadlessEngineCommandWrapperEffect } from '@/command-menu-item/engine-command/components/HeadlessEngineCommandWrapperEffect';
import { useHeadlessCommandContextApi } from '@/command-menu-item/engine-command/hooks/useHeadlessCommandContextApi';
@@ -6,7 +5,7 @@ import { useCreateDraftFromWorkflowVersion } from '@/workflow/hooks/useCreateDra
import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';
import { useCoreWorkflowVersion } from '@/object-core/workflows/versions/hooks/useCoreWorkflowVersion';
import { useLingui } from '@lingui/react/macro';
-import { AppPath, CoreObjectNameSingular } from 'twenty-shared/types';
+import { AppPath } from 'twenty-shared/types';
import { getAppPath, isDefined } from 'twenty-shared/utils';
import { useNavigateApp } from '~/hooks/useNavigateApp';
@@ -17,7 +16,6 @@ const UseAsDraftWorkflowVersionSingleRecordCommandContent = ({
workflowId: string;
workflowVersionId: string;
}) => {
- const isCore = useIsWorkflowCoreEnabled();
const { t } = useLingui();
const workflow = useWorkflowWithCurrentVersion(workflowId);
const { createDraftFromWorkflowVersion } =
@@ -33,14 +31,7 @@ const UseAsDraftWorkflowVersionSingleRecordCommandContent = ({
workflowVersionIdToCopy: workflowVersionId,
});
- if (isCore) {
- navigate(AppPath.WorkflowCoreShowPage, { coreWorkflowId: workflowId });
- return;
- }
- navigate(AppPath.RecordShowPage, {
- objectNameSingular: CoreObjectNameSingular.Workflow,
- objectRecordId: workflowId,
- });
+ navigate(AppPath.WorkflowCoreShowPage, { coreWorkflowId: workflowId });
};
if (!isDefined(workflow)) {
@@ -58,14 +49,9 @@ const UseAsDraftWorkflowVersionSingleRecordCommandContent = ({
confirmButtonText={t`Override Draft`}
linkButton={{
title: t`Go to Draft`,
- to: isCore
- ? getAppPath(AppPath.WorkflowCoreShowPage, {
- coreWorkflowId: workflowId,
- })
- : getAppPath(AppPath.RecordShowPage, {
- objectNameSingular: CoreObjectNameSingular.Workflow,
- objectRecordId: workflowId,
- }),
+ to: getAppPath(AppPath.WorkflowCoreShowPage, {
+ coreWorkflowId: workflowId,
+ }),
}}
execute={handleExecute}
/>
@@ -73,26 +59,17 @@ const UseAsDraftWorkflowVersionSingleRecordCommandContent = ({
};
export const UseAsDraftWorkflowVersionSingleRecordCommand = () => {
- const isCore = useIsWorkflowCoreEnabled();
const { selectedRecords } = useHeadlessCommandContextApi();
- const selectedRecord = selectedRecords[0];
const { coreWorkflowVersion, loading } = useCoreWorkflowVersion(
- isCore ? selectedRecord?.coreWorkflowVersionId : undefined,
+ selectedRecords[0]?.coreWorkflowVersionId,
);
- if (isCore && (loading || !isDefined(coreWorkflowVersion))) {
+ if (loading || !isDefined(coreWorkflowVersion)) {
return null;
}
- const workflowId = isCore
- ? coreWorkflowVersion?.coreWorkflowId
- : selectedRecord?.workflowId;
- const workflowVersionId = isCore
- ? coreWorkflowVersion?.id
- : selectedRecord?.id;
-
- if (!isDefined(workflowId) || !isDefined(workflowVersionId)) {
+ if (!isDefined(coreWorkflowVersion.coreWorkflowId)) {
throw new Error(
'Record ID and workflow ID are required to use as draft workflow version',
);
@@ -100,8 +77,8 @@ export const UseAsDraftWorkflowVersionSingleRecordCommand = () => {
return (
<UseAsDraftWorkflowVersionSingleRecordCommandContent
- workflowId={workflowId}
- workflowVersionId={workflowVersionId}
+ workflowId={coreWorkflowVersion.coreWorkflowId}
+ workflowVersionId={coreWorkflowVersion.id}
/>
);
};
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/ActivateWorkflowSingleRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/ActivateWorkflowSingleRecordCommand.tsx
index 1048ad772bb..492c3cc0ec9 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/ActivateWorkflowSingleRecordCommand.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/ActivateWorkflowSingleRecordCommand.tsx
@@ -24,7 +24,6 @@ export const ActivateWorkflowSingleRecordCommand = () => {
return activateWorkflowVersion({
workflowVersionId: workflowWithCurrentVersion.currentVersion.id,
- workflowId: workflowWithCurrentVersion.id,
});
};
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/DiscardDraftWorkflowSingleRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/DiscardDraftWorkflowSingleRecordCommand.tsx
index 354b7072fce..ecfca89f32a 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/DiscardDraftWorkflowSingleRecordCommand.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/DiscardDraftWorkflowSingleRecordCommand.tsx
@@ -1,5 +1,3 @@
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
-import { useDiscardWorkspaceWorkflowDraft } from '@/workflow/hooks/useDiscardWorkspaceWorkflowDraft';
import { isDefined } from 'twenty-shared/utils';
import { HeadlessEngineCommandWrapperEffect } from '@/command-menu-item/engine-command/components/HeadlessEngineCommandWrapperEffect';
@@ -7,7 +5,7 @@ import { useHeadlessCommandContextApi } from '@/command-menu-item/engine-command
import { useDiscardCoreWorkflowDraft } from '@/object-core/workflows/hooks/useDiscardCoreWorkflowDraft';
import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';
-const DiscardCoreWorkflowDraftCommand = () => {
+export const DiscardDraftWorkflowSingleRecordCommand = () => {
const { selectedRecords } = useHeadlessCommandContextApi();
const recordId = selectedRecords[0]?.id;
@@ -37,31 +35,3 @@ const DiscardCoreWorkflowDraftCommand = () => {
/>
);
};
-
-const DiscardWorkspaceWorkflowDraftCommand = () => {
- const { selectedRecords } = useHeadlessCommandContextApi();
- const workflow = useWorkflowWithCurrentVersion(selectedRecords[0]?.id);
- const { discardWorkspaceWorkflowDraft } = useDiscardWorkspaceWorkflowDraft();
-
- return (
- <HeadlessEngineCommandWrapperEffect
- ready={isDefined(workflow)}
- execute={() =>
- isDefined(workflow)
- ? discardWorkspaceWorkflowDraft({
- workspaceWorkflowVersionId: workflow.currentVersion.id,
- })
- : undefined
- }
- />
- );
-};
-
-export const DiscardDraftWorkflowSingleRecordCommand = () => {
- const isCore = useIsWorkflowCoreEnabled();
- return isCore ? (
- <DiscardCoreWorkflowDraftCommand />
- ) : (
- <DiscardWorkspaceWorkflowDraftCommand />
- );
-};
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/DuplicateWorkflowSingleRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/DuplicateWorkflowSingleRecordCommand.tsx
index a725b0afebd..04145720c01 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/DuplicateWorkflowSingleRecordCommand.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/DuplicateWorkflowSingleRecordCommand.tsx
@@ -1,11 +1,10 @@
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
import { HeadlessEngineCommandWrapperEffect } from '@/command-menu-item/engine-command/components/HeadlessEngineCommandWrapperEffect';
import { useHeadlessCommandContextApi } from '@/command-menu-item/engine-command/hooks/useHeadlessCommandContextApi';
import { useDuplicateWorkflow } from '@/workflow/hooks/useDuplicateWorkflow';
import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';
import { useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
-import { AppPath, CoreObjectNameSingular } from 'twenty-shared/types';
+import { AppPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { useToast } from 'twenty-ui/components/feedback';
import { useNavigateApp } from '~/hooks/useNavigateApp';
@@ -16,7 +15,6 @@ export const DuplicateWorkflowSingleRecordCommand = () => {
const recordId = selectedRecords[0]?.id;
const workflow = useWorkflowWithCurrentVersion(recordId ?? '');
const { duplicateWorkflow } = useDuplicateWorkflow();
- const isCore = useIsWorkflowCoreEnabled();
const navigate = useNavigateApp();
const { enqueueToast } = useToast();
const { t } = useLingui();
@@ -41,15 +39,8 @@ export const DuplicateWorkflowSingleRecordCommand = () => {
children: t`Workflow duplicated successfully`,
});
- if (isCore) {
- navigate(AppPath.WorkflowCoreShowPage, {
- coreWorkflowId: result.workflowId,
- });
- return;
- }
- navigate(AppPath.RecordShowPage, {
- objectNameSingular: CoreObjectNameSingular.Workflow,
- objectRecordId: result.workflowId,
+ navigate(AppPath.WorkflowCoreShowPage, {
+ coreWorkflowId: result.workflowId,
});
} else {
enqueueToast({
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/SeeActiveVersionWorkflowSingleRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/SeeActiveVersionWorkflowSingleRecordCommand.tsx
index 774266f8e3b..e05a28ed6e8 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/SeeActiveVersionWorkflowSingleRecordCommand.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/SeeActiveVersionWorkflowSingleRecordCommand.tsx
@@ -1,12 +1,10 @@
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
import { HeadlessNavigateEngineCommand } from '@/command-menu-item/engine-command/components/HeadlessNavigateEngineCommand';
import { useHeadlessCommandContextApi } from '@/command-menu-item/engine-command/hooks/useHeadlessCommandContextApi';
import { useActiveWorkflowVersion } from '@/workflow/hooks/useActiveWorkflowVersion';
-import { AppPath, CoreObjectNameSingular } from 'twenty-shared/types';
+import { AppPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
export const SeeActiveVersionWorkflowSingleRecordCommand = () => {
- const isCore = useIsWorkflowCoreEnabled();
const { selectedRecords } = useHeadlessCommandContextApi();
const recordId = selectedRecords[0]?.id;
@@ -24,25 +22,13 @@ export const SeeActiveVersionWorkflowSingleRecordCommand = () => {
return null;
}
- if (isCore) {
- return (
- <HeadlessNavigateEngineCommand
- to={AppPath.WorkflowCoreShowPage}
- params={{ coreWorkflowId: recordId }}
- queryParams={
- hasDraftVersion ? { version: workflowVersion.id } : undefined
- }
- />
- );
- }
-
return (
<HeadlessNavigateEngineCommand
- to={AppPath.RecordShowPage}
- params={{
- objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
- objectRecordId: workflowVersion.id,
- }}
+ to={AppPath.WorkflowCoreShowPage}
+ params={{ coreWorkflowId: recordId }}
+ queryParams={
+ hasDraftVersion ? { version: workflowVersion.id } : undefined
+ }
/>
);
};
diff --git a/packages/twenty-front/src/modules/object-core/workflows/hooks/useCoreWorkflowForShowPage.ts b/packages/twenty-front/src/modules/object-core/workflows/hooks/useCoreWorkflowForShowPage.ts
index 9e54a48ff88..8127ba6c137 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/hooks/useCoreWorkflowForShowPage.ts
+++ b/packages/twenty-front/src/modules/object-core/workflows/hooks/useCoreWorkflowForShowPage.ts
@@ -4,7 +4,6 @@ import { isDefined } from 'twenty-shared/utils';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
import { type Workflow, type WorkflowVersion } from '@/workflow/types/Workflow';
import {
- CoreWorkflowVersionStatus,
GetCoreWorkflowDocument,
GetCoreWorkflowVersionsDocument,
} from '~/generated/graphql';
@@ -21,18 +20,15 @@ type CoreWorkflowShowPageWorkflow = Pick<
export const useCoreWorkflowForShowPage = ({
coreWorkflowId,
- skip,
}: {
coreWorkflowId: string | undefined;
- skip: boolean;
}): {
coreWorkflow: CoreWorkflowShowPageWorkflow | undefined;
versions: CoreWorkflowShowPageVersion[];
- draftVersionIdFromServer: string | undefined;
} => {
const apolloCoreClient = useApolloCoreClient();
- const shouldSkip = skip || !isDefined(coreWorkflowId);
+ const shouldSkip = !isDefined(coreWorkflowId);
const { data: coreWorkflowData } = useQuery(GetCoreWorkflowDocument, {
client: apolloCoreClient,
@@ -62,10 +58,6 @@ export const useCoreWorkflowForShowPage = ({
}),
);
- const draftVersionIdFromServer = versions.find(
- (version) => version.status === CoreWorkflowVersionStatus.DRAFT,
- )?.id;
-
return {
coreWorkflow: isDefined(coreWorkflow)
? {
@@ -77,6 +69,5 @@ export const useCoreWorkflowForShowPage = ({
}
: undefined,
versions,
- draftVersionIdFromServer,
};
};
diff --git a/packages/twenty-front/src/modules/object-core/workflows/hooks/useCoreWorkflowVersionContent.ts b/packages/twenty-front/src/modules/object-core/workflows/hooks/useCoreWorkflowVersionContent.ts
index 743a77c113d..da8c58d5394 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/hooks/useCoreWorkflowVersionContent.ts
+++ b/packages/twenty-front/src/modules/object-core/workflows/hooks/useCoreWorkflowVersionContent.ts
@@ -9,11 +9,9 @@ import { GetCoreWorkflowVersionDocument } from '~/generated/graphql';
export const useCoreWorkflowVersionContent = ({
coreWorkflowId,
coreWorkflowVersionId,
- skip,
}: {
coreWorkflowId: string | undefined;
coreWorkflowVersionId: string | undefined;
- skip: boolean;
}): WorkflowVersion | undefined => {
const apolloCoreClient = useApolloCoreClient();
@@ -23,8 +21,7 @@ export const useCoreWorkflowVersionContent = ({
variables: {
coreWorkflowVersionId: coreWorkflowVersionId ?? '',
},
- skip:
- skip || !isDefined(coreWorkflowVersionId) || !isDefined(coreWorkflowId),
+ skip: !isDefined(coreWorkflowVersionId) || !isDefined(coreWorkflowId),
});
const coreWorkflowVersion = data?.coreWorkflowVersion;
diff --git a/packages/twenty-front/src/modules/workflow/graphql/mutations/activateWorkflowVersion.ts b/packages/twenty-front/src/modules/workflow/graphql/mutations/activateWorkflowVersion.ts
deleted file mode 100644
index 22f564206d9..00000000000
--- a/packages/twenty-front/src/modules/workflow/graphql/mutations/activateWorkflowVersion.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { gql } from '@apollo/client';
-
-export const ACTIVATE_WORKFLOW_VERSION = gql`
- mutation ActivateWorkflowVersion($workflowVersionId: UUID!) {
- activateWorkflowVersion(workflowVersionId: $workflowVersionId)
- }
-`;
diff --git a/packages/twenty-front/src/modules/workflow/graphql/mutations/createDraftFromWorkflowVersion.ts b/packages/twenty-front/src/modules/workflow/graphql/mutations/createDraftFromWorkflowVersion.ts
deleted file mode 100644
index 4e0858ecbfc..00000000000
--- a/packages/twenty-front/src/modules/workflow/graphql/mutations/createDraftFromWorkflowVersion.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { gql } from '@apollo/client';
-
-export const CREATE_DRAFT_FROM_WORKFLOW_VERSION = gql`
- mutation CreateDraftFromWorkflowVersion(
- $input: CreateDraftFromWorkflowVersionInput!
- ) {
- createDraftFromWorkflowVersion(input: $input) {
- id
- name
- status
- trigger
- steps
- createdAt
- updatedAt
- }
- }
-`;
diff --git a/packages/twenty-front/src/modules/workflow/graphql/mutations/createWorkflowVersionEdge.ts b/packages/twenty-front/src/modules/workflow/graphql/mutations/createWorkflowVersionEdge.ts
deleted file mode 100644
index df61366ee31..00000000000
--- a/packages/twenty-front/src/modules/workflow/graphql/mutations/createWorkflowVersionEdge.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { WORKFLOW_DIFF_FRAGMENT } from '@/workflow/graphql/fragments/workflowDiffFragment';
-import { gql } from '@apollo/client';
-
-export const CREATE_WORKFLOW_VERSION_EDGE = gql`
- mutation CreateWorkflowVersionEdge($input: CreateWorkflowVersionEdgeInput!) {
- createWorkflowVersionEdge(input: $input) {
- ...WorkflowDiffFragment
- }
- }
-
- ${WORKFLOW_DIFF_FRAGMENT}
-`;
diff --git a/packages/twenty-front/src/modules/workflow/graphql/mutations/createWorkflowVersionStep.ts b/packages/twenty-front/src/modules/workflow/graphql/mutations/createWorkflowVersionStep.ts
deleted file mode 100644
index 37e4081138f..00000000000
--- a/packages/twenty-front/src/modules/workflow/graphql/mutations/createWorkflowVersionStep.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { WORKFLOW_DIFF_FRAGMENT } from '@/workflow/graphql/fragments/workflowDiffFragment';
-import { gql } from '@apollo/client';
-
-export const CREATE_WORKFLOW_VERSION_STEP = gql`
- mutation CreateWorkflowVersionStep($input: CreateWorkflowVersionStepInput!) {
- createWorkflowVersionStep(input: $input) {
- ...WorkflowDiffFragment
- }
- }
-
- ${WORKFLOW_DIFF_FRAGMENT}
-`;
diff --git a/packages/twenty-front/src/modules/workflow/graphql/mutations/deactivateWorkflowVersion.ts b/packages/twenty-front/src/modules/workflow/graphql/mutations/deactivateWorkflowVersion.ts
deleted file mode 100644
index d1a31f4f4a9..00000000000
--- a/packages/twenty-front/src/modules/workflow/graphql/mutations/deactivateWorkflowVersion.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { gql } from '@apollo/client';
-
-export const DEACTIVATE_WORKFLOW_VERSION = gql`
- mutation DeactivateWorkflowVersion($workflowVersionId: UUID!) {
- deactivateWorkflowVersion(workflowVersionId: $workflowVersionId)
- }
-`;
diff --git a/packages/twenty-front/src/modules/workflow/graphql/mutations/deleteWorkflowVersionEdge.ts b/packages/twenty-front/src/modules/workflow/graphql/mutations/deleteWorkflowVersionEdge.ts
deleted file mode 100644
index 6d63cd7f5bd..00000000000
--- a/packages/twenty-front/src/modules/workflow/graphql/mutations/deleteWorkflowVersionEdge.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { WORKFLOW_DIFF_FRAGMENT } from '@/workflow/graphql/fragments/workflowDiffFragment';
-import { gql } from '@apollo/client';
-
-export const DELETE_WORKFLOW_VERSION_EDGE = gql`
- mutation DeleteWorkflowVersionEdge($input: CreateWorkflowVersionEdgeInput!) {
- deleteWorkflowVersionEdge(input: $input) {
- ...WorkflowDiffFragment
- }
- }
-
- ${WORKFLOW_DIFF_FRAGMENT}
-`;
diff --git a/packages/twenty-front/src/modules/workflow/graphql/mutations/deleteWorkflowVersionStep.ts b/packages/twenty-front/src/modules/workflow/graphql/mutations/deleteWorkflowVersionStep.ts
deleted file mode 100644
index a9630b69b76..00000000000
--- a/packages/twenty-front/src/modules/workflow/graphql/mutations/deleteWorkflowVersionStep.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { WORKFLOW_DIFF_FRAGMENT } from '@/workflow/graphql/fragments/workflowDiffFragment';
-import { gql } from '@apollo/client';
-
-export const DELETE_WORKFLOW_VERSION_STEP = gql`
- mutation DeleteWorkflowVersionStep($input: DeleteWorkflowVersionStepInput!) {
- deleteWorkflowVersionStep(input: $input) {
- ...WorkflowDiffFragment
- }
- }
-
- ${WORKFLOW_DIFF_FRAGMENT}
-`;
diff --git a/packages/twenty-front/src/modules/workflow/graphql/mutations/duplicateWorkflow.ts b/packages/twenty-front/src/modules/workflow/graphql/mutations/duplicateWorkflow.ts
deleted file mode 100644
index 20e91ef9180..00000000000
--- a/packages/twenty-front/src/modules/workflow/graphql/mutations/duplicateWorkflow.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { gql } from '@apollo/client';
-
-export const DUPLICATE_WORKFLOW = gql`
- mutation DuplicateWorkflow($input: DuplicateWorkflowInput!) {
- duplicateWorkflow(input: $input) {
- id
- name
- status
- trigger
- steps
- createdAt
- updatedAt
- workflowId
- }
- }
-`;
diff --git a/packages/twenty-front/src/modules/workflow/graphql/mutations/duplicateWorkflowVersionStep.ts b/packages/twenty-front/src/modules/workflow/graphql/mutations/duplicateWorkflowVersionStep.ts
deleted file mode 100644
index f319d174304..00000000000
--- a/packages/twenty-front/src/modules/workflow/graphql/mutations/duplicateWorkflowVersionStep.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { WORKFLOW_DIFF_FRAGMENT } from '@/workflow/graphql/fragments/workflowDiffFragment';
-import { gql } from '@apollo/client';
-
-export const DUPLICATE_WORKFLOW_VERSION_STEP = gql`
- mutation DuplicateWorkflowVersionStep(
- $input: DuplicateWorkflowVersionStepInput!
- ) {
- duplicateWorkflowVersionStep(input: $input) {
- ...WorkflowDiffFragment
- }
- }
-
- ${WORKFLOW_DIFF_FRAGMENT}
-`;
diff --git a/packages/twenty-front/src/modules/workflow/graphql/mutations/runWorkflowVersion.ts b/packages/twenty-front/src/modules/workflow/graphql/mutations/runWorkflowVersion.ts
deleted file mode 100644
index 961efec8971..00000000000
--- a/packages/twenty-front/src/modules/workflow/graphql/mutations/runWorkflowVersion.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { gql } from '@apollo/client';
-
-export const RUN_WORKFLOW_VERSION = gql`
- mutation RunWorkflowVersion($input: RunWorkflowVersionInput!) {
- runWorkflowVersion(input: $input) {
- workflowRunId
- }
- }
-`;
diff --git a/packages/twenty-front/src/modules/workflow/graphql/mutations/updateWorkflowVersionStep.ts b/packages/twenty-front/src/modules/workflow/graphql/mutations/updateWorkflowVersionStep.ts
deleted file mode 100644
index 3f083ce25bd..00000000000
--- a/packages/twenty-front/src/modules/workflow/graphql/mutations/updateWorkflowVersionStep.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { gql } from '@apollo/client';
-
-export const UPDATE_WORKFLOW_VERSION_STEP = gql`
- mutation UpdateWorkflowVersionStep($input: UpdateWorkflowVersionStepInput!) {
- updateWorkflowVersionStep(input: $input) {
- id
- name
- type
- settings
- valid
- nextStepIds
- position {
- x
- y
- }
- }
- }
-`;
diff --git a/packages/twenty-front/src/modules/workflow/graphql/mutations/updateWorkflowVersionTrigger.ts b/packages/twenty-front/src/modules/workflow/graphql/mutations/updateWorkflowVersionTrigger.ts
deleted file mode 100644
index ed0ea40f595..00000000000
--- a/packages/twenty-front/src/modules/workflow/graphql/mutations/updateWorkflowVersionTrigger.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { gql } from '@apollo/client';
-
-export const UPDATE_WORKFLOW_VERSION_TRIGGER = gql`
- mutation UpdateWorkflowVersionTrigger(
- $input: UpdateWorkflowVersionTriggerInput!
- ) {
- updateWorkflowVersionTrigger(input: $input) {
- trigger
- }
- }
-`;
diff --git a/packages/twenty-front/src/modules/workflow/hooks/__tests__/useCreateDraftFromWorkflowVersion.test.ts b/packages/twenty-front/src/modules/workflow/hooks/__tests__/useCreateDraftFromWorkflowVersion.test.ts
index a44d41be673..f4ae59c3729 100644
--- a/packages/twenty-front/src/modules/workflow/hooks/__tests__/useCreateDraftFromWorkflowVersion.test.ts
+++ b/packages/twenty-front/src/modules/workflow/hooks/__tests__/useCreateDraftFromWorkflowVersion.test.ts
@@ -1,45 +1,26 @@
import { act, renderHook } from '@testing-library/react';
import { useCreateDraftFromWorkflowVersion } from '@/workflow/hooks/useCreateDraftFromWorkflowVersion';
-import { CreateDraftFromCoreWorkflowVersionDocument } from '~/generated/graphql';
const mockCoreMutation = jest.fn();
-const mockWorkspaceMutation = jest.fn();
const mockInvalidate = jest.fn();
-let mockIsCore = true;
-jest.mock('@/workflow/hooks/useIsWorkflowCoreEnabled', () => ({
- useIsWorkflowCoreEnabled: () => mockIsCore,
-}));
jest.mock('@/object-metadata/hooks/useApolloCoreClient', () => ({
useApolloCoreClient: () => ({}),
}));
-jest.mock('@/object-record/hooks/useFindManyRecordsQuery', () => ({
- useFindManyRecordsQuery: () => ({ findManyRecordsQuery: {} }),
-}));
jest.mock(
'@/object-core/workflows/versions/utils/invalidateCoreWorkflowVersions',
() => ({ invalidateCoreWorkflowVersions: () => mockInvalidate() }),
);
jest.mock('@apollo/client/react', () => ({
- useMutation: (document: unknown) => [
- document === CreateDraftFromCoreWorkflowVersionDocument
- ? mockCoreMutation
- : mockWorkspaceMutation,
- ],
+ useMutation: () => [mockCoreMutation],
}));
describe('draft creation ID boundary', () => {
beforeEach(() => {
jest.clearAllMocks();
- mockIsCore = true;
mockCoreMutation.mockResolvedValue({
data: { createDraftFromWorkflowVersion: { id: 'returned-core-draft' } },
});
- mockWorkspaceMutation.mockResolvedValue({
- data: {
- createDraftFromWorkflowVersion: { id: 'returned-workspace-draft' },
- },
- });
});
it('returns the core draft ID for subsequent edits and refetches core definitions', async () => {
@@ -60,29 +41,10 @@ describe('draft creation ID boundary', () => {
},
},
});
- expect(mockWorkspaceMutation).not.toHaveBeenCalled();
expect(mockInvalidate).toHaveBeenCalledTimes(1);
});
- it('preserves the workspace mutation and returned ID with the flag off', async () => {
- mockIsCore = false;
- const { result } = renderHook(() => useCreateDraftFromWorkflowVersion());
- const input = {
- workflowId: 'workspace-workflow',
- workflowVersionIdToCopy: 'workspace-published-version',
- };
- let draftId: string | undefined;
- await act(async () => {
- draftId = await result.current.createDraftFromWorkflowVersion(input);
- });
- expect(draftId).toBe('returned-workspace-draft');
- expect(mockWorkspaceMutation).toHaveBeenCalledWith(
- expect.objectContaining({ variables: { input } }),
- );
- expect(mockCoreMutation).not.toHaveBeenCalled();
- });
-
- it('propagates core errors without invoking the workspace mutation', async () => {
+ it('propagates core errors', async () => {
mockCoreMutation.mockRejectedValueOnce(new Error('Core unavailable'));
const { result } = renderHook(() => useCreateDraftFromWorkflowVersion());
await expect(
@@ -91,6 +53,5 @@ describe('draft creation ID boundary', () => {
workflowVersionIdToCopy: 'core-published-version',
}),
).rejects.toThrow('Core unavailable');
- expect(mockWorkspaceMutation).not.toHaveBeenCalled();
});
});
diff --git a/packages/twenty-front/src/modules/workflow/hooks/useActivateWorkflowVersion.ts b/packages/twenty-front/src/modules/workflow/hooks/useActivateWorkflowVersion.ts
index bea329e4bff..fd92096bf39 100644
--- a/packages/twenty-front/src/modules/workflow/hooks/useActivateWorkflowVersion.ts
+++ b/packages/twenty-front/src/modules/workflow/hooks/useActivateWorkflowVersion.ts
@@ -1,183 +1,23 @@
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
-import {
- ActivateCoreWorkflowVersionDocument,
- type ActivateWorkflowVersionMutation,
- type ActivateWorkflowVersionMutationVariables,
-} from '~/generated/graphql';
+import { ActivateCoreWorkflowVersionDocument } from '~/generated/graphql';
import { invalidateCoreWorkflowVersions } from '@/object-core/workflows/versions/utils/invalidateCoreWorkflowVersions';
import { useMutation } from '@apollo/client/react';
-import { triggerUpdateRecordOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerUpdateRecordOptimisticEffect';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
-import { getRecordFromCache } from '@/object-record/cache/utils/getRecordFromCache';
-import { modifyRecordFromCache } from '@/object-record/cache/utils/modifyRecordFromCache';
-import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
-import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useUpsertRecordsInStore';
-import { ACTIVATE_WORKFLOW_VERSION } from '@/workflow/graphql/mutations/activateWorkflowVersion';
-import {
- type Workflow,
- type WorkflowStatus,
- type WorkflowVersion,
-} from '@/workflow/types/Workflow';
-import { isDefined } from 'twenty-shared/utils';
export const useActivateWorkflowVersion = () => {
const apolloCoreClient = useApolloCoreClient();
- const isCore = useIsWorkflowCoreEnabled();
const [mutateCore] = useMutation(ActivateCoreWorkflowVersionDocument, {
client: apolloCoreClient,
});
- const [mutate] = useMutation<
- ActivateWorkflowVersionMutation,
- ActivateWorkflowVersionMutationVariables
- >(ACTIVATE_WORKFLOW_VERSION, {
- client: apolloCoreClient,
- });
- const { upsertRecordsInStore } = useUpsertRecordsInStore();
-
- const { objectMetadataItem: objectMetadataItemWorkflowVersion } =
- useObjectMetadataItem({
- objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
- });
- const { objectMetadataItem: objectMetadataItemWorkflow } =
- useObjectMetadataItem({
- objectNameSingular: CoreObjectNameSingular.Workflow,
- });
- const { objectMetadataItems } = useObjectMetadataItems();
-
- const { objectPermissionsByObjectMetadataId } = useObjectPermissions();
const activateWorkflowVersion = async ({
workflowVersionId,
- workflowId,
}: {
workflowVersionId: string;
- workflowId: string;
}) => {
- if (isCore) {
- await mutateCore({
- variables: { coreWorkflowVersionId: workflowVersionId },
- });
- await invalidateCoreWorkflowVersions(apolloCoreClient);
- return;
- }
-
- await mutate({
- variables: {
- workflowVersionId,
- },
- update: () => {
- modifyRecordFromCache({
- cache: apolloCoreClient.cache,
- recordId: workflowVersionId,
- objectMetadataItem: objectMetadataItemWorkflowVersion,
- fieldModifiers: {
- status: () => 'ACTIVE',
- },
- });
-
- const cacheSnapshot = apolloCoreClient.cache.extract() as Record<
- string,
- Record<string, unknown>
- >;
-
- const allWorkflowVersions = (
- Object.values(cacheSnapshot) as Array<Record<string, unknown>>
- ).filter(
- (item) =>
- item.__typename === 'WorkflowVersion' &&
- item.workflowId === workflowId,
- ) as Array<WorkflowVersion>;
-
- const previousActiveWorkflowVersions = allWorkflowVersions.filter(
- (version) =>
- version.status === 'ACTIVE' && version.id !== workflowVersionId,
- );
-
- const newlyActiveWorkflowVersion = allWorkflowVersions.find(
- (version) => version.id === workflowVersionId,
- );
-
- if (isDefined(newlyActiveWorkflowVersion)) {
- triggerUpdateRecordOptimisticEffect({
- cache: apolloCoreClient.cache,
- objectMetadataItem: objectMetadataItemWorkflowVersion,
- currentRecord: newlyActiveWorkflowVersion,
- updatedRecord: {
- ...newlyActiveWorkflowVersion,
- status: 'ACTIVE',
- },
- objectMetadataItems: objectMetadataItems,
- objectPermissionsByObjectMetadataId,
- upsertRecordsInStore,
- });
- }
-
- for (const workflowVersion of previousActiveWorkflowVersions) {
- apolloCoreClient.cache.modify({
- id: apolloCoreClient.cache.identify(workflowVersion),
- fields: {
- status: () => {
- return workflowVersion.id !== workflowVersionId &&
- workflowVersion.status === 'ACTIVE'
- ? 'ARCHIVED'
- : workflowVersion.status;
- },
- },
- });
-
- triggerUpdateRecordOptimisticEffect({
- cache: apolloCoreClient.cache,
- objectMetadataItem: objectMetadataItemWorkflowVersion,
- currentRecord: workflowVersion,
- updatedRecord: {
- ...workflowVersion,
- status: 'ARCHIVED',
- },
- objectMetadataItems,
- objectPermissionsByObjectMetadataId,
- upsertRecordsInStore,
- });
- }
-
- const cachedWorkflow = getRecordFromCache<Workflow>({
- objectMetadataItem: objectMetadataItemWorkflow,
- cache: apolloCoreClient.cache,
- objectMetadataItems,
- objectPermissionsByObjectMetadataId,
- recordId: workflowId,
- });
-
- const newStatuses = new Set(
- [...(cachedWorkflow?.statuses ?? []), 'ACTIVE'].filter(
- (status) => status !== 'DEACTIVATED',
- ),
- );
-
- if (isDefined(cachedWorkflow)) {
- modifyRecordFromCache({
- cache: apolloCoreClient.cache,
- recordId: workflowId,
- objectMetadataItem: objectMetadataItemWorkflow,
- fieldModifiers: {
- statuses: () => Array.from(newStatuses),
- },
- });
- upsertRecordsInStore({
- partialRecords: [
- {
- ...cachedWorkflow,
- statuses: Array.from(newStatuses) as WorkflowStatus[],
- },
- ],
- });
- }
- },
+ await mutateCore({
+ variables: { coreWorkflowVersionId: workflowVersionId },
});
-
await invalidateCoreWorkflowVersions(apolloCoreClient);
};
diff --git a/packages/twenty-front/src/modules/workflow/hooks/useActiveWorkflowVersion.ts b/packages/twenty-front/src/modules/workflow/hooks/useActiveWorkflowVersion.ts
index 3c40bec5ca0..22c0278262f 100644
--- a/packages/twenty-front/src/modules/workflow/hooks/useActiveWorkflowVersion.ts
+++ b/packages/twenty-front/src/modules/workflow/hooks/useActiveWorkflowVersion.ts
@@ -1,10 +1,6 @@
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
import { useQuery } from '@apollo/client/react';
import { GetCoreWorkflowVersionsDocument } from '~/generated/graphql';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
-import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
-import { type WorkflowVersion } from '@/workflow/types/Workflow';
type UseActiveWorkflowVersionProps = {
workflowId: string;
@@ -13,46 +9,20 @@ type UseActiveWorkflowVersionProps = {
export const useActiveWorkflowVersion = ({
workflowId,
}: UseActiveWorkflowVersionProps) => {
- const isCore = useIsWorkflowCoreEnabled();
const client = useApolloCoreClient();
- const core = useQuery(GetCoreWorkflowVersionsDocument, {
+ const { data, loading } = useQuery(GetCoreWorkflowVersionsDocument, {
client,
variables: { coreWorkflowId: workflowId },
- skip: !isCore || !workflowId,
+ skip: !workflowId,
});
- const { records: workflowVersions, loading } = useFindManyRecords<
- Pick<WorkflowVersion, 'id' | '__typename'>
- >({
- objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
- filter: {
- workflowId: {
- eq: workflowId,
- },
- status: {
- eq: 'ACTIVE',
- },
- },
- skip: isCore,
- recordGqlFields: {
- id: true,
- },
- });
-
- if (isCore) {
- return {
- workflowVersion: core.data?.coreWorkflowVersions.find(
- (version) => version.status === 'ACTIVE',
- ),
- hasDraftVersion: core.data?.coreWorkflowVersions.some(
- (version) => version.status === 'DRAFT',
- ),
- loading: core.loading,
- };
- }
return {
- workflowVersion: workflowVersions?.[0],
- hasDraftVersion: false,
+ workflowVersion: data?.coreWorkflowVersions.find(
+ (version) => version.status === 'ACTIVE',
+ ),
+ hasDraftVersion: data?.coreWorkflowVersions.some(
+ (version) => version.status === 'DRAFT',
+ ),
loading,
};
};
diff --git a/packages/twenty-front/src/modules/workflow/hooks/useCreateDraftFromWorkflowVersion.ts b/packages/twenty-front/src/modules/workflow/hooks/useCreateDraftFromWorkflowVersion.ts
index 195c9f93270..07f71a1b8bf 100644
--- a/packages/twenty-front/src/modules/workflow/hooks/useCreateDraftFromWorkflowVersion.ts
+++ b/packages/twenty-front/src/modules/workflow/hooks/useCreateDraftFromWorkflowVersion.ts
@@ -1,75 +1,29 @@
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
-import {
- CreateDraftFromCoreWorkflowVersionDocument,
- type CreateDraftFromWorkflowVersionInput,
- CreateDraftFromWorkflowVersionDocument,
-} from '~/generated/graphql';
+import { CreateDraftFromCoreWorkflowVersionDocument } from '~/generated/graphql';
import { invalidateCoreWorkflowVersions } from '@/object-core/workflows/versions/utils/invalidateCoreWorkflowVersions';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
-import { useFindManyRecordsQuery } from '@/object-record/hooks/useFindManyRecordsQuery';
import { useMutation } from '@apollo/client/react';
export const useCreateDraftFromWorkflowVersion = () => {
const apolloCoreClient = useApolloCoreClient();
- const isCore = useIsWorkflowCoreEnabled();
const [mutateCore] = useMutation(CreateDraftFromCoreWorkflowVersionDocument, {
client: apolloCoreClient,
});
- const [mutate] = useMutation(CreateDraftFromWorkflowVersionDocument, {
- client: apolloCoreClient,
- });
-
- const { findManyRecordsQuery: findManyWorkflowsQuery } =
- useFindManyRecordsQuery({
- objectNameSingular: CoreObjectNameSingular.Workflow,
- recordGqlFields: {
- id: true,
- name: true,
- statuses: true,
- lastPublishedVersionId: true,
- versions: {
- id: true,
- status: true,
- name: true,
- createdAt: true,
+ const createDraftFromWorkflowVersion = async (input: {
+ workflowId: string;
+ workflowVersionIdToCopy: string;
+ }) => {
+ const result = await mutateCore({
+ variables: {
+ input: {
+ coreWorkflowId: input.workflowId,
+ coreWorkflowVersionIdToCopy: input.workflowVersionIdToCopy,
},
},
});
-
- const createDraftFromWorkflowVersion = async (
- input: CreateDraftFromWorkflowVersionInput,
- ) => {
- if (isCore) {
- const result = await mutateCore({
- variables: {
- input: {
- coreWorkflowId: input.workflowId,
- coreWorkflowVersionIdToCopy: input.workflowVersionIdToCopy,
- },
- },
- });
- await invalidateCoreWorkflowVersions(apolloCoreClient);
- return result.data?.createDraftFromWorkflowVersion.id;
- }
-
- const result = await mutate({
- variables: { input },
- awaitRefetchQueries: true,
- refetchQueries: [
- {
- query: findManyWorkflowsQuery,
- variables: {
- id: input.workflowId,
- },
- },
- ],
- });
-
await invalidateCoreWorkflowVersions(apolloCoreClient);
- return result?.data?.createDraftFromWorkflowVersion.id;
+ return result.data?.createDraftFromWorkflowVersion.id;
};
return {
diff --git a/packages/twenty-front/src/modules/workflow/hooks/useDeactivateWorkflowVersion.ts b/packages/twenty-front/src/modules/workflow/hooks/useDeactivateWorkflowVersion.ts
index a0974b80a1e..a034ffd90cb 100644
--- a/packages/twenty-front/src/modules/workflow/hooks/useDeactivateWorkflowVersion.ts
+++ b/packages/twenty-front/src/modules/workflow/hooks/useDeactivateWorkflowVersion.ts
@@ -1,146 +1,23 @@
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
-import {
- DeactivateCoreWorkflowVersionDocument,
- type DeactivateWorkflowVersionMutation,
- type DeactivateWorkflowVersionMutationVariables,
-} from '~/generated/graphql';
+import { DeactivateCoreWorkflowVersionDocument } from '~/generated/graphql';
import { invalidateCoreWorkflowVersions } from '@/object-core/workflows/versions/utils/invalidateCoreWorkflowVersions';
import { useMutation } from '@apollo/client/react';
-import { triggerUpdateRecordOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerUpdateRecordOptimisticEffect';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
-import { getRecordFromCache } from '@/object-record/cache/utils/getRecordFromCache';
-import { modifyRecordFromCache } from '@/object-record/cache/utils/modifyRecordFromCache';
-import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
-import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useUpsertRecordsInStore';
-import { DEACTIVATE_WORKFLOW_VERSION } from '@/workflow/graphql/mutations/deactivateWorkflowVersion';
-import {
- type Workflow,
- type WorkflowStatus,
- type WorkflowVersion,
-} from '@/workflow/types/Workflow';
-import { isDefined } from 'twenty-shared/utils';
export const useDeactivateWorkflowVersion = () => {
const apolloCoreClient = useApolloCoreClient();
- const isCore = useIsWorkflowCoreEnabled();
const [mutateCore] = useMutation(DeactivateCoreWorkflowVersionDocument, {
client: apolloCoreClient,
});
- const { objectPermissionsByObjectMetadataId } = useObjectPermissions();
- const { objectMetadataItems } = useObjectMetadataItems();
- const [mutate] = useMutation<
- DeactivateWorkflowVersionMutation,
- DeactivateWorkflowVersionMutationVariables
- >(DEACTIVATE_WORKFLOW_VERSION, {
- client: apolloCoreClient,
- });
-
- const { upsertRecordsInStore } = useUpsertRecordsInStore();
-
- const { objectMetadataItem: objectMetadataItemWorkflow } =
- useObjectMetadataItem({
- objectNameSingular: CoreObjectNameSingular.Workflow,
- });
- const { objectMetadataItem: objectMetadataItemWorkflowVersion } =
- useObjectMetadataItem({
- objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
- });
const deactivateWorkflowVersion = async ({
workflowVersionId,
}: {
workflowVersionId: string;
}) => {
- if (isCore) {
- await mutateCore({
- variables: { coreWorkflowVersionId: workflowVersionId },
- });
- await invalidateCoreWorkflowVersions(apolloCoreClient);
- return;
- }
-
- await mutate({
- variables: {
- workflowVersionId,
- },
- update: () => {
- modifyRecordFromCache({
- cache: apolloCoreClient.cache,
- recordId: workflowVersionId,
- objectMetadataItem: objectMetadataItemWorkflowVersion,
- fieldModifiers: {
- status: () => 'DEACTIVATED',
- },
- });
-
- const cacheSnapshot = apolloCoreClient.cache.extract() as Record<
- string,
- Record<string, unknown>
- >;
- const workflowVersion = (
- Object.values(cacheSnapshot) as Array<Record<string, unknown>>
- ).find(
- (item) =>
- item.__typename === 'WorkflowVersion' &&
- item.id === workflowVersionId,
- ) as WorkflowVersion | undefined;
-
- if (!isDefined(workflowVersion)) {
- return;
- }
-
- triggerUpdateRecordOptimisticEffect({
- cache: apolloCoreClient.cache,
- objectMetadataItem: objectMetadataItemWorkflowVersion,
- currentRecord: workflowVersion,
- updatedRecord: {
- ...workflowVersion,
- status: 'DEACTIVATED',
- },
- objectMetadataItems,
- objectPermissionsByObjectMetadataId,
- upsertRecordsInStore,
- });
-
- const cachedWorkflow = getRecordFromCache<Workflow>({
- objectMetadataItem: objectMetadataItemWorkflow,
- cache: apolloCoreClient.cache,
- objectMetadataItems,
- objectPermissionsByObjectMetadataId,
- recordId: workflowVersion.workflowId,
- });
-
- const newStatuses = new Set(
- [...(cachedWorkflow?.statuses ?? []), 'DEACTIVATED'].filter(
- (status) => status !== 'ACTIVE',
- ),
- );
-
- if (isDefined(cachedWorkflow)) {
- modifyRecordFromCache({
- cache: apolloCoreClient.cache,
- recordId: workflowVersion.workflowId,
- objectMetadataItem: objectMetadataItemWorkflow,
- fieldModifiers: {
- statuses: () => Array.from(newStatuses),
- },
- });
- upsertRecordsInStore({
- partialRecords: [
- {
- ...cachedWorkflow,
- statuses: Array.from(newStatuses) as WorkflowStatus[],
- },
- ],
- });
- }
- },
+ await mutateCore({
+ variables: { coreWorkflowVersionId: workflowVersionId },
});
-
await invalidateCoreWorkflowVersions(apolloCoreClient);
};
diff --git a/packages/twenty-front/src/modules/workflow/hooks/useDiscardWorkspaceWorkflowDraft.ts b/packages/twenty-front/src/modules/workflow/hooks/useDiscardWorkspaceWorkflowDraft.ts
deleted file mode 100644
index df61958566f..00000000000
--- a/packages/twenty-front/src/modules/workflow/hooks/useDiscardWorkspaceWorkflowDraft.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { useMutation } from '@apollo/client/react';
-
-import { DISCARD_CORE_WORKFLOW_DRAFT } from '@/object-core/workflows/graphql/mutations/discardCoreWorkflowDraft';
-import { invalidateCoreWorkflowVersions } from '@/object-core/workflows/versions/utils/invalidateCoreWorkflowVersions';
-import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
-import { useEvictDiscardedDraftFromWorkflowCache } from '@/workflow/hooks/useEvictDiscardedDraftFromWorkflowCache';
-import {
- type DiscardCoreWorkflowDraftMutation,
- type DiscardCoreWorkflowDraftMutationVariables,
-} from '~/generated/graphql';
-
-export const useDiscardWorkspaceWorkflowDraft = () => {
- const apolloCoreClient = useApolloCoreClient();
- const { evictDiscardedDraftFromWorkflowCache } =
- useEvictDiscardedDraftFromWorkflowCache();
-
- const [discardCoreWorkflowDraftMutation] = useMutation<
- DiscardCoreWorkflowDraftMutation,
- DiscardCoreWorkflowDraftMutationVariables
- >(DISCARD_CORE_WORKFLOW_DRAFT, { client: apolloCoreClient });
-
- const discardWorkspaceWorkflowDraft = async ({
- workspaceWorkflowVersionId,
- }: {
- workspaceWorkflowVersionId: string;
- }) => {
- await discardCoreWorkflowDraftMutation({
- variables: { input: { workspaceWorkflowVersionId } },
- });
-
- evictDiscardedDraftFromWorkflowCache(workspaceWorkflowVersionId);
-
- await invalidateCoreWorkflowVersions(apolloCoreClient);
- };
-
- return { discardWorkspaceWorkflowDraft };
-};
diff --git a/packages/twenty-front/src/modules/workflow/hooks/useDuplicateWorkflow.ts b/packages/twenty-front/src/modules/workflow/hooks/useDuplicateWorkflow.ts
index b3040090c30..38dec854728 100644
--- a/packages/twenty-front/src/modules/workflow/hooks/useDuplicateWorkflow.ts
+++ b/packages/twenty-front/src/modules/workflow/hooks/useDuplicateWorkflow.ts
@@ -1,69 +1,31 @@
import { invalidateCoreWorkflowVersions } from '@/object-core/workflows/versions/utils/invalidateCoreWorkflowVersions';
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
-import {
- DuplicateCoreWorkflowDocument,
- type DuplicateWorkflowInput,
- type WorkflowVersionDto,
-} from '~/generated/graphql';
+import { DuplicateCoreWorkflowDocument } from '~/generated/graphql';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
-import { useFindManyRecordsQuery } from '@/object-record/hooks/useFindManyRecordsQuery';
import { useMutation } from '@apollo/client/react';
-import { DUPLICATE_WORKFLOW } from '@/workflow/graphql/mutations/duplicateWorkflow';
export const useDuplicateWorkflow = () => {
const apolloCoreClient = useApolloCoreClient();
- const isCore = useIsWorkflowCoreEnabled();
const [mutateCore] = useMutation(DuplicateCoreWorkflowDocument, {
client: apolloCoreClient,
});
- const [mutate] = useMutation<
- { duplicateWorkflow: WorkflowVersionDto },
- { input: DuplicateWorkflowInput }
- >(DUPLICATE_WORKFLOW, {
- client: apolloCoreClient,
- });
-
- const { findManyRecordsQuery: findManyWorkflowsQuery } =
- useFindManyRecordsQuery({
- objectNameSingular: CoreObjectNameSingular.Workflow,
- recordGqlFields: {
- id: true,
- name: true,
- statuses: true,
- lastPublishedVersionId: true,
- versions: true,
- },
- });
-
- const duplicateWorkflow = async (input: DuplicateWorkflowInput) => {
- if (isCore) {
- const result = await mutateCore({
- variables: {
- input: {
- coreWorkflowIdToDuplicate: input.workflowIdToDuplicate,
- coreWorkflowVersionIdToCopy: input.workflowVersionIdToCopy,
- },
- },
- });
- await invalidateCoreWorkflowVersions(apolloCoreClient);
- return result.data
- ? { workflowId: result.data.duplicateWorkflow.id }
- : undefined;
- }
- const result = await mutate({
- variables: { input },
- awaitRefetchQueries: true,
- refetchQueries: [
- {
- query: findManyWorkflowsQuery,
- variables: {},
+ const duplicateWorkflow = async (input: {
+ workflowIdToDuplicate: string;
+ workflowVersionIdToCopy: string;
+ }) => {
+ const result = await mutateCore({
+ variables: {
+ input: {
+ coreWorkflowIdToDuplicate: input.workflowIdToDuplicate,
+ coreWorkflowVersionIdToCopy: input.workflowVersionIdToCopy,
},
- ],
+ },
});
+ await invalidateCoreWorkflowVersions(apolloCoreClient);
- return result?.data?.duplicateWorkflow;
+ return result.data
+ ? { workflowId: result.data.duplicateWorkflow.id }
+ : undefined;
};
return {
diff --git a/packages/twenty-front/src/modules/workflow/hooks/useEffectiveDraftVersionId.ts b/packages/twenty-front/src/modules/workflow/hooks/useEffectiveDraftVersionId.ts
deleted file mode 100644
index 7c41075abda..00000000000
--- a/packages/twenty-front/src/modules/workflow/hooks/useEffectiveDraftVersionId.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
-import { lastDiscardedDraftIdState } from '@/workflow/states/lastDiscardedDraftIdState';
-import { useAtom } from 'jotai';
-import { useState } from 'react';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
-import { isDefined } from 'twenty-shared/utils';
-
-export const useEffectiveDraftVersionId = (
- draftVersionFromServer: { id: string } | undefined,
- skip = false,
-): {
- effectiveDraftId: string | undefined;
- lastDiscardedDraftId: string | undefined;
-} => {
- const getVersionFromCache = useGetRecordFromCache({
- objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
- recordGqlFields: { id: true, status: true, deletedAt: true },
- });
-
- const [lastDiscardedDraftId, setLastDiscardedDraftId] = useAtom(
- lastDiscardedDraftIdState,
- );
-
- const [previouslyKnownDraftId, setPreviouslyKnownDraftId] = useState<
- string | undefined
- >();
-
- if (skip) {
- return { effectiveDraftId: undefined, lastDiscardedDraftId: undefined };
- }
-
- if (isDefined(draftVersionFromServer)) {
- const isReaddedBySSEAfterDiscard =
- draftVersionFromServer.id === lastDiscardedDraftId;
-
- if (isReaddedBySSEAfterDiscard) {
- return { effectiveDraftId: undefined, lastDiscardedDraftId };
- }
-
- const isNewDraft = draftVersionFromServer.id !== previouslyKnownDraftId;
-
- if (isNewDraft) {
- setPreviouslyKnownDraftId(draftVersionFromServer.id);
- }
-
- if (isDefined(lastDiscardedDraftId)) {
- setLastDiscardedDraftId(undefined);
- }
-
- return {
- effectiveDraftId: draftVersionFromServer.id,
- lastDiscardedDraftId,
- };
- }
-
- if (!isDefined(previouslyKnownDraftId)) {
- return { effectiveDraftId: undefined, lastDiscardedDraftId };
- }
-
- const cachedDraft = getVersionFromCache(previouslyKnownDraftId);
-
- const isDraftStillAlive =
- isDefined(cachedDraft) &&
- cachedDraft.status === 'DRAFT' &&
- !isDefined(cachedDraft.deletedAt);
-
- if (isDraftStillAlive) {
- return { effectiveDraftId: previouslyKnownDraftId, lastDiscardedDraftId };
- }
-
- const wasDiscarded =
- isDefined(cachedDraft) && isDefined(cachedDraft.deletedAt);
-
- if (wasDiscarded) {
- setLastDiscardedDraftId(previouslyKnownDraftId);
- }
-
- setPreviouslyKnownDraftId(undefined);
-
- return { effectiveDraftId: undefined, lastDiscardedDraftId };
-};
diff --git a/packages/twenty-front/src/modules/workflow/hooks/useEvictDiscardedDraftFromWorkflowCache.ts b/packages/twenty-front/src/modules/workflow/hooks/useEvictDiscardedDraftFromWorkflowCache.ts
deleted file mode 100644
index 667f24a354d..00000000000
--- a/packages/twenty-front/src/modules/workflow/hooks/useEvictDiscardedDraftFromWorkflowCache.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import { useCallback } from 'react';
-
-import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
-import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
-import { modifyRecordFromCache } from '@/object-record/cache/utils/modifyRecordFromCache';
-import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useUpsertRecordsInStore';
-import { type Workflow, type WorkflowVersion } from '@/workflow/types/Workflow';
-import { isDefined } from 'twenty-shared/utils';
-
-export const useEvictDiscardedDraftFromWorkflowCache = () => {
- const apolloCoreClient = useApolloCoreClient();
- const getWorkflowVersionFromCache = useGetRecordFromCache({
- objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
- });
- const getWorkflowFromCache = useGetRecordFromCache({
- objectNameSingular: CoreObjectNameSingular.Workflow,
- });
- const { objectMetadataItem: objectMetadataItemWorkflow } =
- useObjectMetadataItem({
- objectNameSingular: CoreObjectNameSingular.Workflow,
- });
- const { objectMetadataItem: objectMetadataItemWorkflowVersion } =
- useObjectMetadataItem({
- objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
- });
- const { upsertRecordsInStore } = useUpsertRecordsInStore();
-
- const evictDiscardedDraftFromWorkflowCache = useCallback(
- (workflowVersionId: string) => {
- if (!workflowVersionId) {
- return;
- }
-
- const cache = apolloCoreClient.cache;
-
- const cachedWorkflowVersion =
- getWorkflowVersionFromCache<WorkflowVersion>(workflowVersionId);
-
- if (!isDefined(cachedWorkflowVersion)) {
- return;
- }
-
- const discardedAt = new Date().toISOString();
-
- modifyRecordFromCache({
- objectMetadataItem: objectMetadataItemWorkflowVersion,
- cache,
- recordId: workflowVersionId,
- fieldModifiers: {
- deletedAt: () => discardedAt,
- },
- });
-
- upsertRecordsInStore({
- partialRecords: [{ ...cachedWorkflowVersion, deletedAt: discardedAt }],
- });
-
- const cachedWorkflow = getWorkflowFromCache<Workflow>(
- cachedWorkflowVersion.workflowId,
- );
-
- if (!isDefined(cachedWorkflow)) {
- return;
- }
-
- modifyRecordFromCache({
- objectMetadataItem: objectMetadataItemWorkflow,
- cache,
- recordId: cachedWorkflow.id,
- fieldModifiers: {
- versions: () => {
- return cachedWorkflow.versions.filter(
- (version) => version.id !== workflowVersionId,
- );
- },
- statuses: () => {
- return (
- cachedWorkflow.statuses?.filter((status) => status !== 'DRAFT') ??
- []
- );
- },
- },
- });
-
- upsertRecordsInStore({
- partialRecords: [
- {
- ...cachedWorkflow,
- statuses:
- cachedWorkflow.statuses?.filter((status) => status !== 'DRAFT') ??
- [],
- versions: cachedWorkflow.versions.filter(
- (version) => version.id !== workflowVersionId,
- ),
- },
- ],
- });
- },
- [
- apolloCoreClient.cache,
- getWorkflowFromCache,
- getWorkflowVersionFromCache,
- objectMetadataItemWorkflow,
- objectMetadataItemWorkflowVersion,
- upsertRecordsInStore,
- ],
- );
-
- return { evictDiscardedDraftFromWorkflowCache };
-};
diff --git a/packages/twenty-front/src/modules/workflow/hooks/useRunWorkflowRunOpeningInSidePanelEffects.ts b/packages/twenty-front/src/modules/workflow/hooks/useRunWorkflowRunOpeningInSidePanelEffects.ts
index f687543dba3..6a9a50da23f 100644
--- a/packages/twenty-front/src/modules/workflow/hooks/useRunWorkflowRunOpeningInSidePanelEffects.ts
+++ b/packages/twenty-front/src/modules/workflow/hooks/useRunWorkflowRunOpeningInSidePanelEffects.ts
@@ -1,4 +1,3 @@
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
import { useSidePanelWorkflowNavigation } from '@/side-panel/pages/workflow/hooks/useSidePanelWorkflowNavigation';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';
@@ -20,7 +19,6 @@ import { useIcons } from 'twenty-ui/icon';
import { useStore } from 'jotai';
export const useRunWorkflowRunOpeningInSidePanelEffects = () => {
- const isCore = useIsWorkflowCoreEnabled();
const store = useStore();
const apolloCoreClient = useApolloCoreClient();
const { openWorkflowRunViewStepInSidePanel } =
@@ -52,13 +50,11 @@ export const useRunWorkflowRunOpeningInSidePanelEffects = () => {
return;
}
- const workflowId = isCore
- ? (workflowRunRecord.coreWorkflowId ?? workflowRunRecord.workflowId)
- : workflowRunRecord.workflowId;
- const workflowVersionId = isCore
- ? (workflowRunRecord.coreWorkflowVersionId ??
- workflowRunRecord.workflowVersionId)
- : workflowRunRecord.workflowVersionId;
+ const workflowId =
+ workflowRunRecord.coreWorkflowId ?? workflowRunRecord.workflowId;
+ const workflowVersionId =
+ workflowRunRecord.coreWorkflowVersionId ??
+ workflowRunRecord.workflowVersionId;
if (!isDefined(workflowId) || !isDefined(workflowVersionId)) {
return;
}
@@ -127,7 +123,6 @@ export const useRunWorkflowRunOpeningInSidePanelEffects = () => {
});
},
[
- isCore,
apolloCoreClient.cache,
objectPermissionsByObjectMetadataId,
openWorkflowRunViewStepInSidePanel,
diff --git a/packages/twenty-front/src/modules/workflow/hooks/useRunWorkflowVersion.tsx b/packages/twenty-front/src/modules/workflow/hooks/useRunWorkflowVersion.tsx
index b1f8b43abc0..2703cf28b07 100644
--- a/packages/twenty-front/src/modules/workflow/hooks/useRunWorkflowVersion.tsx
+++ b/packages/twenty-front/src/modules/workflow/hooks/useRunWorkflowVersion.tsx
@@ -1,9 +1,4 @@
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
-import {
- RunCoreWorkflowVersionDocument,
- type RunWorkflowVersionMutation,
- type RunWorkflowVersionMutationVariables,
-} from '~/generated/graphql';
+import { RunCoreWorkflowVersionDocument } from '~/generated/graphql';
import { triggerCreateRecordsOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerCreateRecordsOptimisticEffect';
import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
import { useOpenRecordInSidePanel } from '@/side-panel/hooks/useOpenRecordInSidePanel';
@@ -22,7 +17,6 @@ import { recordStoreFamilyState } from '@/object-record/record-store/states/reco
import { computeOptimisticCreateRecordBaseRecordInput } from '@/object-record/utils/computeOptimisticCreateRecordBaseRecordInput';
import { computeOptimisticRecordFromInput } from '@/object-record/utils/computeOptimisticRecordFromInput';
import { useChangeQueryListenState } from '@/sse-db-event/hooks/useChangeQueryListenState';
-import { RUN_WORKFLOW_VERSION } from '@/workflow/graphql/mutations/runWorkflowVersion';
import { getWorkflowRunSseQueryId } from '@/workflow/utils/getWorkflowRunSseQueryId';
import { type WorkflowRun } from '@/workflow/types/Workflow';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
@@ -34,7 +28,6 @@ import { useStore } from 'jotai';
export const useRunWorkflowVersion = () => {
const store = useStore();
- const isCore = useIsWorkflowCoreEnabled();
const apolloCoreClient = useApolloCoreClient();
const [mutateCore] = useMutation(RunCoreWorkflowVersionDocument, {
client: apolloCoreClient,
@@ -52,13 +45,6 @@ export const useRunWorkflowVersion = () => {
});
const currentWorkspaceMember = useAtomStateValue(currentWorkspaceMemberState);
- const [mutate] = useMutation<
- RunWorkflowVersionMutation,
- RunWorkflowVersionMutationVariables
- >(RUN_WORKFLOW_VERSION, {
- client: apolloCoreClient,
- });
-
const computedRecordGqlFields = useGenerateDepthRecordGqlFieldsFromObject({
objectNameSingular: CoreObjectNameSingular.WorkflowRun,
depth: 1,
@@ -94,12 +80,8 @@ export const useRunWorkflowVersion = () => {
const recordInput: Partial<WorkflowRun> = {
name: '#0',
status: 'NOT_STARTED',
- ...(isCore
- ? {
- coreWorkflowVersionId: workflowVersionId,
- coreWorkflowId: workflowId,
- }
- : { workflowVersionId, workflowId }),
+ coreWorkflowVersionId: workflowVersionId,
+ coreWorkflowId: workflowId,
createdAt: new Date().toISOString(),
};
@@ -161,21 +143,15 @@ export const useRunWorkflowVersion = () => {
changeQueryIdListenState(true, sseQueryId, sseOperationSignature);
try {
- if (isCore) {
- await mutateCore({
- variables: {
- input: {
- coreWorkflowVersionId: workflowVersionId,
- workflowRunId,
- payload,
- },
+ await mutateCore({
+ variables: {
+ input: {
+ coreWorkflowVersionId: workflowVersionId,
+ workflowRunId,
+ payload,
},
- });
- } else {
- await mutate({
- variables: { input: { workflowVersionId, workflowRunId, payload } },
- });
- }
+ },
+ });
} catch (error) {
changeQueryIdListenState(false, sseQueryId, sseOperationSignature);
throw error;
diff --git a/packages/twenty-front/src/modules/workflow/hooks/useWorkflowVersion.ts b/packages/twenty-front/src/modules/workflow/hooks/useWorkflowVersion.ts
index 6352c226943..ccf8399ab33 100644
--- a/packages/twenty-front/src/modules/workflow/hooks/useWorkflowVersion.ts
+++ b/packages/twenty-front/src/modules/workflow/hooks/useWorkflowVersion.ts
@@ -5,29 +5,25 @@ import {
GetCoreWorkflowDocument,
} from '~/generated/graphql';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
import { buildWorkflowVersionFromCore } from '@/object-core/workflows/utils/buildWorkflowVersionFromCore';
-import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
-import { type Workflow, type WorkflowVersion } from '@/workflow/types/Workflow';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
export const useWorkflowVersion = (workflowVersionId?: string) => {
- const isCore = useIsWorkflowCoreEnabled();
const client = useApolloCoreClient();
const { data } = useQuery(GetCoreWorkflowVersionDocument, {
client,
variables: { coreWorkflowVersionId: workflowVersionId ?? '' },
fetchPolicy: 'cache-and-network',
- skip: !isCore || !workflowVersionId,
+ skip: !workflowVersionId,
});
const coreWorkflowId = data?.coreWorkflowVersion?.coreWorkflowId;
const { data: workflowData } = useQuery(GetCoreWorkflowDocument, {
client,
variables: { coreWorkflowId: coreWorkflowId ?? '' },
fetchPolicy: 'cache-and-network',
- skip: !isCore || !coreWorkflowId,
+ skip: !coreWorkflowId,
});
- const coreVersion = useMemo(() => {
+
+ return useMemo(() => {
const version = buildWorkflowVersionFromCore(data?.coreWorkflowVersion);
return version
? {
@@ -39,25 +35,4 @@ export const useWorkflowVersion = (workflowVersionId?: string) => {
}
: undefined;
}, [data, workflowData]);
- const { record: workflowVersion } = useFindOneRecord<
- WorkflowVersion & { workflow: Pick<Workflow, 'id' | 'name'> }
- >({
- objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
- objectRecordId: workflowVersionId,
- recordGqlFields: {
- id: true,
- name: true,
- createdAt: true,
- updatedAt: true,
- workflowId: true,
- status: true,
- workflow: {
- id: true,
- name: true,
- },
- },
- skip: isCore || !workflowVersionId,
- });
-
- return isCore ? coreVersion : workflowVersion;
};
diff --git a/packages/twenty-front/src/modules/workflow/hooks/useWorkflowWithCurrentVersion.ts b/packages/twenty-front/src/modules/workflow/hooks/useWorkflowWithCurrentVersion.ts
index f9475b4c32c..4c7d5f70d93 100644
--- a/packages/twenty-front/src/modules/workflow/hooks/useWorkflowWithCurrentVersion.ts
+++ b/packages/twenty-front/src/modules/workflow/hooks/useWorkflowWithCurrentVersion.ts
@@ -1,126 +1,36 @@
import { useCoreWorkflowForShowPage } from '@/object-core/workflows/hooks/useCoreWorkflowForShowPage';
import { useCoreWorkflowVersionContent } from '@/object-core/workflows/hooks/useCoreWorkflowVersionContent';
-import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
-import { useEffectiveDraftVersionId } from '@/workflow/hooks/useEffectiveDraftVersionId';
import { getWorkflowCurrentVersion } from '@/workflow/utils/getWorkflowCurrentVersion';
-import {
- type Workflow,
- type WorkflowVersion,
- type WorkflowWithCurrentVersion,
-} from '@/workflow/types/Workflow';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
-import { CoreObjectNameSingular, FeatureFlagKey } from 'twenty-shared/types';
+import { type WorkflowWithCurrentVersion } from '@/workflow/types/Workflow';
import { isDefined } from 'twenty-shared/utils';
-type WorkflowWithAllVersions = Omit<Workflow, 'versions'> & {
- versions: Array<
- Pick<WorkflowVersion, 'id' | 'status' | 'name' | 'createdAt'>
- >;
-};
-
export const useWorkflowWithCurrentVersion = (
workflowId: string | undefined,
): WorkflowWithCurrentVersion | undefined => {
- const isWorkflowCoreIndexPageEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED,
- );
-
- const { record: workspaceWorkflow } =
- useFindOneRecord<WorkflowWithAllVersions>({
- objectNameSingular: CoreObjectNameSingular.Workflow,
- objectRecordId: workflowId,
- recordGqlFields: {
- id: true,
- name: true,
- statuses: true,
- lastPublishedVersionId: true,
- versions: {
- id: true,
- status: true,
- name: true,
- createdAt: true,
- },
- },
- skip: !isDefined(workflowId) || isWorkflowCoreIndexPageEnabled,
- });
-
- const {
- coreWorkflow,
- versions: coreVersions,
- draftVersionIdFromServer,
- } = useCoreWorkflowForShowPage({
+ const { coreWorkflow, versions } = useCoreWorkflowForShowPage({
coreWorkflowId: workflowId,
- skip: !isWorkflowCoreIndexPageEnabled,
});
- const workflow = isWorkflowCoreIndexPageEnabled
- ? coreWorkflow
- : workspaceWorkflow;
-
- const allVersions = isWorkflowCoreIndexPageEnabled
- ? coreVersions
- : (workspaceWorkflow?.versions ?? []);
-
- const coreDraftVersion = isDefined(draftVersionIdFromServer)
- ? { id: draftVersionIdFromServer }
- : undefined;
-
- const workspaceDraftVersion = workspaceWorkflow?.versions.find(
- (version) => version.status === 'DRAFT',
+ const workflowVersions = [...versions].sort((a, b) =>
+ a.createdAt > b.createdAt ? -1 : 1,
);
- const draftVersionFromServer = isWorkflowCoreIndexPageEnabled
- ? coreDraftVersion
- : workspaceDraftVersion;
-
- const { effectiveDraftId, lastDiscardedDraftId } = useEffectiveDraftVersionId(
- draftVersionFromServer,
- isWorkflowCoreIndexPageEnabled,
- );
-
- const workflowVersions = [...allVersions]
- .filter((version) => version.id !== lastDiscardedDraftId)
- .sort((a, b) => (a.createdAt > b.createdAt ? -1 : 1));
-
- const currentVersionId = isWorkflowCoreIndexPageEnabled
- ? getWorkflowCurrentVersion({
- versions: workflowVersions,
- lastPublishedVersionId: coreWorkflow?.lastPublishedVersionId,
- })?.id
- : (effectiveDraftId ?? workflowVersions[0]?.id);
-
- const { record: workspaceCurrentVersion } = useFindOneRecord<WorkflowVersion>(
- {
- objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
- objectRecordId: currentVersionId,
- recordGqlFields: {
- id: true,
- name: true,
- status: true,
- workflowId: true,
- createdAt: true,
- updatedAt: true,
- },
- skip: !isDefined(currentVersionId) || isWorkflowCoreIndexPageEnabled,
- },
- );
+ const currentVersionId = getWorkflowCurrentVersion({
+ versions: workflowVersions,
+ lastPublishedVersionId: coreWorkflow?.lastPublishedVersionId,
+ })?.id;
- const coreCurrentVersion = useCoreWorkflowVersionContent({
+ const currentVersion = useCoreWorkflowVersionContent({
coreWorkflowId: workflowId,
coreWorkflowVersionId: currentVersionId,
- skip: !isWorkflowCoreIndexPageEnabled,
});
- const currentVersion = isWorkflowCoreIndexPageEnabled
- ? coreCurrentVersion
- : workspaceCurrentVersion;
-
- if (!isDefined(workflow) || !isDefined(currentVersion)) {
+ if (!isDefined(coreWorkflow) || !isDefined(currentVersion)) {
return undefined;
}
return {
- ...workflow,
+ ...coreWorkflow,
__typename: 'Workflow',
versions: workflowVersions,
currentVersion,
diff --git a/packages/twenty-front/src/modules/workflow/states/lastDiscardedDraftIdState.ts b/packages/twenty-front/src/modules/workflow/states/lastDiscardedDraftIdState.ts
deleted file mode 100644
index d8ee605df83..00000000000
--- a/packages/twenty-front/src/modules/workflow/states/lastDiscardedDraftIdState.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { atom } from 'jotai';
-
-export const lastDiscardedDraftIdState = atom<string | undefined>(undefined);
-lastDiscardedDraftIdState.debugLabel = 'lastDiscardedDraftIdState';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunVisualizerEffect.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunVisualizerEffect.tsx
index 7cdd986a026..ebd7475c583 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunVisualizerEffect.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunVisualizerEffect.tsx
@@ -1,4 +1,3 @@
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
import { CommandMenuContext } from '@/command-menu-item/contexts/CommandMenuContext';
import { useSidePanelWorkflowNavigation } from '@/side-panel/pages/workflow/hooks/useSidePanelWorkflowNavigation';
import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
@@ -30,22 +29,18 @@ export const WorkflowRunVisualizerEffect = ({
workflowRunId: string;
}) => {
const { getIcon } = useIcons();
- const isCore = useIsWorkflowCoreEnabled();
const workflowRun = useWorkflowRun({ workflowRunId });
const setWorkflowVisualizerWorkflowRunId = useSetAtomComponentState(
workflowVisualizerWorkflowRunIdComponentState,
);
- const workflowVersionId = isCore
- ? (workflowRun?.coreWorkflowVersionId ??
- workflowRun?.workflowVersionId ??
- undefined)
- : (workflowRun?.workflowVersionId ?? undefined);
+ const workflowVersionId =
+ workflowRun?.coreWorkflowVersionId ??
+ workflowRun?.workflowVersionId ??
+ undefined;
const workflowVersion = useWorkflowVersion(
- isCore
- ? (workflowRun?.coreWorkflowVersionId ?? undefined)
- : workflowVersionId,
+ workflowRun?.coreWorkflowVersionId ?? undefined,
);
const setWorkflowVisualizerWorkflowVersionId = useSetAtomComponentState(
workflowVisualizerWorkflowVersionIdComponentState,
@@ -94,11 +89,9 @@ export const WorkflowRunVisualizerEffect = ({
}
setWorkflowVisualizerWorkflowId(
- isCore
- ? (workflowRun.coreWorkflowId ?? workflowRun.workflowId ?? undefined)
- : (workflowRun.workflowId ?? undefined),
+ workflowRun.coreWorkflowId ?? workflowRun.workflowId ?? undefined,
);
- }, [isCore, setWorkflowVisualizerWorkflowId, workflowRun]);
+ }, [setWorkflowVisualizerWorkflowId, workflowRun]);
useEffect(() => {
if (!isDefined(workflowVersionId)) {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useUpdateWorkflowVersionStep.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useUpdateWorkflowVersionStep.test.ts
index 1bc2509bd1c..2b77404cbdf 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useUpdateWorkflowVersionStep.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useUpdateWorkflowVersionStep.test.ts
@@ -9,11 +9,7 @@ import { createElement, type ReactNode } from 'react';
const mockMutate = jest.fn();
let mockOnCoreError: (error: Error) => void;
const jotaiStore = createStore();
-let mockIsCore = false;
const mockInvalidate = jest.fn();
-jest.mock('@/workflow/hooks/useIsWorkflowCoreEnabled', () => ({
- useIsWorkflowCoreEnabled: () => mockIsCore,
-}));
jest.mock(
'@/object-core/workflows/versions/utils/invalidateCoreWorkflowVersions',
() => ({
@@ -21,25 +17,12 @@ jest.mock(
mockInvalidate(...args),
}),
);
-const mockGetRecordFromCache = jest.fn();
const mockMarkStepForRecomputation = jest.fn();
jest.mock('@/object-metadata/hooks/useApolloCoreClient', () => ({
useApolloCoreClient: () => ({ cache: {} }),
}));
-jest.mock('@/object-metadata/hooks/useObjectMetadataItems', () => ({
- useObjectMetadataItems: () => ({ objectMetadataItems: [] }),
-}));
-
-jest.mock('@/object-metadata/hooks/useObjectMetadataItem', () => ({
- useObjectMetadataItem: () => ({ objectMetadataItem: {} }),
-}));
-
-jest.mock('@/object-record/hooks/useObjectPermissions', () => ({
- useObjectPermissions: () => ({ objectPermissionsByObjectMetadataId: {} }),
-}));
-
const mockEnqueueToast = jest.fn();
jest.mock('twenty-ui/components/feedback', () => ({
@@ -47,14 +30,6 @@ jest.mock('twenty-ui/components/feedback', () => ({
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
-jest.mock('@/object-record/cache/hooks/useGetRecordFromCache', () => ({
- useGetRecordFromCache: () => mockGetRecordFromCache,
-}));
-
-jest.mock('@/object-record/cache/utils/updateRecordFromCache', () => ({
- updateRecordFromCache: jest.fn(),
-}));
-
jest.mock('@/workflow/workflow-variables/hooks/useStepsOutputSchema', () => ({
useStepsOutputSchema: () => ({
markStepForRecomputation: mockMarkStepForRecomputation,
@@ -85,7 +60,6 @@ const Wrapper = ({ children }: { children: ReactNode }) =>
describe('useUpdateWorkflowVersionStep', () => {
beforeEach(() => {
jest.clearAllMocks();
- mockIsCore = false;
jotaiStore.set(
flowComponentState.atomFamily({ instanceId: 'workflow-visualizer-test' }),
undefined,
@@ -103,11 +77,6 @@ describe('useUpdateWorkflowVersionStep', () => {
data: { updateWorkflowVersionStep: updatedStep },
});
- mockGetRecordFromCache.mockReturnValue({
- id: 'version-1',
- steps: [{ id: 'step-1', name: 'Create Record', type: 'CREATE_RECORD' }],
- });
-
const { result } = renderHook(() => useUpdateWorkflowVersionStep(), {
wrapper: Wrapper,
});
@@ -142,37 +111,7 @@ describe('useUpdateWorkflowVersionStep', () => {
expect(mockMarkStepForRecomputation).not.toHaveBeenCalled();
});
- it('should still mark step for recomputation when cached record is missing', async () => {
- mockMutate.mockResolvedValue({
- data: {
- updateWorkflowVersionStep: {
- id: 'step-1',
- name: 'Step',
- type: 'CODE',
- },
- },
- });
-
- mockGetRecordFromCache.mockReturnValue(undefined);
-
- const { result } = renderHook(() => useUpdateWorkflowVersionStep(), {
- wrapper: Wrapper,
- });
-
- await act(async () => {
- await result.current.updateWorkflowVersionStep({
- workflowVersionId: 'version-1',
- step: { id: 'step-1', name: 'Step', type: 'CODE' },
- });
- });
-
- expect(mockMarkStepForRecomputation).toHaveBeenCalledWith({
- stepId: 'step-1',
- workflowVersionId: 'version-1',
- });
- });
it('sends a core version ID and preserves business record IDs in step input', async () => {
- mockIsCore = true;
const step = {
id: 'step-1',
type: 'UPDATE_RECORD',
@@ -191,11 +130,10 @@ describe('useUpdateWorkflowVersionStep', () => {
expect(mockMutate).toHaveBeenCalledWith({
variables: { input: { coreWorkflowVersionId: 'core-draft-id', step } },
});
- expect(mockGetRecordFromCache).not.toHaveBeenCalled();
expect(mockInvalidate).toHaveBeenCalled();
});
+
it('reports a failed core edit and removes unpersisted diagram changes', async () => {
- mockIsCore = true;
const error = new Error('Core save failed');
const instance = { instanceId: 'workflow-visualizer-test' };
jotaiStore.set(flowComponentState.atomFamily(instance), {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useApplyWorkflowVersionStepChanges.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useApplyWorkflowVersionStepChanges.ts
index 53dee0bd4d7..5c158448383 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useApplyWorkflowVersionStepChanges.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useApplyWorkflowVersionStepChanges.ts
@@ -1,36 +1,9 @@
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
-import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
-import {
- CoreObjectNameSingular,
- type RecordGqlFields,
-} from 'twenty-shared/types';
-import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
-import { updateRecordFromCache } from '@/object-record/cache/utils/updateRecordFromCache';
-import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { flowComponentState } from '@/workflow/states/flowComponentState';
-import { type WorkflowVersion } from '@/workflow/types/Workflow';
import { applyDiff, isDefined } from 'twenty-shared/utils';
import { type WorkflowVersionStepChanges } from '~/generated/graphql';
export const useApplyWorkflowVersionStepChanges = (instanceId?: string) => {
- const isCore = useIsWorkflowCoreEnabled();
- const apolloCoreClient = useApolloCoreClient();
-
- const { objectMetadataItems } = useObjectMetadataItems();
-
- const { objectPermissionsByObjectMetadataId } = useObjectPermissions();
-
- const { objectMetadataItem } = useObjectMetadataItem({
- objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
- });
-
- const getRecordFromCache = useGetRecordFromCache({
- objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
- });
-
const setFlow = useSetAtomComponentState(flowComponentState, instanceId);
const applyWorkflowVersionStepChanges = ({
@@ -39,7 +12,7 @@ export const useApplyWorkflowVersionStepChanges = (instanceId?: string) => {
}: {
workflowVersionStepChanges: WorkflowVersionStepChanges | undefined;
workflowVersionId: string;
- }): WorkflowVersion | undefined => {
+ }): void => {
if (!isDefined(workflowVersionStepChanges)) {
return;
}
@@ -58,39 +31,6 @@ export const useApplyWorkflowVersionStepChanges = (instanceId?: string) => {
steps: applyDiff({ steps: currentFlow.steps }, stepsDiff).steps,
};
});
-
- if (isCore) {
- return;
- }
-
- const cachedRecord = getRecordFromCache<WorkflowVersion>(workflowVersionId);
-
- if (!isDefined(cachedRecord)) {
- return;
- }
-
- const newCachedRecord = {
- ...cachedRecord,
- steps: applyDiff({ steps: cachedRecord.steps }, stepsDiff).steps,
- trigger: applyDiff({ trigger: cachedRecord.trigger }, triggerDiff)
- .trigger,
- } as WorkflowVersion;
-
- const recordGqlFields: RecordGqlFields = {
- steps: true,
- trigger: true,
- };
-
- updateRecordFromCache({
- objectMetadataItems,
- objectMetadataItem,
- cache: apolloCoreClient.cache,
- record: newCachedRecord,
- recordGqlFields,
- objectPermissionsByObjectMetadataId,
- });
-
- return newCachedRecord;
};
return { applyWorkflowVersionStepChanges };
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useCreateWorkflowVersionEdge.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useCreateWorkflowVersionEdge.ts
index f3f5b806cf4..00c15d73604 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useCreateWorkflowVersionEdge.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useCreateWorkflowVersionEdge.ts
@@ -1,22 +1,22 @@
-import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { useWorkflowEditorMutationErrorHandler } from '@/workflow/hooks/useWorkflowEditorMutationErrorHandler';
import { invalidateCoreWorkflowVersions } from '@/object-core/workflows/versions/utils/invalidateCoreWorkflowVersions';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
-import { CREATE_WORKFLOW_VERSION_EDGE } from '@/workflow/graphql/mutations/createWorkflowVersionEdge';
import { useApplyWorkflowVersionStepChanges } from '@/workflow/workflow-steps/hooks/useApplyWorkflowVersionStepChanges';
import { useMutation } from '@apollo/client/react';
-import { useToast } from 'twenty-ui/components/feedback';
import {
CreateCoreWorkflowVersionEdgeDocument,
- type CreateWorkflowVersionEdgeInput,
- type CreateWorkflowVersionEdgeMutation,
- type CreateWorkflowVersionEdgeMutationVariables,
+ type CreateCoreWorkflowVersionEdgeInput,
} from '~/generated/graphql';
+export type WorkflowVersionEdgeInput = Omit<
+ CreateCoreWorkflowVersionEdgeInput,
+ 'coreWorkflowVersionId'
+> & {
+ workflowVersionId: string;
+};
+
export const useCreateWorkflowVersionEdge = () => {
const apolloCoreClient = useApolloCoreClient();
- const isCore = useIsWorkflowCoreEnabled();
const handleCoreMutationError = useWorkflowEditorMutationErrorHandler();
const [mutateCore] = useMutation(CreateCoreWorkflowVersionEdgeDocument, {
client: apolloCoreClient,
@@ -25,40 +25,23 @@ export const useCreateWorkflowVersionEdge = () => {
const { applyWorkflowVersionStepChanges } =
useApplyWorkflowVersionStepChanges();
- const { enqueueToast } = useToast();
- const [mutate] = useMutation<
- CreateWorkflowVersionEdgeMutation,
- CreateWorkflowVersionEdgeMutationVariables
- >(CREATE_WORKFLOW_VERSION_EDGE, { client: apolloCoreClient });
-
- const createWorkflowVersionEdge = async (
- input: CreateWorkflowVersionEdgeInput,
- ) => {
- const { workflowVersionId, ...stepInput } = input;
- const result = isCore
- ? await mutateCore({
- variables: {
- input: { ...stepInput, coreWorkflowVersionId: workflowVersionId },
- },
- })
- : await mutate({
- variables: { input },
- onError: (error) => {
- enqueueToast(getToastOptionsFromError({ error }));
- },
- });
+ const createWorkflowVersionEdge = async (input: WorkflowVersionEdgeInput) => {
+ const { workflowVersionId, ...edgeInput } = input;
+ const result = await mutateCore({
+ variables: {
+ input: { ...edgeInput, coreWorkflowVersionId: workflowVersionId },
+ },
+ });
const workflowVersionStepChanges = result?.data?.createWorkflowVersionEdge;
applyWorkflowVersionStepChanges({
workflowVersionStepChanges,
- workflowVersionId: input.workflowVersionId,
+ workflowVersionId,
});
- if (isCore) {
- await invalidateCoreWorkflowVersions(apolloCoreClient);
- }
+ await invalidateCoreWorkflowVersions(apolloCoreClient);
return result;
};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useCreateWorkflowVersionStep.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useCreateWorkflowVersionStep.ts
index 016db0f7fae..97afc0884c2 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useCreateWorkflowVersionStep.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useCreateWorkflowVersionStep.ts
@@ -1,22 +1,22 @@
-import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { useWorkflowEditorMutationErrorHandler } from '@/workflow/hooks/useWorkflowEditorMutationErrorHandler';
import { invalidateCoreWorkflowVersions } from '@/object-core/workflows/versions/utils/invalidateCoreWorkflowVersions';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
-import { CREATE_WORKFLOW_VERSION_STEP } from '@/workflow/graphql/mutations/createWorkflowVersionStep';
import { useApplyWorkflowVersionStepChanges } from '@/workflow/workflow-steps/hooks/useApplyWorkflowVersionStepChanges';
import { useMutation } from '@apollo/client/react';
-import { useToast } from 'twenty-ui/components/feedback';
import {
CreateCoreWorkflowVersionStepDocument,
- type CreateWorkflowVersionStepInput,
- type CreateWorkflowVersionStepMutation,
- type CreateWorkflowVersionStepMutationVariables,
+ type CreateCoreWorkflowVersionStepInput,
} from '~/generated/graphql';
+export type CreateWorkflowVersionStepInput = Omit<
+ CreateCoreWorkflowVersionStepInput,
+ 'coreWorkflowVersionId'
+> & {
+ workflowVersionId: string;
+};
+
export const useCreateWorkflowVersionStep = () => {
const apolloCoreClient = useApolloCoreClient();
- const isCore = useIsWorkflowCoreEnabled();
const handleCoreMutationError = useWorkflowEditorMutationErrorHandler();
const [mutateCore] = useMutation(CreateCoreWorkflowVersionStepDocument, {
client: apolloCoreClient,
@@ -26,42 +26,24 @@ export const useCreateWorkflowVersionStep = () => {
const { applyWorkflowVersionStepChanges } =
useApplyWorkflowVersionStepChanges();
- const { enqueueToast } = useToast();
-
- const [mutate] = useMutation<
- CreateWorkflowVersionStepMutation,
- CreateWorkflowVersionStepMutationVariables
- >(CREATE_WORKFLOW_VERSION_STEP, {
- client: apolloCoreClient,
- });
-
const createWorkflowVersionStep = async (
input: CreateWorkflowVersionStepInput,
) => {
const { workflowVersionId, ...stepInput } = input;
- const result = isCore
- ? await mutateCore({
- variables: {
- input: { ...stepInput, coreWorkflowVersionId: workflowVersionId },
- },
- })
- : await mutate({
- variables: { input },
- onError: (error) => {
- enqueueToast(getToastOptionsFromError({ error }));
- },
- });
+ const result = await mutateCore({
+ variables: {
+ input: { ...stepInput, coreWorkflowVersionId: workflowVersionId },
+ },
+ });
const workflowVersionStepChanges = result?.data?.createWorkflowVersionStep;
applyWorkflowVersionStepChanges({
workflowVersionStepChanges,
- workflowVersionId: input.workflowVersionId,
+ workflowVersionId,
});
- if (isCore) {
- await invalidateCoreWorkflowVersions(apolloCoreClient);
- }
+ await invalidateCoreWorkflowVersions(apolloCoreClient);
return result;
};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDeleteWorkflowVersionEdge.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDeleteWorkflowVersionEdge.ts
index a9869a9f11e..73d753fc608 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDeleteWorkflowVersionEdge.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDeleteWorkflowVersionEdge.ts
@@ -1,20 +1,13 @@
import { useWorkflowEditorMutationErrorHandler } from '@/workflow/hooks/useWorkflowEditorMutationErrorHandler';
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
import { invalidateCoreWorkflowVersions } from '@/object-core/workflows/versions/utils/invalidateCoreWorkflowVersions';
-import {
- DeleteCoreWorkflowVersionEdgeDocument,
- type CreateWorkflowVersionEdgeInput,
- type DeleteWorkflowVersionEdgeMutation,
- type DeleteWorkflowVersionEdgeMutationVariables,
-} from '~/generated/graphql';
+import { DeleteCoreWorkflowVersionEdgeDocument } from '~/generated/graphql';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
import { useMutation } from '@apollo/client/react';
-import { DELETE_WORKFLOW_VERSION_EDGE } from '@/workflow/graphql/mutations/deleteWorkflowVersionEdge';
import { useApplyWorkflowVersionStepChanges } from '@/workflow/workflow-steps/hooks/useApplyWorkflowVersionStepChanges';
+import { type WorkflowVersionEdgeInput } from '@/workflow/workflow-steps/hooks/useCreateWorkflowVersionEdge';
export const useDeleteWorkflowVersionEdge = () => {
const apolloCoreClient = useApolloCoreClient();
- const isCore = useIsWorkflowCoreEnabled();
const handleCoreMutationError = useWorkflowEditorMutationErrorHandler();
const [mutateCore] = useMutation(DeleteCoreWorkflowVersionEdgeDocument, {
client: apolloCoreClient,
@@ -24,33 +17,22 @@ export const useDeleteWorkflowVersionEdge = () => {
const { applyWorkflowVersionStepChanges } =
useApplyWorkflowVersionStepChanges();
- const [mutate] = useMutation<
- DeleteWorkflowVersionEdgeMutation,
- DeleteWorkflowVersionEdgeMutationVariables
- >(DELETE_WORKFLOW_VERSION_EDGE, { client: apolloCoreClient });
-
- const deleteWorkflowVersionEdge = async (
- input: CreateWorkflowVersionEdgeInput,
- ) => {
- const { workflowVersionId, ...stepInput } = input;
- const result = isCore
- ? await mutateCore({
- variables: {
- input: { ...stepInput, coreWorkflowVersionId: workflowVersionId },
- },
- })
- : await mutate({ variables: { input } });
+ const deleteWorkflowVersionEdge = async (input: WorkflowVersionEdgeInput) => {
+ const { workflowVersionId, ...edgeInput } = input;
+ const result = await mutateCore({
+ variables: {
+ input: { ...edgeInput, coreWorkflowVersionId: workflowVersionId },
+ },
+ });
const workflowVersionStepChanges = result?.data?.deleteWorkflowVersionEdge;
applyWorkflowVersionStepChanges({
workflowVersionStepChanges,
- workflowVersionId: input.workflowVersionId,
+ workflowVersionId,
});
- if (isCore) {
- await invalidateCoreWorkflowVersions(apolloCoreClient);
- }
+ await invalidateCoreWorkflowVersions(apolloCoreClient);
return result;
};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDeleteWorkflowVersionStep.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDeleteWorkflowVersionStep.ts
index ef83e6054c9..14f692ede22 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDeleteWorkflowVersionStep.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDeleteWorkflowVersionStep.ts
@@ -1,24 +1,22 @@
-import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { useWorkflowEditorMutationErrorHandler } from '@/workflow/hooks/useWorkflowEditorMutationErrorHandler';
import { invalidateCoreWorkflowVersions } from '@/object-core/workflows/versions/utils/invalidateCoreWorkflowVersions';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
-import { useFindOneRecordQuery } from '@/object-record/hooks/useFindOneRecordQuery';
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
-import { DELETE_WORKFLOW_VERSION_STEP } from '@/workflow/graphql/mutations/deleteWorkflowVersionStep';
import { useApplyWorkflowVersionStepChanges } from '@/workflow/workflow-steps/hooks/useApplyWorkflowVersionStepChanges';
import { useMutation } from '@apollo/client/react';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
-import { useToast } from 'twenty-ui/components/feedback';
import {
DeleteCoreWorkflowVersionStepDocument,
- type DeleteWorkflowVersionStepInput,
- type DeleteWorkflowVersionStepMutation,
- type DeleteWorkflowVersionStepMutationVariables,
+ type DeleteCoreWorkflowVersionStepInput,
} from '~/generated/graphql';
+export type DeleteWorkflowVersionStepInput = Omit<
+ DeleteCoreWorkflowVersionStepInput,
+ 'coreWorkflowVersionId'
+> & {
+ workflowVersionId: string;
+};
+
export const useDeleteWorkflowVersionStep = () => {
const apolloCoreClient = useApolloCoreClient();
- const isCore = useIsWorkflowCoreEnabled();
const handleCoreMutationError = useWorkflowEditorMutationErrorHandler();
const [mutateCore] = useMutation(DeleteCoreWorkflowVersionStepDocument, {
client: apolloCoreClient,
@@ -27,54 +25,25 @@ export const useDeleteWorkflowVersionStep = () => {
const { applyWorkflowVersionStepChanges } =
useApplyWorkflowVersionStepChanges();
- const { enqueueToast } = useToast();
-
- const { findOneRecordQuery: findOneWorkflowVersionQuery } =
- useFindOneRecordQuery({
- objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
- });
-
- const [mutate] = useMutation<
- DeleteWorkflowVersionStepMutation,
- DeleteWorkflowVersionStepMutationVariables
- >(DELETE_WORKFLOW_VERSION_STEP, {
- client: apolloCoreClient,
- });
const deleteWorkflowVersionStep = async (
input: DeleteWorkflowVersionStepInput,
) => {
const { workflowVersionId, ...stepInput } = input;
- const result = isCore
- ? await mutateCore({
- variables: {
- input: { ...stepInput, coreWorkflowVersionId: workflowVersionId },
- },
- })
- : await mutate({
- variables: { input },
- awaitRefetchQueries: true,
- refetchQueries: [
- {
- query: findOneWorkflowVersionQuery,
- variables: { objectRecordId: input.workflowVersionId },
- },
- ],
- onError: (error) => {
- enqueueToast(getToastOptionsFromError({ error }));
- },
- });
+ const result = await mutateCore({
+ variables: {
+ input: { ...stepInput, coreWorkflowVersionId: workflowVersionId },
+ },
+ });
const workflowVersionStepChanges = result?.data?.deleteWorkflowVersionStep;
applyWorkflowVersionStepChanges({
workflowVersionStepChanges,
- workflowVersionId: input.workflowVersionId,
+ workflowVersionId,
});
- if (isCore) {
- await invalidateCoreWorkflowVersions(apolloCoreClient);
- }
+ await invalidateCoreWorkflowVersions(apolloCoreClient);
return workflowVersionStepChanges;
};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDuplicateWorkflowVersionStep.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDuplicateWorkflowVersionStep.ts
index 758966b54ea..f8b769c6589 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDuplicateWorkflowVersionStep.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDuplicateWorkflowVersionStep.ts
@@ -1,22 +1,22 @@
-import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { useWorkflowEditorMutationErrorHandler } from '@/workflow/hooks/useWorkflowEditorMutationErrorHandler';
import { invalidateCoreWorkflowVersions } from '@/object-core/workflows/versions/utils/invalidateCoreWorkflowVersions';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
-import { DUPLICATE_WORKFLOW_VERSION_STEP } from '@/workflow/graphql/mutations/duplicateWorkflowVersionStep';
import { useApplyWorkflowVersionStepChanges } from '@/workflow/workflow-steps/hooks/useApplyWorkflowVersionStepChanges';
import { useMutation } from '@apollo/client/react';
-import { useToast } from 'twenty-ui/components/feedback';
import {
DuplicateCoreWorkflowVersionStepDocument,
- type DuplicateWorkflowVersionStepInput,
- type DuplicateWorkflowVersionStepMutation,
- type DuplicateWorkflowVersionStepMutationVariables,
+ type DuplicateCoreWorkflowVersionStepInput,
} from '~/generated/graphql';
+export type DuplicateWorkflowVersionStepInput = Omit<
+ DuplicateCoreWorkflowVersionStepInput,
+ 'coreWorkflowVersionId'
+> & {
+ workflowVersionId: string;
+};
+
export const useDuplicateWorkflowVersionStep = () => {
const apolloCoreClient = useApolloCoreClient();
- const isCore = useIsWorkflowCoreEnabled();
const handleCoreMutationError = useWorkflowEditorMutationErrorHandler();
const [mutateCore] = useMutation(DuplicateCoreWorkflowVersionStepDocument, {
client: apolloCoreClient,
@@ -26,43 +26,25 @@ export const useDuplicateWorkflowVersionStep = () => {
const { applyWorkflowVersionStepChanges } =
useApplyWorkflowVersionStepChanges();
- const { enqueueToast } = useToast();
-
- const [mutate] = useMutation<
- DuplicateWorkflowVersionStepMutation,
- DuplicateWorkflowVersionStepMutationVariables
- >(DUPLICATE_WORKFLOW_VERSION_STEP, {
- client: apolloCoreClient,
- });
-
const duplicateWorkflowVersionStep = async (
input: DuplicateWorkflowVersionStepInput,
) => {
const { workflowVersionId, ...stepInput } = input;
- const result = isCore
- ? await mutateCore({
- variables: {
- input: { ...stepInput, coreWorkflowVersionId: workflowVersionId },
- },
- })
- : await mutate({
- variables: { input },
- onError: (error) => {
- enqueueToast(getToastOptionsFromError({ error }));
- },
- });
+ const result = await mutateCore({
+ variables: {
+ input: { ...stepInput, coreWorkflowVersionId: workflowVersionId },
+ },
+ });
const workflowVersionStepChanges =
result?.data?.duplicateWorkflowVersionStep;
applyWorkflowVersionStepChanges({
workflowVersionStepChanges,
- workflowVersionId: input.workflowVersionId,
+ workflowVersionId,
});
- if (isCore) {
- await invalidateCoreWorkflowVersions(apolloCoreClient);
- }
+ await invalidateCoreWorkflowVersions(apolloCoreClient);
return result;
};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateWorkflowVersionStep.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateWorkflowVersionStep.ts
index ef21b2d7e13..78153f4fd06 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateWorkflowVersionStep.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateWorkflowVersionStep.ts
@@ -1,79 +1,43 @@
-import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { useWorkflowEditorMutationErrorHandler } from '@/workflow/hooks/useWorkflowEditorMutationErrorHandler';
import { invalidateCoreWorkflowVersions } from '@/object-core/workflows/versions/utils/invalidateCoreWorkflowVersions';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
-import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
-import { updateRecordFromCache } from '@/object-record/cache/utils/updateRecordFromCache';
-import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
-import { UPDATE_WORKFLOW_VERSION_STEP } from '@/workflow/graphql/mutations/updateWorkflowVersionStep';
import { flowComponentState } from '@/workflow/states/flowComponentState';
-import {
- type WorkflowStep,
- type WorkflowVersion,
-} from '@/workflow/types/Workflow';
import { useStepsOutputSchema } from '@/workflow/workflow-variables/hooks/useStepsOutputSchema';
import { useMutation } from '@apollo/client/react';
-import {
- CoreObjectNameSingular,
- type RecordGqlFields,
-} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { useToast } from 'twenty-ui/components/feedback';
import {
UpdateCoreWorkflowVersionStepDocument,
- type UpdateWorkflowVersionStepInput,
- type UpdateWorkflowVersionStepMutation,
- type UpdateWorkflowVersionStepMutationVariables,
+ type UpdateCoreWorkflowVersionStepInput,
} from '~/generated/graphql';
+export type UpdateWorkflowVersionStepInput = Omit<
+ UpdateCoreWorkflowVersionStepInput,
+ 'coreWorkflowVersionId'
+> & {
+ workflowVersionId: string;
+};
+
export const useUpdateWorkflowVersionStep = (instanceId?: string) => {
const apolloCoreClient = useApolloCoreClient();
- const isCore = useIsWorkflowCoreEnabled();
const handleCoreMutationError =
useWorkflowEditorMutationErrorHandler(instanceId);
const [mutateCore] = useMutation(UpdateCoreWorkflowVersionStepDocument, {
client: apolloCoreClient,
onError: handleCoreMutationError,
});
- const { objectMetadataItems } = useObjectMetadataItems();
- const { objectPermissionsByObjectMetadataId } = useObjectPermissions();
- const { enqueueToast } = useToast();
const { markStepForRecomputation } = useStepsOutputSchema();
const setFlow = useSetAtomComponentState(flowComponentState, instanceId);
- const { objectMetadataItem } = useObjectMetadataItem({
- objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
- });
- const getRecordFromCache = useGetRecordFromCache({
- objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
- });
- const [mutate] = useMutation<
- UpdateWorkflowVersionStepMutation,
- UpdateWorkflowVersionStepMutationVariables
- >(UPDATE_WORKFLOW_VERSION_STEP, {
- client: apolloCoreClient,
- });
-
const updateWorkflowVersionStep = async (
input: UpdateWorkflowVersionStepInput,
) => {
const { workflowVersionId, ...stepInput } = input;
- const result = isCore
- ? await mutateCore({
- variables: {
- input: { ...stepInput, coreWorkflowVersionId: workflowVersionId },
- },
- })
- : await mutate({
- variables: { input },
- onError: (error) => {
- enqueueToast(getToastOptionsFromError({ error }));
- },
- });
+ const result = await mutateCore({
+ variables: {
+ input: { ...stepInput, coreWorkflowVersionId: workflowVersionId },
+ },
+ });
const updatedStep = result?.data?.updateWorkflowVersionStep;
if (!isDefined(updatedStep)) {
return;
@@ -81,7 +45,7 @@ export const useUpdateWorkflowVersionStep = (instanceId?: string) => {
markStepForRecomputation({
stepId: updatedStep.id,
- workflowVersionId: input.workflowVersionId,
+ workflowVersionId,
});
setFlow((currentFlow) => {
@@ -91,46 +55,14 @@ export const useUpdateWorkflowVersionStep = (instanceId?: string) => {
return {
...currentFlow,
- workflowVersionId: input.workflowVersionId,
+ workflowVersionId,
steps: (currentFlow.steps ?? []).map((step) =>
step.id === updatedStep.id ? updatedStep : step,
),
};
});
- if (isCore) {
- await invalidateCoreWorkflowVersions(apolloCoreClient);
- return result;
- }
-
- const cachedRecord = getRecordFromCache<WorkflowVersion>(
- input.workflowVersionId,
- );
- if (!isDefined(cachedRecord)) {
- return result;
- }
-
- const newCachedRecord = {
- ...cachedRecord,
- steps: (cachedRecord.steps || []).map((step: WorkflowStep) => {
- if (step.id === updatedStep.id) {
- return updatedStep;
- }
- return step;
- }),
- };
-
- const recordGqlFields: RecordGqlFields = {
- steps: true,
- };
- updateRecordFromCache({
- objectMetadataItems,
- objectMetadataItem,
- cache: apolloCoreClient.cache,
- record: newCachedRecord,
- recordGqlFields,
- objectPermissionsByObjectMetadataId,
- });
+ await invalidateCoreWorkflowVersions(apolloCoreClient);
return result;
};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/hooks/__tests__/useUpdateWorkflowVersionTrigger.test.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/hooks/__tests__/useUpdateWorkflowVersionTrigger.test.ts
index 441b11d127b..006b020ac3d 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/hooks/__tests__/useUpdateWorkflowVersionTrigger.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/hooks/__tests__/useUpdateWorkflowVersionTrigger.test.ts
@@ -7,24 +7,16 @@ import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';
const mockMutate = jest.fn();
const mockGetUpdatableWorkflowVersion = jest.fn();
-const mockGetRecordFromCache = jest.fn();
const mockMarkStepForRecomputation = jest.fn();
jest.mock('@/object-metadata/hooks/useApolloCoreClient', () => ({
useApolloCoreClient: () => ({ cache: {} }),
}));
-jest.mock('@/object-metadata/hooks/useObjectMetadataItems', () => ({
- useObjectMetadataItems: () => ({ objectMetadataItems: [] }),
-}));
-
-jest.mock('@/object-metadata/hooks/useObjectMetadataItem', () => ({
- useObjectMetadataItem: () => ({ objectMetadataItem: {} }),
-}));
-
-jest.mock('@/object-record/hooks/useObjectPermissions', () => ({
- useObjectPermissions: () => ({ objectPermissionsByObjectMetadataId: {} }),
-}));
+jest.mock(
+ '@/object-core/workflows/versions/utils/invalidateCoreWorkflowVersions',
+ () => ({ invalidateCoreWorkflowVersions: jest.fn() }),
+);
const mockEnqueueToast = jest.fn();
@@ -33,14 +25,6 @@ jest.mock('twenty-ui/components/feedback', () => ({
useToast: () => ({ enqueueToast: mockEnqueueToast }),
}));
-jest.mock('@/object-record/cache/hooks/useGetRecordFromCache', () => ({
- useGetRecordFromCache: () => mockGetRecordFromCache,
-}));
-
-jest.mock('@/object-record/cache/utils/updateRecordFromCache', () => ({
- updateRecordFromCache: jest.fn(),
-}));
-
jest.mock('@/workflow/hooks/useGetUpdatableWorkflowVersionOrThrow', () => ({
useGetUpdatableWorkflowVersionOrThrow: jest.fn(() => ({
getUpdatableWorkflowVersion: mockGetUpdatableWorkflowVersion,
@@ -80,7 +64,6 @@ describe('useUpdateWorkflowVersionTrigger', () => {
mockMutate.mockResolvedValue({
data: { updateWorkflowVersionTrigger: { trigger } },
});
- mockGetRecordFromCache.mockReturnValue(undefined);
});
it('updates the trigger via the dedicated mutation and marks it for recomputation', async () => {
@@ -99,7 +82,7 @@ describe('useUpdateWorkflowVersionTrigger', () => {
expect.objectContaining({
variables: {
input: {
- workflowVersionId: 'version-id',
+ coreWorkflowVersionId: 'version-id',
trigger,
},
},
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger.ts
index f28b892bbfb..878e997f2d4 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger.ts
@@ -1,90 +1,43 @@
-import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { useWorkflowEditorMutationErrorHandler } from '@/workflow/hooks/useWorkflowEditorMutationErrorHandler';
import { invalidateCoreWorkflowVersions } from '@/object-core/workflows/versions/utils/invalidateCoreWorkflowVersions';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
-import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
-import { updateRecordFromCache } from '@/object-record/cache/utils/updateRecordFromCache';
-import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
-import { UPDATE_WORKFLOW_VERSION_TRIGGER } from '@/workflow/graphql/mutations/updateWorkflowVersionTrigger';
import { useGetUpdatableWorkflowVersionOrThrow } from '@/workflow/hooks/useGetUpdatableWorkflowVersionOrThrow';
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
import { flowComponentState } from '@/workflow/states/flowComponentState';
-import {
- type WorkflowTrigger,
- type WorkflowVersion,
-} from '@/workflow/types/Workflow';
+import { type WorkflowTrigger } from '@/workflow/types/Workflow';
import { useStepsOutputSchema } from '@/workflow/workflow-variables/hooks/useStepsOutputSchema';
import { useMutation } from '@apollo/client/react';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';
-import { useToast } from 'twenty-ui/components/feedback';
-import {
- UpdateCoreWorkflowVersionTriggerDocument,
- type UpdateWorkflowVersionTriggerMutation,
- type UpdateWorkflowVersionTriggerMutationVariables,
-} from '~/generated/graphql';
+import { UpdateCoreWorkflowVersionTriggerDocument } from '~/generated/graphql';
export const useUpdateWorkflowVersionTrigger = (instanceId?: string) => {
const apolloCoreClient = useApolloCoreClient();
- const isCore = useIsWorkflowCoreEnabled();
const handleCoreMutationError =
useWorkflowEditorMutationErrorHandler(instanceId);
const [mutateCore] = useMutation(UpdateCoreWorkflowVersionTriggerDocument, {
client: apolloCoreClient,
onError: handleCoreMutationError,
});
- const { objectMetadataItems } = useObjectMetadataItems();
- const { objectPermissionsByObjectMetadataId } = useObjectPermissions();
- const { enqueueToast } = useToast();
const { getUpdatableWorkflowVersion } =
useGetUpdatableWorkflowVersionOrThrow(instanceId);
const { markStepForRecomputation } = useStepsOutputSchema();
- const { objectMetadataItem } = useObjectMetadataItem({
- objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
- });
- const getRecordFromCache = useGetRecordFromCache({
- objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
- });
-
const setFlow = useSetAtomComponentState(flowComponentState, instanceId);
- const [mutate] = useMutation<
- UpdateWorkflowVersionTriggerMutation,
- UpdateWorkflowVersionTriggerMutationVariables
- >(UPDATE_WORKFLOW_VERSION_TRIGGER, {
- client: apolloCoreClient,
- });
-
const updateTrigger = async (updatedTrigger: WorkflowTrigger) => {
const workflowVersionId = await getUpdatableWorkflowVersion();
- const { data } = isCore
- ? await mutateCore({
- variables: {
- input: {
- coreWorkflowVersionId: workflowVersionId,
- trigger: updatedTrigger,
- },
- },
- })
- : await mutate({
- variables: {
- input: {
- workflowVersionId,
- trigger: updatedTrigger,
- },
- },
- onError: (error) => {
- enqueueToast(getToastOptionsFromError({ error }));
- },
- });
+ const { data } = await mutateCore({
+ variables: {
+ input: {
+ coreWorkflowVersionId: workflowVersionId,
+ trigger: updatedTrigger,
+ },
+ },
+ });
if (!isDefined(data?.updateWorkflowVersionTrigger)) {
return;
@@ -103,29 +56,7 @@ export const useUpdateWorkflowVersionTrigger = (instanceId?: string) => {
return { ...currentFlow, workflowVersionId, trigger: updatedTrigger };
});
- if (isCore) {
- await invalidateCoreWorkflowVersions(apolloCoreClient);
- return;
- }
-
- const cachedRecord = getRecordFromCache<WorkflowVersion>(workflowVersionId);
- if (!isDefined(cachedRecord)) {
- return;
- }
-
- updateRecordFromCache({
- objectMetadataItems,
- objectMetadataItem,
- cache: apolloCoreClient.cache,
- record: {
- ...cachedRecord,
- trigger: updatedTrigger,
- },
- recordGqlFields: {
- trigger: true,
- },
- objectPermissionsByObjectMetadataId,
- });
+ await invalidateCoreWorkflowVersions(apolloCoreClient);
};
return {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/__tests__/useStepsOutputSchema.test.tsx b/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/__tests__/useStepsOutputSchema.test.tsx
index d0a1c0be92e..d34fd071b0f 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/__tests__/useStepsOutputSchema.test.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/__tests__/useStepsOutputSchema.test.tsx
@@ -9,9 +9,6 @@ import { stepsOutputSchemaFamilyState } from '@/workflow/workflow-variables/stat
const mockMutate = jest.fn();
const mockClient = { mutate: mockMutate };
const mockEnqueueToast = jest.fn();
-jest.mock('@/workflow/hooks/useIsWorkflowCoreEnabled', () => ({
- useIsWorkflowCoreEnabled: () => true,
-}));
jest.mock('@/object-metadata/hooks/useApolloCoreClient', () => ({
useApolloCoreClient: () => mockClient,
}));
diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useStepsOutputSchema.ts b/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useStepsOutputSchema.ts
index e68c63b8f34..0ed6c6786b0 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useStepsOutputSchema.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useStepsOutputSchema.ts
@@ -1,7 +1,6 @@
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
import { type WorkflowVersion } from '@/workflow/types/Workflow';
import { getStepOutputSchemaFamilyStateKey } from '@/workflow/utils/getStepOutputSchemaFamilyStateKey';
import { getActionIcon } from '@/workflow/workflow-steps/workflow-actions/utils/getActionIcon';
@@ -28,7 +27,6 @@ import { ComputeStepOutputSchemaDocument } from '~/generated/graphql';
export const useStepsOutputSchema = () => {
const store = useStore();
const client = useApolloCoreClient();
- const isCore = useIsWorkflowCoreEnabled();
const { enqueueToast } = useToast();
const populateStepsOutputSchema = useCallback(
@@ -82,7 +80,7 @@ export const useStepsOutputSchema = () => {
false,
);
- if (isCore && step.type === 'ITERATOR') {
+ if (step.type === 'ITERATOR') {
void client
.mutate({
mutation: ComputeStepOutputSchemaDocument,
@@ -159,7 +157,7 @@ export const useStepsOutputSchema = () => {
);
}
},
- [store, client, isCore, enqueueToast],
+ [store, client, enqueueToast],
);
const markStepForRecomputation = useCallback(