fix merge conflicts, make arguments more consistent

packages/builder/src/builderStore/store/automation/index.js

@@ -78,11 +78,11 @@ const automationActions = store => ({
       return state
     })
   },
-  trigger: async ({ automation }) => {
+  trigger: async automation => {
     const { _id } = automation
     return await api.post(`/api/automations/${_id}/trigger`)
   },
-  test: async ({ automation }, testData) => {
+  test: async (automation, testData) => {
     const { _id } = automation
     const response = await api.post(`/api/automations/${_id}/test`, testData)
     const json = await response.json()

packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte

@@ -38,10 +38,9 @@
       actionVal
     )
     automationStore.actions.addBlockToAutomation(newBlock)
-    await automationStore.actions.save({
+    await automationStore.actions.save(
-      instanceId,
+      $automationStore.selectedAutomation?.automation
-      automation: $automationStore.selectedAutomation?.automation,
+    )
-    })
   }
 </script>
 

packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte

@@ -32,16 +32,15 @@
   }
 
   async function deleteAutomation() {
-    await automationStore.actions.delete({
+    await automationStore.actions.delete(
-      instanceId,
+      $automationStore.selectedAutomation?.automation
-      automation: $automationStore.selectedAutomation?.automation,
+    )
-    })
   }
 
   async function testAutomation() {
-    const result = await automationStore.actions.trigger({
+    const result = await automationStore.actions.trigger(
-      automation: $automationStore.selectedAutomation.automation,
+      $automationStore.selectedAutomation.automation
-    })
+    )
     if (result.status === 200) {
       notifications.success(
         `Automation ${$automationStore.selectedAutomation.automation.name} triggered successfully.`

packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte

@@ -52,10 +52,9 @@
 
   async function deleteStep() {
     automationStore.actions.deleteAutomationBlock(block)
-    await automationStore.actions.save({
+    await automationStore.actions.save(
-      instanceId,
+      $automationStore.selectedAutomation?.automation
-      automation: $automationStore.selectedAutomation?.automation,
+    )
-    })
   }
 </script>
 

packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte

@@ -42,7 +42,10 @@
   disabled={isError}
   onConfirm={() => {
     automationStore.actions.addTestDataToAutomation(testData)
-    automationStore.actions.test($automationStore.selectedAutomation, testData)
+    automationStore.actions.test(
+      $automationStore.selectedAutomation?.automation,
+      testData
+    )
   }}
   cancelText="Cancel"
 >

packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte

@@ -29,10 +29,9 @@
       webhookModal.show
     }
 
-    await automationStore.actions.save({
+    await automationStore.actions.save(
-      instanceId,
+      $automationStore.selectedAutomation?.automation
-      automation: $automationStore.selectedAutomation?.automation,
+    )
-    })
 
     notifications.success(`Automation ${name} created.`)
 

packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte

@@ -56,10 +56,9 @@
         testData[key] = e.detail
       } else {
         block.inputs[key] = e.detail
-        await automationStore.actions.save({
+        await automationStore.actions.save(
-          instanceId,
+          $automationStore.selectedAutomation?.automation
-          automation: $automationStore.selectedAutomation?.automation,
+        )
-        })
       }
     },
     isTestModal ? 0 : 800

packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventPropertyControl.svelte

@@ -46,7 +46,9 @@
     }
 
     automationStore.actions.addBlockToAutomation(newBlock)
-    await automationStore.actions.save($automationStore.selectedAutomation)
+    await automationStore.actions.save(
+      $automationStore.selectedAutomation?.automation
+    )
     parameters.automationId = $automationStore.selectedAutomation.automation._id
     delete parameters.newAutomationName
   }