refactor: reuse utility function to find a step

twentyhq · Sep 2, 2024 · 3319d0b · 3319d0b
1 parent 284ef5d
commit 3319d0b
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/packages/twenty-front/src/modules/workflow/components/RightDrawerWorkflowEditStepContent.tsx b/packages/twenty-front/src/modules/workflow/components/RightDrawerWorkflowEditStepContent.tsx
@@ -7,6 +7,7 @@ import {
   WorkflowVersion,
   WorkflowWithCurrentVersion,
 } from '@/workflow/types/Workflow';
+import { findStepPositionOrThrow } from '@/workflow/utils/findStepPositionOrThrow';
 import { replaceStep } from '@/workflow/utils/replaceStep';
 import { useRecoilValue } from 'recoil';
 import { isDefined } from 'twenty-ui';
@@ -34,16 +35,18 @@ const getStepDefinition = ({
     } as const;
   }
 
-  const selectedNodeDefinition = currentVersion.steps?.find(
-    (step) => step.id === stepId,
-  );
-  if (selectedNodeDefinition === undefined) {
+  if (!isDefined(currentVersion.steps)) {
     return undefined;
   }
 
+  const selectedNodePosition = findStepPositionOrThrow({
+    steps: currentVersion.steps,
+    stepId: stepId,
+  });
+
   return {
     type: 'action',
-    definition: selectedNodeDefinition,
+    definition: selectedNodePosition.steps[selectedNodePosition.index],
   } as const;
 };