fix(editor): 🚑️ Step id duplication

baptisteArno · Mar 24, 2022 · b8019f3 · b8019f3 · vercel · Mar 24, 2022
1 parent e502413
commit b8019f3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/apps/builder/contexts/TypebotContext/actions/blocks.ts b/apps/builder/contexts/TypebotContext/actions/blocks.ts
@@ -6,6 +6,7 @@ import {
   Block,
   DraggableStep,
   DraggableStepType,
+  IntegrationStepType,
   StepIndices,
   Typebot,
 } from 'models'
@@ -65,7 +66,11 @@ const blocksActions = (setTypebot: SetTypebot): BlocksActions => ({
           ...block,
           title: `${block.title} copy`,
           id,
-          steps: block.steps.map((s) => ({ ...s, blockId: id })),
+          steps: block.steps.map((s) =>
+            s.type === IntegrationStepType.WEBHOOK
+              ? { ...s, blockId: id, id: cuid(), webhookId: cuid() }
+              : { ...s, blockId: id, id: cuid() }
+          ),
           graphCoordinates: {
             x: block.graphCoordinates.x + 200,
             y: block.graphCoordinates.y + 100,

diff --git a/apps/builder/contexts/TypebotContext/actions/steps.ts b/apps/builder/contexts/TypebotContext/actions/steps.ts
@@ -4,6 +4,7 @@ import {
   DraggableStep,
   DraggableStepType,
   StepIndices,
+  IntegrationStepType,
 } from 'models'
 import { parseNewStep } from 'services/typebots/typebots'
 import { removeEmptyBlocks } from './blocks'
@@ -54,10 +55,17 @@ const stepsAction = (setTypebot: SetTypebot): StepsActions => ({
       produce(typebot, (typebot) => {
         const step = typebot.blocks[blockIndex].steps[stepIndex]
         const id = cuid()
-        const newStep: Step = {
-          ...step,
-          id,
-        }
+        const newStep: Step =
+          step.type === IntegrationStepType.WEBHOOK
+            ? {
+                ...step,
+                id,
+                webhookId: cuid(),
+              }
+            : {
+                ...step,
+                id,
+              }
         typebot.blocks[blockIndex].steps.splice(stepIndex + 1, 0, newStep)
       })
     ),