From 9b66b309695939c09254ef8b4502506e23f0f671 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 9 May 2023 12:04:16 +0100
Subject: [PATCH 01/35] add property to denote if step can be looped

---
 packages/server/src/automations/steps/bash.ts            | 1 +
 packages/server/src/automations/steps/createRow.ts       | 1 +
 packages/server/src/automations/steps/delay.ts           | 1 +
 packages/server/src/automations/steps/deleteRow.ts       | 1 +
 packages/server/src/automations/steps/discord.ts         | 1 +
 packages/server/src/automations/steps/executeQuery.ts    | 1 +
 packages/server/src/automations/steps/executeScript.ts   | 1 +
 packages/server/src/automations/steps/filter.ts          | 1 +
 packages/server/src/automations/steps/integromat.ts      | 1 +
 packages/server/src/automations/steps/loop.ts            | 2 ++
 packages/server/src/automations/steps/outgoingWebhook.ts | 1 +
 packages/server/src/automations/steps/queryRows.ts       | 1 +
 packages/server/src/automations/steps/sendSmtpEmail.ts   | 1 +
 packages/server/src/automations/steps/serverLog.ts       | 1 +
 packages/server/src/automations/steps/slack.ts           | 1 +
 packages/server/src/automations/steps/updateRow.ts       | 1 +
 packages/server/src/automations/steps/zapier.ts          | 1 +
 17 files changed, 18 insertions(+)

