The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Make the workflow flow the editor's source of truth and save it on a debounce (#28461)
Charles Bochet9d7f6c13788a
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.tsxindex 8392a4254b3..27c4f52c490 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@@ -1,4 +1,6 @@import { HeadlessEngineCommandWrapperEffect } from '@/command-menu-item/engine-command/components/HeadlessEngineCommandWrapperEffect';+import { useSavePendingWorkflowFlow } from '@/workflow/hooks/useSavePendingWorkflowFlow';+import { getWorkflowVisualizerComponentInstanceId } from '@/workflow/utils/getWorkflowVisualizerComponentInstanceId';import { useHeadlessCommandContextApi } from '@/command-menu-item/engine-command/hooks/useHeadlessCommandContextApi';import { useActivateWorkflowVersion } from '@/workflow/hooks/useActivateWorkflowVersion';import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';@@ -8,6 +10,9 @@ import { doNotTranslate } from 'twenty-shared/i18n';export const ActivateWorkflowSingleRecordCommand = () => {const { selectedRecords } = useHeadlessCommandContextApi();const recordId = selectedRecords[0]?.id;+ const { savePendingWorkflowFlow } = useSavePendingWorkflowFlow(+ getWorkflowVisualizerComponentInstanceId({ recordId: recordId ?? '' }),+ );const { activateWorkflowVersion } = useActivateWorkflowVersion();const workflowWithCurrentVersion = useWorkflowWithCurrentVersion(@@ -20,13 +25,21 @@ export const ActivateWorkflowSingleRecordCommand = () => {);}- const handleExecute = () => {+ const handleExecute = async () => {if (!isDefined(workflowWithCurrentVersion)) {return;}+ const { isSaved, savedDraftFlow } = await savePendingWorkflowFlow();++ if (!isSaved) {+ return;+ }+return activateWorkflowVersion({- workflowVersionId: workflowWithCurrentVersion.currentVersion.id,+ workflowVersionId:+ savedDraftFlow?.workflowVersionId ??+ workflowWithCurrentVersion.currentVersion.id,});};diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/DeactivateWorkflowSingleRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/DeactivateWorkflowSingleRecordCommand.tsxindex 25b636c08f5..16cd8045c99 100644--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/DeactivateWorkflowSingleRecordCommand.tsx+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/DeactivateWorkflowSingleRecordCommand.tsx@@ -1,4 +1,6 @@import { HeadlessEngineCommandWrapperEffect } from '@/command-menu-item/engine-command/components/HeadlessEngineCommandWrapperEffect';+import { useSavePendingWorkflowFlow } from '@/workflow/hooks/useSavePendingWorkflowFlow';+import { getWorkflowVisualizerComponentInstanceId } from '@/workflow/utils/getWorkflowVisualizerComponentInstanceId';import { useHeadlessCommandContextApi } from '@/command-menu-item/engine-command/hooks/useHeadlessCommandContextApi';import { useDeactivateWorkflowVersion } from '@/workflow/hooks/useDeactivateWorkflowVersion';import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';@@ -9,6 +11,9 @@ export const DeactivateWorkflowSingleRecordCommand = () => {const { selectedRecords } = useHeadlessCommandContextApi();const recordId = selectedRecords[0]?.id;+ const { savePendingWorkflowFlow } = useSavePendingWorkflowFlow(+ getWorkflowVisualizerComponentInstanceId({ recordId: recordId ?? '' }),+ );const { deactivateWorkflowVersion } = useDeactivateWorkflowVersion();const workflowWithCurrentVersion = useWorkflowWithCurrentVersion(recordId ?? '',@@ -20,11 +25,13 @@ export const DeactivateWorkflowSingleRecordCommand = () => {);}- const handleExecute = () => {+ const handleExecute = async () => {if (!isDefined(workflowWithCurrentVersion)) {return;}+ await savePendingWorkflowFlow();+return deactivateWorkflowVersion({workflowVersionId:workflowWithCurrentVersion.lastPublishedVersionId ??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.tsxindex 47407172954..220db638143 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,4 +1,6 @@import { isDefined } from 'twenty-shared/utils';+import { useSavePendingWorkflowFlow } from '@/workflow/hooks/useSavePendingWorkflowFlow';+import { getWorkflowVisualizerComponentInstanceId } from '@/workflow/utils/getWorkflowVisualizerComponentInstanceId';import { doNotTranslate } from 'twenty-shared/i18n';import { HeadlessEngineCommandWrapperEffect } from '@/command-menu-item/engine-command/components/HeadlessEngineCommandWrapperEffect';@@ -10,6 +12,9 @@ export const DiscardDraftWorkflowSingleRecordCommand = () => {const { selectedRecords } = useHeadlessCommandContextApi();const recordId = selectedRecords[0]?.id;+ const { savePendingWorkflowFlow } = useSavePendingWorkflowFlow(+ getWorkflowVisualizerComponentInstanceId({ recordId: recordId ?? '' }),+ );const { discardCoreWorkflowDraft } = useDiscardCoreWorkflowDraft();const workflowWithCurrentVersion = useWorkflowWithCurrentVersion(recordId ?? '',@@ -21,11 +26,13 @@ export const DiscardDraftWorkflowSingleRecordCommand = () => {);}- const handleExecute = () => {+ const handleExecute = async () => {if (!isDefined(workflowWithCurrentVersion)) {return;}+ await savePendingWorkflowFlow();+return discardCoreWorkflowDraft({coreWorkflowVersionId: workflowWithCurrentVersion.currentVersion.id,});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.tsxindex 309c29bda3b..60147889337 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,4 +1,6 @@import { HeadlessEngineCommandWrapperEffect } from '@/command-menu-item/engine-command/components/HeadlessEngineCommandWrapperEffect';+import { useSavePendingWorkflowFlow } from '@/workflow/hooks/useSavePendingWorkflowFlow';+import { getWorkflowVisualizerComponentInstanceId } from '@/workflow/utils/getWorkflowVisualizerComponentInstanceId';import { useHeadlessCommandContextApi } from '@/command-menu-item/engine-command/hooks/useHeadlessCommandContextApi';import { useDuplicateWorkflow } from '@/workflow/hooks/useDuplicateWorkflow';import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';@@ -14,6 +16,9 @@ export const DuplicateWorkflowSingleRecordCommand = () => {const { selectedRecords } = useHeadlessCommandContextApi();const recordId = selectedRecords[0]?.id;+ const { savePendingWorkflowFlow } = useSavePendingWorkflowFlow(+ getWorkflowVisualizerComponentInstanceId({ recordId: recordId ?? '' }),+ );const workflow = useWorkflowWithCurrentVersion(recordId ?? '');const { duplicateWorkflow } = useDuplicateWorkflow();const navigate = useNavigateApp();@@ -31,9 +36,16 @@ export const DuplicateWorkflowSingleRecordCommand = () => {return;}+ const { isSaved, savedDraftFlow } = await savePendingWorkflowFlow();++ if (!isSaved) {+ return;+ }+const result = await duplicateWorkflow({workflowIdToDuplicate: workflow.id,- workflowVersionIdToCopy: workflow.currentVersion.id,+ workflowVersionIdToCopy:+ savedDraftFlow?.workflowVersionId ?? workflow.currentVersion.id,});if (isDefined(result) && isNonEmptyString(result.workflowId)) {diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/TestWorkflowSingleRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/TestWorkflowSingleRecordCommand.tsxindex ec8bde2a9a0..17cdc910042 100644--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/TestWorkflowSingleRecordCommand.tsx+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/TestWorkflowSingleRecordCommand.tsx@@ -1,4 +1,6 @@import { HeadlessEngineCommandWrapperEffect } from '@/command-menu-item/engine-command/components/HeadlessEngineCommandWrapperEffect';+import { useSavePendingWorkflowFlow } from '@/workflow/hooks/useSavePendingWorkflowFlow';+import { getWorkflowVisualizerComponentInstanceId } from '@/workflow/utils/getWorkflowVisualizerComponentInstanceId';import { useHeadlessCommandContextApi } from '@/command-menu-item/engine-command/hooks/useHeadlessCommandContextApi';import { useRunWorkflowVersion } from '@/workflow/hooks/useRunWorkflowVersion';import { useWorkflowVersionContent } from '@/workflow/workflow-version/hooks/useWorkflowVersionContent';@@ -11,6 +13,9 @@ export const TestWorkflowSingleRecordCommand = () => {const { selectedRecords } = useHeadlessCommandContextApi();const recordId = selectedRecords[0]?.id;+ const { savePendingWorkflowFlow } = useSavePendingWorkflowFlow(+ getWorkflowVisualizerComponentInstanceId({ recordId: recordId ?? '' }),+ );const { runWorkflowVersion } = useRunWorkflowVersion();const workflowWithCurrentVersion = useWorkflowWithCurrentVersion(recordId ?? '',@@ -23,21 +28,31 @@ export const TestWorkflowSingleRecordCommand = () => {throw new Error(doNotTranslate('Record ID is required to test workflow'));}- const handleExecute = () => {+ const handleExecute = async () => {if (!isDefined(workflowWithCurrentVersion)) {return;}- const { currentVersion } = workflowWithCurrentVersion;+ const { isSaved, savedDraftFlow } = await savePendingWorkflowFlow();++ if (!isSaved) {+ return;+ }++ const trigger = isDefined(savedDraftFlow)+ ? savedDraftFlow.trigger+ : content?.trigger;- if (!isDefined(content) || !isDefined(content.trigger)) {+ if (!isDefined(trigger)) {return;}return runWorkflowVersion({- workflowVersionId: currentVersion.id,+ workflowVersionId:+ savedDraftFlow?.workflowVersionId ??+ workflowWithCurrentVersion.currentVersion.id,workflowId: workflowWithCurrentVersion.id,- payload: getTestPayloadFromTrigger(content.trigger),+ payload: getTestPayloadFromTrigger(trigger),});};diff --git a/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowEditor.tsx b/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowEditor.tsxindex 7b882556809..47eddf69726 100644--- a/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowEditor.tsx+++ b/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowEditor.tsx@@ -1,7 +1,10 @@import { t } from '@lingui/core/macro';+import { useCallback } from 'react';import { isDefined } from 'twenty-shared/utils';import { WorkspaceRouteUnavailable } from '@/ui/layout/page/components/WorkspaceRouteUnavailable';+import { useSetAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomFamilyState';+import { shouldWorkflowRefetchRequestFamilyState } from '@/workflow/states/shouldWorkflowRefetchRequestFamilyState';import { useListenToCoreWorkflowEvents } from '@/object-core/workflows/hooks/useListenToCoreWorkflowEvents';import { useCoreWorkflowVersion } from '@/object-core/workflows/versions/hooks/useCoreWorkflowVersion';import { CoreWorkflowVersionCard } from '@/object-core/workflows/versions/components/CoreWorkflowVersionCard';@@ -23,9 +26,19 @@ export const CoreWorkflowEditor = ({const { coreWorkflowVersion, loading, error, refetchCoreWorkflowVersion } =useCoreWorkflowVersion(coreWorkflowVersionId);+ const setShouldWorkflowRefetchRequest = useSetAtomFamilyState(+ shouldWorkflowRefetchRequestFamilyState,+ coreWorkflowId,+ );++ const refetchCoreWorkflow = useCallback(() => {+ void refetchCoreWorkflowVersion();+ setShouldWorkflowRefetchRequest(true);+ }, [refetchCoreWorkflowVersion, setShouldWorkflowRefetchRequest]);+useListenToCoreWorkflowEvents({coreWorkflowId,- refetch: refetchCoreWorkflowVersion,+ refetch: refetchCoreWorkflow,});if (loading && !isDefined(coreWorkflowVersion)) {diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelWorkflowStepInfo.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelWorkflowStepInfo.tsxindex 672e501c1ab..3295a699689 100644--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelWorkflowStepInfo.tsx+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelWorkflowStepInfo.tsx@@ -7,7 +7,6 @@ import { sidePanelPageInfoSelector } from '@/side-panel/states/sidePanelPageInfoimport { TitleInput } from '@/ui/input/components/TitleInput';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { useGetUpdatableWorkflowVersionOrThrow } from '@/workflow/hooks/useGetUpdatableWorkflowVersionOrThrow';import { flowComponentState } from '@/workflow/states/flowComponentState';import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';import { getAgentIdFromStep } from '@/workflow/utils/getAgentIdFromStep';@@ -15,8 +14,8 @@ import { getStepDefinitionOrThrow } from '@/workflow/utils/getStepDefinitionOrThimport { getWorkflowStepDisplayName } from '@/workflow/utils/getWorkflowStepDisplayName';import { getWorkflowVisualizerComponentInstanceId } from '@/workflow/utils/getWorkflowVisualizerComponentInstanceId';import { useUpdateAgentLabel } from '@/workflow/workflow-steps/hooks/useUpdateAgentLabel';-import { useUpdateWorkflowVersionStep } from '@/workflow/workflow-steps/hooks/useUpdateWorkflowVersionStep';-import { useUpdateWorkflowVersionTrigger } from '@/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger';+import { useUpdateStep } from '@/workflow/workflow-steps/hooks/useUpdateStep';+import { useUpdateTrigger } from '@/workflow/workflow-trigger/hooks/useUpdateTrigger';import { useWorkflowVersionContent } from '@/workflow/workflow-version/hooks/useWorkflowVersionContent';import { getActionHeaderTypeOrThrow } from '@/workflow/workflow-steps/workflow-actions/utils/getActionHeaderTypeOrThrow';import { getActionIcon } from '@/workflow/workflow-steps/workflow-actions/utils/getActionIcon';@@ -60,12 +59,8 @@ export const SidePanelWorkflowStepInfo = ({const instanceId = getWorkflowVisualizerComponentInstanceId({recordId: workflowId,});- const { getUpdatableWorkflowVersion } =- useGetUpdatableWorkflowVersionOrThrow(instanceId);-- const { updateWorkflowVersionStep } =- useUpdateWorkflowVersionStep(instanceId);- const { updateTrigger } = useUpdateWorkflowVersionTrigger(instanceId);+ const { updateStep } = useUpdateStep(instanceId);+ const { updateTrigger } = useUpdateTrigger(instanceId);const workflowVersionId = workflowWithCurrentVersion?.currentVersion?.id;@@ -172,20 +167,15 @@ export const SidePanelWorkflowStepInfo = ({pageIcon: Icon,});- const targetWorkflowVersionId = await getUpdatableWorkflowVersion();-if (isTrigger) {- await updateTrigger({+ updateTrigger({...stepDefinition.definition,name: title,} as typeof stepDefinition.definition);} else {- await updateWorkflowVersionStep({- workflowVersionId: targetWorkflowVersionId,- step: {- ...stepDefinition.definition,- name: title,- },+ updateStep({+ ...stepDefinition.definition,+ name: title,});if (isDefined(agentId)) {diff --git a/packages/twenty-front/src/modules/side-panel/pages/workflow/step/create/components/SidePanelWorkflowCreateStepContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/workflow/step/create/components/SidePanelWorkflowCreateStepContent.tsxindex 13195c933c1..c10835f9a8b 100644--- a/packages/twenty-front/src/modules/side-panel/pages/workflow/step/create/components/SidePanelWorkflowCreateStepContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/workflow/step/create/components/SidePanelWorkflowCreateStepContent.tsx@@ -31,7 +31,7 @@ export const SidePanelWorkflowCreateStepContent = () => {);const { createStep } = useCreateStep();- const { updateStep } = useUpdateStep();+ const { updateStepNow } = useUpdateStep();const flow = useAtomComponentStateValue(flowComponentState);const { openWorkflowEditStepInSidePanel } = useSidePanelWorkflowNavigation();@@ -55,7 +55,7 @@ export const SidePanelWorkflowCreateStepContent = () => {targetStepId: createdStepId,});- await updateStep(updatedStep);+ await updateStepNow(updatedStep);};const handleCreateStep = async (selection: WorkflowActionSelection) => {diff --git a/packages/twenty-front/src/modules/side-panel/pages/workflow/step/create/components/__tests__/SidePanelWorkflowCreateStepContent.test.tsx b/packages/twenty-front/src/modules/side-panel/pages/workflow/step/create/components/__tests__/SidePanelWorkflowCreateStepContent.test.tsxindex a867f7c74c6..86317b38d13 100644--- a/packages/twenty-front/src/modules/side-panel/pages/workflow/step/create/components/__tests__/SidePanelWorkflowCreateStepContent.test.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/workflow/step/create/components/__tests__/SidePanelWorkflowCreateStepContent.test.tsx@@ -66,7 +66,7 @@ jest.mock('@/workflow/workflow-steps/hooks/useCreateStep', () => ({useCreateStep: () => ({ createStep: mockCreateStep }),}));jest.mock('@/workflow/workflow-steps/hooks/useUpdateStep', () => ({- useUpdateStep: () => ({ updateStep: mockUpdateStep }),+ useUpdateStep: () => ({ updateStepNow: mockUpdateStep }),}));jest.mock('@/workflow/workflow-diagram/hooks/useCloseRightClickMenu', () => ({useCloseRightClickMenu: () => ({ closeRightClickMenu: jest.fn() }),diff --git a/packages/twenty-front/src/modules/side-panel/pages/workflow/step/edit/components/SidePanelWorkflowEditStepContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/workflow/step/edit/components/SidePanelWorkflowEditStepContent.tsxindex 27e09c2a9d8..5840603a21e 100644--- a/packages/twenty-front/src/modules/side-panel/pages/workflow/step/edit/components/SidePanelWorkflowEditStepContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/workflow/step/edit/components/SidePanelWorkflowEditStepContent.tsx@@ -3,7 +3,7 @@ import { useFlowOrThrow } from '@/workflow/hooks/useFlowOrThrow';import { workflowSelectedNodeComponentState } from '@/workflow/workflow-diagram/states/workflowSelectedNodeComponentState';import { WorkflowStepDetail } from '@/workflow/workflow-steps/components/WorkflowStepDetail';import { useUpdateStep } from '@/workflow/workflow-steps/hooks/useUpdateStep';-import { useUpdateWorkflowVersionTrigger } from '@/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger';+import { useUpdateTrigger } from '@/workflow/workflow-trigger/hooks/useUpdateTrigger';import { styled } from '@linaria/react';import { isDefined } from 'twenty-shared/utils';@@ -19,7 +19,7 @@ export const SidePanelWorkflowEditStepContent = () => {workflowSelectedNodeComponentState,);- const { updateTrigger } = useUpdateWorkflowVersionTrigger();+ const { updateTrigger } = useUpdateTrigger();const { updateStep } = useUpdateStep();if (!isDefined(workflowSelectedNode)) {diff --git a/packages/twenty-front/src/modules/side-panel/pages/workflow/step/edit/components/SidePanelWorkflowEditStepTypeContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/workflow/step/edit/components/SidePanelWorkflowEditStepTypeContent.tsxindex 0467117c722..9fcae497941 100644--- a/packages/twenty-front/src/modules/side-panel/pages/workflow/step/edit/components/SidePanelWorkflowEditStepTypeContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/workflow/step/edit/components/SidePanelWorkflowEditStepTypeContent.tsx@@ -31,7 +31,7 @@ export const SidePanelWorkflowEditStepTypeContent = () => {);const flow = useFlowOrThrow();- const { updateStep } = useUpdateStep();+ const { updateStepNow } = useUpdateStep();const { openWorkflowEditStepInSidePanel } = useSidePanelWorkflowNavigation();const { closeRightClickMenu } = useCloseRightClickMenu();@@ -62,7 +62,7 @@ export const SidePanelWorkflowEditStepTypeContent = () => {settings: selection.defaultSettings ?? existingStep.settings,};- const { updatedStep } = await updateStep(stepUpdate as WorkflowAction);+ const { updatedStep } = await updateStepNow(stepUpdate as WorkflowAction);if (!isDefined(updatedStep)) {return;diff --git a/packages/twenty-front/src/modules/side-panel/pages/workflow/step/settings/components/SidePanelWorkflowStepSettingsContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/workflow/step/settings/components/SidePanelWorkflowStepSettingsContent.tsxindex 997276da65c..3fed8748b12 100644--- a/packages/twenty-front/src/modules/side-panel/pages/workflow/step/settings/components/SidePanelWorkflowStepSettingsContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/workflow/step/settings/components/SidePanelWorkflowStepSettingsContent.tsx@@ -23,7 +23,7 @@ const SidePanelWorkflowStepSettingsForm = ({step: WorkflowAction;}) => {const { t } = useLingui();- const { updateStep } = useUpdateStep();+ const { updateStepNow } = useUpdateStep();const [errorHandlingOptions, setErrorHandlingOptions] =useState<StepErrorHandlingOptions>(step.settings.errorHandlingOptions);@@ -36,15 +36,15 @@ const SidePanelWorkflowStepSettingsForm = ({setErrorHandlingOptions(updatedOptions);- try {- await updateStep({- ...step,- settings: {- ...step.settings,- errorHandlingOptions: updatedOptions,- },- } as WorkflowAction);- } catch {+ const { updatedStep } = await updateStepNow({+ ...step,+ settings: {+ ...step.settings,+ errorHandlingOptions: updatedOptions,+ },+ } as WorkflowAction).catch(() => ({ updatedStep: undefined }));++ if (!isDefined(updatedStep)) {setErrorHandlingOptions((currentOptions) => ({...currentOptions,...('continueOnFailure' in partialOptionsdiff --git a/packages/twenty-front/src/modules/side-panel/pages/workflow/trigger-type/components/SidePanelWorkflowSelectTriggerTypeContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/workflow/trigger-type/components/SidePanelWorkflowSelectTriggerTypeContent.tsxindex 7bbf21f84b3..402a635d805 100644--- a/packages/twenty-front/src/modules/side-panel/pages/workflow/trigger-type/components/SidePanelWorkflowSelectTriggerTypeContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/workflow/trigger-type/components/SidePanelWorkflowSelectTriggerTypeContent.tsx@@ -14,7 +14,7 @@ import { SidePanelStepListContainer } from '@/workflow/workflow-steps/componentsimport { SidePanelWorkflowSelectStepTitle } from '@/workflow/workflow-steps/components/SidePanelWorkflowSelectStepTitle';import { DATABASE_TRIGGER_TYPES } from '@/workflow/workflow-trigger/constants/DatabaseTriggerTypes';import { OTHER_TRIGGER_TYPES } from '@/workflow/workflow-trigger/constants/OtherTriggerTypes';-import { useUpdateWorkflowVersionTrigger } from '@/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger';+import { useUpdateTrigger } from '@/workflow/workflow-trigger/hooks/useUpdateTrigger';import { getTriggerDefaultDefinition } from '@/workflow/workflow-trigger/utils/getTriggerDefaultDefinition';import { t } from '@lingui/core/macro';import { isDefined } from 'twenty-shared/utils';@@ -27,7 +27,7 @@ export const SidePanelWorkflowSelectTriggerTypeContent = () => {const theme = useTheme();const { getIcon } = useIcons();const workflowId = useSidePanelWorkflowIdOrThrow();- const { updateTrigger } = useUpdateWorkflowVersionTrigger();+ const { updateTriggerNow } = useUpdateTrigger();const { activeNonSystemObjectMetadataItems } =useFilteredObjectMetadataItems();@@ -62,7 +62,7 @@ export const SidePanelWorkflowSelectTriggerTypeContent = () => {};}- await updateTrigger(updatedTrigger);+ await updateTriggerNow(updatedTrigger);setWorkflowSelectedNode(TRIGGER_STEP_ID);diff --git a/packages/twenty-front/src/modules/workflow/hooks/__tests__/useGetUpdatableWorkflowVersion.test.ts b/packages/twenty-front/src/modules/workflow/hooks/__tests__/useGetUpdatableWorkflowVersion.test.tsindex 2fce2634e15..b7269a39d0e 100644--- a/packages/twenty-front/src/modules/workflow/hooks/__tests__/useGetUpdatableWorkflowVersion.test.ts+++ b/packages/twenty-front/src/modules/workflow/hooks/__tests__/useGetUpdatableWorkflowVersion.test.ts@@ -4,6 +4,7 @@ import { renderHook } from '@testing-library/react';const mockCreateDraftFromWorkflowVersion = jest.fn().mockResolvedValue('457');const mockWorkflowId = '123';+const mockInstanceId = 'workflow-visualizer-instance';const mockWorkflow = {id: mockWorkflowId,currentVersion: {@@ -38,7 +39,7 @@ describe('useGetUpdatableWorkflowVersionOrThrow', () => {it('should return draft version id when current version is draft', async () => {const { result } = renderHook(() =>- useGetUpdatableWorkflowVersionOrThrow(),+ useGetUpdatableWorkflowVersionOrThrow(mockInstanceId),);const workflowVersionId =await result.current.getUpdatableWorkflowVersion();@@ -62,7 +63,7 @@ describe('useGetUpdatableWorkflowVersionOrThrow', () => {useWorkflowWithCurrentVersion.mockReturnValue(mockActiveWorkflow);const { result } = renderHook(() =>- useGetUpdatableWorkflowVersionOrThrow(),+ useGetUpdatableWorkflowVersionOrThrow(mockInstanceId),);const workflowVersionId =await result.current.getUpdatableWorkflowVersion();@@ -81,7 +82,7 @@ describe('useGetUpdatableWorkflowVersionOrThrow', () => {useWorkflowWithCurrentVersion.mockReturnValue(undefined);const { result } = renderHook(() =>- useGetUpdatableWorkflowVersionOrThrow(),+ useGetUpdatableWorkflowVersionOrThrow(mockInstanceId),);await expect(result.current.getUpdatableWorkflowVersion()).rejects.toThrow(diff --git a/packages/twenty-front/src/modules/workflow/hooks/useGetUpdatableWorkflowVersionOrThrow.ts b/packages/twenty-front/src/modules/workflow/hooks/useGetUpdatableWorkflowVersionOrThrow.tsindex c94b5f28931..55b407b18ca 100644--- a/packages/twenty-front/src/modules/workflow/hooks/useGetUpdatableWorkflowVersionOrThrow.ts+++ b/packages/twenty-front/src/modules/workflow/hooks/useGetUpdatableWorkflowVersionOrThrow.ts@@ -1,11 +1,17 @@+import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useCreateDraftFromWorkflowVersion } from '@/workflow/hooks/useCreateDraftFromWorkflowVersion';import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';+import { flowComponentState } from '@/workflow/states/flowComponentState';+import { workflowDraftVersionCreationComponentState } from '@/workflow/states/workflowDraftVersionCreationComponentState';+import { workflowFlowSaveDraftVersionIdComponentState } from '@/workflow/states/workflowFlowSaveDraftVersionIdComponentState';import { workflowVisualizerWorkflowIdComponentState } from '@/workflow/states/workflowVisualizerWorkflowIdComponentState';+import { useStore } from 'jotai';import { isDefined } from 'twenty-shared/utils';import { doNotTranslate } from 'twenty-shared/i18n';export const useGetUpdatableWorkflowVersionOrThrow = (instanceId?: string) => {+ const store = useStore();const { createDraftFromWorkflowVersion } =useCreateDraftFromWorkflowVersion();const workflowVisualizerWorkflowId = useAtomComponentStateValue(@@ -13,8 +19,30 @@ export const useGetUpdatableWorkflowVersionOrThrow = (instanceId?: string) => {instanceId,);const workflow = useWorkflowWithCurrentVersion(workflowVisualizerWorkflowId);+ const flowState = useAtomComponentStateCallbackState(+ flowComponentState,+ instanceId,+ );+ const saveDraftVersionIdState = useAtomComponentStateCallbackState(+ workflowFlowSaveDraftVersionIdComponentState,+ instanceId,+ );+ const draftVersionCreationState = useAtomComponentStateCallbackState(+ workflowDraftVersionCreationComponentState,+ instanceId,+ );const getUpdatableWorkflowVersion = async (): Promise<string> => {+ const saveDraftVersionId = store.get(saveDraftVersionIdState);++ // The caller may run on a stale render that has not seen a draft created by an earlier save+ if (+ isDefined(saveDraftVersionId) &&+ saveDraftVersionId === store.get(flowState)?.workflowVersionId+ ) {+ return saveDraftVersionId;+ }+if (!isDefined(workflowVisualizerWorkflowId) || !isDefined(workflow)) {throw new Error(doNotTranslate('Failed to get updatable workflow version'),@@ -22,18 +50,29 @@ export const useGetUpdatableWorkflowVersionOrThrow = (instanceId?: string) => {}if (workflow.currentVersion.status === 'DRAFT') {+ store.set(saveDraftVersionIdState, workflow.currentVersion.id);+return workflow.currentVersion.id;}- const draftVersionId = await createDraftFromWorkflowVersion({- workflowId: workflowVisualizerWorkflowId,- workflowVersionIdToCopy: workflow.currentVersion.id,- });+ // A second draft creation would overwrite the first draft with the copied version+ const draftVersionCreation =+ store.get(draftVersionCreationState) ??+ createDraftFromWorkflowVersion({+ workflowId: workflowVisualizerWorkflowId,+ workflowVersionIdToCopy: workflow.currentVersion.id,+ }).finally(() => store.set(draftVersionCreationState, undefined));++ store.set(draftVersionCreationState, draftVersionCreation);++ const draftVersionId = await draftVersionCreation;if (!isDefined(draftVersionId)) {throw new Error(doNotTranslate('Failed to create draft version'));}+ store.set(saveDraftVersionIdState, draftVersionId);+return draftVersionId;};diff --git a/packages/twenty-front/src/modules/workflow/hooks/useSavePendingWorkflowFlow.ts b/packages/twenty-front/src/modules/workflow/hooks/useSavePendingWorkflowFlow.tsnew file mode 100644index 00000000000..5c04246fade--- /dev/null+++ b/packages/twenty-front/src/modules/workflow/hooks/useSavePendingWorkflowFlow.ts@@ -0,0 +1,225 @@+import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';+import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';+import { useGetUpdatableWorkflowVersionOrThrow } from '@/workflow/hooks/useGetUpdatableWorkflowVersionOrThrow';+import { flowComponentState } from '@/workflow/states/flowComponentState';+import { workflowFailedFlowKeysComponentState } from '@/workflow/states/workflowFailedFlowKeysComponentState';+import { workflowFlowSaveDraftVersionIdComponentState } from '@/workflow/states/workflowFlowSaveDraftVersionIdComponentState';+import { workflowFlowSaveInProgressComponentState } from '@/workflow/states/workflowFlowSaveInProgressComponentState';+import { workflowPendingFlowKeysComponentState } from '@/workflow/states/workflowPendingFlowKeysComponentState';+import { buildFlowWithLocalEdits } from '@/workflow/utils/buildFlowWithLocalEdits';+import { useUpdateWorkflowVersionStep } from '@/workflow/workflow-steps/hooks/useUpdateWorkflowVersionStep';+import { useUpdateWorkflowVersionTrigger } from '@/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger';+import { useStore } from 'jotai';+import { useCallback } from 'react';+import { isDefined } from 'twenty-shared/utils';+import { doNotTranslate } from 'twenty-shared/i18n';+import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';+import { GetCoreWorkflowVersionDocument } from '~/generated/graphql';+import { logError } from '~/utils/logError';++export const useSavePendingWorkflowFlow = (instanceId?: string) => {+ const store = useStore();+ const apolloCoreClient = useApolloCoreClient();++ const flowState = useAtomComponentStateCallbackState(+ flowComponentState,+ instanceId,+ );+ const pendingFlowKeysState = useAtomComponentStateCallbackState(+ workflowPendingFlowKeysComponentState,+ instanceId,+ );+ const saveInProgressState = useAtomComponentStateCallbackState(+ workflowFlowSaveInProgressComponentState,+ instanceId,+ );+ const failedFlowKeysState = useAtomComponentStateCallbackState(+ workflowFailedFlowKeysComponentState,+ instanceId,+ );+ const saveDraftVersionIdState = useAtomComponentStateCallbackState(+ workflowFlowSaveDraftVersionIdComponentState,+ instanceId,+ );++ const { getUpdatableWorkflowVersion } =+ useGetUpdatableWorkflowVersionOrThrow(instanceId);+ const { updateWorkflowVersionStep } =+ useUpdateWorkflowVersionStep(instanceId);+ const { updateWorkflowVersionTrigger } =+ useUpdateWorkflowVersionTrigger(instanceId);++ const moveFlowToWorkflowVersionOrThrow = useCallback(+ async ({+ workflowVersionId,+ flowKeys,+ }: {+ workflowVersionId: string;+ flowKeys: string[];+ }) => {+ const { data } = await apolloCoreClient.query({+ query: GetCoreWorkflowVersionDocument,+ variables: { coreWorkflowVersionId: workflowVersionId },+ fetchPolicy: 'network-only',+ });++ const workflowVersion = data?.coreWorkflowVersion;++ if (!isDefined(workflowVersion)) {+ throw new Error(+ doNotTranslate(`Workflow version ${workflowVersionId} not found`),+ );+ }++ store.set(flowState, (localFlow) =>+ buildFlowWithLocalEdits({+ serverFlow: {+ workflowVersionId,+ trigger: workflowVersion.trigger,+ steps: workflowVersion.steps,+ },+ localFlow,+ localFlowKeys: [...flowKeys, ...store.get(pendingFlowKeysState)],+ }),+ );+ },+ [apolloCoreClient, flowState, store, pendingFlowKeysState],+ );++ const saveFlowKeys = useCallback(+ async (flowKeys: string[]): Promise<string[]> => {+ const workflowVersionId = await getUpdatableWorkflowVersion();++ if (store.get(flowState)?.workflowVersionId !== workflowVersionId) {+ await moveFlowToWorkflowVersionOrThrow({ workflowVersionId, flowKeys });+ }++ const failedFlowKeys: string[] = [];++ for (const flowKey of flowKeys) {+ const flow = store.get(flowState);++ if (flowKey === TRIGGER_STEP_ID) {+ if (+ isDefined(flow?.trigger) &&+ !(await updateWorkflowVersionTrigger({+ workflowVersionId,+ trigger: flow.trigger,+ }))+ ) {+ failedFlowKeys.push(flowKey);+ }++ continue;+ }++ const step = flow?.steps?.find((flowStep) => flowStep.id === flowKey);++ if (+ isDefined(step) &&+ !isDefined(+ await updateWorkflowVersionStep({ workflowVersionId, step }),+ )+ ) {+ failedFlowKeys.push(flowKey);+ }+ }++ return failedFlowKeys;+ },+ [+ flowState,+ getUpdatableWorkflowVersion,+ moveFlowToWorkflowVersionOrThrow,+ store,+ updateWorkflowVersionStep,+ updateWorkflowVersionTrigger,+ ],+ );++ const saveFlow = useCallback(+ async ({+ shouldRetryFailedFlowKeys,+ }: {+ shouldRetryFailedFlowKeys: boolean;+ }): Promise<boolean> => {+ let saveInProgress = store.get(saveInProgressState);++ while (isDefined(saveInProgress)) {+ await saveInProgress.promise.catch(() => undefined);+ saveInProgress = store.get(saveInProgressState);+ }++ const pendingFlowKeys = store.get(pendingFlowKeysState);+ const previouslyFailedFlowKeys = store+ .get(failedFlowKeysState)+ .filter((flowKey) => !pendingFlowKeys.includes(flowKey));++ // Failed keys ride along with new edits so waiters on a failed save do not each retry it+ if (+ pendingFlowKeys.length === 0 &&+ (!shouldRetryFailedFlowKeys || previouslyFailedFlowKeys.length === 0)+ ) {+ return previouslyFailedFlowKeys.length === 0;+ }++ const flowKeys = [...previouslyFailedFlowKeys, ...pendingFlowKeys];++ store.set(pendingFlowKeysState, []);+ store.set(failedFlowKeysState, []);++ const failedFlowKeysPromise = saveFlowKeys(flowKeys).catch(+ (error: unknown) => {+ logError(error);++ return flowKeys;+ },+ );++ store.set(saveInProgressState, {+ flowKeys,+ promise: failedFlowKeysPromise.then(() => undefined),+ });++ const failedFlowKeys = await failedFlowKeysPromise;++ store.set(failedFlowKeysState, (currentFailedFlowKeys) => [+ ...currentFailedFlowKeys.filter(+ (flowKey) => !failedFlowKeys.includes(flowKey),+ ),+ ...failedFlowKeys,+ ]);+ store.set(saveInProgressState, undefined);++ return failedFlowKeys.length === 0;+ },+ [+ failedFlowKeysState,+ saveFlowKeys,+ saveInProgressState,+ store,+ pendingFlowKeysState,+ ],+ );++ const saveWorkflowFlowEdits = useCallback(+ () => saveFlow({ shouldRetryFailedFlowKeys: false }),+ [saveFlow],+ );++ const savePendingWorkflowFlow = useCallback(async () => {+ const isSaved = await saveFlow({ shouldRetryFailedFlowKeys: true });+ const flow = store.get(flowState);++ return {+ isSaved,+ savedDraftFlow:+ isDefined(flow) &&+ flow.workflowVersionId === store.get(saveDraftVersionIdState)+ ? flow+ : undefined,+ };+ }, [flowState, saveDraftVersionIdState, saveFlow, store]);++ return { savePendingWorkflowFlow, saveWorkflowFlowEdits };+};diff --git a/packages/twenty-front/src/modules/workflow/states/workflowDraftVersionCreationComponentState.ts b/packages/twenty-front/src/modules/workflow/states/workflowDraftVersionCreationComponentState.tsnew file mode 100644index 00000000000..792d7427149--- /dev/null+++ b/packages/twenty-front/src/modules/workflow/states/workflowDraftVersionCreationComponentState.ts@@ -0,0 +1,9 @@+import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';+import { WorkflowVisualizerComponentInstanceContext } from '@/workflow/workflow-diagram/states/contexts/WorkflowVisualizerComponentInstanceContext';++export const workflowDraftVersionCreationComponentState =+ createAtomComponentState<Promise<string | undefined> | undefined>({+ key: 'workflowDraftVersionCreationComponentState',+ defaultValue: undefined,+ componentInstanceContext: WorkflowVisualizerComponentInstanceContext,+ });diff --git a/packages/twenty-front/src/modules/workflow/states/workflowFailedFlowKeysComponentState.ts b/packages/twenty-front/src/modules/workflow/states/workflowFailedFlowKeysComponentState.tsnew file mode 100644index 00000000000..1240aac19ec--- /dev/null+++ b/packages/twenty-front/src/modules/workflow/states/workflowFailedFlowKeysComponentState.ts@@ -0,0 +1,10 @@+import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';+import { WorkflowVisualizerComponentInstanceContext } from '@/workflow/workflow-diagram/states/contexts/WorkflowVisualizerComponentInstanceContext';++export const workflowFailedFlowKeysComponentState = createAtomComponentState<+ string[]+>({+ key: 'workflowFailedFlowKeysComponentState',+ defaultValue: [],+ componentInstanceContext: WorkflowVisualizerComponentInstanceContext,+});diff --git a/packages/twenty-front/src/modules/workflow/states/workflowFlowSaveDraftVersionIdComponentState.ts b/packages/twenty-front/src/modules/workflow/states/workflowFlowSaveDraftVersionIdComponentState.tsnew file mode 100644index 00000000000..cd9d157e1c3--- /dev/null+++ b/packages/twenty-front/src/modules/workflow/states/workflowFlowSaveDraftVersionIdComponentState.ts@@ -0,0 +1,9 @@+import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';+import { WorkflowVisualizerComponentInstanceContext } from '@/workflow/workflow-diagram/states/contexts/WorkflowVisualizerComponentInstanceContext';++export const workflowFlowSaveDraftVersionIdComponentState =+ createAtomComponentState<string | undefined>({+ key: 'workflowFlowSaveDraftVersionIdComponentState',+ defaultValue: undefined,+ componentInstanceContext: WorkflowVisualizerComponentInstanceContext,+ });diff --git a/packages/twenty-front/src/modules/workflow/states/workflowFlowSaveInProgressComponentState.ts b/packages/twenty-front/src/modules/workflow/states/workflowFlowSaveInProgressComponentState.tsnew file mode 100644index 00000000000..1c86b792247--- /dev/null+++ b/packages/twenty-front/src/modules/workflow/states/workflowFlowSaveInProgressComponentState.ts@@ -0,0 +1,11 @@+import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';+import { WorkflowVisualizerComponentInstanceContext } from '@/workflow/workflow-diagram/states/contexts/WorkflowVisualizerComponentInstanceContext';++export const workflowFlowSaveInProgressComponentState =+ createAtomComponentState<+ { flowKeys: string[]; promise: Promise<void> } | undefined+ >({+ key: 'workflowFlowSaveInProgressComponentState',+ defaultValue: undefined,+ componentInstanceContext: WorkflowVisualizerComponentInstanceContext,+ });diff --git a/packages/twenty-front/src/modules/workflow/states/workflowPendingFlowKeysComponentState.ts b/packages/twenty-front/src/modules/workflow/states/workflowPendingFlowKeysComponentState.tsnew file mode 100644index 00000000000..fc103824ce5--- /dev/null+++ b/packages/twenty-front/src/modules/workflow/states/workflowPendingFlowKeysComponentState.ts@@ -0,0 +1,10 @@+import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';+import { WorkflowVisualizerComponentInstanceContext } from '@/workflow/workflow-diagram/states/contexts/WorkflowVisualizerComponentInstanceContext';++export const workflowPendingFlowKeysComponentState = createAtomComponentState<+ string[]+>({+ key: 'workflowPendingFlowKeysComponentState',+ defaultValue: [],+ componentInstanceContext: WorkflowVisualizerComponentInstanceContext,+});diff --git a/packages/twenty-front/src/modules/workflow/utils/__tests__/buildFlowWithLocalEdits.test.ts b/packages/twenty-front/src/modules/workflow/utils/__tests__/buildFlowWithLocalEdits.test.tsnew file mode 100644index 00000000000..36af763c052--- /dev/null+++ b/packages/twenty-front/src/modules/workflow/utils/__tests__/buildFlowWithLocalEdits.test.ts@@ -0,0 +1,82 @@+import {+ type WorkflowCodeAction,+ type WorkflowManualTrigger,+} from '@/workflow/types/Workflow';+import { buildFlowWithLocalEdits } from '@/workflow/utils/buildFlowWithLocalEdits';+import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';++const buildStep = ({+ id,+ name,+}: {+ id: string;+ name: string;+}): WorkflowCodeAction => ({+ id,+ name,+ valid: true,+ type: 'CODE',+ settings: {+ input: { logicFunctionId: 'logic-function-id', logicFunctionInput: {} },+ outputSchema: {},+ errorHandlingOptions: {+ retryOnFailure: { value: 0 },+ continueOnFailure: { value: false },+ },+ },+});++const localFlow = {+ workflowVersionId: 'active-version',+ trigger: null,+ steps: [+ buildStep({ id: 'a', name: 'local a' }),+ buildStep({ id: 'b', name: 'local b' }),+ ],+};++const serverFlow = {+ workflowVersionId: 'draft-version',+ trigger: null,+ steps: [+ buildStep({ id: 'a', name: 'server a' }),+ buildStep({ id: 'b', name: 'server b' }),+ ],+};++describe('buildFlowWithLocalEdits', () => {+ it('keeps the local value of steps with pending edits', () => {+ expect(+ buildFlowWithLocalEdits({ serverFlow, localFlow, localFlowKeys: ['a'] }),+ ).toEqual({+ workflowVersionId: 'draft-version',+ trigger: null,+ steps: [+ buildStep({ id: 'a', name: 'local a' }),+ buildStep({ id: 'b', name: 'server b' }),+ ],+ });+ });++ it('returns the server flow when nothing is edited locally', () => {+ expect(+ buildFlowWithLocalEdits({ serverFlow, localFlow, localFlowKeys: [] }),+ ).toBe(serverFlow);+ });++ it('keeps the local trigger when it has pending edits', () => {+ const localTrigger: WorkflowManualTrigger = {+ name: 'local trigger',+ type: 'MANUAL',+ settings: { outputSchema: {} },+ };++ expect(+ buildFlowWithLocalEdits({+ serverFlow,+ localFlow: { ...localFlow, trigger: localTrigger },+ localFlowKeys: [TRIGGER_STEP_ID],+ }).trigger,+ ).toBe(localTrigger);+ });+});diff --git a/packages/twenty-front/src/modules/workflow/utils/buildFlowWithLocalEdits.ts b/packages/twenty-front/src/modules/workflow/utils/buildFlowWithLocalEdits.tsnew file mode 100644index 00000000000..f25ed53047d--- /dev/null+++ b/packages/twenty-front/src/modules/workflow/utils/buildFlowWithLocalEdits.ts@@ -0,0 +1,45 @@+import {+ type WorkflowAction,+ type WorkflowTrigger,+} from '@/workflow/types/Workflow';+import { isDefined } from 'twenty-shared/utils';+import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';++type Flow = {+ workflowVersionId: string;+ trigger: WorkflowTrigger | null;+ steps: WorkflowAction[] | null;+};++export const buildFlowWithLocalEdits = ({+ serverFlow,+ localFlow,+ localFlowKeys,+}: {+ serverFlow: Flow;+ localFlow: Pick<Flow, 'trigger' | 'steps'> | undefined;+ localFlowKeys: string[];+}): Flow => {+ if (!isDefined(localFlow) || localFlowKeys.length === 0) {+ return serverFlow;+ }++ const trigger =+ localFlowKeys.includes(TRIGGER_STEP_ID) && isDefined(localFlow.trigger)+ ? localFlow.trigger+ : serverFlow.trigger;++ const steps =+ serverFlow.steps?.map((serverStep) => {+ if (!localFlowKeys.includes(serverStep.id)) {+ return serverStep;+ }++ return (+ localFlow.steps?.find((localStep) => localStep.id === serverStep.id) ??+ serverStep+ );+ }) ?? null;++ return { workflowVersionId: serverFlow.workflowVersionId, trigger, steps };+};diff --git a/packages/twenty-front/src/modules/workflow/utils/replaceStepInFlow.ts b/packages/twenty-front/src/modules/workflow/utils/replaceStepInFlow.tsnew file mode 100644index 00000000000..60a4f1f98c1--- /dev/null+++ b/packages/twenty-front/src/modules/workflow/utils/replaceStepInFlow.ts@@ -0,0 +1,30 @@+import {+ type WorkflowAction,+ type WorkflowTrigger,+} from '@/workflow/types/Workflow';+import { isDefined } from 'twenty-shared/utils';++type Flow = {+ workflowVersionId: string;+ trigger: WorkflowTrigger | null;+ steps: WorkflowAction[] | null;+};++export const replaceStepInFlow = ({+ flow,+ step,+}: {+ flow: Flow | undefined;+ step: WorkflowAction;+}): Flow | undefined => {+ if (!isDefined(flow)) {+ return flow;+ }++ return {+ ...flow,+ steps: (flow.steps ?? []).map((flowStep) =>+ flowStep.id === step.id ? step : flowStep,+ ),+ };+};diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasEditable.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasEditable.tsxindex 003c0a65e6f..a421eac45d2 100644--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasEditable.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasEditable.tsx@@ -24,7 +24,7 @@ import { useCreateEdge } from '@/workflow/workflow-steps/hooks/useCreateEdge';import { useDeleteEdge } from '@/workflow/workflow-steps/hooks/useDeleteEdge';import { useUpdateStep } from '@/workflow/workflow-steps/hooks/useUpdateStep';import { prepareIfElseStepWithNewBranch } from '@/workflow/workflow-steps/workflow-actions/if-else-action/utils/prepareIfElseStepWithNewBranch';-import { useUpdateWorkflowVersionTrigger } from '@/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger';+import { useUpdateTrigger } from '@/workflow/workflow-trigger/hooks/useUpdateTrigger';import {addEdge,ReactFlowProvider,@@ -61,9 +61,9 @@ export const WorkflowDiagramCanvasEditable = () => {// oxlint-disable-next-line twenty/no-state-userefconst reconnectionQueueRef = useRef<Promise<void>>(Promise.resolve());- const { updateStep } = useUpdateStep();+ const { updateStep, updateStepNow } = useUpdateStep();- const { updateTrigger } = useUpdateWorkflowVersionTrigger();+ const { updateTrigger } = useUpdateTrigger();const { startNodeCreation } = useStartNodeCreation();@@ -81,7 +81,7 @@ export const WorkflowDiagramCanvasEditable = () => {targetStepId: edgeConnect.target,});- await updateStep(updatedStep);+ await updateStepNow(updatedStep);}setWorkflowDiagram((diagram) => {@@ -184,7 +184,7 @@ export const WorkflowDiagramCanvasEditable = () => {const stepToUpdate = flow?.steps?.find((step) => step.id === node.id);if (isDefined(stepToUpdate)) {- await updateStep({+ updateStep({...stepToUpdate,position: node.position,});@@ -195,7 +195,7 @@ export const WorkflowDiagramCanvasEditable = () => {const triggerToUpdate = flow?.trigger;if (isDefined(triggerToUpdate)) {- await updateTrigger({+ updateTrigger({...triggerToUpdate,position: node.position,});diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramEffect.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramEffect.tsxindex e80eba087ea..ef9b2c4910a 100644--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramEffect.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramEffect.tsx@@ -7,6 +7,12 @@ import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCimport { flowComponentState } from '@/workflow/states/flowComponentState';import { shouldWorkflowRefetchRequestFamilyState } from '@/workflow/states/shouldWorkflowRefetchRequestFamilyState';import { workflowLastCreatedStepIdComponentState } from '@/workflow/states/workflowLastCreatedStepIdComponentState';+import { workflowFailedFlowKeysComponentState } from '@/workflow/states/workflowFailedFlowKeysComponentState';+import { workflowFlowSaveDraftVersionIdComponentState } from '@/workflow/states/workflowFlowSaveDraftVersionIdComponentState';+import { workflowFlowSaveInProgressComponentState } from '@/workflow/states/workflowFlowSaveInProgressComponentState';+import { workflowPendingFlowKeysComponentState } from '@/workflow/states/workflowPendingFlowKeysComponentState';+import { useSavePendingWorkflowFlow } from '@/workflow/hooks/useSavePendingWorkflowFlow';+import { buildFlowWithLocalEdits } from '@/workflow/utils/buildFlowWithLocalEdits';import { workflowVisualizerWorkflowIdComponentState } from '@/workflow/states/workflowVisualizerWorkflowIdComponentState';import {type WorkflowAction,@@ -20,6 +26,7 @@ import { generateWorkflowDiagram } from '@/workflow/workflow-diagram/utils/generimport { mergeWorkflowDiagrams } from '@/workflow/workflow-diagram/utils/mergeWorkflowDiagrams';import { useStore } from 'jotai';import { useCallback, useEffect, useState } from 'react';+import { logError } from '~/utils/logError';import { isDefined } from 'twenty-shared/utils';export const WorkflowDiagramEffect = () => {@@ -55,9 +62,25 @@ export const WorkflowDiagramEffect = () => {workflowVisualizerWorkflowId ?? '',);- const [seededVersionId, setSeededVersionId] = useState<string>();+ const [shouldSeedFlowFromServer, setShouldSeedFlowFromServer] =+ useState(false);+ const [lastCurrentVersionId, setLastCurrentVersionId] = useState<string>();const [seededVersionUpdatedAt, setSeededVersionUpdatedAt] =useState<string>();++ const pendingFlowKeys = useAtomComponentStateCallbackState(+ workflowPendingFlowKeysComponentState,+ );+ const flowSaveInProgress = useAtomComponentStateCallbackState(+ workflowFlowSaveInProgressComponentState,+ );+ const failedFlowKeys = useAtomComponentStateCallbackState(+ workflowFailedFlowKeysComponentState,+ );+ const saveDraftVersionId = useAtomComponentStateCallbackState(+ workflowFlowSaveDraftVersionIdComponentState,+ );+ const { savePendingWorkflowFlow } = useSavePendingWorkflowFlow();const [previousDiagramUpdatedAt, setPreviousDiagramUpdatedAt] =useState<string>();const [previousDiagramVersionId, setPreviousDiagramVersionId] =@@ -116,16 +139,18 @@ export const WorkflowDiagramEffect = () => {setShouldWorkflowRefetchRequest(false);- void refetchContent()+ void savePendingWorkflowFlow()+ .then(() => refetchContent()).then(() => {- setSeededVersionId(undefined);+ setShouldSeedFlowFromServer(true);})- .catch(() => {});+ .catch(logError);}, [currentVersion?.id,shouldWorkflowRefetchRequest,setShouldWorkflowRefetchRequest,refetchContent,+ savePendingWorkflowFlow,]);useEffect(() => {@@ -137,9 +162,28 @@ export const WorkflowDiagramEffect = () => {return;}+ const isDraftVersion = currentVersion.status === 'DRAFT';+if (- seededVersionId === currentVersion.id &&- seededVersionUpdatedAt === contentUpdatedAt+ !isDraftVersion &&+ store.get(saveDraftVersionId) === currentVersion.id+ ) {+ store.set(saveDraftVersionId, undefined);+ }++ const hasCurrentVersionChanged = lastCurrentVersionId !== currentVersion.id;++ if (!hasCurrentVersionChanged && !shouldSeedFlowFromServer) {+ return;+ }++ setLastCurrentVersionId(currentVersion.id);+ setShouldSeedFlowFromServer(false);++ if (+ isDefined(lastCurrentVersionId) &&+ flow?.workflowVersionId === currentVersion.id &&+ !shouldSeedFlowFromServer) {return;}@@ -153,22 +197,48 @@ export const WorkflowDiagramEffect = () => {],});}- setSeededVersionId(currentVersion.id);setSeededVersionUpdatedAt(contentUpdatedAt);- setFlow({- workflowVersionId: currentVersion.id,- trigger: content.trigger,- steps: content.steps,- });+ if (!isDraftVersion) {+ store.set(pendingFlowKeys, []);+ store.set(failedFlowKeys, []);+ }++ const flowSaveInProgressKeys = isDraftVersion+ ? (store.get(flowSaveInProgress)?.flowKeys ?? [])+ : [];++ const localFlowKeys = [+ ...store.get(pendingFlowKeys),+ ...store.get(failedFlowKeys),+ ...flowSaveInProgressKeys,+ ];++ setFlow((localFlow) =>+ buildFlowWithLocalEdits({+ serverFlow: {+ workflowVersionId: currentVersion.id,+ trigger: content.trigger,+ steps: content.steps,+ },+ localFlow,+ localFlowKeys,+ }),+ );}, [content,currentVersion,- seededVersionId,- seededVersionUpdatedAt,+ flow?.workflowVersionId,+ lastCurrentVersionId,+ shouldSeedFlowFromServer,contentUpdatedAt,setFlow,deleteStepsOutputSchema,+ store,+ saveDraftVersionId,+ pendingFlowKeys,+ failedFlowKeys,+ flowSaveInProgress,]);useEffect(() => {diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/hooks/__tests__/useReconnectWorkflowEdge.test.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/hooks/__tests__/useReconnectWorkflowEdge.test.tsxindex 9ee43cec74e..faa54e29c9c 100644--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/hooks/__tests__/useReconnectWorkflowEdge.test.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/hooks/__tests__/useReconnectWorkflowEdge.test.tsx@@ -52,16 +52,13 @@ const Wrapper = ({ children }: { children: ReactNode }) => ();jest.mock('@/workflow/workflow-steps/hooks/useUpdateStep', () => ({- useUpdateStep: () => ({ updateStep: mockUpdateStep }),+ useUpdateStep: () => ({ updateStepNow: mockUpdateStep }),}));-jest.mock(- '@/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger',- () => ({- useUpdateWorkflowVersionTrigger: () => ({- updateTrigger: mockUpdateTrigger,- }),+jest.mock('@/workflow/workflow-trigger/hooks/useUpdateTrigger', () => ({+ useUpdateTrigger: () => ({+ updateTriggerNow: mockUpdateTrigger,}),-);+}));const edge: WorkflowDiagramEdge = {id: 'edge',diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/hooks/useReconnectWorkflowEdge.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/hooks/useReconnectWorkflowEdge.tsindex ae02fbc3d09..c23a148987b 100644--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/hooks/useReconnectWorkflowEdge.ts+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/hooks/useReconnectWorkflowEdge.ts@@ -7,7 +7,7 @@ import { getConnectionOptionsForSourceHandle } from '@/workflow/workflow-diagramimport { useUpdateStep } from '@/workflow/workflow-steps/hooks/useUpdateStep';import { getReconnectedStepIds } from '@/workflow/workflow-steps/utils/getReconnectedStepIds';import { reconnectWorkflowStep } from '@/workflow/workflow-steps/utils/reconnectWorkflowStep';-import { useUpdateWorkflowVersionTrigger } from '@/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger';+import { useUpdateTrigger } from '@/workflow/workflow-trigger/hooks/useUpdateTrigger';import { type Connection } from '@xyflow/react';import { useStore } from 'jotai';import { isDefined } from 'twenty-shared/utils';@@ -18,8 +18,8 @@ export const useReconnectWorkflowEdge = () => {const store = useStore();const flowCallbackState =useAtomComponentStateCallbackState(flowComponentState);- const { updateStep } = useUpdateStep();- const { updateTrigger } = useUpdateWorkflowVersionTrigger();+ const { updateStepNow } = useUpdateStep();+ const { updateTriggerNow } = useUpdateTrigger();const reconnectEdge = async (oldEdge: WorkflowDiagramEdge,@@ -59,7 +59,7 @@ export const useReconnectWorkflowEdge = () => {if (isDefined(trigger) && isDefined(nextStepIds)) {const updatedTrigger = { ...trigger, nextStepIds };- await updateTrigger(updatedTrigger);+ await updateTriggerNow(updatedTrigger);return isDeeplyEqual(store.get(flowCallbackState)?.trigger?.nextStepIds,@@ -88,7 +88,7 @@ export const useReconnectWorkflowEdge = () => {});if (isDefined(updatedStep)) {- const { updatedStep: savedStep } = await updateStep(updatedStep);+ const { updatedStep: savedStep } = await updateStepNow(updatedStep);return isDefined(savedStep);}diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useUpdateStep.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useUpdateStep.test.tsdeleted file mode 100644index a42b30ac2d4..00000000000--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useUpdateStep.test.ts+++ /dev/null@@ -1,64 +0,0 @@-import { useUpdateStep } from '@/workflow/workflow-steps/hooks/useUpdateStep';-import { act, renderHook } from '@testing-library/react';--const mockUpdateWorkflowVersionStep = jest.fn();-const mockGetUpdatableWorkflowVersion = jest.fn();--jest.mock(- '@/workflow/workflow-steps/hooks/useUpdateWorkflowVersionStep',- () => ({- useUpdateWorkflowVersionStep: () => ({- updateWorkflowVersionStep: mockUpdateWorkflowVersionStep,- }),- }),-);--jest.mock('@/workflow/hooks/useGetUpdatableWorkflowVersionOrThrow', () => ({- useGetUpdatableWorkflowVersionOrThrow: () => ({- getUpdatableWorkflowVersion: mockGetUpdatableWorkflowVersion,- }),-}));--describe('useUpdateStep', () => {- beforeEach(() => {- jest.clearAllMocks();- });-- it('should update step in workflow version', async () => {- const mockWorkflowVersionId = 'version-123';- const mockStep = {- id: '1',- name: 'name',- valid: true,- type: 'CODE' as const,- settings: {- input: {- logicFunctionId: 'id',- logicFunctionInput: {},- },- outputSchema: {},- errorHandlingOptions: {- retryOnFailure: {- value: 3,- },- continueOnFailure: {- value: true,- },- },- },- };-- mockGetUpdatableWorkflowVersion.mockResolvedValue(mockWorkflowVersionId);-- const { result } = renderHook(() => useUpdateStep());- await act(async () => {- await result.current.updateStep(mockStep);- });-- expect(mockGetUpdatableWorkflowVersion).toHaveBeenCalled();- expect(mockUpdateWorkflowVersionStep).toHaveBeenCalledWith({- workflowVersionId: mockWorkflowVersionId,- step: mockStep,- });- });-});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.tsindex 00c15d73604..ac08703d941 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,4 +1,5 @@import { useWorkflowEditorMutationErrorHandler } from '@/workflow/hooks/useWorkflowEditorMutationErrorHandler';+import { useSavePendingWorkflowFlow } from '@/workflow/hooks/useSavePendingWorkflowFlow';import { invalidateCoreWorkflowVersions } from '@/object-core/workflows/versions/utils/invalidateCoreWorkflowVersions';import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';import { useApplyWorkflowVersionStepChanges } from '@/workflow/workflow-steps/hooks/useApplyWorkflowVersionStepChanges';@@ -16,6 +17,7 @@ export type WorkflowVersionEdgeInput = Omit<};export const useCreateWorkflowVersionEdge = () => {+ const { savePendingWorkflowFlow } = useSavePendingWorkflowFlow();const apolloCoreClient = useApolloCoreClient();const handleCoreMutationError = useWorkflowEditorMutationErrorHandler();const [mutateCore] = useMutation(CreateCoreWorkflowVersionEdgeDocument, {@@ -28,6 +30,8 @@ export const useCreateWorkflowVersionEdge = () => {const createWorkflowVersionEdge = async (input: WorkflowVersionEdgeInput) => {const { workflowVersionId, ...edgeInput } = input;+ await savePendingWorkflowFlow();+const result = await mutateCore({variables: {input: { ...edgeInput, coreWorkflowVersionId: workflowVersionId },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.tsindex 97afc0884c2..280c27d6b22 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,4 +1,5 @@import { useWorkflowEditorMutationErrorHandler } from '@/workflow/hooks/useWorkflowEditorMutationErrorHandler';+import { useSavePendingWorkflowFlow } from '@/workflow/hooks/useSavePendingWorkflowFlow';import { invalidateCoreWorkflowVersions } from '@/object-core/workflows/versions/utils/invalidateCoreWorkflowVersions';import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';import { useApplyWorkflowVersionStepChanges } from '@/workflow/workflow-steps/hooks/useApplyWorkflowVersionStepChanges';@@ -16,6 +17,7 @@ export type CreateWorkflowVersionStepInput = Omit<};export const useCreateWorkflowVersionStep = () => {+ const { savePendingWorkflowFlow } = useSavePendingWorkflowFlow();const apolloCoreClient = useApolloCoreClient();const handleCoreMutationError = useWorkflowEditorMutationErrorHandler();const [mutateCore] = useMutation(CreateCoreWorkflowVersionStepDocument, {@@ -30,6 +32,8 @@ export const useCreateWorkflowVersionStep = () => {input: CreateWorkflowVersionStepInput,) => {const { workflowVersionId, ...stepInput } = input;+ await savePendingWorkflowFlow();+const result = await mutateCore({variables: {input: { ...stepInput, coreWorkflowVersionId: workflowVersionId },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.tsindex 73d753fc608..acfead780b7 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,4 +1,5 @@import { useWorkflowEditorMutationErrorHandler } from '@/workflow/hooks/useWorkflowEditorMutationErrorHandler';+import { useSavePendingWorkflowFlow } from '@/workflow/hooks/useSavePendingWorkflowFlow';import { invalidateCoreWorkflowVersions } from '@/object-core/workflows/versions/utils/invalidateCoreWorkflowVersions';import { DeleteCoreWorkflowVersionEdgeDocument } from '~/generated/graphql';import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';@@ -7,6 +8,7 @@ import { useApplyWorkflowVersionStepChanges } from '@/workflow/workflow-steps/hoimport { type WorkflowVersionEdgeInput } from '@/workflow/workflow-steps/hooks/useCreateWorkflowVersionEdge';export const useDeleteWorkflowVersionEdge = () => {+ const { savePendingWorkflowFlow } = useSavePendingWorkflowFlow();const apolloCoreClient = useApolloCoreClient();const handleCoreMutationError = useWorkflowEditorMutationErrorHandler();const [mutateCore] = useMutation(DeleteCoreWorkflowVersionEdgeDocument, {@@ -19,6 +21,8 @@ export const useDeleteWorkflowVersionEdge = () => {const deleteWorkflowVersionEdge = async (input: WorkflowVersionEdgeInput) => {const { workflowVersionId, ...edgeInput } = input;+ await savePendingWorkflowFlow();+const result = await mutateCore({variables: {input: { ...edgeInput, coreWorkflowVersionId: workflowVersionId },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.tsindex 14f692ede22..eca5e693c3b 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,4 +1,5 @@import { useWorkflowEditorMutationErrorHandler } from '@/workflow/hooks/useWorkflowEditorMutationErrorHandler';+import { useSavePendingWorkflowFlow } from '@/workflow/hooks/useSavePendingWorkflowFlow';import { invalidateCoreWorkflowVersions } from '@/object-core/workflows/versions/utils/invalidateCoreWorkflowVersions';import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';import { useApplyWorkflowVersionStepChanges } from '@/workflow/workflow-steps/hooks/useApplyWorkflowVersionStepChanges';@@ -16,6 +17,7 @@ export type DeleteWorkflowVersionStepInput = Omit<};export const useDeleteWorkflowVersionStep = () => {+ const { savePendingWorkflowFlow } = useSavePendingWorkflowFlow();const apolloCoreClient = useApolloCoreClient();const handleCoreMutationError = useWorkflowEditorMutationErrorHandler();const [mutateCore] = useMutation(DeleteCoreWorkflowVersionStepDocument, {@@ -30,6 +32,8 @@ export const useDeleteWorkflowVersionStep = () => {input: DeleteWorkflowVersionStepInput,) => {const { workflowVersionId, ...stepInput } = input;+ await savePendingWorkflowFlow();+const result = await mutateCore({variables: {input: { ...stepInput, coreWorkflowVersionId: workflowVersionId },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.tsindex f8b769c6589..637b73784be 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,4 +1,5 @@import { useWorkflowEditorMutationErrorHandler } from '@/workflow/hooks/useWorkflowEditorMutationErrorHandler';+import { useSavePendingWorkflowFlow } from '@/workflow/hooks/useSavePendingWorkflowFlow';import { invalidateCoreWorkflowVersions } from '@/object-core/workflows/versions/utils/invalidateCoreWorkflowVersions';import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';import { useApplyWorkflowVersionStepChanges } from '@/workflow/workflow-steps/hooks/useApplyWorkflowVersionStepChanges';@@ -16,6 +17,7 @@ export type DuplicateWorkflowVersionStepInput = Omit<};export const useDuplicateWorkflowVersionStep = () => {+ const { savePendingWorkflowFlow } = useSavePendingWorkflowFlow();const apolloCoreClient = useApolloCoreClient();const handleCoreMutationError = useWorkflowEditorMutationErrorHandler();const [mutateCore] = useMutation(DuplicateCoreWorkflowVersionStepDocument, {@@ -30,6 +32,8 @@ export const useDuplicateWorkflowVersionStep = () => {input: DuplicateWorkflowVersionStepInput,) => {const { workflowVersionId, ...stepInput } = input;+ await savePendingWorkflowFlow();+const result = await mutateCore({variables: {input: { ...stepInput, coreWorkflowVersionId: workflowVersionId },diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateStep.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateStep.tsindex 46f892d6c12..58aeee9b4fc 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateStep.ts+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateStep.ts@@ -1,13 +1,49 @@+import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';import { useGetUpdatableWorkflowVersionOrThrow } from '@/workflow/hooks/useGetUpdatableWorkflowVersionOrThrow';+import { useSavePendingWorkflowFlow } from '@/workflow/hooks/useSavePendingWorkflowFlow';+import { flowComponentState } from '@/workflow/states/flowComponentState';+import { workflowPendingFlowKeysComponentState } from '@/workflow/states/workflowPendingFlowKeysComponentState';import { type WorkflowAction } from '@/workflow/types/Workflow';+import { replaceStepInFlow } from '@/workflow/utils/replaceStepInFlow';import { useUpdateWorkflowVersionStep } from '@/workflow/workflow-steps/hooks/useUpdateWorkflowVersionStep';+import { useCallback } from 'react';+import { isDefined } from 'twenty-shared/utils';++export const useUpdateStep = (instanceId?: string) => {+ const setFlow = useSetAtomComponentState(flowComponentState, instanceId);+ const setWorkflowPendingFlowKeys = useSetAtomComponentState(+ workflowPendingFlowKeysComponentState,+ instanceId,+ );-export const useUpdateStep = () => {const { getUpdatableWorkflowVersion } =- useGetUpdatableWorkflowVersionOrThrow();- const { updateWorkflowVersionStep } = useUpdateWorkflowVersionStep();+ useGetUpdatableWorkflowVersionOrThrow(instanceId);+ const { updateWorkflowVersionStep } =+ useUpdateWorkflowVersionStep(instanceId);+ const { savePendingWorkflowFlow, saveWorkflowFlowEdits } =+ useSavePendingWorkflowFlow(instanceId);++ const writeStepToFlow = useCallback(+ (step: WorkflowAction) => {+ setFlow((currentFlow) => replaceStepInFlow({ flow: currentFlow, step }));+ },+ [setFlow],+ );++ const updateStep = (updatedStep: WorkflowAction) => {+ writeStepToFlow(updatedStep);++ setWorkflowPendingFlowKeys((pendingFlowKeys) => [+ ...pendingFlowKeys.filter((flowKey) => flowKey !== updatedStep.id),+ updatedStep.id,+ ]);++ return saveWorkflowFlowEdits();+ };++ const updateStepNow = async (updatedStep: WorkflowAction) => {+ await savePendingWorkflowFlow();- const updateStep = async (updatedStep: WorkflowAction) => {const workflowVersionId = await getUpdatableWorkflowVersion();const result = await updateWorkflowVersionStep({@@ -15,12 +51,17 @@ export const useUpdateStep = () => {step: updatedStep,});- return {- updatedStep: result?.data?.updateWorkflowVersionStep,- };+ const savedStep = result?.data?.updateWorkflowVersionStep;++ if (isDefined(savedStep)) {+ writeStepToFlow(savedStep);+ }++ return { updatedStep: savedStep };};return {updateStep,+ updateStepNow,};};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.tsindex 78153f4fd06..5f949df2c9a 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,8 +1,6 @@import { useWorkflowEditorMutationErrorHandler } from '@/workflow/hooks/useWorkflowEditorMutationErrorHandler';import { invalidateCoreWorkflowVersions } from '@/object-core/workflows/versions/utils/invalidateCoreWorkflowVersions';import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';-import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';-import { flowComponentState } from '@/workflow/states/flowComponentState';import { useStepsOutputSchema } from '@/workflow/workflow-variables/hooks/useStepsOutputSchema';import { useMutation } from '@apollo/client/react';import { isDefined } from 'twenty-shared/utils';@@ -27,7 +25,6 @@ export const useUpdateWorkflowVersionStep = (instanceId?: string) => {onError: handleCoreMutationError,});const { markStepForRecomputation } = useStepsOutputSchema();- const setFlow = useSetAtomComponentState(flowComponentState, instanceId);const updateWorkflowVersionStep = async (input: UpdateWorkflowVersionStepInput,@@ -48,20 +45,6 @@ export const useUpdateWorkflowVersionStep = (instanceId?: string) => {workflowVersionId,});- setFlow((currentFlow) => {- if (!isDefined(currentFlow)) {- return currentFlow;- }-- return {- ...currentFlow,- workflowVersionId,- steps: (currentFlow.steps ?? []).map((step) =>- step.id === updatedStep.id ? updatedStep : step,- ),- };- });-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.tsindex 006b020ac3d..486d23cac9c 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@@ -6,7 +6,6 @@ import { createElement, type ReactNode } from 'react';import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';const mockMutate = jest.fn();-const mockGetUpdatableWorkflowVersion = jest.fn();const mockMarkStepForRecomputation = jest.fn();jest.mock('@/object-metadata/hooks/useApolloCoreClient', () => ({@@ -25,12 +24,6 @@ jest.mock('twenty-ui/components/feedback', () => ({useToast: () => ({ enqueueToast: mockEnqueueToast }),}));-jest.mock('@/workflow/hooks/useGetUpdatableWorkflowVersionOrThrow', () => ({- useGetUpdatableWorkflowVersionOrThrow: jest.fn(() => ({- getUpdatableWorkflowVersion: mockGetUpdatableWorkflowVersion,- })),-}));-jest.mock('@/workflow/workflow-variables/hooks/useStepsOutputSchema', () => ({useStepsOutputSchema: jest.fn(() => ({markStepForRecomputation: mockMarkStepForRecomputation,@@ -67,17 +60,17 @@ describe('useUpdateWorkflowVersionTrigger', () => {});it('updates the trigger via the dedicated mutation and marks it for recomputation', async () => {- mockGetUpdatableWorkflowVersion.mockResolvedValue('version-id');-const { result } = renderHook(() => useUpdateWorkflowVersionTrigger(), {wrapper: Wrapper,});await act(async () => {- await result.current.updateTrigger(trigger);+ await result.current.updateWorkflowVersionTrigger({+ workflowVersionId: 'version-id',+ trigger,+ });});- expect(mockGetUpdatableWorkflowVersion).toHaveBeenCalled();expect(mockMutate).toHaveBeenCalledWith(expect.objectContaining({variables: {@@ -99,7 +92,6 @@ describe('useUpdateWorkflowVersionTrigger', () => {for (const triggerType of triggerTypes) {mockMarkStepForRecomputation.mockClear();- mockGetUpdatableWorkflowVersion.mockResolvedValue('version-id');const testTrigger = {name: `${triggerType} Trigger`,@@ -115,7 +107,10 @@ describe('useUpdateWorkflowVersionTrigger', () => {});await act(async () => {- await result.current.updateTrigger(testTrigger);+ await result.current.updateWorkflowVersionTrigger({+ workflowVersionId: 'version-id',+ trigger: testTrigger,+ });});expect(mockMarkStepForRecomputation).toHaveBeenCalledWith({diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/hooks/useUpdateTrigger.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/hooks/useUpdateTrigger.tsnew file mode 100644index 00000000000..4fe312a7196--- /dev/null+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/hooks/useUpdateTrigger.ts@@ -0,0 +1,67 @@+import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';+import { useGetUpdatableWorkflowVersionOrThrow } from '@/workflow/hooks/useGetUpdatableWorkflowVersionOrThrow';+import { useSavePendingWorkflowFlow } from '@/workflow/hooks/useSavePendingWorkflowFlow';+import { flowComponentState } from '@/workflow/states/flowComponentState';+import { workflowPendingFlowKeysComponentState } from '@/workflow/states/workflowPendingFlowKeysComponentState';+import { type WorkflowTrigger } from '@/workflow/types/Workflow';+import { useUpdateWorkflowVersionTrigger } from '@/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger';+import { useCallback } from 'react';+import { isDefined } from 'twenty-shared/utils';+import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';++export const useUpdateTrigger = (instanceId?: string) => {+ const setFlow = useSetAtomComponentState(flowComponentState, instanceId);+ const setWorkflowPendingFlowKeys = useSetAtomComponentState(+ workflowPendingFlowKeysComponentState,+ instanceId,+ );++ const { getUpdatableWorkflowVersion } =+ useGetUpdatableWorkflowVersionOrThrow(instanceId);+ const { updateWorkflowVersionTrigger } =+ useUpdateWorkflowVersionTrigger(instanceId);+ const { savePendingWorkflowFlow, saveWorkflowFlowEdits } =+ useSavePendingWorkflowFlow(instanceId);++ const writeTriggerToFlow = useCallback(+ (trigger: WorkflowTrigger) => {+ setFlow((currentFlow) =>+ isDefined(currentFlow) ? { ...currentFlow, trigger } : currentFlow,+ );+ },+ [setFlow],+ );++ const updateTrigger = (updatedTrigger: WorkflowTrigger) => {+ writeTriggerToFlow(updatedTrigger);++ setWorkflowPendingFlowKeys((pendingFlowKeys) => [+ ...pendingFlowKeys.filter((flowKey) => flowKey !== TRIGGER_STEP_ID),+ TRIGGER_STEP_ID,+ ]);++ return saveWorkflowFlowEdits();+ };++ const updateTriggerNow = async (updatedTrigger: WorkflowTrigger) => {+ await savePendingWorkflowFlow();++ const workflowVersionId = await getUpdatableWorkflowVersion();++ const isSaved = await updateWorkflowVersionTrigger({+ workflowVersionId,+ trigger: updatedTrigger,+ });++ if (isSaved) {+ writeTriggerToFlow(updatedTrigger);+ }++ return isSaved;+ };++ return {+ updateTrigger,+ updateTriggerNow,+ };+};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.tsindex 878e997f2d4..42b77eb6f1e 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,9 +1,6 @@import { useWorkflowEditorMutationErrorHandler } from '@/workflow/hooks/useWorkflowEditorMutationErrorHandler';import { invalidateCoreWorkflowVersions } from '@/object-core/workflows/versions/utils/invalidateCoreWorkflowVersions';import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';-import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';-import { useGetUpdatableWorkflowVersionOrThrow } from '@/workflow/hooks/useGetUpdatableWorkflowVersionOrThrow';-import { flowComponentState } from '@/workflow/states/flowComponentState';import { type WorkflowTrigger } from '@/workflow/types/Workflow';import { useStepsOutputSchema } from '@/workflow/workflow-variables/hooks/useStepsOutputSchema';import { useMutation } from '@apollo/client/react';@@ -20,27 +17,26 @@ export const useUpdateWorkflowVersionTrigger = (instanceId?: string) => {onError: handleCoreMutationError,});- const { getUpdatableWorkflowVersion } =- useGetUpdatableWorkflowVersionOrThrow(instanceId);-const { markStepForRecomputation } = useStepsOutputSchema();- const setFlow = useSetAtomComponentState(flowComponentState, instanceId);-- const updateTrigger = async (updatedTrigger: WorkflowTrigger) => {- const workflowVersionId = await getUpdatableWorkflowVersion();-+ const updateWorkflowVersionTrigger = async ({+ workflowVersionId,+ trigger,+ }: {+ workflowVersionId: string;+ trigger: WorkflowTrigger;+ }) => {const { data } = await mutateCore({variables: {input: {coreWorkflowVersionId: workflowVersionId,- trigger: updatedTrigger,+ trigger,},},});if (!isDefined(data?.updateWorkflowVersionTrigger)) {- return;+ return false;}markStepForRecomputation({@@ -48,18 +44,10 @@ export const useUpdateWorkflowVersionTrigger = (instanceId?: string) => {workflowVersionId,});- setFlow((currentFlow) => {- if (!isDefined(currentFlow)) {- return currentFlow;- }-- return { ...currentFlow, workflowVersionId, trigger: updatedTrigger };- });-await invalidateCoreWorkflowVersions(apolloCoreClient);- };- return {- updateTrigger,+ return true;};++ return { updateWorkflowVersionTrigger };};diff --git a/packages/twenty-front/src/modules/workflow/workflow-version/hooks/useTidyUpWorkflowVersion.ts b/packages/twenty-front/src/modules/workflow/workflow-version/hooks/useTidyUpWorkflowVersion.tsindex a6f73e0b04d..c8d5b80c82f 100644--- a/packages/twenty-front/src/modules/workflow/workflow-version/hooks/useTidyUpWorkflowVersion.ts+++ b/packages/twenty-front/src/modules/workflow/workflow-version/hooks/useTidyUpWorkflowVersion.ts@@ -1,4 +1,5 @@import { invalidateCoreWorkflowVersions } from '@/object-core/workflows/versions/utils/invalidateCoreWorkflowVersions';+import { useSavePendingWorkflowFlow } from '@/workflow/hooks/useSavePendingWorkflowFlow';import { UpdateCoreWorkflowVersionPositionsDocument } from '~/generated/graphql';import { type WorkflowDiagram } from '@/workflow/workflow-diagram/types/WorkflowDiagram';import { useMutation } from '@apollo/client/react';@@ -10,6 +11,7 @@ import { flowComponentState } from '@/workflow/states/flowComponentState';import { getOrganizedDiagram } from '@/workflow/workflow-diagram/utils/getOrganizedDiagram';export const useTidyUpWorkflowVersion = (instanceId?: string) => {+ const { savePendingWorkflowFlow } = useSavePendingWorkflowFlow(instanceId);const apolloCoreClient = useApolloCoreClient();const [mutateCore] = useMutation(UpdateCoreWorkflowVersionPositionsDocument, {client: apolloCoreClient,@@ -21,6 +23,8 @@ export const useTidyUpWorkflowVersion = (instanceId?: string) => {workflowVersionId: string,positions: { id: string; position: { x: number; y: number } }[],) => {+ await savePendingWorkflowFlow();+await mutateCore({variables: {input: { coreWorkflowVersionId: workflowVersionId, positions },