From d11f8fed59c308e614a1d68ba0f155b984dc6351 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Mon, 11 Oct 2021 11:10:26 +0100
Subject: [PATCH 1/3] fix issue where automation block was not being added in
 the correct order

---
 .../AutomationBuilder/FlowChart/ActionModal.svelte        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
index acb945a96a..b076a8da86 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
@@ -4,10 +4,11 @@
   import { externalActions } from "./ExternalActions"
 
   export let blockIdx
+  export let blockComplete
+
   let selectedAction
   let actionVal
   let actions = Object.entries($automationStore.blockDefinitions.ACTION)
-  export let blockComplete
 
   const external = actions.reduce((acc, elm) => {
     const [k, v] = elm
@@ -36,10 +37,9 @@
       actionVal.stepId,
       actionVal
     )
-    automationStore.actions.addBlockToAutomation(newBlock)
+    automationStore.actions.addBlockToAutomation(newBlock, blockIdx + 1)
     await automationStore.actions.save(
-      $automationStore.selectedAutomation?.automation,
-      blockIdx
+      $automationStore.selectedAutomation?.automation
     )
   }
 </script>

From 47adf12a4a35f5325fad47b65eeb5ad5aaa6243a Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Mon, 11 Oct 2021 11:33:54 +0100
Subject: [PATCH 2/3] fix lint

---
 packages/builder/cypress/support/commands.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index c8e01435aa..f179a24729 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -5,7 +5,7 @@
 // ***********************************************
 //
 
-Cypress.on('uncaught:exception', (err, runnable) => {
+Cypress.on("uncaught:exception", () => {
   return false
 })
 

From 8b97588851154069a37af82687d1676ed28aae5c Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Mon, 11 Oct 2021 11:35:07 +0100
Subject: [PATCH 3/3] enable 'add action' button when inputs completed

---
 .../automation/AutomationBuilder/FlowChart/FlowItem.svelte      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
index 0c0b79c3de..e69f5ec204 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
@@ -151,7 +151,7 @@
             >
           {/if}
           <Button
-            disabled={disableAddButton ? true : !hasCompletedInputs}
+            disabled={!hasCompletedInputs}
             on:click={() => {
               setupToggled = false
               actionModal.show()