diff --git a/packages/server/src/automations/steps/bash.ts b/packages/server/src/automations/steps/bash.ts
index 820d0329db..de1f43a907 100644
--- a/packages/server/src/automations/steps/bash.ts
+++ b/packages/server/src/automations/steps/bash.ts
@@ -18,6 +18,7 @@ export const definition: AutomationStepSchema = {
   description: "Run a bash script",
   type: AutomationStepType.ACTION,
   internal: true,
+  canLoop: true,
   stepId: AutomationActionStepId.EXECUTE_BASH,
   inputs: {},
   schema: {
diff --git a/packages/server/src/automations/steps/createRow.ts b/packages/server/src/automations/steps/createRow.ts
index dac929f1ee..027012338b 100644
--- a/packages/server/src/automations/steps/createRow.ts
+++ b/packages/server/src/automations/steps/createRow.ts
@@ -17,6 +17,7 @@ export const definition: AutomationStepSchema = {
   description: "Add a row to your database",
   type: AutomationStepType.ACTION,
   internal: true,
+  canLoop: true,
   stepId: AutomationActionStepId.CREATE_ROW,
   inputs: {},
   schema: {
diff --git a/packages/server/src/automations/steps/delay.ts b/packages/server/src/automations/steps/delay.ts
index 9cf578805c..736e392821 100644
--- a/packages/server/src/automations/steps/delay.ts
+++ b/packages/server/src/automations/steps/delay.ts
@@ -14,6 +14,7 @@ export const definition: AutomationStepSchema = {
   description: "Delay the automation until an amount of time has passed",
   stepId: AutomationActionStepId.DELAY,
   internal: true,
+  canLoop: false,
   inputs: {},
   schema: {
     inputs: {
diff --git a/packages/server/src/automations/steps/deleteRow.ts b/packages/server/src/automations/steps/deleteRow.ts
index 86c7703491..6b830a3eab 100644
--- a/packages/server/src/automations/steps/deleteRow.ts
+++ b/packages/server/src/automations/steps/deleteRow.ts
@@ -18,6 +18,7 @@ export const definition: AutomationStepSchema = {
   type: AutomationStepType.ACTION,
   stepId: AutomationActionStepId.DELETE_ROW,
   internal: true,
+  canLoop: true,
   inputs: {},
   schema: {
     inputs: {
diff --git a/packages/server/src/automations/steps/discord.ts b/packages/server/src/automations/steps/discord.ts
index c46220c3b2..165f1a6d04 100644
--- a/packages/server/src/automations/steps/discord.ts
+++ b/packages/server/src/automations/steps/discord.ts
@@ -19,6 +19,7 @@ export const definition: AutomationStepSchema = {
   stepId: AutomationActionStepId.discord,
   type: AutomationStepType.ACTION,
   internal: false,
+  canLoop: true,
   inputs: {},
   schema: {
     inputs: {
diff --git a/packages/server/src/automations/steps/executeQuery.ts b/packages/server/src/automations/steps/executeQuery.ts
index 4969400552..b63d894f5c 100644
--- a/packages/server/src/automations/steps/executeQuery.ts
+++ b/packages/server/src/automations/steps/executeQuery.ts
@@ -18,6 +18,7 @@ export const definition: AutomationStepSchema = {
   type: AutomationStepType.ACTION,
   stepId: AutomationActionStepId.EXECUTE_QUERY,
   internal: true,
+  canLoop: true,
   inputs: {},
   schema: {
     inputs: {
diff --git a/packages/server/src/automations/steps/executeScript.ts b/packages/server/src/automations/steps/executeScript.ts
index 9bd0eaed18..d0bb500cf1 100644
--- a/packages/server/src/automations/steps/executeScript.ts
+++ b/packages/server/src/automations/steps/executeScript.ts
@@ -19,6 +19,7 @@ export const definition: AutomationStepSchema = {
   internal: true,
   stepId: AutomationActionStepId.EXECUTE_SCRIPT,
   inputs: {},
+  canLoop: true,
   schema: {
     inputs: {
       properties: {
diff --git a/packages/server/src/automations/steps/filter.ts b/packages/server/src/automations/steps/filter.ts
index c7ab4210ec..f457492fc3 100644
--- a/packages/server/src/automations/steps/filter.ts
+++ b/packages/server/src/automations/steps/filter.ts
@@ -28,6 +28,7 @@ export const definition: AutomationStepSchema = {
     "Conditionally halt automations which do not meet certain conditions",
   type: AutomationStepType.LOGIC,
   internal: true,
+  canLoop: false,
   stepId: AutomationActionStepId.FILTER,
   inputs: {
     condition: FilterConditions.EQUAL,
diff --git a/packages/server/src/automations/steps/integromat.ts b/packages/server/src/automations/steps/integromat.ts
index d7c78a6dd8..45d659d0c7 100644
--- a/packages/server/src/automations/steps/integromat.ts
+++ b/packages/server/src/automations/steps/integromat.ts
@@ -17,6 +17,7 @@ export const definition: AutomationStepSchema = {
   stepId: AutomationActionStepId.integromat,
   type: AutomationStepType.ACTION,
   internal: false,
+  canLoop: true,
   inputs: {},
   schema: {
     inputs: {
diff --git a/packages/server/src/automations/steps/loop.ts b/packages/server/src/automations/steps/loop.ts
index fdbec83f2e..f646492ee7 100644
--- a/packages/server/src/automations/steps/loop.ts
+++ b/packages/server/src/automations/steps/loop.ts
@@ -13,6 +13,8 @@ export const definition: AutomationStepSchema = {
   description: "Loop",
   stepId: AutomationActionStepId.LOOP,
   internal: true,
+  canLoop: false,
+
   inputs: {},
   schema: {
     inputs: {
diff --git a/packages/server/src/automations/steps/outgoingWebhook.ts b/packages/server/src/automations/steps/outgoingWebhook.ts
index f174935195..acdf60d869 100644
--- a/packages/server/src/automations/steps/outgoingWebhook.ts
+++ b/packages/server/src/automations/steps/outgoingWebhook.ts
@@ -32,6 +32,7 @@ export const definition: AutomationStepSchema = {
   description: "Send a request of specified method to a URL",
   type: AutomationStepType.ACTION,
   internal: true,
+  canLoop: true,
   stepId: AutomationActionStepId.OUTGOING_WEBHOOK,
   inputs: {
     requestMethod: "POST",
diff --git a/packages/server/src/automations/steps/queryRows.ts b/packages/server/src/automations/steps/queryRows.ts
index 1d7e8a419e..f3ab298e55 100644
--- a/packages/server/src/automations/steps/queryRows.ts
+++ b/packages/server/src/automations/steps/queryRows.ts
@@ -42,6 +42,7 @@ export const definition: AutomationStepSchema = {
   type: AutomationStepType.ACTION,
   stepId: AutomationActionStepId.QUERY_ROWS,
   internal: true,
+  canLoop: true,
   inputs: {},
   schema: {
     inputs: {
diff --git a/packages/server/src/automations/steps/sendSmtpEmail.ts b/packages/server/src/automations/steps/sendSmtpEmail.ts
index c4af9aeaa9..fc88ee721b 100644
--- a/packages/server/src/automations/steps/sendSmtpEmail.ts
+++ b/packages/server/src/automations/steps/sendSmtpEmail.ts
@@ -15,6 +15,7 @@ export const definition: AutomationStepSchema = {
   name: "Send Email (SMTP)",
   type: AutomationStepType.ACTION,
   internal: true,
+  canLoop: true,
   stepId: AutomationActionStepId.SEND_EMAIL_SMTP,
   inputs: {},
   schema: {
diff --git a/packages/server/src/automations/steps/serverLog.ts b/packages/server/src/automations/steps/serverLog.ts
index 382f7d4efc..241d71a220 100644
--- a/packages/server/src/automations/steps/serverLog.ts
+++ b/packages/server/src/automations/steps/serverLog.ts
@@ -19,6 +19,7 @@ export const definition: AutomationStepSchema = {
   description: "Logs the given text to the server (using console.log)",
   type: AutomationStepType.ACTION,
   internal: true,
+  canLoop: true,
   stepId: AutomationActionStepId.SERVER_LOG,
   inputs: {
     text: "",
diff --git a/packages/server/src/automations/steps/slack.ts b/packages/server/src/automations/steps/slack.ts
index 21ee6ed742..ec08f60e5a 100644
--- a/packages/server/src/automations/steps/slack.ts
+++ b/packages/server/src/automations/steps/slack.ts
@@ -16,6 +16,7 @@ export const definition: AutomationStepSchema = {
   stepId: AutomationActionStepId.slack,
   type: AutomationStepType.ACTION,
   internal: false,
+  canLoop: true,
   inputs: {},
   schema: {
     inputs: {
diff --git a/packages/server/src/automations/steps/updateRow.ts b/packages/server/src/automations/steps/updateRow.ts
index 96ab1d1642..4b3457961b 100644
--- a/packages/server/src/automations/steps/updateRow.ts
+++ b/packages/server/src/automations/steps/updateRow.ts
@@ -17,6 +17,7 @@ export const definition: AutomationStepSchema = {
   description: "Update a row in your database",
   type: AutomationStepType.ACTION,
   internal: true,
+  canLoop: true,
   stepId: AutomationActionStepId.UPDATE_ROW,
   inputs: {},
   schema: {
diff --git a/packages/server/src/automations/steps/zapier.ts b/packages/server/src/automations/steps/zapier.ts
index 75a21deaae..dcb3947f1d 100644
--- a/packages/server/src/automations/steps/zapier.ts
+++ b/packages/server/src/automations/steps/zapier.ts
@@ -13,6 +13,7 @@ export const definition: AutomationStepSchema = {
   stepId: AutomationActionStepId.zapier,
   type: AutomationStepType.ACTION,
   internal: false,
+  canLoop: true,
   description: "Trigger a Zapier Zap via webhooks",
   tagline: "Trigger a Zapier Zap",
   icon: "ri-flashlight-line",

From ac57a849ce23fd8c389aa04b424378755cac1f4e Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 9 May 2023 12:04:32 +0100
Subject: [PATCH 02/35] add collect bloc definition

---
 .../server/src/automations/steps/collect.ts   | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 packages/server/src/automations/steps/collect.ts

diff --git a/packages/server/src/automations/steps/collect.ts b/packages/server/src/automations/steps/collect.ts
new file mode 100644
index 0000000000..1083c2a216
--- /dev/null
+++ b/packages/server/src/automations/steps/collect.ts
@@ -0,0 +1,53 @@
+import {
+  AutomationActionStepId,
+  AutomationStepSchema,
+  AutomationStepInput,
+  AutomationStepType,
+  AutomationIOType,
+} from "@budibase/types"
+
+export const definition: AutomationStepSchema = {
+  name: "Collect Data",
+  tagline: "Collect data to be sent to design",
+  icon: "Collection",
+  description:
+    "Collects specified data so it can be provided to the design section",
+  type: AutomationStepType.ACTION,
+  internal: true,
+  canLoop: false,
+  stepId: AutomationActionStepId.COLLECT,
+  inputs: {
+    text: "",
+  },
+  schema: {
+    inputs: {
+      properties: {
+        collection: {
+          type: AutomationIOType.STRING,
+          title: "What to Collect",
+        },
+      },
+      required: ["text"],
+    },
+    outputs: {
+      properties: {
+        success: {
+          type: AutomationIOType.BOOLEAN,
+          description: "Whether the action was successful",
+        },
+        value: {
+          type: AutomationIOType.STRING,
+          description: "Collected data",
+        },
+      },
+      required: ["success", "value"],
+    },
+  },
+}
+
+export async function run({ inputs }: AutomationStepInput) {
+  return {
+    success: true,
+    value: inputs.collection,
+  }
+}

From 1539bf234be9ff42c5882c4fb11149c2ccb0c8ca Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 9 May 2023 12:10:20 +0100
Subject: [PATCH 03/35] add ability to trigger synchronous automation from
 button action

---
 .../FlowChart/ActionModal.svelte              |  1 -
 .../FlowChart/FlowItem.svelte                 |  2 +-
 .../ButtonActionDrawer.svelte                 | 30 +++++++++++--
 .../actions/TriggerAutomation.svelte          | 43 ++++++++++++++++++-
 .../controls/ButtonActionEditor/manifest.json |  8 +++-
 packages/client/src/utils/buttonActions.js    | 24 +++++++----
 packages/frontend-core/src/api/automations.js |  7 +++
 .../server/src/api/controllers/automation.ts  | 25 ++++++++++-
 packages/server/src/api/routes/automation.ts  | 11 +++++
 packages/server/src/automations/actions.ts    |  3 ++
 .../types/src/documents/app/automation.ts     |  2 +
 11 files changed, 139 insertions(+), 17 deletions(-)

diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
index 3a85c7ed56..73394f5b90 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
@@ -48,7 +48,6 @@
     }
     return acc
   }, {})
-  console.log(plugins)
 
   const selectAction = action => {
     actionVal = action
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
index 7484a60502..9730c03ef3 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
@@ -184,7 +184,7 @@
         {#if !isTrigger}
           <div>
             <div class="block-options">
-              {#if !loopBlock}
+              {#if block?.canLoop}
                 <ActionButton on:click={() => addLooping()} icon="Reuse">
                   Add Looping
                 </ActionButton>
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte
index 8f2c286261..3228c1402d 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte
@@ -126,8 +126,7 @@
   }
 
   const getAllBindings = (bindings, eventContextBindings, actions) => {
-    let allBindings = eventContextBindings.concat(bindings)
-
+    let allBindings = []
     if (!actions) {
       return []
     }
@@ -145,14 +144,37 @@
       .forEach(action => {
         // Check we have a binding for this action, and generate one if not
         const stateBinding = makeStateBinding(action.parameters.key)
-        const hasKey = allBindings.some(binding => {
+        const hasKey = bindings.some(binding => {
           return binding.runtimeBinding === stateBinding.runtimeBinding
         })
         if (!hasKey) {
-          allBindings.push(stateBinding)
+          bindings.push(stateBinding)
         }
       })
 
+    // Get which indexes are asynchronous automations as we want to filter them out from the bindings
+    const asynchronousAutomationIndexes = actions
+      .map((action, index) => {
+        if (
+          action[EVENT_TYPE_KEY] === "Trigger Automation" &&
+          !action.parameters?.synchronous
+        ) {
+          return index
+        }
+      })
+      .filter(index => index !== undefined)
+
+    // Based on the above, filter out the asynchronous automations from the bindings
+    if (asynchronousAutomationIndexes) {
+      allBindings = eventContextBindings
+        .filter((binding, index) => {
+          return !asynchronousAutomationIndexes.includes(index)
+        })
+        .concat(bindings)
+    } else {
+      allBindings = eventContextBindings.concat(bindings)
+    }
+
     return allBindings
   }
 </script>
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
index a2ffb144c0..aa617ab9a3 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
@@ -1,12 +1,15 @@
 <script>
-  import { Select, Label, Input, Checkbox } from "@budibase/bbui"
+  import { Select, Label, Input, Checkbox, Icon } from "@budibase/bbui"
   import { automationStore } from "builderStore"
   import SaveFields from "./SaveFields.svelte"
   import { TriggerStepID } from "constants/backend/automations"
+  import { AutomationActionStepId } from "../../../../../../../../types/src/documents"
 
   export let parameters = {}
   export let bindings = []
 
+  let synchronous = parameters.synchronous
+
   const AUTOMATION_STATUS = {
     NEW: "new",
     EXISTING: "existing",
@@ -16,6 +19,11 @@
     ? AUTOMATION_STATUS.EXISTING
     : AUTOMATION_STATUS.NEW
 
+  $: {
+    if (automationStatus === AUTOMATION_STATUS.NEW) {
+      synchronous = false
+    }
+  }
   $: automations = $automationStore.automations
     .filter(a => a.definition.trigger?.stepId === TriggerStepID.APP)
     .map(automation => {
@@ -23,10 +31,15 @@
         automation.definition.trigger.inputs.fields || {}
       ).map(([name, type]) => ({ name, type }))
 
+      let hasCollectBlock = automation.definition.steps.some(
+        step => step.stepId === AutomationActionStepId.COLLECT
+      )
+
       return {
         name: automation.name,
         _id: automation._id,
         schema,
+        synchronous: hasCollectBlock,
       }
     })
   $: hasAutomations = automations && automations.length > 0
@@ -57,6 +70,15 @@
     parameters.fields = {}
     parameters.automationId = automations[0]?._id
   }
+
+  const onChange = value => {
+    let automationId = value.detail
+    synchronous = automations.find(
+      automation => automation._id === automationId
+    ).synchronous
+    parameters.automationId = automationId
+    parameters.synchronous = synchronous
+  }
 </script>
 
 <div class="root">
@@ -85,6 +107,7 @@
 
     {#if automationStatus === AUTOMATION_STATUS.EXISTING}
       <Select
+        on:change={onChange}
         bind:value={parameters.automationId}
         placeholder="Choose automation"
         options={automations}
@@ -98,6 +121,19 @@
       />
     {/if}
 
+    {#if synchronous}
+      <Label small />
+
+      <div class="synchronous-info">
+        <Icon name="Info" />
+        <div>
+          <i
+            >This automation will run synchronously due to the existence of a
+            Collect block</i
+          >
+        </div>
+      </div>
+    {/if}
     <Label small />
     <Checkbox
       text="Do not display default notification"
@@ -142,6 +178,11 @@
     align-items: center;
   }
 
+  .synchronous-info {
+    display: flex;
+    gap: var(--spacing-s);
+  }
+
   .fields {
     margin-top: var(--spacing-l);
     display: grid;
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/manifest.json b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/manifest.json
index 97ac9aa0b6..bb21116213 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/manifest.json
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/manifest.json
@@ -57,7 +57,13 @@
     {
       "name": "Trigger Automation",
       "type": "application",
-      "component": "TriggerAutomation"
+      "component": "TriggerAutomation",
+      "context": [
+        {
+          "label": "Automation Result",
+          "value": "result"
+        }
+      ]
     },
     {
       "name": "Update Field Value",
diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js
index 895584b782..7b1e286b31 100644
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@@ -122,15 +122,24 @@ const deleteRowHandler = async action => {
 }
 
 const triggerAutomationHandler = async action => {
-  const { fields, notificationOverride } = action.parameters
+  const { fields, notificationOverride, synchronous } = action.parameters
   if (fields) {
     try {
-      await API.triggerAutomation({
-        automationId: action.parameters.automationId,
-        fields,
-      })
-      if (!notificationOverride) {
-        notificationStore.actions.success("Automation triggered")
+      if (synchronous) {
+        const result = await API.triggerSynchronousAutomation({
+          automationId: action.parameters.automationId,
+          fields,
+        })
+        console.log(typeof result)
+        return { result }
+      } else {
+        await API.triggerAutomation({
+          automationId: action.parameters.automationId,
+          fields,
+        })
+        if (!notificationOverride) {
+          notificationStore.actions.success("Automation triggered")
+        }
       }
     } catch (error) {
       // Abort next actions
@@ -138,7 +147,6 @@ const triggerAutomationHandler = async action => {
     }
   }
 }
-
 const navigationHandler = action => {
   const { url, peek, externalNewTab } = action.parameters
   routeStore.actions.navigate(url, peek, externalNewTab)
diff --git a/packages/frontend-core/src/api/automations.js b/packages/frontend-core/src/api/automations.js
index c0b770a1c2..12fdf6c926 100644
--- a/packages/frontend-core/src/api/automations.js
+++ b/packages/frontend-core/src/api/automations.js
@@ -11,6 +11,13 @@ export const buildAutomationEndpoints = API => ({
     })
   },
 
+  triggerSynchronousAutomation: async ({ automationId, fields }) => {
+    return await API.post({
+      url: `/api/automations/${automationId}/triggerSynchronous`,
+      body: { fields },
+    })
+  },
+
   /**
    * Tests an automation with data.
    * @param automationId the ID of the automation to test
diff --git a/packages/server/src/api/controllers/automation.ts b/packages/server/src/api/controllers/automation.ts
index ae49cd83f1..2f56179ac0 100644
--- a/packages/server/src/api/controllers/automation.ts
+++ b/packages/server/src/api/controllers/automation.ts
@@ -15,7 +15,12 @@ import { MetadataTypes } from "../../constants"
 import { setTestFlag, clearTestFlag } from "../../utilities/redis"
 import { context, cache, events } from "@budibase/backend-core"
 import { automations } from "@budibase/pro"
-import { Automation, BBContext } from "@budibase/types"
+import {
+  Automation,
+  AutomationActionStepId,
+  AutomationResults,
+  BBContext,
+} from "@budibase/types"
 import { getActionDefinitions as actionDefs } from "../../automations/actions"
 
 async function getActionDefinitions() {
@@ -267,6 +272,24 @@ export async function trigger(ctx: BBContext) {
   }
 }
 
+export async function triggerSynchronous(ctx: BBContext) {
+  const db = context.getAppDB()
+  let automation = await db.get(ctx.params.id)
+  const response: AutomationResults = await triggers.externalTrigger(
+    automation,
+    {
+      ...ctx.request.body,
+      appId: ctx.appId,
+    },
+    { getResponses: true }
+  )
+
+  let collectedValue = response.steps.find(
+    step => step.stepId === AutomationActionStepId.COLLECT
+  )
+  ctx.body = collectedValue?.outputs
+}
+
 function prepareTestInput(input: any) {
   // prepare the test parameters
   if (input.id && input.row) {
diff --git a/packages/server/src/api/routes/automation.ts b/packages/server/src/api/routes/automation.ts
index cb8b6042ae..9c0ce13c48 100644
--- a/packages/server/src/api/routes/automation.ts
+++ b/packages/server/src/api/routes/automation.ts
@@ -73,6 +73,17 @@ router
     ),
     controller.trigger
   )
+  .post(
+    "/api/automations/:id/triggerSynchronous",
+    appInfoMiddleware({ appType: AppType.PROD }),
+    paramResource("id"),
+    authorized(
+      permissions.PermissionType.AUTOMATION,
+      permissions.PermissionLevel.EXECUTE
+    ),
+    controller.triggerSynchronous
+  )
+
   .post(
     "/api/automations/:id/test",
     appInfoMiddleware({ appType: AppType.DEV }),
diff --git a/packages/server/src/automations/actions.ts b/packages/server/src/automations/actions.ts
index 2a6b760725..8882b5fb92 100644
--- a/packages/server/src/automations/actions.ts
+++ b/packages/server/src/automations/actions.ts
@@ -14,6 +14,7 @@ import * as filter from "./steps/filter"
 import * as delay from "./steps/delay"
 import * as queryRow from "./steps/queryRows"
 import * as loop from "./steps/loop"
+import * as collect from "./steps/collect"
 import env from "../environment"
 import {
   AutomationStepSchema,
@@ -39,6 +40,7 @@ const ACTION_IMPLS: Record<
   DELAY: delay.run,
   FILTER: filter.run,
   QUERY_ROWS: queryRow.run,
+  COLLECT: collect.run,
   // these used to be lowercase step IDs, maintain for backwards compat
   discord: discord.run,
   slack: slack.run,
@@ -59,6 +61,7 @@ export const BUILTIN_ACTION_DEFINITIONS: Record<string, AutomationStepSchema> =
     FILTER: filter.definition,
     QUERY_ROWS: queryRow.definition,
     LOOP: loop.definition,
+    COLLECT: collect.definition,
     // these used to be lowercase step IDs, maintain for backwards compat
     discord: discord.definition,
     slack: slack.definition,
diff --git a/packages/types/src/documents/app/automation.ts b/packages/types/src/documents/app/automation.ts
index aa600c6375..6d3b8ae1a9 100644
--- a/packages/types/src/documents/app/automation.ts
+++ b/packages/types/src/documents/app/automation.ts
@@ -56,6 +56,7 @@ export enum AutomationActionStepId {
   FILTER = "FILTER",
   QUERY_ROWS = "QUERY_ROWS",
   LOOP = "LOOP",
+  COLLECT = "COLLECT",
   // these used to be lowercase step IDs, maintain for backwards compat
   discord = "discord",
   slack = "slack",
@@ -120,6 +121,7 @@ export interface AutomationStepSchema {
     outputs: InputOutputBlock
   }
   custom?: boolean
+  canLoop?: boolean
 }
 
 export interface AutomationStep extends AutomationStepSchema {

From dcfb65b92d6116e9ca9fd36c3ce551fcc08b69e1 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 12 May 2023 15:56:24 +0100
Subject: [PATCH 04/35] sync / async automations go through one endpoint

---
 .../actions/TriggerAutomation.svelte          | 21 ++++++++
 packages/client/src/utils/buttonActions.js    | 27 +++++-----
 packages/frontend-core/src/api/automations.js | 11 +----
 .../server/src/api/controllers/automation.ts  | 49 ++++++++++---------
 packages/server/src/api/routes/automation.ts  | 11 -----
 packages/server/src/automations/triggers.ts   |  4 +-
 packages/server/src/automations/utils.ts      |  7 ++-
 7 files changed, 68 insertions(+), 62 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
index aa617ab9a3..ecbb5a9a31 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
@@ -23,6 +23,12 @@
     if (automationStatus === AUTOMATION_STATUS.NEW) {
       synchronous = false
     }
+
+    if (automationStatus === AUTOMATION_STATUS.EXISTING) {
+      synchronous = automations.find(
+        automation => automation._id === parameters.automationId
+      ).synchronous
+    }
   }
   $: automations = $automationStore.automations
     .filter(a => a.definition.trigger?.stepId === TriggerStepID.APP)
@@ -79,6 +85,8 @@
     parameters.automationId = automationId
     parameters.synchronous = synchronous
   }
+
+  $: error = parameters.timeout > 120 ? "Timeout must be less than 120s" : null
 </script>
 
 <div class="root">
@@ -133,6 +141,16 @@
           >
         </div>
       </div>
+      <Label small />
+
+      <div class="timeout-width">
+        <Input
+          label="Timeout in seconds (120 max)"
+          type="number"
+          {error}
+          bind:value={parameters.timeout}
+        />
+      </div>
     {/if}
     <Label small />
     <Checkbox
@@ -169,6 +187,9 @@
     max-width: 800px;
     margin: 0 auto;
   }
+  .timeout-width {
+    width: 30%;
+  }
 
   .params {
     display: grid;
diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js
index 54cdfa1fab..0280cd1d54 100644
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@@ -122,24 +122,21 @@ const deleteRowHandler = async action => {
 }
 
 const triggerAutomationHandler = async action => {
-  const { fields, notificationOverride, synchronous } = action.parameters
+  const { fields, notificationOverride, timeout } = action.parameters
   if (fields) {
     try {
-      if (synchronous) {
-        const result = await API.triggerSynchronousAutomation({
-          automationId: action.parameters.automationId,
-          fields,
-        })
-        console.log(typeof result)
+      const result = await API.triggerAutomation({
+        automationId: action.parameters.automationId,
+        fields,
+        timeout,
+      })
+      if (!notificationOverride) {
+        notificationStore.actions.success("Automation triggered")
+      }
+
+      // Value will exist if automation is synchronous, so return it.
+      if (result.value) {
         return { result }
-      } else {
-        await API.triggerAutomation({
-          automationId: action.parameters.automationId,
-          fields,
-        })
-        if (!notificationOverride) {
-          notificationStore.actions.success("Automation triggered")
-        }
       }
     } catch (error) {
       // Abort next actions
diff --git a/packages/frontend-core/src/api/automations.js b/packages/frontend-core/src/api/automations.js
index 12fdf6c926..37a834cf04 100644
--- a/packages/frontend-core/src/api/automations.js
+++ b/packages/frontend-core/src/api/automations.js
@@ -4,17 +4,10 @@ export const buildAutomationEndpoints = API => ({
    * @param automationId the ID of the automation to trigger
    * @param fields the fields to trigger the automation with
    */
-  triggerAutomation: async ({ automationId, fields }) => {
+  triggerAutomation: async ({ automationId, fields, timeout }) => {
     return await API.post({
       url: `/api/automations/${automationId}/trigger`,
-      body: { fields },
-    })
-  },
-
-  triggerSynchronousAutomation: async ({ automationId, fields }) => {
-    return await API.post({
-      url: `/api/automations/${automationId}/triggerSynchronous`,
-      body: { fields },
+      body: { fields, timeout },
     })
   },
 
diff --git a/packages/server/src/api/controllers/automation.ts b/packages/server/src/api/controllers/automation.ts
index 2f56179ac0..dccab86156 100644
--- a/packages/server/src/api/controllers/automation.ts
+++ b/packages/server/src/api/controllers/automation.ts
@@ -19,6 +19,7 @@ import {
   Automation,
   AutomationActionStepId,
   AutomationResults,
+  AutomationStepType,
   BBContext,
 } from "@budibase/types"
 import { getActionDefinitions as actionDefs } from "../../automations/actions"
@@ -262,32 +263,34 @@ export async function getDefinitionList(ctx: BBContext) {
 export async function trigger(ctx: BBContext) {
   const db = context.getAppDB()
   let automation = await db.get(ctx.params.id)
-  await triggers.externalTrigger(automation, {
-    ...ctx.request.body,
-    appId: ctx.appId,
-  })
-  ctx.body = {
-    message: `Automation ${automation._id} has been triggered.`,
-    automation,
-  }
-}
 
-export async function triggerSynchronous(ctx: BBContext) {
-  const db = context.getAppDB()
-  let automation = await db.get(ctx.params.id)
-  const response: AutomationResults = await triggers.externalTrigger(
-    automation,
-    {
+  let hasCollectBlock = automation.definition.steps.some(
+    (step: any) => step.stepId === AutomationActionStepId.COLLECT
+  )
+  if (hasCollectBlock) {
+    const response: AutomationResults = await triggers.externalTrigger(
+      automation,
+      {
+        fields: ctx.request.body.fields,
+        timeout: ctx.request.body.timeout || 120000,
+      },
+      { getResponses: true }
+    )
+
+    let collectedValue = response.steps.find(
+      step => step.stepId === AutomationActionStepId.COLLECT
+    )
+    ctx.body = collectedValue?.outputs
+  } else {
+    await triggers.externalTrigger(automation, {
       ...ctx.request.body,
       appId: ctx.appId,
-    },
-    { getResponses: true }
-  )
-
-  let collectedValue = response.steps.find(
-    step => step.stepId === AutomationActionStepId.COLLECT
-  )
-  ctx.body = collectedValue?.outputs
+    })
+    ctx.body = {
+      message: `Automation ${automation._id} has been triggered.`,
+      automation,
+    }
+  }
 }
 
 function prepareTestInput(input: any) {
diff --git a/packages/server/src/api/routes/automation.ts b/packages/server/src/api/routes/automation.ts
index 9c0ce13c48..cb8b6042ae 100644
--- a/packages/server/src/api/routes/automation.ts
+++ b/packages/server/src/api/routes/automation.ts
@@ -73,17 +73,6 @@ router
     ),
     controller.trigger
   )
-  .post(
-    "/api/automations/:id/triggerSynchronous",
-    appInfoMiddleware({ appType: AppType.PROD }),
-    paramResource("id"),
-    authorized(
-      permissions.PermissionType.AUTOMATION,
-      permissions.PermissionLevel.EXECUTE
-    ),
-    controller.triggerSynchronous
-  )
-
   .post(
     "/api/automations/:id/test",
     appInfoMiddleware({ appType: AppType.DEV }),
diff --git a/packages/server/src/automations/triggers.ts b/packages/server/src/automations/triggers.ts
index 78f8a87b0c..772ffa4fd2 100644
--- a/packages/server/src/automations/triggers.ts
+++ b/packages/server/src/automations/triggers.ts
@@ -91,7 +91,7 @@ emitter.on("row:delete", async function (event) {
 
 export async function externalTrigger(
   automation: Automation,
-  params: { fields: Record<string, any> },
+  params: { fields: Record<string, any>; timeout?: number },
   { getResponses }: { getResponses?: boolean } = {}
 ) {
   if (
@@ -116,7 +116,7 @@ export async function externalTrigger(
       appId: context.getAppId(),
       automation,
     }
-    return utils.processEvent({ data })
+    return utils.processEvent({ data }, { timeout: params.timeout })
   } else {
     return automationQueue.add(data, JOB_OPTS)
   }
diff --git a/packages/server/src/automations/utils.ts b/packages/server/src/automations/utils.ts
index 5296a0fa50..82e3c941e8 100644
--- a/packages/server/src/automations/utils.ts
+++ b/packages/server/src/automations/utils.ts
@@ -14,13 +14,16 @@ import sdk from "../sdk"
 const REBOOT_CRON = "@reboot"
 const WH_STEP_ID = definitions.WEBHOOK.stepId
 const CRON_STEP_ID = definitions.CRON.stepId
-const Runner = new Thread(ThreadType.AUTOMATION)
 
 const jobMessage = (job: any, message: string) => {
   return `app=${job.data.event.appId} automation=${job.data.automation._id} jobId=${job.id} trigger=${job.data.automation.definition.trigger.event} : ${message}`
 }
 
-export async function processEvent(job: any) {
+export async function processEvent(job: any, timeout?: { timeout?: number }) {
+  const Runner = new Thread(ThreadType.AUTOMATION, {
+    timeout: timeout || null,
+  })
+
   try {
     const automationId = job.data.automation._id
     console.log(jobMessage(job, "running"))

From c86c2b40962b2d8e6f98c25c1f58e699cc8ca147 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 12 May 2023 15:57:34 +0100
Subject: [PATCH 05/35] add synchronous webhook functionality

---
 .../tests/core/utilities/mocks/licenses.ts    |  4 ++
 .../FlowChart/ActionModal.svelte              | 27 ++++++++++-
 .../FlowChart/FlowItem.svelte                 |  2 +-
 .../src/constants/backend/automations.js      |  1 +
 .../builder/src/stores/portal/licensing.js    |  4 ++
 packages/frontend-core/src/constants.js       |  1 +
 .../server/src/api/controllers/webhook.ts     | 45 +++++++++++++++----
 packages/types/src/sdk/licensing/feature.ts   |  1 +
 8 files changed, 73 insertions(+), 12 deletions(-)

diff --git a/packages/backend-core/tests/core/utilities/mocks/licenses.ts b/packages/backend-core/tests/core/utilities/mocks/licenses.ts
index 839b22e5f9..6e74294417 100644
--- a/packages/backend-core/tests/core/utilities/mocks/licenses.ts
+++ b/packages/backend-core/tests/core/utilities/mocks/licenses.ts
@@ -90,6 +90,10 @@ export const useScimIntegration = () => {
   return useFeature(Feature.SCIM)
 }
 
+export const useSyncWebhook = () => {
+  return useFeature(Feature.SYNC_WEBHOOKS)
+}
+
 // QUOTAS
 
 export const setAutomationLogsQuota = (value: number) => {
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
index 162c4c5618..e4ebd7f20f 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
@@ -7,17 +7,40 @@
     Icon,
     notifications,
   } from "@budibase/bbui"
-  import { automationStore } from "builderStore"
-  import { admin } from "stores/portal"
+  import { automationStore, selectedAutomation } from "builderStore"
+  import { admin, licensing } from "stores/portal"
   import { externalActions } from "./ExternalActions"
+  import { TriggerStepID, ActionStepID } from "constants/backend/automations"
 
   export let blockIdx
+  export let lastStep
 
+  let syncWebhooksEnabled = $licensing.syncWebhooksEnabled
+  let collectBlockAllowedSteps = [TriggerStepID.APP, TriggerStepID.WEBHOOK]
+  let collectBlockExists = $selectedAutomation.definition.steps.some(
+    step => step.stepId === ActionStepID.COLLECT
+  )
+  $: console.log($licensing)
+  $: console.log(syncWebhooksEnabled)
   const disabled = {
     SEND_EMAIL_SMTP: {
       disabled: !$admin.checklist.smtp.checked,
       message: "Please configure SMTP",
     },
+    COLLECT: {
+      disabled:
+        !collectBlockAllowedSteps.includes(
+          $selectedAutomation.definition.trigger.stepId
+        ) ||
+        !lastStep ||
+        !syncWebhooksEnabled ||
+        collectBlockExists,
+      message: !collectBlockAllowedSteps.includes(
+        $selectedAutomation.definition.trigger.stepId
+      )
+        ? "Only available for App Action or Webhook triggers"
+        : "Only available as the last step",
+    },
   }
 
   let selectedAction
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
index 9730c03ef3..99cbab52af 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
@@ -226,7 +226,7 @@
   {/if}
 
   <Modal bind:this={actionModal} width="30%">
-    <ActionModal {blockIdx} />
+    <ActionModal {lastStep} {blockIdx} />
   </Modal>
 
   <Modal bind:this={webhookModal} width="30%">
diff --git a/packages/builder/src/constants/backend/automations.js b/packages/builder/src/constants/backend/automations.js
index e0cd5b6405..6c58ed8620 100644
--- a/packages/builder/src/constants/backend/automations.js
+++ b/packages/builder/src/constants/backend/automations.js
@@ -20,6 +20,7 @@ export const ActionStepID = {
   FILTER: "FILTER",
   QUERY_ROWS: "QUERY_ROWS",
   LOOP: "LOOP",
+  COLLECT: "COLLECT",
   // these used to be lowercase step IDs, maintain for backwards compat
   discord: "discord",
   slack: "slack",
diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js
index e6056f1993..24589307b7 100644
--- a/packages/builder/src/stores/portal/licensing.js
+++ b/packages/builder/src/stores/portal/licensing.js
@@ -103,6 +103,9 @@ export const createLicensingStore = () => {
       const auditLogsEnabled = license.features.includes(
         Constants.Features.AUDIT_LOGS
       )
+      const syncWebhooksEnabled = license.features.includes(
+        Constants.Features.SYNC_WEBHOOKS
+      )
       store.update(state => {
         return {
           ...state,
@@ -117,6 +120,7 @@ export const createLicensingStore = () => {
           environmentVariablesEnabled,
           auditLogsEnabled,
           enforceableSSO,
+          syncWebhooksEnabled,
         }
       })
     },
diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js
index 42b561d48d..f1f4cf1d7f 100644
--- a/packages/frontend-core/src/constants.js
+++ b/packages/frontend-core/src/constants.js
@@ -70,6 +70,7 @@ export const Features = {
   ENFORCEABLE_SSO: "enforceableSSO",
   BRANDING: "branding",
   SCIM: "scim",
+  SYNC_WEBHOOKS: "syncWebhooks",
 }
 
 // Role IDs
diff --git a/packages/server/src/api/controllers/webhook.ts b/packages/server/src/api/controllers/webhook.ts
index c3fc3892d3..066b1e534d 100644
--- a/packages/server/src/api/controllers/webhook.ts
+++ b/packages/server/src/api/controllers/webhook.ts
@@ -6,8 +6,11 @@ import {
   WebhookActionType,
   BBContext,
   Automation,
+  AutomationActionStepId,
 } from "@budibase/types"
 import sdk from "../../sdk"
+import * as pro from "@budibase/pro"
+
 const toJsonSchema = require("to-json-schema")
 const validate = require("jsonschema").validate
 
@@ -78,15 +81,39 @@ export async function trigger(ctx: BBContext) {
       if (webhook.action.type === WebhookActionType.AUTOMATION) {
         // trigger with both the pure request and then expand it
         // incase the user has produced a schema to bind to
-        await triggers.externalTrigger(target, {
-          body: ctx.request.body,
-          ...ctx.request.body,
-          appId: prodAppId,
-        })
-      }
-      ctx.status = 200
-      ctx.body = {
-        message: "Webhook trigger fired successfully",
+
+        let hasCollectBlock = target.definition.steps.some(
+          (step: any) => step.stepId === AutomationActionStepId.COLLECT
+        )
+
+        if (hasCollectBlock && (await pro.features.isSyncWebhookEnabled())) {
+          const response = await triggers.externalTrigger(
+            target,
+            {
+              body: ctx.request.body,
+              ...ctx.request.body,
+              appId: prodAppId,
+            },
+            { getResponses: true }
+          )
+
+          let collectedValue = response.steps.find(
+            (step: any) => step.stepId === AutomationActionStepId.COLLECT
+          )
+
+          ctx.status = 200
+          ctx.body = collectedValue.outputs
+        } else {
+          await triggers.externalTrigger(target, {
+            body: ctx.request.body,
+            ...ctx.request.body,
+            appId: prodAppId,
+          })
+          ctx.status = 200
+          ctx.body = {
+            message: "Webhook trigger fired successfully",
+          }
+        }
       }
     } catch (err: any) {
       if (err.status === 404) {
diff --git a/packages/types/src/sdk/licensing/feature.ts b/packages/types/src/sdk/licensing/feature.ts
index 97fbd36224..d5b5fe6e24 100644
--- a/packages/types/src/sdk/licensing/feature.ts
+++ b/packages/types/src/sdk/licensing/feature.ts
@@ -8,6 +8,7 @@ export enum Feature {
   ENFORCEABLE_SSO = "enforceableSSO",
   BRANDING = "branding",
   SCIM = "scim",
+  SYNC_WEBHOOKS = "syncWebhooks",
 }
 
 export type PlanFeatures = { [key in PlanType]: Feature[] | undefined }

From 1904d77b2d36bb622b12da62ebbf17a68f3c34c7 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Mon, 15 May 2023 14:25:36 +0100
Subject: [PATCH 06/35] sync webhook automations feature and feature check

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index c57a98d246..a39de19bb7 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit c57a98d246a50a43905d8572a88c901ec598390c
+Subproject commit a39de19bb7304262bb9257008b2c29d24a4a3fcc

From 2b5b7f2b87e1457b2e89bcd71e26f95cb3dd5141 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Mon, 15 May 2023 14:31:23 +0100
Subject: [PATCH 07/35] Revert "sync webhook automations feature and feature
 check"

This reverts commit 1904d77b2d36bb622b12da62ebbf17a68f3c34c7.
---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index a39de19bb7..c57a98d246 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit a39de19bb7304262bb9257008b2c29d24a4a3fcc
+Subproject commit c57a98d246a50a43905d8572a88c901ec598390c

From 266465c8df4f93f9444cf74d13283988d007c39e Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Mon, 15 May 2023 14:48:34 +0100
Subject: [PATCH 08/35] convert timeout seconds to milliseconds

---
 packages/server/src/api/controllers/automation.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/api/controllers/automation.ts b/packages/server/src/api/controllers/automation.ts
index dccab86156..3e68dcb0cb 100644
--- a/packages/server/src/api/controllers/automation.ts
+++ b/packages/server/src/api/controllers/automation.ts
@@ -272,7 +272,7 @@ export async function trigger(ctx: BBContext) {
       automation,
       {
         fields: ctx.request.body.fields,
-        timeout: ctx.request.body.timeout || 120000,
+        timeout: ctx.request.body.timeout * 1000 || 120000,
       },
       { getResponses: true }
     )

From 27e78206c4410517390d7f5d93e586e17a18b786 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Mon, 15 May 2023 14:49:05 +0100
Subject: [PATCH 09/35] remove logs and copy changes

---
 .../AutomationBuilder/FlowChart/ActionModal.svelte        | 3 +--
 .../controls/ButtonActionEditor/ButtonActionDrawer.svelte | 2 --
 .../ButtonActionEditor/actions/TriggerAutomation.svelte   | 8 ++++----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
index e4ebd7f20f..66632fb2e0 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
@@ -20,8 +20,7 @@
   let collectBlockExists = $selectedAutomation.definition.steps.some(
     step => step.stepId === ActionStepID.COLLECT
   )
-  $: console.log($licensing)
-  $: console.log(syncWebhooksEnabled)
+
   const disabled = {
     SEND_EMAIL_SMTP: {
       disabled: !$admin.checklist.smtp.checked,
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte
index 3228c1402d..aa8e1af950 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte
@@ -151,7 +151,6 @@
           bindings.push(stateBinding)
         }
       })
-
     // Get which indexes are asynchronous automations as we want to filter them out from the bindings
     const asynchronousAutomationIndexes = actions
       .map((action, index) => {
@@ -174,7 +173,6 @@
     } else {
       allBindings = eventContextBindings.concat(bindings)
     }
-
     return allBindings
   }
 </script>
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
index ecbb5a9a31..8a38645ee7 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
@@ -54,6 +54,8 @@
   )
   $: selectedSchema = selectedAutomation?.schema
 
+  $: error = parameters.timeout > 120 ? "Timeout must be less than 120s" : null
+
   const onFieldsChanged = e => {
     parameters.fields = Object.entries(e.detail || {}).reduce(
       (acc, [key, value]) => {
@@ -85,8 +87,6 @@
     parameters.automationId = automationId
     parameters.synchronous = synchronous
   }
-
-  $: error = parameters.timeout > 120 ? "Timeout must be less than 120s" : null
 </script>
 
 <div class="root">
@@ -136,8 +136,8 @@
         <Icon name="Info" />
         <div>
           <i
-            >This automation will run synchronously due to the existence of a
-            Collect block</i
+            >This automation will run synchronously as it contains a Collect
+            step</i
           >
         </div>
       </div>

From 84dfc69b8829c54fe96c8677e4a9993ae92bb135 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Mon, 15 May 2023 15:15:36 +0100
Subject: [PATCH 10/35] fix submodule conflict

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index c57a98d246..9955edaa14 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit c57a98d246a50a43905d8572a88c901ec598390c
+Subproject commit 9955edaa147803dc271bf7bfb8c576b2aeb3dfa0

From 16ace6bf27981cc9b92a3ba9529a363d51faad27 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Mon, 15 May 2023 16:40:52 +0100
Subject: [PATCH 11/35] add plan tag to collect step

---
 .../FlowChart/ActionModal.svelte              | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
index 66632fb2e0..6f0eb38816 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
@@ -6,6 +6,8 @@
     Body,
     Icon,
     notifications,
+    Tags,
+    Tag,
   } from "@budibase/bbui"
   import { automationStore, selectedAutomation } from "builderStore"
   import { admin, licensing } from "stores/portal"
@@ -15,7 +17,7 @@
   export let blockIdx
   export let lastStep
 
-  let syncWebhooksEnabled = $licensing.syncWebhooksEnabled
+  let syncWebhooksEnabled = false
   let collectBlockAllowedSteps = [TriggerStepID.APP, TriggerStepID.WEBHOOK]
   let collectBlockExists = $selectedAutomation.definition.steps.some(
     step => step.stepId === ActionStepID.COLLECT
@@ -93,7 +95,7 @@
 <ModalContent
   title="Add automation step"
   confirmText="Save"
-  size="M"
+  size="L"
   disabled={!selectedAction}
   onConfirm={addBlockToAutomation}
 >
@@ -138,7 +140,13 @@
           <div class="item-body">
             <Icon name={action.icon} />
             <Body size="XS">{action.name}</Body>
-            {#if isDisabled}
+            {#if isDisabled && !syncWebhooksEnabled}
+              <div class="tag-color">
+                <Tags>
+                  <Tag icon="LockClosed">Business</Tag>
+                </Tags>
+              </div>
+            {:else if isDisabled}
               <Icon name="Help" tooltip={disabled[idx].message} />
             {/if}
           </div>
@@ -173,6 +181,7 @@
     display: flex;
     margin-left: var(--spacing-m);
     gap: var(--spacing-m);
+    align-items: center;
   }
   .item-list {
     display: grid;
@@ -202,4 +211,8 @@
   .disabled :global(.spectrum-Body) {
     color: var(--spectrum-global-color-gray-600);
   }
+
+  .tag-color :global(.spectrum-Tags-item) {
+    background: var(--spectrum-global-color-gray-200);
+  }
 </style>

From d43fc819c70eaa27ee49d39dab1b95c51c48212a Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 16 May 2023 09:29:40 +0100
Subject: [PATCH 12/35] refactor check for collect step into sdk

---
 packages/server/src/api/controllers/automation.ts | 8 ++++----
 packages/server/src/api/controllers/webhook.ts    | 7 ++-----
 packages/server/src/sdk/app/automations/index.ts  | 2 ++
 packages/server/src/sdk/app/automations/utils.ts  | 7 +++++++
 4 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 packages/server/src/sdk/app/automations/utils.ts

diff --git a/packages/server/src/api/controllers/automation.ts b/packages/server/src/api/controllers/automation.ts
index 3e68dcb0cb..f7e664964c 100644
--- a/packages/server/src/api/controllers/automation.ts
+++ b/packages/server/src/api/controllers/automation.ts
@@ -23,6 +23,7 @@ import {
   BBContext,
 } from "@budibase/types"
 import { getActionDefinitions as actionDefs } from "../../automations/actions"
+import sdk from "src/sdk"
 
 async function getActionDefinitions() {
   return removeDeprecated(await actionDefs())
@@ -264,10 +265,9 @@ export async function trigger(ctx: BBContext) {
   const db = context.getAppDB()
   let automation = await db.get(ctx.params.id)
 
-  let hasCollectBlock = automation.definition.steps.some(
-    (step: any) => step.stepId === AutomationActionStepId.COLLECT
-  )
-  if (hasCollectBlock) {
+  let hasCollectStep = sdk.automations.utils.checkForCollectStep(automation)
+
+  if (hasCollectStep) {
     const response: AutomationResults = await triggers.externalTrigger(
       automation,
       {
diff --git a/packages/server/src/api/controllers/webhook.ts b/packages/server/src/api/controllers/webhook.ts
index 066b1e534d..01bb43046b 100644
--- a/packages/server/src/api/controllers/webhook.ts
+++ b/packages/server/src/api/controllers/webhook.ts
@@ -81,12 +81,9 @@ export async function trigger(ctx: BBContext) {
       if (webhook.action.type === WebhookActionType.AUTOMATION) {
         // trigger with both the pure request and then expand it
         // incase the user has produced a schema to bind to
+        let hasCollectStep = sdk.automations.utils.checkForCollectStep(target)
 
-        let hasCollectBlock = target.definition.steps.some(
-          (step: any) => step.stepId === AutomationActionStepId.COLLECT
-        )
-
-        if (hasCollectBlock && (await pro.features.isSyncWebhookEnabled())) {
+        if (hasCollectStep && (await pro.features.isSyncWebhookEnabled())) {
           const response = await triggers.externalTrigger(
             target,
             {
diff --git a/packages/server/src/sdk/app/automations/index.ts b/packages/server/src/sdk/app/automations/index.ts
index 1c9ce13455..16530cf085 100644
--- a/packages/server/src/sdk/app/automations/index.ts
+++ b/packages/server/src/sdk/app/automations/index.ts
@@ -1,5 +1,7 @@
 import * as webhook from "./webhook"
+import * as utils from "./utils"
 
 export default {
   webhook,
+  utils,
 }
diff --git a/packages/server/src/sdk/app/automations/utils.ts b/packages/server/src/sdk/app/automations/utils.ts
new file mode 100644
index 0000000000..79e70923f1
--- /dev/null
+++ b/packages/server/src/sdk/app/automations/utils.ts
@@ -0,0 +1,7 @@
+import { Automation, AutomationActionStepId } from "@budibase/types"
+
+export function checkForCollectStep(automation: Automation) {
+  return automation.definition.steps.some(
+    (step: any) => step.stepId === AutomationActionStepId.COLLECT
+  )
+}

From 59e1150eee68fe236dbe300277e48ff946bcf7b0 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 16 May 2023 09:59:37 +0100
Subject: [PATCH 13/35] improve notification message for sync automation run

---
 packages/client/src/utils/buttonActions.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js
index 0280cd1d54..ed702f6718 100644
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@@ -130,14 +130,18 @@ const triggerAutomationHandler = async action => {
         fields,
         timeout,
       })
-      if (!notificationOverride) {
-        notificationStore.actions.success("Automation triggered")
-      }
 
       // Value will exist if automation is synchronous, so return it.
       if (result.value) {
+        if (!notificationOverride) {
+          notificationStore.actions.success("Automation ran successfully")
+        }
         return { result }
       }
+
+      if (!notificationOverride) {
+        notificationStore.actions.success("Automation triggered")
+      }
     } catch (error) {
       // Abort next actions
       return false

From e3d867611be8cf11c860b5113008c8319a3cd0a8 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 16 May 2023 16:05:37 +0100
Subject: [PATCH 14/35] use correct sdk import

---
 packages/server/src/api/controllers/automation.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/server/src/api/controllers/automation.ts b/packages/server/src/api/controllers/automation.ts
index f7e664964c..ff1de148fc 100644
--- a/packages/server/src/api/controllers/automation.ts
+++ b/packages/server/src/api/controllers/automation.ts
@@ -19,11 +19,10 @@ import {
   Automation,
   AutomationActionStepId,
   AutomationResults,
-  AutomationStepType,
   BBContext,
 } from "@budibase/types"
 import { getActionDefinitions as actionDefs } from "../../automations/actions"
-import sdk from "src/sdk"
+import sdk from "../../sdk"
 
 async function getActionDefinitions() {
   return removeDeprecated(await actionDefs())

From 67272c28afffee847dcd18b9f7a9ffadc8a1de14 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 16 May 2023 16:06:37 +0100
Subject: [PATCH 15/35] Improve logic in add action modal for collect step

---
 packages/builder/src/builderStore/utils.js    |  7 ++
 .../FlowChart/ActionModal.svelte              | 65 +++++++++++--------
 .../FlowChart/FlowItem.svelte                 | 32 +++++----
 3 files changed, 65 insertions(+), 39 deletions(-)

diff --git a/packages/builder/src/builderStore/utils.js b/packages/builder/src/builderStore/utils.js
index 3ddf6fb667..86c63f20ee 100644
--- a/packages/builder/src/builderStore/utils.js
+++ b/packages/builder/src/builderStore/utils.js
@@ -1,3 +1,4 @@
+import { ActionStepID } from "constants/backend/automations"
 import { TableNames } from "../constants"
 import {
   AUTO_COLUMN_DISPLAY_NAMES,
@@ -53,3 +54,9 @@ export function buildAutoColumn(tableName, name, subtype) {
   }
   return base
 }
+
+export function checkForCollectStep(automation) {
+  return automation.definition.steps.some(
+    step => step.stepId === ActionStepID.COLLECT
+  )
+}
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
index 6f0eb38816..25db2ce5e4 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
@@ -13,41 +13,41 @@
   import { admin, licensing } from "stores/portal"
   import { externalActions } from "./ExternalActions"
   import { TriggerStepID, ActionStepID } from "constants/backend/automations"
+  import { checkForCollectStep } from "builderStore/utils"
 
   export let blockIdx
   export let lastStep
 
-  let syncWebhooksEnabled = false
+  let syncWebhooksEnabled = $licensing.syncWebhooksEnabled
   let collectBlockAllowedSteps = [TriggerStepID.APP, TriggerStepID.WEBHOOK]
-  let collectBlockExists = $selectedAutomation.definition.steps.some(
-    step => step.stepId === ActionStepID.COLLECT
-  )
-
-  const disabled = {
-    SEND_EMAIL_SMTP: {
-      disabled: !$admin.checklist.smtp.checked,
-      message: "Please configure SMTP",
-    },
-    COLLECT: {
-      disabled:
-        !collectBlockAllowedSteps.includes(
-          $selectedAutomation.definition.trigger.stepId
-        ) ||
-        !lastStep ||
-        !syncWebhooksEnabled ||
-        collectBlockExists,
-      message: !collectBlockAllowedSteps.includes(
-        $selectedAutomation.definition.trigger.stepId
-      )
-        ? "Only available for App Action or Webhook triggers"
-        : "Only available as the last step",
-    },
-  }
-
   let selectedAction
   let actionVal
   let actions = Object.entries($automationStore.blockDefinitions.ACTION)
 
+  $: collectBlockExists = checkForCollectStep($selectedAutomation)
+
+  const disabled = () => {
+    return {
+      SEND_EMAIL_SMTP: {
+        disabled: !$admin.checklist.smtp.checked,
+        message: "Please configure SMTP",
+      },
+      COLLECT: {
+        disabled: !lastStep || !syncWebhooksEnabled || collectBlockExists,
+        message: collectDisabledMessage(),
+      },
+    }
+  }
+
+  const collectDisabledMessage = () => {
+    if (collectBlockExists) {
+      return "Only one Collect step allowed"
+    }
+    if (!lastStep) {
+      return "Only available as the last step"
+    }
+  }
+
   const external = actions.reduce((acc, elm) => {
     const [k, v] = elm
     if (!v.internal && !v.custom) {
@@ -62,6 +62,15 @@
       acc[k] = v
     }
     delete acc.LOOP
+
+    // Filter out Collect block if not App Action or Webhook
+    if (
+      !collectBlockAllowedSteps.includes(
+        $selectedAutomation.definition.trigger.stepId
+      )
+    ) {
+      delete acc.COLLECT
+    }
     return acc
   }, {})
 
@@ -130,7 +139,7 @@
     <Detail size="S">Actions</Detail>
     <div class="item-list">
       {#each Object.entries(internal) as [idx, action]}
-        {@const isDisabled = disabled[idx] && disabled[idx].disabled}
+        {@const isDisabled = disabled()[idx] && disabled()[idx].disabled}
         <div
           class="item"
           class:disabled={isDisabled}
@@ -147,7 +156,7 @@
                 </Tags>
               </div>
             {:else if isDisabled}
-              <Icon name="Help" tooltip={disabled[idx].message} />
+              <Icon name="Help" tooltip={disabled()[idx].message} />
             {/if}
           </div>
         </div>
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
index 99cbab52af..9ff57a764b 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
@@ -31,6 +31,9 @@
   let showLooping = false
   let role
 
+  $: collectBlockExists = $selectedAutomation.definition.steps.some(
+    step => step.stepId === ActionStepID.COLLECT
+  )
   $: automationId = $selectedAutomation?._id
   $: showBindingPicker =
     block.stepId === ActionStepID.CREATE_ROW ||
@@ -224,21 +227,28 @@
       </Layout>
     </div>
   {/if}
-
-  <Modal bind:this={actionModal} width="30%">
-    <ActionModal {lastStep} {blockIdx} />
-  </Modal>
-
-  <Modal bind:this={webhookModal} width="30%">
-    <CreateWebhookModal />
-  </Modal>
 </div>
-<div class="separator" />
-<Icon on:click={() => actionModal.show()} hoverable name="AddCircle" size="S" />
-{#if isTrigger ? totalBlocks > 1 : blockIdx !== totalBlocks - 2}
+{#if !collectBlockExists || !lastStep}
   <div class="separator" />
+  <Icon
+    on:click={() => actionModal.show()}
+    hoverable
+    name="AddCircle"
+    size="S"
+  />
+  {#if isTrigger ? totalBlocks > 1 : blockIdx !== totalBlocks - 2}
+    <div class="separator" />
+  {/if}
 {/if}
 
+<Modal bind:this={actionModal} width="30%">
+  <ActionModal {lastStep} {blockIdx} />
+</Modal>
+
+<Modal bind:this={webhookModal} width="30%">
+  <CreateWebhookModal />
+</Modal>
+
 <style>
   .delete-padding {
     padding-left: 30px;

From e1eda14204a1b17020cadecbeb5dda1f384dae4c Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 18 May 2023 17:01:53 +0100
Subject: [PATCH 16/35] move sync automations away from bull and call directly

---
 packages/server/src/automations/triggers.ts |  3 ++-
 packages/server/src/threads/automation.ts   | 30 +++++++++++++++++++++
 packages/types/src/sdk/automations/index.ts |  1 +
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/automations/triggers.ts b/packages/server/src/automations/triggers.ts
index fe98f20d72..922bc10343 100644
--- a/packages/server/src/automations/triggers.ts
+++ b/packages/server/src/automations/triggers.ts
@@ -10,6 +10,7 @@ import * as utils from "./utils"
 import env from "../environment"
 import { context, db as dbCore } from "@budibase/backend-core"
 import { Automation, Row, AutomationData, AutomationJob } from "@budibase/types"
+import { executeSynchronously } from "../threads/automation"
 
 export const TRIGGER_DEFINITIONS = definitions
 const JOB_OPTS = {
@@ -118,7 +119,7 @@ export async function externalTrigger(
       automation,
     }
     const job = { data } as AutomationJob
-    return utils.processEvent(job)
+    return executeSynchronously(job)
   } else {
     return automationQueue.add(data, JOB_OPTS)
   }
diff --git a/packages/server/src/threads/automation.ts b/packages/server/src/threads/automation.ts
index e271ebba0b..d9e0bc9c5d 100644
--- a/packages/server/src/threads/automation.ts
+++ b/packages/server/src/threads/automation.ts
@@ -495,6 +495,36 @@ export function execute(job: Job, callback: WorkerCallback) {
   })
 }
 
+export function executeSynchronously(job: Job) {
+  const appId = job.data.event.appId
+  if (!appId) {
+    throw new Error("Unable to execute, event doesn't contain app ID.")
+  }
+
+  const timeoutPromise = new Promise((resolve, reject) => {
+    setTimeout(() => {
+      reject(new Error("Timeout exceeded"))
+    }, job.data.event.timeout || 12000)
+  })
+
+  return context.doInAppContext(appId, async () => {
+    const envVars = await sdkUtils.getEnvironmentVariables()
+    // put into automation thread for whole context
+    return context.doInEnvironmentContext(envVars, async () => {
+      const automationOrchestrator = new Orchestrator(job)
+      try {
+        const response = await Promise.race([
+          automationOrchestrator.execute(),
+          timeoutPromise,
+        ])
+        return response
+      } catch (err) {
+        throw err
+      }
+    })
+  })
+}
+
 export const removeStalled = async (job: Job) => {
   const appId = job.data.event.appId
   if (!appId) {
diff --git a/packages/types/src/sdk/automations/index.ts b/packages/types/src/sdk/automations/index.ts
index f1e3d38101..c0e4bacabc 100644
--- a/packages/types/src/sdk/automations/index.ts
+++ b/packages/types/src/sdk/automations/index.ts
@@ -5,6 +5,7 @@ export interface AutomationDataEvent {
   appId?: string
   metadata?: AutomationMetadata
   automation?: Automation
+  timeout?: number
 }
 
 export interface AutomationData {

From d271bbdadb1d80d1a41c4162c92c56d8ca5314a2 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 19 May 2023 10:07:02 +0100
Subject: [PATCH 17/35] rename syncWebHooks to syncAutomations

---
 .../tests/core/utilities/mocks/licenses.ts         |  4 ++--
 .../AutomationBuilder/FlowChart/ActionModal.svelte |  6 +++---
 packages/builder/src/stores/portal/licensing.js    |  6 +++---
 packages/frontend-core/src/constants.js            |  2 +-
 packages/server/src/api/controllers/webhook.ts     |  2 +-
 packages/server/src/threads/automation.ts          | 14 +++++---------
 packages/types/src/sdk/licensing/feature.ts        |  2 +-
 7 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/packages/backend-core/tests/core/utilities/mocks/licenses.ts b/packages/backend-core/tests/core/utilities/mocks/licenses.ts
index 6e74294417..4272e78eb8 100644
--- a/packages/backend-core/tests/core/utilities/mocks/licenses.ts
+++ b/packages/backend-core/tests/core/utilities/mocks/licenses.ts
@@ -90,8 +90,8 @@ export const useScimIntegration = () => {
   return useFeature(Feature.SCIM)
 }
 
-export const useSyncWebhook = () => {
-  return useFeature(Feature.SYNC_WEBHOOKS)
+export const useSyncAutomations = () => {
+  return useFeature(Feature.SYNC_AUTOMATIONS)
 }
 
 // QUOTAS
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
index 25db2ce5e4..c8de0b5692 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
@@ -18,7 +18,7 @@
   export let blockIdx
   export let lastStep
 
-  let syncWebhooksEnabled = $licensing.syncWebhooksEnabled
+  let syncAutomationsEnabled = $licensing.syncAutomationsEnabled
   let collectBlockAllowedSteps = [TriggerStepID.APP, TriggerStepID.WEBHOOK]
   let selectedAction
   let actionVal
@@ -33,7 +33,7 @@
         message: "Please configure SMTP",
       },
       COLLECT: {
-        disabled: !lastStep || !syncWebhooksEnabled || collectBlockExists,
+        disabled: !lastStep || !syncAutomationsEnabled || collectBlockExists,
         message: collectDisabledMessage(),
       },
     }
@@ -149,7 +149,7 @@
           <div class="item-body">
             <Icon name={action.icon} />
             <Body size="XS">{action.name}</Body>
-            {#if isDisabled && !syncWebhooksEnabled}
+            {#if isDisabled && !syncAutomationsEnabled}
               <div class="tag-color">
                 <Tags>
                   <Tag icon="LockClosed">Business</Tag>
diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js
index 4e2de2a001..ded77894f9 100644
--- a/packages/builder/src/stores/portal/licensing.js
+++ b/packages/builder/src/stores/portal/licensing.js
@@ -116,8 +116,8 @@ export const createLicensingStore = () => {
       const auditLogsEnabled = license.features.includes(
         Constants.Features.AUDIT_LOGS
       )
-      const syncWebhooksEnabled = license.features.includes(
-        Constants.Features.SYNC_WEBHOOKS
+      const syncAutomationsEnabled = license.features.includes(
+        Constants.Features.SYNC_AUTOMATIONS
       )
       store.update(state => {
         return {
@@ -133,7 +133,7 @@ export const createLicensingStore = () => {
           environmentVariablesEnabled,
           auditLogsEnabled,
           enforceableSSO,
-          syncWebhooksEnabled,
+          syncAutomationsEnabled,
         }
       })
     },
diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js
index f1f4cf1d7f..f897feee86 100644
--- a/packages/frontend-core/src/constants.js
+++ b/packages/frontend-core/src/constants.js
@@ -70,7 +70,7 @@ export const Features = {
   ENFORCEABLE_SSO: "enforceableSSO",
   BRANDING: "branding",
   SCIM: "scim",
-  SYNC_WEBHOOKS: "syncWebhooks",
+  SYNC_AUTOMATIONS: "syncAutoamtions",
 }
 
 // Role IDs
diff --git a/packages/server/src/api/controllers/webhook.ts b/packages/server/src/api/controllers/webhook.ts
index 01bb43046b..ee92c70628 100644
--- a/packages/server/src/api/controllers/webhook.ts
+++ b/packages/server/src/api/controllers/webhook.ts
@@ -83,7 +83,7 @@ export async function trigger(ctx: BBContext) {
         // incase the user has produced a schema to bind to
         let hasCollectStep = sdk.automations.utils.checkForCollectStep(target)
 
-        if (hasCollectStep && (await pro.features.isSyncWebhookEnabled())) {
+        if (hasCollectStep && (await pro.features.isSyncAutomationsEnabled())) {
           const response = await triggers.externalTrigger(
             target,
             {
diff --git a/packages/server/src/threads/automation.ts b/packages/server/src/threads/automation.ts
index d9e0bc9c5d..e2c9de20a5 100644
--- a/packages/server/src/threads/automation.ts
+++ b/packages/server/src/threads/automation.ts
@@ -512,15 +512,11 @@ export function executeSynchronously(job: Job) {
     // put into automation thread for whole context
     return context.doInEnvironmentContext(envVars, async () => {
       const automationOrchestrator = new Orchestrator(job)
-      try {
-        const response = await Promise.race([
-          automationOrchestrator.execute(),
-          timeoutPromise,
-        ])
-        return response
-      } catch (err) {
-        throw err
-      }
+      const response = await Promise.race([
+        automationOrchestrator.execute(),
+        timeoutPromise,
+      ])
+      return response
     })
   })
 }
diff --git a/packages/types/src/sdk/licensing/feature.ts b/packages/types/src/sdk/licensing/feature.ts
index d5b5fe6e24..1cbdd55bcf 100644
--- a/packages/types/src/sdk/licensing/feature.ts
+++ b/packages/types/src/sdk/licensing/feature.ts
@@ -8,7 +8,7 @@ export enum Feature {
   ENFORCEABLE_SSO = "enforceableSSO",
   BRANDING = "branding",
   SCIM = "scim",
-  SYNC_WEBHOOKS = "syncWebhooks",
+  SYNC_AUTOMATIONS = "syncAutomations",
 }
 
 export type PlanFeatures = { [key in PlanType]: Feature[] | undefined }

From 9b7972fdfdf9723102036fec6945fd7850692e5b Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 19 May 2023 15:12:08 +0100
Subject: [PATCH 18/35] remove middleware but check if prod in controller

---
 packages/server/src/api/controllers/automation.ts | 5 ++++-
 packages/server/src/api/routes/automation.ts      | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/api/controllers/automation.ts b/packages/server/src/api/controllers/automation.ts
index ff1de148fc..67c550357a 100644
--- a/packages/server/src/api/controllers/automation.ts
+++ b/packages/server/src/api/controllers/automation.ts
@@ -23,6 +23,7 @@ import {
 } from "@budibase/types"
 import { getActionDefinitions as actionDefs } from "../../automations/actions"
 import sdk from "../../sdk"
+import { isProdAppID } from "@budibase/backend-core/src/db"
 
 async function getActionDefinitions() {
   return removeDeprecated(await actionDefs())
@@ -265,7 +266,6 @@ export async function trigger(ctx: BBContext) {
   let automation = await db.get(ctx.params.id)
 
   let hasCollectStep = sdk.automations.utils.checkForCollectStep(automation)
-
   if (hasCollectStep) {
     const response: AutomationResults = await triggers.externalTrigger(
       automation,
@@ -281,6 +281,9 @@ export async function trigger(ctx: BBContext) {
     )
     ctx.body = collectedValue?.outputs
   } else {
+    if (ctx.appId && !isProdAppID(ctx.appId)) {
+      ctx.throw(400, "Only apps in production support this endpoint")
+    }
     await triggers.externalTrigger(automation, {
       ...ctx.request.body,
       appId: ctx.appId,
diff --git a/packages/server/src/api/routes/automation.ts b/packages/server/src/api/routes/automation.ts
index cb8b6042ae..489487271c 100644
--- a/packages/server/src/api/routes/automation.ts
+++ b/packages/server/src/api/routes/automation.ts
@@ -65,7 +65,6 @@ router
   )
   .post(
     "/api/automations/:id/trigger",
-    appInfoMiddleware({ appType: AppType.PROD }),
     paramResource("id"),
     authorized(
       permissions.PermissionType.AUTOMATION,

From d7ae338bc5f41d9b0f9b25eb75a0d2892c181ea8 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 19 May 2023 15:14:01 +0100
Subject: [PATCH 19/35] fix import

---
 packages/server/src/api/controllers/automation.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/api/controllers/automation.ts b/packages/server/src/api/controllers/automation.ts
index 67c550357a..79f93c3efa 100644
--- a/packages/server/src/api/controllers/automation.ts
+++ b/packages/server/src/api/controllers/automation.ts
@@ -23,7 +23,7 @@ import {
 } from "@budibase/types"
 import { getActionDefinitions as actionDefs } from "../../automations/actions"
 import sdk from "../../sdk"
-import { isProdAppID } from "@budibase/backend-core/src/db"
+import { db as dbCore } from "@budibase/backend-core"
 
 async function getActionDefinitions() {
   return removeDeprecated(await actionDefs())
@@ -281,7 +281,7 @@ export async function trigger(ctx: BBContext) {
     )
     ctx.body = collectedValue?.outputs
   } else {
-    if (ctx.appId && !isProdAppID(ctx.appId)) {
+    if (ctx.appId && !dbCore.isProdAppID(ctx.appId)) {
       ctx.throw(400, "Only apps in production support this endpoint")
     }
     await triggers.externalTrigger(automation, {

From 754b30dd5c7f326cf31415913c64853492d8dc12 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Mon, 22 May 2023 15:46:42 +0100
Subject: [PATCH 20/35] add features property to automation defintions

---
 .../automation/AutomationBuilder/FlowChart/FlowItem.svelte  | 2 +-
 packages/server/src/automations/steps/bash.ts               | 3 ++-
 packages/server/src/automations/steps/collect.ts            | 3 ++-
 packages/server/src/automations/steps/createRow.ts          | 3 ++-
 packages/server/src/automations/steps/delay.ts              | 2 +-
 packages/server/src/automations/steps/deleteRow.ts          | 3 ++-
 packages/server/src/automations/steps/discord.ts            | 3 ++-
 packages/server/src/automations/steps/executeQuery.ts       | 3 ++-
 packages/server/src/automations/steps/executeScript.ts      | 3 ++-
 packages/server/src/automations/steps/filter.ts             | 2 +-
 packages/server/src/automations/steps/loop.ts               | 3 +--
 packages/server/src/automations/steps/make.ts               | 3 ++-
 packages/server/src/automations/steps/outgoingWebhook.ts    | 3 ++-
 packages/server/src/automations/steps/queryRows.ts          | 3 ++-
 packages/server/src/automations/steps/sendSmtpEmail.ts      | 3 ++-
 packages/server/src/automations/steps/serverLog.ts          | 3 ++-
 packages/server/src/automations/steps/slack.ts              | 3 ++-
 packages/server/src/automations/steps/updateRow.ts          | 3 ++-
 packages/server/src/automations/steps/zapier.ts             | 3 ++-
 packages/types/src/documents/app/automation.ts              | 6 +++++-
 20 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
index 9ff57a764b..ce3756b6ae 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
@@ -187,7 +187,7 @@
         {#if !isTrigger}
           <div>
             <div class="block-options">
-              {#if block?.canLoop}
+              {#if block?.features.includes("LOOPING")}
                 <ActionButton on:click={() => addLooping()} icon="Reuse">
                   Add Looping
                 </ActionButton>
diff --git a/packages/server/src/automations/steps/bash.ts b/packages/server/src/automations/steps/bash.ts
index de1f43a907..36e89f17de 100644
--- a/packages/server/src/automations/steps/bash.ts
+++ b/packages/server/src/automations/steps/bash.ts
@@ -5,6 +5,7 @@ import environment from "../../environment"
 import {
   AutomationActionStepId,
   AutomationCustomIOType,
+  AutomationFeature,
   AutomationIOType,
   AutomationStepInput,
   AutomationStepSchema,
@@ -18,7 +19,7 @@ export const definition: AutomationStepSchema = {
   description: "Run a bash script",
   type: AutomationStepType.ACTION,
   internal: true,
-  canLoop: true,
+  features: [AutomationFeature.LOOPING],
   stepId: AutomationActionStepId.EXECUTE_BASH,
   inputs: {},
   schema: {
diff --git a/packages/server/src/automations/steps/collect.ts b/packages/server/src/automations/steps/collect.ts
index 1083c2a216..512dfc0dff 100644
--- a/packages/server/src/automations/steps/collect.ts
+++ b/packages/server/src/automations/steps/collect.ts
@@ -4,6 +4,7 @@ import {
   AutomationStepInput,
   AutomationStepType,
   AutomationIOType,
+  AutomationFeature,
 } from "@budibase/types"
 
 export const definition: AutomationStepSchema = {
@@ -14,7 +15,7 @@ export const definition: AutomationStepSchema = {
     "Collects specified data so it can be provided to the design section",
   type: AutomationStepType.ACTION,
   internal: true,
-  canLoop: false,
+  features: [],
   stepId: AutomationActionStepId.COLLECT,
   inputs: {
     text: "",
diff --git a/packages/server/src/automations/steps/createRow.ts b/packages/server/src/automations/steps/createRow.ts
index 027012338b..5886c95be5 100644
--- a/packages/server/src/automations/steps/createRow.ts
+++ b/packages/server/src/automations/steps/createRow.ts
@@ -4,6 +4,7 @@ import { buildCtx } from "./utils"
 import {
   AutomationActionStepId,
   AutomationCustomIOType,
+  AutomationFeature,
   AutomationIOType,
   AutomationStepInput,
   AutomationStepSchema,
@@ -17,7 +18,7 @@ export const definition: AutomationStepSchema = {
   description: "Add a row to your database",
   type: AutomationStepType.ACTION,
   internal: true,
-  canLoop: true,
+  features: [AutomationFeature.LOOPING],
   stepId: AutomationActionStepId.CREATE_ROW,
   inputs: {},
   schema: {
diff --git a/packages/server/src/automations/steps/delay.ts b/packages/server/src/automations/steps/delay.ts
index 736e392821..abddd73196 100644
--- a/packages/server/src/automations/steps/delay.ts
+++ b/packages/server/src/automations/steps/delay.ts
@@ -14,7 +14,7 @@ export const definition: AutomationStepSchema = {
   description: "Delay the automation until an amount of time has passed",
   stepId: AutomationActionStepId.DELAY,
   internal: true,
-  canLoop: false,
+  features: [],
   inputs: {},
   schema: {
     inputs: {
diff --git a/packages/server/src/automations/steps/deleteRow.ts b/packages/server/src/automations/steps/deleteRow.ts
index 6b830a3eab..5ba52cfe99 100644
--- a/packages/server/src/automations/steps/deleteRow.ts
+++ b/packages/server/src/automations/steps/deleteRow.ts
@@ -8,6 +8,7 @@ import {
   AutomationStepType,
   AutomationIOType,
   AutomationCustomIOType,
+  AutomationFeature,
 } from "@budibase/types"
 
 export const definition: AutomationStepSchema = {
@@ -18,7 +19,7 @@ export const definition: AutomationStepSchema = {
   type: AutomationStepType.ACTION,
   stepId: AutomationActionStepId.DELETE_ROW,
   internal: true,
-  canLoop: true,
+  features: [AutomationFeature.LOOPING],
   inputs: {},
   schema: {
     inputs: {
diff --git a/packages/server/src/automations/steps/discord.ts b/packages/server/src/automations/steps/discord.ts
index 165f1a6d04..e495fe0241 100644
--- a/packages/server/src/automations/steps/discord.ts
+++ b/packages/server/src/automations/steps/discord.ts
@@ -6,6 +6,7 @@ import {
   AutomationStepInput,
   AutomationStepType,
   AutomationIOType,
+  AutomationFeature,
 } from "@budibase/types"
 
 const DEFAULT_USERNAME = "Budibase Automate"
@@ -19,7 +20,7 @@ export const definition: AutomationStepSchema = {
   stepId: AutomationActionStepId.discord,
   type: AutomationStepType.ACTION,
   internal: false,
-  canLoop: true,
+  features: [AutomationFeature.LOOPING],
   inputs: {},
   schema: {
     inputs: {
diff --git a/packages/server/src/automations/steps/executeQuery.ts b/packages/server/src/automations/steps/executeQuery.ts
index b63d894f5c..50893c7758 100644
--- a/packages/server/src/automations/steps/executeQuery.ts
+++ b/packages/server/src/automations/steps/executeQuery.ts
@@ -4,6 +4,7 @@ import * as automationUtils from "../automationUtils"
 import {
   AutomationActionStepId,
   AutomationCustomIOType,
+  AutomationFeature,
   AutomationIOType,
   AutomationStepInput,
   AutomationStepSchema,
@@ -18,7 +19,7 @@ export const definition: AutomationStepSchema = {
   type: AutomationStepType.ACTION,
   stepId: AutomationActionStepId.EXECUTE_QUERY,
   internal: true,
-  canLoop: true,
+  features: [AutomationFeature.LOOPING],
   inputs: {},
   schema: {
     inputs: {
diff --git a/packages/server/src/automations/steps/executeScript.ts b/packages/server/src/automations/steps/executeScript.ts
index d0bb500cf1..5bfc6dee36 100644
--- a/packages/server/src/automations/steps/executeScript.ts
+++ b/packages/server/src/automations/steps/executeScript.ts
@@ -4,6 +4,7 @@ import * as automationUtils from "../automationUtils"
 import {
   AutomationActionStepId,
   AutomationCustomIOType,
+  AutomationFeature,
   AutomationIOType,
   AutomationStepInput,
   AutomationStepSchema,
@@ -19,7 +20,7 @@ export const definition: AutomationStepSchema = {
   internal: true,
   stepId: AutomationActionStepId.EXECUTE_SCRIPT,
   inputs: {},
-  canLoop: true,
+  features: [AutomationFeature.LOOPING],
   schema: {
     inputs: {
       properties: {
diff --git a/packages/server/src/automations/steps/filter.ts b/packages/server/src/automations/steps/filter.ts
index f457492fc3..b96cfc0f07 100644
--- a/packages/server/src/automations/steps/filter.ts
+++ b/packages/server/src/automations/steps/filter.ts
@@ -28,7 +28,7 @@ export const definition: AutomationStepSchema = {
     "Conditionally halt automations which do not meet certain conditions",
   type: AutomationStepType.LOGIC,
   internal: true,
-  canLoop: false,
+  features: [],
   stepId: AutomationActionStepId.FILTER,
   inputs: {
     condition: FilterConditions.EQUAL,
diff --git a/packages/server/src/automations/steps/loop.ts b/packages/server/src/automations/steps/loop.ts
index f646492ee7..729a0b5c01 100644
--- a/packages/server/src/automations/steps/loop.ts
+++ b/packages/server/src/automations/steps/loop.ts
@@ -13,8 +13,7 @@ export const definition: AutomationStepSchema = {
   description: "Loop",
   stepId: AutomationActionStepId.LOOP,
   internal: true,
-  canLoop: false,
-
+  features: [],
   inputs: {},
   schema: {
     inputs: {
diff --git a/packages/server/src/automations/steps/make.ts b/packages/server/src/automations/steps/make.ts
index dc4c75d27b..c8e0ac8a91 100644
--- a/packages/server/src/automations/steps/make.ts
+++ b/packages/server/src/automations/steps/make.ts
@@ -6,6 +6,7 @@ import {
   AutomationStepInput,
   AutomationStepType,
   AutomationIOType,
+  AutomationFeature,
 } from "@budibase/types"
 
 export const definition: AutomationStepSchema = {
@@ -18,7 +19,7 @@ export const definition: AutomationStepSchema = {
   stepId: AutomationActionStepId.integromat,
   type: AutomationStepType.ACTION,
   internal: false,
-  canLoop: true,
+  features: [AutomationFeature.LOOPING],
   inputs: {},
   schema: {
     inputs: {
diff --git a/packages/server/src/automations/steps/outgoingWebhook.ts b/packages/server/src/automations/steps/outgoingWebhook.ts
index acdf60d869..96fd279320 100644
--- a/packages/server/src/automations/steps/outgoingWebhook.ts
+++ b/packages/server/src/automations/steps/outgoingWebhook.ts
@@ -4,6 +4,7 @@ import * as automationUtils from "../automationUtils"
 import {
   AutomationActionStepId,
   AutomationCustomIOType,
+  AutomationFeature,
   AutomationIOType,
   AutomationStepInput,
   AutomationStepSchema,
@@ -32,7 +33,7 @@ export const definition: AutomationStepSchema = {
   description: "Send a request of specified method to a URL",
   type: AutomationStepType.ACTION,
   internal: true,
-  canLoop: true,
+  features: [AutomationFeature.LOOPING],
   stepId: AutomationActionStepId.OUTGOING_WEBHOOK,
   inputs: {
     requestMethod: "POST",
diff --git a/packages/server/src/automations/steps/queryRows.ts b/packages/server/src/automations/steps/queryRows.ts
index f3ab298e55..c50170a733 100644
--- a/packages/server/src/automations/steps/queryRows.ts
+++ b/packages/server/src/automations/steps/queryRows.ts
@@ -6,6 +6,7 @@ import * as automationUtils from "../automationUtils"
 import {
   AutomationActionStepId,
   AutomationCustomIOType,
+  AutomationFeature,
   AutomationIOType,
   AutomationStepInput,
   AutomationStepSchema,
@@ -42,7 +43,7 @@ export const definition: AutomationStepSchema = {
   type: AutomationStepType.ACTION,
   stepId: AutomationActionStepId.QUERY_ROWS,
   internal: true,
-  canLoop: true,
+  features: [AutomationFeature.LOOPING],
   inputs: {},
   schema: {
     inputs: {
diff --git a/packages/server/src/automations/steps/sendSmtpEmail.ts b/packages/server/src/automations/steps/sendSmtpEmail.ts
index fc88ee721b..c2614c3e3c 100644
--- a/packages/server/src/automations/steps/sendSmtpEmail.ts
+++ b/packages/server/src/automations/steps/sendSmtpEmail.ts
@@ -6,6 +6,7 @@ import {
   AutomationStepInput,
   AutomationStepType,
   AutomationIOType,
+  AutomationFeature,
 } from "@budibase/types"
 
 export const definition: AutomationStepSchema = {
@@ -15,7 +16,7 @@ export const definition: AutomationStepSchema = {
   name: "Send Email (SMTP)",
   type: AutomationStepType.ACTION,
   internal: true,
-  canLoop: true,
+  features: [AutomationFeature.LOOPING],
   stepId: AutomationActionStepId.SEND_EMAIL_SMTP,
   inputs: {},
   schema: {
diff --git a/packages/server/src/automations/steps/serverLog.ts b/packages/server/src/automations/steps/serverLog.ts
index 241d71a220..67535c8ded 100644
--- a/packages/server/src/automations/steps/serverLog.ts
+++ b/packages/server/src/automations/steps/serverLog.ts
@@ -4,6 +4,7 @@ import {
   AutomationStepInput,
   AutomationStepType,
   AutomationIOType,
+  AutomationFeature,
 } from "@budibase/types"
 
 /**
@@ -19,7 +20,7 @@ export const definition: AutomationStepSchema = {
   description: "Logs the given text to the server (using console.log)",
   type: AutomationStepType.ACTION,
   internal: true,
-  canLoop: true,
+  features: [AutomationFeature.LOOPING],
   stepId: AutomationActionStepId.SERVER_LOG,
   inputs: {
     text: "",
diff --git a/packages/server/src/automations/steps/slack.ts b/packages/server/src/automations/steps/slack.ts
index ec08f60e5a..769d81e2a3 100644
--- a/packages/server/src/automations/steps/slack.ts
+++ b/packages/server/src/automations/steps/slack.ts
@@ -6,6 +6,7 @@ import {
   AutomationStepInput,
   AutomationStepType,
   AutomationIOType,
+  AutomationFeature,
 } from "@budibase/types"
 
 export const definition: AutomationStepSchema = {
@@ -16,7 +17,7 @@ export const definition: AutomationStepSchema = {
   stepId: AutomationActionStepId.slack,
   type: AutomationStepType.ACTION,
   internal: false,
-  canLoop: true,
+  features: [AutomationFeature.LOOPING],
   inputs: {},
   schema: {
     inputs: {
diff --git a/packages/server/src/automations/steps/updateRow.ts b/packages/server/src/automations/steps/updateRow.ts
index 4b3457961b..c05b121106 100644
--- a/packages/server/src/automations/steps/updateRow.ts
+++ b/packages/server/src/automations/steps/updateRow.ts
@@ -4,6 +4,7 @@ import { buildCtx } from "./utils"
 import {
   AutomationActionStepId,
   AutomationCustomIOType,
+  AutomationFeature,
   AutomationIOType,
   AutomationStepInput,
   AutomationStepSchema,
@@ -17,7 +18,7 @@ export const definition: AutomationStepSchema = {
   description: "Update a row in your database",
   type: AutomationStepType.ACTION,
   internal: true,
-  canLoop: true,
+  features: [AutomationFeature.LOOPING],
   stepId: AutomationActionStepId.UPDATE_ROW,
   inputs: {},
   schema: {
diff --git a/packages/server/src/automations/steps/zapier.ts b/packages/server/src/automations/steps/zapier.ts
index 85f056e6dd..dcd96f0f48 100644
--- a/packages/server/src/automations/steps/zapier.ts
+++ b/packages/server/src/automations/steps/zapier.ts
@@ -6,6 +6,7 @@ import {
   AutomationStepInput,
   AutomationStepType,
   AutomationIOType,
+  AutomationFeature,
 } from "@budibase/types"
 
 export const definition: AutomationStepSchema = {
@@ -13,7 +14,7 @@ export const definition: AutomationStepSchema = {
   stepId: AutomationActionStepId.zapier,
   type: AutomationStepType.ACTION,
   internal: false,
-  canLoop: true,
+  features: [AutomationFeature.LOOPING],
   description: "Trigger a Zapier Zap via webhooks",
   tagline: "Trigger a Zapier Zap",
   icon: "ri-flashlight-line",
diff --git a/packages/types/src/documents/app/automation.ts b/packages/types/src/documents/app/automation.ts
index 70cefbb0d9..84c9072d0f 100644
--- a/packages/types/src/documents/app/automation.ts
+++ b/packages/types/src/documents/app/automation.ts
@@ -123,7 +123,11 @@ export interface AutomationStepSchema {
     outputs: InputOutputBlock
   }
   custom?: boolean
-  canLoop?: boolean
+  features?: AutomationFeature[]
+}
+
+export enum AutomationFeature {
+  LOOPING = "LOOPING",
 }
 
 export interface AutomationStep extends AutomationStepSchema {

From a8e40d711b3e172d6a3dbaf0ea86b762054ee175 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Mon, 22 May 2023 15:53:20 +0100
Subject: [PATCH 21/35] uneeded input value

---
 packages/server/src/automations/steps/collect.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/server/src/automations/steps/collect.ts b/packages/server/src/automations/steps/collect.ts
index 512dfc0dff..3ceadcb714 100644
--- a/packages/server/src/automations/steps/collect.ts
+++ b/packages/server/src/automations/steps/collect.ts
@@ -17,9 +17,7 @@ export const definition: AutomationStepSchema = {
   internal: true,
   features: [],
   stepId: AutomationActionStepId.COLLECT,
-  inputs: {
-    text: "",
-  },
+  inputs: {},
   schema: {
     inputs: {
       properties: {
@@ -28,7 +26,7 @@ export const definition: AutomationStepSchema = {
           title: "What to Collect",
         },
       },
-      required: ["text"],
+      required: ["collection"],
     },
     outputs: {
       properties: {

From 986348f511a6c6cdf832ce7893ed2f8ba9c7a904 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 23 May 2023 15:55:25 +0100
Subject: [PATCH 22/35] sync automation tests

---
 ...{automation.spec.js => automation.spec.ts} | 135 ++++++++++++++----
 .../src/tests/utilities/TestConfiguration.ts  |   6 +-
 .../server/src/tests/utilities/structures.ts  |  42 ++++++
 3 files changed, 150 insertions(+), 33 deletions(-)
 rename packages/server/src/api/routes/tests/{automation.spec.js => automation.spec.ts} (76%)

diff --git a/packages/server/src/api/routes/tests/automation.spec.js b/packages/server/src/api/routes/tests/automation.spec.ts
similarity index 76%
rename from packages/server/src/api/routes/tests/automation.spec.js
rename to packages/server/src/api/routes/tests/automation.spec.ts
index 9efc2b0d7e..a03bd8d0c3 100644
--- a/packages/server/src/api/routes/tests/automation.spec.js
+++ b/packages/server/src/api/routes/tests/automation.spec.ts
@@ -1,15 +1,26 @@
-const {
+import {
   checkBuilderEndpoint,
   getAllTableRows,
   clearAllAutomations,
   testAutomation,
-} = require("./utilities/TestFunctions")
-const setup = require("./utilities")
-const { basicAutomation, newAutomation, automationTrigger, automationStep } = setup.structures
-const MAX_RETRIES = 4
-const { TRIGGER_DEFINITIONS, BUILTIN_ACTION_DEFINITIONS } = require("../../../automations")
-const { events } = require("@budibase/backend-core")
+} from "./utilities/TestFunctions"
+import * as setup from "./utilities"
+import {
+  TRIGGER_DEFINITIONS,
+  BUILTIN_ACTION_DEFINITIONS,
+} from "../../../automations"
+import { events } from "@budibase/backend-core"
+import sdk from "../../../sdk"
+import { Automation } from "@budibase/types"
 
+const MAX_RETRIES = 4
+let {
+  basicAutomation,
+  newAutomation,
+  automationTrigger,
+  automationStep,
+  collectAutomation,
+} = setup.structures
 
 jest.setTimeout(30000)
 
@@ -24,6 +35,7 @@ describe("/automations", () => {
   })
 
   beforeEach(() => {
+    // @ts-ignore
     events.automation.deleted.mockClear()
   })
 
@@ -32,7 +44,7 @@ describe("/automations", () => {
       const res = await request
         .get(`/api/automations/action/list`)
         .set(config.defaultHeaders())
-        .expect('Content-Type', /json/)
+        .expect("Content-Type", /json/)
         .expect(200)
 
       expect(Object.keys(res.body).length).not.toEqual(0)
@@ -42,7 +54,7 @@ describe("/automations", () => {
       const res = await request
         .get(`/api/automations/trigger/list`)
         .set(config.defaultHeaders())
-        .expect('Content-Type', /json/)
+        .expect("Content-Type", /json/)
         .expect(200)
 
       expect(Object.keys(res.body).length).not.toEqual(0)
@@ -52,14 +64,18 @@ describe("/automations", () => {
       const res = await request
         .get(`/api/automations/definitions/list`)
         .set(config.defaultHeaders())
-        .expect('Content-Type', /json/)
+        .expect("Content-Type", /json/)
         .expect(200)
 
       let definitionsLength = Object.keys(BUILTIN_ACTION_DEFINITIONS).length
       definitionsLength-- // OUTGOING_WEBHOOK is deprecated
 
-      expect(Object.keys(res.body.action).length).toBeGreaterThanOrEqual(definitionsLength)
-      expect(Object.keys(res.body.trigger).length).toEqual(Object.keys(TRIGGER_DEFINITIONS).length)
+      expect(Object.keys(res.body.action).length).toBeGreaterThanOrEqual(
+        definitionsLength
+      )
+      expect(Object.keys(res.body.trigger).length).toEqual(
+        Object.keys(TRIGGER_DEFINITIONS).length
+      )
     })
   })
 
@@ -72,7 +88,7 @@ describe("/automations", () => {
         .post(`/api/automations`)
         .set(config.defaultHeaders())
         .send(automation)
-        .expect('Content-Type', /json/)
+        .expect("Content-Type", /json/)
         .expect(200)
 
       expect(res.body.message).toEqual("Automation created successfully")
@@ -91,7 +107,7 @@ describe("/automations", () => {
         .post(`/api/automations`)
         .set(config.defaultHeaders())
         .send(automation)
-        .expect('Content-Type', /json/)
+        .expect("Content-Type", /json/)
         .expect(200)
 
       expect(res.body.message).toEqual("Automation created successfully")
@@ -107,7 +123,7 @@ describe("/automations", () => {
         config,
         method: "POST",
         url: `/api/automations`,
-        body: automation
+        body: automation,
       })
     })
   })
@@ -118,7 +134,7 @@ describe("/automations", () => {
       const res = await request
         .get(`/api/automations/${automation._id}`)
         .set(config.defaultHeaders())
-        .expect('Content-Type', /json/)
+        .expect("Content-Type", /json/)
         .expect(200)
       expect(res.body._id).toEqual(automation._id)
       expect(res.body._rev).toEqual(automation._rev)
@@ -134,8 +150,8 @@ describe("/automations", () => {
         row: {
           name: "{{trigger.row.name}}",
           description: "{{trigger.row.description}}",
-          tableId: table._id
-        }
+          tableId: table._id,
+        },
       }
       automation.appId = config.appId
       automation = await config.createAutomation(automation)
@@ -162,23 +178,67 @@ describe("/automations", () => {
     })
   })
 
-  describe("update", () => {
+  describe("trigger", () => {
+    it("does not trigger an automation when not synchronous and in dev", async () => {
+      let automation = newAutomation()
+      automation = await config.createAutomation(automation)
+      const res = await request
+        .post(`/api/automations/${automation._id}/trigger`)
+        .set(config.defaultHeaders())
+        .expect("Content-Type", /json/)
+        .expect(400)
 
-    const update = async (automation) => {
+      expect(res.body.message).toEqual(
+        "Only apps in production support this endpoint"
+      )
+    })
+
+    it("triggers a synchronous automation", async () => {
+      let automation = collectAutomation()
+      automation = await config.createAutomation(automation)
+      const res = await request
+        .post(`/api/automations/${automation._id}/trigger`)
+        .set(config.defaultHeaders())
+        .expect("Content-Type", /json/)
+        .expect(200)
+
+      expect(res.body.success).toEqual(true)
+      expect(res.body.value).toEqual([1, 2, 3])
+    })
+
+    it("triggers an asynchronous automation", async () => {
+      let automation = newAutomation()
+      automation = await config.createAutomation(automation)
+      await config.publish()
+
+      const res = await request
+        .post(`/api/automations/${automation._id}/trigger`)
+        .set(config.defaultHeaders({}, true))
+        .expect("Content-Type", /json/)
+        .expect(200)
+
+      expect(res.body.message).toEqual(
+        `Automation ${automation._id} has been triggered.`
+      )
+    })
+  })
+
+  describe("update", () => {
+    const update = async (automation: Automation) => {
       return request
         .put(`/api/automations`)
         .set(config.defaultHeaders())
         .send(automation)
-        .expect('Content-Type', /json/)
+        .expect("Content-Type", /json/)
         .expect(200)
     }
 
-    const updateWithPost = async (automation) => {
+    const updateWithPost = async (automation: Automation) => {
       return request
         .post(`/api/automations`)
         .set(config.defaultHeaders())
         .send(automation)
-        .expect('Content-Type', /json/)
+        .expect("Content-Type", /json/)
         .expect(200)
     }
 
@@ -199,7 +259,9 @@ describe("/automations", () => {
       expect(automationRes._rev).not.toEqual(automation._rev)
       // content updates
       expect(automationRes.name).toEqual("Updated Name")
-      expect(message).toEqual(`Automation ${automation._id} updated successfully.`)
+      expect(message).toEqual(
+        `Automation ${automation._id} updated successfully.`
+      )
       // events
       expect(events.automation.created).not.toBeCalled()
       expect(events.automation.stepCreated).not.toBeCalled()
@@ -207,7 +269,6 @@ describe("/automations", () => {
       expect(events.automation.triggerUpdated).not.toBeCalled()
     })
 
-
     it("updates a automations name using POST request", async () => {
       let automation = newAutomation()
       await config.createAutomation(automation)
@@ -226,7 +287,9 @@ describe("/automations", () => {
       expect(automationRes._rev).not.toEqual(automation._rev)
       // content updates
       expect(automationRes.name).toEqual("Updated Name")
-      expect(message).toEqual(`Automation ${automation._id} updated successfully.`)
+      expect(message).toEqual(
+        `Automation ${automation._id} updated successfully.`
+      )
       // events
       expect(events.automation.created).not.toBeCalled()
       expect(events.automation.stepCreated).not.toBeCalled()
@@ -237,7 +300,9 @@ describe("/automations", () => {
     it("updates an automation trigger", async () => {
       let automation = newAutomation()
       automation = await config.createAutomation(automation)
-      automation.definition.trigger = automationTrigger(TRIGGER_DEFINITIONS.WEBHOOK)
+      automation.definition.trigger = automationTrigger(
+        TRIGGER_DEFINITIONS.WEBHOOK
+      )
       jest.clearAllMocks()
 
       await update(automation)
@@ -266,7 +331,6 @@ describe("/automations", () => {
       expect(events.automation.triggerUpdated).not.toBeCalled()
     })
 
-
     it("removes automation steps", async () => {
       let automation = newAutomation()
       automation.definition.steps.push(automationStep())
@@ -305,11 +369,11 @@ describe("/automations", () => {
     it("return all the automations for an instance", async () => {
       await clearAllAutomations(config)
       const autoConfig = basicAutomation()
-      automation = await config.createAutomation(autoConfig)
+      await config.createAutomation(autoConfig)
       const res = await request
         .get(`/api/automations`)
         .set(config.defaultHeaders())
-        .expect('Content-Type', /json/)
+        .expect("Content-Type", /json/)
         .expect(200)
 
       expect(res.body[0]).toEqual(expect.objectContaining(autoConfig))
@@ -330,7 +394,7 @@ describe("/automations", () => {
       const res = await request
         .delete(`/api/automations/${automation.id}/${automation.rev}`)
         .set(config.defaultHeaders())
-        .expect('Content-Type', /json/)
+        .expect("Content-Type", /json/)
         .expect(200)
 
       expect(res.body.id).toEqual(automation._id)
@@ -346,4 +410,13 @@ describe("/automations", () => {
       })
     })
   })
+
+  describe("checkForCollectStep", () => {
+    it("should return true if a collect step exists in an automation", async () => {
+      let automation = collectAutomation()
+      await config.createAutomation(automation)
+      let res = await sdk.automations.utils.checkForCollectStep(automation)
+      expect(res).toEqual(true)
+    })
+  })
 })
diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts
index f5887e6558..995035aa97 100644
--- a/packages/server/src/tests/utilities/TestConfiguration.ts
+++ b/packages/server/src/tests/utilities/TestConfiguration.ts
@@ -373,7 +373,7 @@ class TestConfiguration {
 
   // HEADERS
 
-  defaultHeaders(extras = {}) {
+  defaultHeaders(extras = {}, prodApp = false) {
     const tenantId = this.getTenantId()
     const authObj: AuthToken = {
       userId: this.defaultUserValues.globalUserId,
@@ -390,7 +390,9 @@ class TestConfiguration {
       ...extras,
     }
 
-    if (this.appId) {
+    if (prodApp) {
+      headers[constants.Header.APP_ID] = this.prodAppId
+    } else if (this.appId) {
       headers[constants.Header.APP_ID] = this.appId
     }
     return headers
diff --git a/packages/server/src/tests/utilities/structures.ts b/packages/server/src/tests/utilities/structures.ts
index e4e03fb85d..71f30f0074 100644
--- a/packages/server/src/tests/utilities/structures.ts
+++ b/packages/server/src/tests/utilities/structures.ts
@@ -199,6 +199,48 @@ export function loopAutomation(tableId: string, loopOpts?: any): Automation {
   return automation as Automation
 }
 
+export function collectAutomation(tableId?: string): Automation {
+  const automation: any = {
+    name: "looping",
+    type: "automation",
+    definition: {
+      steps: [
+        {
+          id: "b",
+          type: "ACTION",
+          internal: true,
+          stepId: AutomationActionStepId.EXECUTE_SCRIPT,
+          inputs: {
+            code: "return [1,2,3]",
+          },
+          schema: BUILTIN_ACTION_DEFINITIONS.EXECUTE_SCRIPT.schema,
+        },
+        {
+          id: "c",
+          type: "ACTION",
+          internal: true,
+          stepId: AutomationActionStepId.COLLECT,
+          inputs: {
+            collection: "{{ literal steps.1.value }}",
+          },
+          schema: BUILTIN_ACTION_DEFINITIONS.SERVER_LOG.schema,
+        },
+      ],
+      trigger: {
+        id: "a",
+        type: "TRIGGER",
+        event: "row:save",
+        stepId: AutomationTriggerStepId.ROW_SAVED,
+        inputs: {
+          tableId,
+        },
+        schema: TRIGGER_DEFINITIONS.ROW_SAVED.schema,
+      },
+    },
+  }
+  return automation as Automation
+}
+
 export function basicRow(tableId: string) {
   return {
     name: "Test Contact",

From 8d3a5307ed88770332a0eeb8ba961a79d1858bfe Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 23 May 2023 15:55:52 +0100
Subject: [PATCH 23/35] sync automation webhooks tests

---
 .../{webhook.spec.js => webhook.spec.ts}      | 44 ++++++++++++++-----
 1 file changed, 33 insertions(+), 11 deletions(-)
 rename packages/server/src/api/routes/tests/{webhook.spec.js => webhook.spec.ts} (74%)

diff --git a/packages/server/src/api/routes/tests/webhook.spec.js b/packages/server/src/api/routes/tests/webhook.spec.ts
similarity index 74%
rename from packages/server/src/api/routes/tests/webhook.spec.js
rename to packages/server/src/api/routes/tests/webhook.spec.ts
index 55368fb8ab..e7046d07c8 100644
--- a/packages/server/src/api/routes/tests/webhook.spec.js
+++ b/packages/server/src/api/routes/tests/webhook.spec.ts
@@ -1,11 +1,13 @@
-const setup = require("./utilities")
-const { checkBuilderEndpoint } = require("./utilities/TestFunctions")
-const { basicWebhook, basicAutomation } = setup.structures
+import { Webhook } from "@budibase/types"
+import * as setup from "./utilities"
+import { checkBuilderEndpoint } from "./utilities/TestFunctions"
+import { mocks } from "@budibase/backend-core/tests"
+const { basicWebhook, basicAutomation, collectAutomation } = setup.structures
 
 describe("/webhooks", () => {
   let request = setup.getRequest()
   let config = setup.getConfig()
-  let webhook
+  let webhook: Webhook
 
   afterAll(setup.afterAll)
 
@@ -13,10 +15,11 @@ describe("/webhooks", () => {
     config.modeSelf()
     await config.init()
     const autoConfig = basicAutomation()
-    autoConfig.definition.trigger = {
-      schema: { outputs: { properties: {} } },
-      inputs: {},
+    autoConfig.definition.trigger.schema = {
+      outputs: { properties: {} },
+      inputs: { properties: {} },
     }
+    autoConfig.definition.trigger.inputs = {}
     await config.createAutomation(autoConfig)
     webhook = await config.createWebhook()
   }
@@ -70,7 +73,7 @@ describe("/webhooks", () => {
 
   describe("delete", () => {
     beforeAll(setupTest)
-    
+
     it("should successfully delete", async () => {
       const res = await request
         .delete(`/api/webhooks/${webhook._id}/${webhook._rev}`)
@@ -97,7 +100,7 @@ describe("/webhooks", () => {
       const res = await request
         .post(`/api/webhooks/schema/${config.getAppId()}/${webhook._id}`)
         .send({
-          a: 1
+          a: 1,
         })
         .set(config.defaultHeaders())
         .expect("Content-Type", /json/)
@@ -112,7 +115,7 @@ describe("/webhooks", () => {
       expect(fetch.body[0]).toBeDefined()
       expect(fetch.body[0].bodySchema).toEqual({
         properties: {
-          a: { type: "integer" }
+          a: { type: "integer" },
         },
         type: "object",
       })
@@ -131,4 +134,23 @@ describe("/webhooks", () => {
       expect(res.body.message).toBeDefined()
     })
   })
-})
\ No newline at end of file
+
+  it("should trigger a synchronous webhook call ", async () => {
+    mocks.licenses.useSyncAutomations()
+    let automation = collectAutomation()
+    let newAutomation = await config.createAutomation(automation)
+    let syncWebhook = await config.createWebhook(
+      basicWebhook(newAutomation._id)
+    )
+
+    // replicate changes before checking webhook
+    await config.publish()
+
+    const res = await request
+      .post(`/api/webhooks/trigger/${config.prodAppId}/${syncWebhook._id}`)
+      .expect("Content-Type", /json/)
+      .expect(200)
+    expect(res.body.success).toEqual(true)
+    expect(res.body.value).toEqual([1, 2, 3])
+  })
+})

From 6818e4debb36abb73cbeafffa648b1e452e3cdd6 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 23 May 2023 16:12:20 +0100
Subject: [PATCH 24/35] check collection actually exists

---
 packages/server/src/automations/steps/collect.ts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/automations/steps/collect.ts b/packages/server/src/automations/steps/collect.ts
index 3ceadcb714..1107c68c32 100644
--- a/packages/server/src/automations/steps/collect.ts
+++ b/packages/server/src/automations/steps/collect.ts
@@ -45,8 +45,14 @@ export const definition: AutomationStepSchema = {
 }
 
 export async function run({ inputs }: AutomationStepInput) {
-  return {
-    success: true,
-    value: inputs.collection,
+  if (!inputs.collection) {
+    return {
+      success: false,
+    }
+  } else {
+    return {
+      success: true,
+      value: inputs.collection,
+    }
   }
 }

From a9bb534cdf5f3622cdee25baca5e3e4f431ba3b7 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 24 May 2023 14:41:58 +0100
Subject: [PATCH 25/35] set flag in automation orchestrator

---
 .../AutomationBuilder/FlowChart/FlowItem.svelte   |  2 +-
 packages/frontend-core/src/constants.js           |  2 +-
 packages/server/src/threads/automation.ts         | 15 ++++++++++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
index ce3756b6ae..88516b99b4 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
@@ -187,7 +187,7 @@
         {#if !isTrigger}
           <div>
             <div class="block-options">
-              {#if block?.features.includes("LOOPING")}
+              {#if block?.features?.includes("LOOPING")}
                 <ActionButton on:click={() => addLooping()} icon="Reuse">
                   Add Looping
                 </ActionButton>
diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js
index f897feee86..0497a392f3 100644
--- a/packages/frontend-core/src/constants.js
+++ b/packages/frontend-core/src/constants.js
@@ -70,7 +70,7 @@ export const Features = {
   ENFORCEABLE_SSO: "enforceableSSO",
   BRANDING: "branding",
   SCIM: "scim",
-  SYNC_AUTOMATIONS: "syncAutoamtions",
+  SYNC_AUTOMATIONS: "syncAutomations",
 }
 
 // Role IDs
diff --git a/packages/server/src/threads/automation.ts b/packages/server/src/threads/automation.ts
index e2c9de20a5..f70d18bbae 100644
--- a/packages/server/src/threads/automation.ts
+++ b/packages/server/src/threads/automation.ts
@@ -68,6 +68,7 @@ class Orchestrator {
   constructor(job: AutomationJob) {
     let automation = job.data.automation
     let triggerOutput = job.data.event
+    let timeout = job.data.event.timeout
     const metadata = triggerOutput.metadata
     this._chainCount = metadata ? metadata.automationChainCount! : 0
     this._appId = triggerOutput.appId as string
@@ -240,7 +241,9 @@ class Orchestrator {
     let loopStepNumber: any = undefined
     let loopSteps: LoopStep[] | undefined = []
     let metadata
+    let timeoutFlag = false
     let wasLoopStep = false
+    let timeout = this._job.data.event.timeout
     // check if this is a recurring automation,
     if (isProdAppID(this._appId) && isRecurring(automation)) {
       metadata = await this.getMetadata()
@@ -251,6 +254,16 @@ class Orchestrator {
     }
 
     for (let step of automation.definition.steps) {
+      if (timeoutFlag) {
+        break
+      }
+
+      if (timeout) {
+        setTimeout(() => {
+          timeoutFlag = true
+        }, timeout || 12000)
+      }
+
       stepCount++
       let input: any,
         iterations = 1,
@@ -391,7 +404,7 @@ class Orchestrator {
             emitter: this._emitter,
             context: this._context,
           })
-
+          console.log("after stepFn")
           this._context.steps[stepCount] = outputs
           // if filter causes us to stop execution don't break the loop, set a var
           // so that we can finish iterating through the steps and record that it stopped

From f91b599b725d4c630c90d50b8de7e01a50b1a060 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 24 May 2023 14:56:37 +0100
Subject: [PATCH 26/35] fix import

---
 .../ButtonActionEditor/actions/TriggerAutomation.svelte      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
index 8a38645ee7..4a70dd2fd4 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
@@ -2,8 +2,7 @@
   import { Select, Label, Input, Checkbox, Icon } from "@budibase/bbui"
   import { automationStore } from "builderStore"
   import SaveFields from "./SaveFields.svelte"
-  import { TriggerStepID } from "constants/backend/automations"
-  import { AutomationActionStepId } from "../../../../../../../../types/src/documents"
+  import { TriggerStepID, ActionStepID } from "constants/backend/automations"
 
   export let parameters = {}
   export let bindings = []
@@ -38,7 +37,7 @@
       ).map(([name, type]) => ({ name, type }))
 
       let hasCollectBlock = automation.definition.steps.some(
-        step => step.stepId === AutomationActionStepId.COLLECT
+        step => step.stepId === ActionStepID.COLLECT
       )
 
       return {

From c0477e328589f9a00f83e2da98d4eb1127464b58 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 24 May 2023 15:04:21 +0100
Subject: [PATCH 27/35] update pro

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index 9955edaa14..26a988f794 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 9955edaa147803dc271bf7bfb8c576b2aeb3dfa0
+Subproject commit 26a988f794fac0f88004890f127f8614beabfe20

From d675b256768af840d6adc519d2f0810c6ff36189 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 24 May 2023 15:16:04 +0100
Subject: [PATCH 28/35] unused import

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

diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
index c8de0b5692..c5e4eaf61f 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
@@ -12,7 +12,7 @@
   import { automationStore, selectedAutomation } from "builderStore"
   import { admin, licensing } from "stores/portal"
   import { externalActions } from "./ExternalActions"
-  import { TriggerStepID, ActionStepID } from "constants/backend/automations"
+  import { TriggerStepID } from "constants/backend/automations"
   import { checkForCollectStep } from "builderStore/utils"
 
   export let blockIdx

From b0a32f03b40333880f5e8657fed6389ddfc54262 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 25 May 2023 09:14:09 +0100
Subject: [PATCH 29/35] remove log

---
 packages/server/src/threads/automation.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/threads/automation.ts b/packages/server/src/threads/automation.ts
index f70d18bbae..9db647b693 100644
--- a/packages/server/src/threads/automation.ts
+++ b/packages/server/src/threads/automation.ts
@@ -404,7 +404,7 @@ class Orchestrator {
             emitter: this._emitter,
             context: this._context,
           })
-          console.log("after stepFn")
+
           this._context.steps[stepCount] = outputs
           // if filter causes us to stop execution don't break the loop, set a var
           // so that we can finish iterating through the steps and record that it stopped

From 5a73b028278390e114ec98dbeada8303dad0df18 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 26 May 2023 11:02:47 +0100
Subject: [PATCH 30/35] update feature array to be an object

---
 .../AutomationBuilder/FlowChart/FlowItem.svelte           | 8 ++++++--
 packages/builder/src/constants/backend/automations.js     | 4 ++++
 packages/server/src/automations/steps/bash.ts             | 4 +++-
 packages/server/src/automations/steps/collect.ts          | 2 +-
 packages/server/src/automations/steps/createRow.ts        | 4 +++-
 packages/server/src/automations/steps/delay.ts            | 2 +-
 packages/server/src/automations/steps/deleteRow.ts        | 4 +++-
 packages/server/src/automations/steps/discord.ts          | 4 +++-
 packages/server/src/automations/steps/executeQuery.ts     | 4 +++-
 packages/server/src/automations/steps/executeScript.ts    | 4 +++-
 packages/server/src/automations/steps/filter.ts           | 2 +-
 packages/server/src/automations/steps/loop.ts             | 2 +-
 packages/server/src/automations/steps/make.ts             | 4 +++-
 packages/server/src/automations/steps/openai.ts           | 1 +
 packages/server/src/automations/steps/outgoingWebhook.ts  | 4 +++-
 packages/server/src/automations/steps/queryRows.ts        | 4 +++-
 packages/server/src/automations/steps/sendSmtpEmail.ts    | 4 +++-
 packages/server/src/automations/steps/serverLog.ts        | 4 +++-
 packages/server/src/automations/steps/slack.ts            | 4 +++-
 packages/server/src/automations/steps/updateRow.ts        | 4 +++-
 packages/server/src/automations/steps/zapier.ts           | 4 +++-
 packages/types/src/documents/app/automation.ts            | 2 +-
 22 files changed, 58 insertions(+), 21 deletions(-)

diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
index 88516b99b4..092138170f 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
@@ -17,7 +17,11 @@
   import ActionModal from "./ActionModal.svelte"
   import FlowItemHeader from "./FlowItemHeader.svelte"
   import RoleSelect from "components/design/settings/controls/RoleSelect.svelte"
-  import { ActionStepID, TriggerStepID } from "constants/backend/automations"
+  import {
+    ActionStepID,
+    TriggerStepID,
+    Features,
+  } from "constants/backend/automations"
   import { permissions } from "stores/backend"
 
   export let block
@@ -187,7 +191,7 @@
         {#if !isTrigger}
           <div>
             <div class="block-options">
-              {#if block?.features?.includes("LOOPING")}
+              {#if block?.features?.[Features.LOOPING] || !block.features}
                 <ActionButton on:click={() => addLooping()} icon="Reuse">
                   Add Looping
                 </ActionButton>
diff --git a/packages/builder/src/constants/backend/automations.js b/packages/builder/src/constants/backend/automations.js
index 6c58ed8620..f89a126d3c 100644
--- a/packages/builder/src/constants/backend/automations.js
+++ b/packages/builder/src/constants/backend/automations.js
@@ -27,3 +27,7 @@ export const ActionStepID = {
   zapier: "zapier",
   integromat: "integromat",
 }
+
+export const Features = {
+  LOOPING: "LOOPING",
+}
diff --git a/packages/server/src/automations/steps/bash.ts b/packages/server/src/automations/steps/bash.ts
index 36e89f17de..61d446f12c 100644
--- a/packages/server/src/automations/steps/bash.ts
+++ b/packages/server/src/automations/steps/bash.ts
@@ -19,7 +19,9 @@ export const definition: AutomationStepSchema = {
   description: "Run a bash script",
   type: AutomationStepType.ACTION,
   internal: true,
-  features: [AutomationFeature.LOOPING],
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
   stepId: AutomationActionStepId.EXECUTE_BASH,
   inputs: {},
   schema: {
diff --git a/packages/server/src/automations/steps/collect.ts b/packages/server/src/automations/steps/collect.ts
index 1107c68c32..ef1fe64772 100644
--- a/packages/server/src/automations/steps/collect.ts
+++ b/packages/server/src/automations/steps/collect.ts
@@ -15,7 +15,7 @@ export const definition: AutomationStepSchema = {
     "Collects specified data so it can be provided to the design section",
   type: AutomationStepType.ACTION,
   internal: true,
-  features: [],
+  features: {},
   stepId: AutomationActionStepId.COLLECT,
   inputs: {},
   schema: {
diff --git a/packages/server/src/automations/steps/createRow.ts b/packages/server/src/automations/steps/createRow.ts
index 5886c95be5..d11baab5c6 100644
--- a/packages/server/src/automations/steps/createRow.ts
+++ b/packages/server/src/automations/steps/createRow.ts
@@ -18,7 +18,9 @@ export const definition: AutomationStepSchema = {
   description: "Add a row to your database",
   type: AutomationStepType.ACTION,
   internal: true,
-  features: [AutomationFeature.LOOPING],
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
   stepId: AutomationActionStepId.CREATE_ROW,
   inputs: {},
   schema: {
diff --git a/packages/server/src/automations/steps/delay.ts b/packages/server/src/automations/steps/delay.ts
index abddd73196..4e04539998 100644
--- a/packages/server/src/automations/steps/delay.ts
+++ b/packages/server/src/automations/steps/delay.ts
@@ -14,7 +14,7 @@ export const definition: AutomationStepSchema = {
   description: "Delay the automation until an amount of time has passed",
   stepId: AutomationActionStepId.DELAY,
   internal: true,
-  features: [],
+  features: {},
   inputs: {},
   schema: {
     inputs: {
diff --git a/packages/server/src/automations/steps/deleteRow.ts b/packages/server/src/automations/steps/deleteRow.ts
index 5ba52cfe99..c8b6585cae 100644
--- a/packages/server/src/automations/steps/deleteRow.ts
+++ b/packages/server/src/automations/steps/deleteRow.ts
@@ -19,7 +19,9 @@ export const definition: AutomationStepSchema = {
   type: AutomationStepType.ACTION,
   stepId: AutomationActionStepId.DELETE_ROW,
   internal: true,
-  features: [AutomationFeature.LOOPING],
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
   inputs: {},
   schema: {
     inputs: {
diff --git a/packages/server/src/automations/steps/discord.ts b/packages/server/src/automations/steps/discord.ts
index e495fe0241..c80e4ba66f 100644
--- a/packages/server/src/automations/steps/discord.ts
+++ b/packages/server/src/automations/steps/discord.ts
@@ -20,7 +20,9 @@ export const definition: AutomationStepSchema = {
   stepId: AutomationActionStepId.discord,
   type: AutomationStepType.ACTION,
   internal: false,
-  features: [AutomationFeature.LOOPING],
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
   inputs: {},
   schema: {
     inputs: {
diff --git a/packages/server/src/automations/steps/executeQuery.ts b/packages/server/src/automations/steps/executeQuery.ts
index 50893c7758..a9517b01a0 100644
--- a/packages/server/src/automations/steps/executeQuery.ts
+++ b/packages/server/src/automations/steps/executeQuery.ts
@@ -19,7 +19,9 @@ export const definition: AutomationStepSchema = {
   type: AutomationStepType.ACTION,
   stepId: AutomationActionStepId.EXECUTE_QUERY,
   internal: true,
-  features: [AutomationFeature.LOOPING],
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
   inputs: {},
   schema: {
     inputs: {
diff --git a/packages/server/src/automations/steps/executeScript.ts b/packages/server/src/automations/steps/executeScript.ts
index 5bfc6dee36..7ce6c1d0f4 100644
--- a/packages/server/src/automations/steps/executeScript.ts
+++ b/packages/server/src/automations/steps/executeScript.ts
@@ -20,7 +20,9 @@ export const definition: AutomationStepSchema = {
   internal: true,
   stepId: AutomationActionStepId.EXECUTE_SCRIPT,
   inputs: {},
-  features: [AutomationFeature.LOOPING],
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
   schema: {
     inputs: {
       properties: {
diff --git a/packages/server/src/automations/steps/filter.ts b/packages/server/src/automations/steps/filter.ts
index b96cfc0f07..3b000f8f29 100644
--- a/packages/server/src/automations/steps/filter.ts
+++ b/packages/server/src/automations/steps/filter.ts
@@ -28,7 +28,7 @@ export const definition: AutomationStepSchema = {
     "Conditionally halt automations which do not meet certain conditions",
   type: AutomationStepType.LOGIC,
   internal: true,
-  features: [],
+  features: {},
   stepId: AutomationActionStepId.FILTER,
   inputs: {
     condition: FilterConditions.EQUAL,
diff --git a/packages/server/src/automations/steps/loop.ts b/packages/server/src/automations/steps/loop.ts
index 729a0b5c01..cdf494c288 100644
--- a/packages/server/src/automations/steps/loop.ts
+++ b/packages/server/src/automations/steps/loop.ts
@@ -13,7 +13,7 @@ export const definition: AutomationStepSchema = {
   description: "Loop",
   stepId: AutomationActionStepId.LOOP,
   internal: true,
-  features: [],
+  features: {},
   inputs: {},
   schema: {
     inputs: {
diff --git a/packages/server/src/automations/steps/make.ts b/packages/server/src/automations/steps/make.ts
index c8e0ac8a91..e90648d573 100644
--- a/packages/server/src/automations/steps/make.ts
+++ b/packages/server/src/automations/steps/make.ts
@@ -19,7 +19,9 @@ export const definition: AutomationStepSchema = {
   stepId: AutomationActionStepId.integromat,
   type: AutomationStepType.ACTION,
   internal: false,
-  features: [AutomationFeature.LOOPING],
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
   inputs: {},
   schema: {
     inputs: {
diff --git a/packages/server/src/automations/steps/openai.ts b/packages/server/src/automations/steps/openai.ts
index 88d3fb8b85..8ae211579e 100644
--- a/packages/server/src/automations/steps/openai.ts
+++ b/packages/server/src/automations/steps/openai.ts
@@ -22,6 +22,7 @@ export const definition: AutomationStepSchema = {
   description: "Interact with the OpenAI ChatGPT API.",
   type: AutomationStepType.ACTION,
   internal: true,
+  features: {},
   stepId: AutomationActionStepId.OPENAI,
   inputs: {
     prompt: "",
diff --git a/packages/server/src/automations/steps/outgoingWebhook.ts b/packages/server/src/automations/steps/outgoingWebhook.ts
index 96fd279320..269c8c7157 100644
--- a/packages/server/src/automations/steps/outgoingWebhook.ts
+++ b/packages/server/src/automations/steps/outgoingWebhook.ts
@@ -33,7 +33,9 @@ export const definition: AutomationStepSchema = {
   description: "Send a request of specified method to a URL",
   type: AutomationStepType.ACTION,
   internal: true,
-  features: [AutomationFeature.LOOPING],
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
   stepId: AutomationActionStepId.OUTGOING_WEBHOOK,
   inputs: {
     requestMethod: "POST",
diff --git a/packages/server/src/automations/steps/queryRows.ts b/packages/server/src/automations/steps/queryRows.ts
index c50170a733..28da430858 100644
--- a/packages/server/src/automations/steps/queryRows.ts
+++ b/packages/server/src/automations/steps/queryRows.ts
@@ -43,7 +43,9 @@ export const definition: AutomationStepSchema = {
   type: AutomationStepType.ACTION,
   stepId: AutomationActionStepId.QUERY_ROWS,
   internal: true,
-  features: [AutomationFeature.LOOPING],
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
   inputs: {},
   schema: {
     inputs: {
diff --git a/packages/server/src/automations/steps/sendSmtpEmail.ts b/packages/server/src/automations/steps/sendSmtpEmail.ts
index c2614c3e3c..448c374ce8 100644
--- a/packages/server/src/automations/steps/sendSmtpEmail.ts
+++ b/packages/server/src/automations/steps/sendSmtpEmail.ts
@@ -16,7 +16,9 @@ export const definition: AutomationStepSchema = {
   name: "Send Email (SMTP)",
   type: AutomationStepType.ACTION,
   internal: true,
-  features: [AutomationFeature.LOOPING],
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
   stepId: AutomationActionStepId.SEND_EMAIL_SMTP,
   inputs: {},
   schema: {
diff --git a/packages/server/src/automations/steps/serverLog.ts b/packages/server/src/automations/steps/serverLog.ts
index 67535c8ded..eb75ca1f3b 100644
--- a/packages/server/src/automations/steps/serverLog.ts
+++ b/packages/server/src/automations/steps/serverLog.ts
@@ -20,7 +20,9 @@ export const definition: AutomationStepSchema = {
   description: "Logs the given text to the server (using console.log)",
   type: AutomationStepType.ACTION,
   internal: true,
-  features: [AutomationFeature.LOOPING],
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
   stepId: AutomationActionStepId.SERVER_LOG,
   inputs: {
     text: "",
diff --git a/packages/server/src/automations/steps/slack.ts b/packages/server/src/automations/steps/slack.ts
index 769d81e2a3..79544bf001 100644
--- a/packages/server/src/automations/steps/slack.ts
+++ b/packages/server/src/automations/steps/slack.ts
@@ -17,7 +17,9 @@ export const definition: AutomationStepSchema = {
   stepId: AutomationActionStepId.slack,
   type: AutomationStepType.ACTION,
   internal: false,
-  features: [AutomationFeature.LOOPING],
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
   inputs: {},
   schema: {
     inputs: {
diff --git a/packages/server/src/automations/steps/updateRow.ts b/packages/server/src/automations/steps/updateRow.ts
index c05b121106..5ed4e19f61 100644
--- a/packages/server/src/automations/steps/updateRow.ts
+++ b/packages/server/src/automations/steps/updateRow.ts
@@ -18,7 +18,9 @@ export const definition: AutomationStepSchema = {
   description: "Update a row in your database",
   type: AutomationStepType.ACTION,
   internal: true,
-  features: [AutomationFeature.LOOPING],
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
   stepId: AutomationActionStepId.UPDATE_ROW,
   inputs: {},
   schema: {
diff --git a/packages/server/src/automations/steps/zapier.ts b/packages/server/src/automations/steps/zapier.ts
index dcd96f0f48..d69ac39ba7 100644
--- a/packages/server/src/automations/steps/zapier.ts
+++ b/packages/server/src/automations/steps/zapier.ts
@@ -14,7 +14,9 @@ export const definition: AutomationStepSchema = {
   stepId: AutomationActionStepId.zapier,
   type: AutomationStepType.ACTION,
   internal: false,
-  features: [AutomationFeature.LOOPING],
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
   description: "Trigger a Zapier Zap via webhooks",
   tagline: "Trigger a Zapier Zap",
   icon: "ri-flashlight-line",
diff --git a/packages/types/src/documents/app/automation.ts b/packages/types/src/documents/app/automation.ts
index 3e361806ae..193a5a414a 100644
--- a/packages/types/src/documents/app/automation.ts
+++ b/packages/types/src/documents/app/automation.ts
@@ -124,7 +124,7 @@ export interface AutomationStepSchema {
     outputs: InputOutputBlock
   }
   custom?: boolean
-  features?: AutomationFeature[]
+  features?: Partial<Record<AutomationFeature, boolean>>
 }
 
 export enum AutomationFeature {

From 9dc354c28b6ed8d3459df0f343fe58447d5619e2 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 26 May 2023 11:15:44 +0100
Subject: [PATCH 31/35] update pro

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index 26a988f794..6265117ac4 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 26a988f794fac0f88004890f127f8614beabfe20
+Subproject commit 6265117ac441bb6b945b6320dea1f460e197233c

From 221d03c15343ed122f4fd3b6d8017f145e275b87 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 26 May 2023 13:18:08 +0100
Subject: [PATCH 32/35] fix reactivity bug with synchronous param

---
 .../actions/TriggerAutomation.svelte          | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
index 4a70dd2fd4..4c54761650 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
@@ -7,8 +7,6 @@
   export let parameters = {}
   export let bindings = []
 
-  let synchronous = parameters.synchronous
-
   const AUTOMATION_STATUS = {
     NEW: "new",
     EXISTING: "existing",
@@ -20,14 +18,11 @@
 
   $: {
     if (automationStatus === AUTOMATION_STATUS.NEW) {
-      synchronous = false
-    }
-
-    if (automationStatus === AUTOMATION_STATUS.EXISTING) {
-      synchronous = automations.find(
-        automation => automation._id === parameters.automationId
-      ).synchronous
+      parameters.synchronous = false
     }
+    parameters.synchronous = automations.find(
+      automation => automation._id === parameters.automationId
+    )?.synchronous
   }
   $: automations = $automationStore.automations
     .filter(a => a.definition.trigger?.stepId === TriggerStepID.APP)
@@ -80,11 +75,10 @@
 
   const onChange = value => {
     let automationId = value.detail
-    synchronous = automations.find(
+    parameters.synchronous = automations.find(
       automation => automation._id === automationId
-    ).synchronous
+    )?.synchronous
     parameters.automationId = automationId
-    parameters.synchronous = synchronous
   }
 </script>
 
@@ -128,7 +122,7 @@
       />
     {/if}
 
-    {#if synchronous}
+    {#if parameters.synchronous}
       <Label small />
 
       <div class="synchronous-info">

From 66e1f57a3d6452a52d93a0abe86b9b9d85fc92ac Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 26 May 2023 16:06:16 +0100
Subject: [PATCH 33/35] one more feature check for safety on the trigger

---
 packages/server/src/api/controllers/automation.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/api/controllers/automation.ts b/packages/server/src/api/controllers/automation.ts
index 79f93c3efa..be7af7b075 100644
--- a/packages/server/src/api/controllers/automation.ts
+++ b/packages/server/src/api/controllers/automation.ts
@@ -14,7 +14,7 @@ import { deleteEntityMetadata } from "../../utilities"
 import { MetadataTypes } from "../../constants"
 import { setTestFlag, clearTestFlag } from "../../utilities/redis"
 import { context, cache, events } from "@budibase/backend-core"
-import { automations } from "@budibase/pro"
+import { automations, features } from "@budibase/pro"
 import {
   Automation,
   AutomationActionStepId,
@@ -266,7 +266,7 @@ export async function trigger(ctx: BBContext) {
   let automation = await db.get(ctx.params.id)
 
   let hasCollectStep = sdk.automations.utils.checkForCollectStep(automation)
-  if (hasCollectStep) {
+  if (hasCollectStep && (await features.isSyncAutomationsEnabled())) {
     const response: AutomationResults = await triggers.externalTrigger(
       automation,
       {

From 9a1071918ba441286d2088cb540d65a4e5d6c4ef Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 26 May 2023 16:40:58 +0100
Subject: [PATCH 34/35] Latest version of pro.

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index 6265117ac4..3d307df17a 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 6265117ac441bb6b945b6320dea1f460e197233c
+Subproject commit 3d307df17a53ba25bbf5d9ddc94b1706c813eb6f

From 2ae960e2eead46cfa82af937b3cb1944990574ac Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 26 May 2023 16:58:00 +0100
Subject: [PATCH 35/35] fix broken test

---
 packages/server/src/api/routes/tests/automation.spec.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/server/src/api/routes/tests/automation.spec.ts b/packages/server/src/api/routes/tests/automation.spec.ts
index a03bd8d0c3..178189555d 100644
--- a/packages/server/src/api/routes/tests/automation.spec.ts
+++ b/packages/server/src/api/routes/tests/automation.spec.ts
@@ -12,6 +12,7 @@ import {
 import { events } from "@budibase/backend-core"
 import sdk from "../../../sdk"
 import { Automation } from "@budibase/types"
+import { mocks } from "@budibase/backend-core/tests"
 
 const MAX_RETRIES = 4
 let {
@@ -194,6 +195,7 @@ describe("/automations", () => {
     })
 
     it("triggers a synchronous automation", async () => {
+      mocks.licenses.useSyncAutomations()
       let automation = collectAutomation()
       automation = await config.createAutomation(automation)
       const res = await request