From 0e3689548c349b188bdd779638d4da93550cb747 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Tue, 14 Jan 2025 14:45:37 +0000
Subject: [PATCH 1/9] Initial work to make a new JS script block in
 automations.

---
 .../src/constants/backend/automations.ts      |  1 +
 .../builder/src/stores/builder/automations.ts |  5 +-
 packages/server/src/automations/actions.ts    |  3 +
 .../src/automations/steps/executeScriptV2.ts  | 82 +++++++++++++++++++
 .../tests/utilities/AutomationTestBuilder.ts  | 15 ++++
 .../documents/app/automation/automation.ts    |  1 +
 .../src/documents/app/automation/schema.ts    | 10 +++
 7 files changed, 116 insertions(+), 1 deletion(-)
 create mode 100644 packages/server/src/automations/steps/executeScriptV2.ts

diff --git a/packages/builder/src/constants/backend/automations.ts b/packages/builder/src/constants/backend/automations.ts
index 37ae35aea0..3c8ac8d362 100644
--- a/packages/builder/src/constants/backend/automations.ts
+++ b/packages/builder/src/constants/backend/automations.ts
@@ -15,6 +15,7 @@ export const ActionStepID = {
   DELETE_ROW: "DELETE_ROW",
   OUTGOING_WEBHOOK: "OUTGOING_WEBHOOK",
   EXECUTE_SCRIPT: "EXECUTE_SCRIPT",
+  EXECUTE_SCRIPT_V2: "EXECUTE_SCRIPT_V2",
   EXECUTE_QUERY: "EXECUTE_QUERY",
   SERVER_LOG: "SERVER_LOG",
   DELAY: "DELAY",
diff --git a/packages/builder/src/stores/builder/automations.ts b/packages/builder/src/stores/builder/automations.ts
index 9b20b4cd03..c44bad9eeb 100644
--- a/packages/builder/src/stores/builder/automations.ts
+++ b/packages/builder/src/stores/builder/automations.ts
@@ -676,7 +676,10 @@ const automationActions = (store: AutomationStore) => ({
       runtimeName = `loop.${name}`
     } else if (idx === 0) {
       runtimeName = `trigger.${name}`
-    } else if (currentBlock?.stepId === AutomationActionStepId.EXECUTE_SCRIPT) {
+    } else if (
+      currentBlock?.stepId === AutomationActionStepId.EXECUTE_SCRIPT ||
+      currentBlock?.stepId === AutomationActionStepId.EXECUTE_SCRIPT_V2
+    ) {
       const stepId = pathSteps[idx].id
       if (!stepId) {
         notifications.error("Error generating binding: Step ID not found.")
diff --git a/packages/server/src/automations/actions.ts b/packages/server/src/automations/actions.ts
index 537b6befc3..c50a4482fc 100644
--- a/packages/server/src/automations/actions.ts
+++ b/packages/server/src/automations/actions.ts
@@ -3,6 +3,7 @@ import * as createRow from "./steps/createRow"
 import * as updateRow from "./steps/updateRow"
 import * as deleteRow from "./steps/deleteRow"
 import * as executeScript from "./steps/executeScript"
+import * as executeScriptV2 from "./steps/executeScriptV2"
 import * as executeQuery from "./steps/executeQuery"
 import * as outgoingWebhook from "./steps/outgoingWebhook"
 import * as serverLog from "./steps/serverLog"
@@ -42,6 +43,7 @@ const ACTION_IMPLS: ActionImplType = {
   DELETE_ROW: deleteRow.run,
   OUTGOING_WEBHOOK: outgoingWebhook.run,
   EXECUTE_SCRIPT: executeScript.run,
+  EXECUTE_SCRIPT_V2: executeScriptV2.run,
   EXECUTE_QUERY: executeQuery.run,
   SERVER_LOG: serverLog.run,
   DELAY: delay.run,
@@ -68,6 +70,7 @@ export const BUILTIN_ACTION_DEFINITIONS: Record<
   DELETE_ROW: deleteRow.definition,
   OUTGOING_WEBHOOK: outgoingWebhook.definition,
   EXECUTE_SCRIPT: executeScript.definition,
+  EXECUTE_SCRIPT_V2: executeScriptV2.definition,
   EXECUTE_QUERY: executeQuery.definition,
   SERVER_LOG: serverLog.definition,
   DELAY: delay.definition,
diff --git a/packages/server/src/automations/steps/executeScriptV2.ts b/packages/server/src/automations/steps/executeScriptV2.ts
new file mode 100644
index 0000000000..e58ee244d4
--- /dev/null
+++ b/packages/server/src/automations/steps/executeScriptV2.ts
@@ -0,0 +1,82 @@
+import * as automationUtils from "../automationUtils"
+import {
+  AutomationActionStepId,
+  AutomationCustomIOType,
+  AutomationFeature,
+  AutomationIOType,
+  AutomationStepDefinition,
+  AutomationStepType,
+  ExecuteScriptStepInputs,
+  ExecuteScriptStepOutputs,
+} from "@budibase/types"
+import { processStringSync } from "@budibase/string-templates"
+
+export const definition: AutomationStepDefinition = {
+  name: "JS Scripting",
+  tagline: "Execute JavaScript Code",
+  icon: "Code",
+  description: "Run a piece of JavaScript code in your automation",
+  type: AutomationStepType.ACTION,
+  internal: true,
+  stepId: AutomationActionStepId.EXECUTE_SCRIPT_V2,
+  inputs: {},
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
+  schema: {
+    inputs: {
+      properties: {
+        code: {
+          type: AutomationIOType.STRING,
+          customType: AutomationCustomIOType.CODE,
+          title: "Code",
+        },
+      },
+      required: ["code"],
+    },
+    outputs: {
+      properties: {
+        value: {
+          type: AutomationIOType.STRING,
+          description: "The result of the return statement",
+        },
+        success: {
+          type: AutomationIOType.BOOLEAN,
+          description: "Whether the action was successful",
+        },
+      },
+      required: ["success"],
+    },
+  },
+}
+
+export async function run({
+  inputs,
+  context,
+}: {
+  inputs: ExecuteScriptStepInputs
+  context: Record<string, any>
+}): Promise<ExecuteScriptStepOutputs> {
+  if (inputs.code == null) {
+    return {
+      success: false,
+      response: {
+        message: "Invalid inputs",
+      },
+    }
+  }
+
+  const js = Buffer.from(inputs.code, "utf-8").toString("base64")
+
+  try {
+    return {
+      success: true,
+      value: processStringSync(`{{ js "${js}" }}`, context),
+    }
+  } catch (err) {
+    return {
+      success: false,
+      response: automationUtils.getError(err),
+    }
+  }
+}
diff --git a/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts b/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts
index acc35a0eeb..840c107b3e 100644
--- a/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts
+++ b/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts
@@ -208,6 +208,9 @@ class BaseStepBuilder {
     )
   }
 
+  /**
+   * @deprecated Use `executeScriptV2` instead
+   */
   executeScript(
     input: ExecuteScriptStepInputs,
     opts?: { stepName?: string; stepId?: string }
@@ -220,6 +223,18 @@ class BaseStepBuilder {
     )
   }
 
+  executeScriptV2(
+    input: ExecuteScriptStepInputs,
+    opts?: { stepName?: string; stepId?: string }
+  ): this {
+    return this.step(
+      AutomationActionStepId.EXECUTE_SCRIPT_V2,
+      BUILTIN_ACTION_DEFINITIONS.EXECUTE_SCRIPT_V2,
+      input,
+      opts
+    )
+  }
+
   filter(input: FilterStepInputs): this {
     return this.step(
       AutomationActionStepId.FILTER,
diff --git a/packages/types/src/documents/app/automation/automation.ts b/packages/types/src/documents/app/automation/automation.ts
index d56f0de879..0bb3750c5c 100644
--- a/packages/types/src/documents/app/automation/automation.ts
+++ b/packages/types/src/documents/app/automation/automation.ts
@@ -63,6 +63,7 @@ export enum AutomationActionStepId {
   EXECUTE_BASH = "EXECUTE_BASH",
   OUTGOING_WEBHOOK = "OUTGOING_WEBHOOK",
   EXECUTE_SCRIPT = "EXECUTE_SCRIPT",
+  EXECUTE_SCRIPT_V2 = "EXECUTE_SCRIPT_V2",
   EXECUTE_QUERY = "EXECUTE_QUERY",
   SERVER_LOG = "SERVER_LOG",
   DELAY = "DELAY",
diff --git a/packages/types/src/documents/app/automation/schema.ts b/packages/types/src/documents/app/automation/schema.ts
index 84bfebf6bf..677d25d4ce 100644
--- a/packages/types/src/documents/app/automation/schema.ts
+++ b/packages/types/src/documents/app/automation/schema.ts
@@ -79,6 +79,10 @@ export type ActionImplementations<T extends Hosting> = {
     ExecuteScriptStepInputs,
     ExecuteScriptStepOutputs
   >
+  [AutomationActionStepId.EXECUTE_SCRIPT_V2]: ActionImplementation<
+    ExecuteScriptStepInputs,
+    ExecuteScriptStepOutputs
+  >
   [AutomationActionStepId.FILTER]: ActionImplementation<
     FilterStepInputs,
     FilterStepOutputs
@@ -190,6 +194,8 @@ export type AutomationStepInputs<T extends AutomationActionStepId> =
     ? ExecuteQueryStepInputs
     : T extends AutomationActionStepId.EXECUTE_SCRIPT
     ? ExecuteScriptStepInputs
+    : T extends AutomationActionStepId.EXECUTE_SCRIPT_V2
+    ? ExecuteScriptStepInputs
     : T extends AutomationActionStepId.FILTER
     ? FilterStepInputs
     : T extends AutomationActionStepId.QUERY_ROWS
@@ -247,6 +253,9 @@ export type ExecuteQueryStep =
 export type ExecuteScriptStep =
   AutomationStepSchema<AutomationActionStepId.EXECUTE_SCRIPT>
 
+export type ExecuteScriptV2Step =
+  AutomationStepSchema<AutomationActionStepId.EXECUTE_SCRIPT_V2>
+
 export type FilterStep = AutomationStepSchema<AutomationActionStepId.FILTER>
 
 export type QueryRowsStep =
@@ -293,6 +302,7 @@ export type AutomationStep =
   | DeleteRowStep
   | ExecuteQueryStep
   | ExecuteScriptStep
+  | ExecuteScriptV2Step
   | FilterStep
   | QueryRowsStep
   | SendEmailSmtpStep

From d92a82f44d3a452877af5cc31c4d7302db69089b Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Tue, 14 Jan 2025 15:04:41 +0000
Subject: [PATCH 2/9] Temporarily rename new step.

---
 packages/server/src/automations/steps/executeScriptV2.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/automations/steps/executeScriptV2.ts b/packages/server/src/automations/steps/executeScriptV2.ts
index e58ee244d4..20a0ed0805 100644
--- a/packages/server/src/automations/steps/executeScriptV2.ts
+++ b/packages/server/src/automations/steps/executeScriptV2.ts
@@ -12,7 +12,7 @@ import {
 import { processStringSync } from "@budibase/string-templates"
 
 export const definition: AutomationStepDefinition = {
-  name: "JS Scripting",
+  name: "JS Scripting V2",
   tagline: "Execute JavaScript Code",
   icon: "Code",
   description: "Run a piece of JavaScript code in your automation",

From bf281fdff5658228ce28c2e0e34a6c9236ada2ff Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Tue, 14 Jan 2025 16:14:37 +0000
Subject: [PATCH 3/9] Assume code is already base64 encoded.

---
 packages/server/src/automations/steps/executeScriptV2.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/server/src/automations/steps/executeScriptV2.ts b/packages/server/src/automations/steps/executeScriptV2.ts
index 20a0ed0805..d568245f4d 100644
--- a/packages/server/src/automations/steps/executeScriptV2.ts
+++ b/packages/server/src/automations/steps/executeScriptV2.ts
@@ -66,12 +66,10 @@ export async function run({
     }
   }
 
-  const js = Buffer.from(inputs.code, "utf-8").toString("base64")
-
   try {
     return {
       success: true,
-      value: processStringSync(`{{ js "${js}" }}`, context),
+      value: processStringSync(inputs.code, context),
     }
   } catch (err) {
     return {

From 96869c2b4d2f3ec3f057649d5a9561c6a24d239d Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Tue, 14 Jan 2025 17:09:35 +0000
Subject: [PATCH 4/9] Deprecate old JS script block, mark new one as... well,
 new.

---
 .../FlowChart/ActionModal.svelte               |  6 ++++++
 .../src/automations/steps/executeScript.ts     |  1 +
 .../src/automations/steps/executeScriptV2.ts   | 18 ++++++++++++++++--
 .../src/documents/app/automation/schema.ts     |  1 +
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
index 706c196fff..4400c3fcf3 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
@@ -186,6 +186,12 @@
               </div>
             {:else if isDisabled}
               <Icon name="Help" tooltip={disabled()[idx].message} />
+            {:else if action.new}
+              <div class="tag-color">
+                <Tags>
+                  <Tag>New</Tag>
+                </Tags>
+              </div>
             {/if}
           </div>
         </div>
diff --git a/packages/server/src/automations/steps/executeScript.ts b/packages/server/src/automations/steps/executeScript.ts
index 97145f3e14..58ddb332c1 100644
--- a/packages/server/src/automations/steps/executeScript.ts
+++ b/packages/server/src/automations/steps/executeScript.ts
@@ -15,6 +15,7 @@ import { EventEmitter } from "events"
 
 export const definition: AutomationStepDefinition = {
   name: "JS Scripting",
+  deprecated: true,
   tagline: "Execute JavaScript Code",
   icon: "Code",
   description: "Run a piece of JavaScript code in your automation",
diff --git a/packages/server/src/automations/steps/executeScriptV2.ts b/packages/server/src/automations/steps/executeScriptV2.ts
index d568245f4d..f5edf20f7d 100644
--- a/packages/server/src/automations/steps/executeScriptV2.ts
+++ b/packages/server/src/automations/steps/executeScriptV2.ts
@@ -12,12 +12,13 @@ import {
 import { processStringSync } from "@budibase/string-templates"
 
 export const definition: AutomationStepDefinition = {
-  name: "JS Scripting V2",
+  name: "JS Scripting",
   tagline: "Execute JavaScript Code",
   icon: "Code",
   description: "Run a piece of JavaScript code in your automation",
   type: AutomationStepType.ACTION,
   internal: true,
+  new: true,
   stepId: AutomationActionStepId.EXECUTE_SCRIPT_V2,
   inputs: {},
   features: {
@@ -57,7 +58,9 @@ export async function run({
   inputs: ExecuteScriptStepInputs
   context: Record<string, any>
 }): Promise<ExecuteScriptStepOutputs> {
-  if (inputs.code == null) {
+  let { code } = inputs
+
+  if (code == null) {
     return {
       success: false,
       response: {
@@ -66,6 +69,17 @@ export async function run({
     }
   }
 
+  code = code.trim()
+
+  if (!code.startsWith("{{ js ")) {
+    return {
+      success: false,
+      response: {
+        message: "Expected code to be a {{ js }} template block",
+      },
+    }
+  }
+
   try {
     return {
       success: true,
diff --git a/packages/types/src/documents/app/automation/schema.ts b/packages/types/src/documents/app/automation/schema.ts
index 677d25d4ce..a712b9e45b 100644
--- a/packages/types/src/documents/app/automation/schema.ts
+++ b/packages/types/src/documents/app/automation/schema.ts
@@ -154,6 +154,7 @@ export interface AutomationStepSchemaBase {
   type: AutomationStepType
   internal?: boolean
   deprecated?: boolean
+  new?: boolean
   blockToLoop?: string
   schema: {
     inputs: InputOutputBlock

From 6dafe79e671f838ad6e5761e20ae077a8923d89f Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Wed, 15 Jan 2025 12:24:33 +0000
Subject: [PATCH 5/9] Tweak styling of new component, add deprecation warning
 to old component.

---
 packages/bbui/src/Tags/Tag.svelte             |  7 +++++
 .../FlowChart/ActionModal.svelte              | 19 +++++++------
 .../FlowChart/FlowItemHeader.svelte           | 21 ++++++++++++--
 .../builder/src/stores/builder/automations.ts | 21 ++++++++------
 .../server/src/api/controllers/automation.ts  | 18 ++++--------
 .../src/api/routes/tests/automation.spec.ts   |  9 ++----
 .../src/automations/steps/executeScriptV2.ts  |  4 +--
 packages/server/src/automations/utils.ts      | 28 +------------------
 packages/types/src/ui/stores/automations.ts   | 11 ++++++--
 9 files changed, 68 insertions(+), 70 deletions(-)

diff --git a/packages/bbui/src/Tags/Tag.svelte b/packages/bbui/src/Tags/Tag.svelte
index 0cdd6c385d..b54bd234c5 100644
--- a/packages/bbui/src/Tags/Tag.svelte
+++ b/packages/bbui/src/Tags/Tag.svelte
@@ -6,6 +6,7 @@
   export let icon = ""
   export let avatar = ""
   export let invalid = false
+  export let emphasized = false
   export let disabled = false
   export let closable = false
 </script>
@@ -13,6 +14,7 @@
 <div
   class:is-invalid={invalid}
   class:is-disabled={disabled}
+  class:is-emphasized={emphasized}
   class="spectrum-Tags-item"
   role="listitem"
 >
@@ -40,4 +42,9 @@
     margin-bottom: 0;
     margin-top: 0;
   }
+
+  .is-emphasized {
+    border-color: var(--spectrum-global-color-blue-700);
+    color: var(--spectrum-global-color-blue-700);
+  }
 </style>
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
index 4400c3fcf3..d9f5ad1ef6 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
@@ -23,9 +23,8 @@
   let collectBlockAllowedSteps = [TriggerStepID.APP, TriggerStepID.WEBHOOK]
   let selectedAction
   let actions = Object.entries($automationStore.blockDefinitions.ACTION).filter(
-    entry => {
-      const [key] = entry
-      return key !== AutomationActionStepId.BRANCH
+    ([key, action]) => {
+      return key !== AutomationActionStepId.BRANCH && action.deprecated !== true
     }
   )
   let lockedFeatures = [
@@ -187,11 +186,9 @@
             {:else if isDisabled}
               <Icon name="Help" tooltip={disabled()[idx].message} />
             {:else if action.new}
-              <div class="tag-color">
-                <Tags>
-                  <Tag>New</Tag>
-                </Tags>
-              </div>
+              <Tags>
+                <Tag emphasized>New</Tag>
+              </Tags>
             {/if}
           </div>
         </div>
@@ -233,6 +230,10 @@
     grid-gap: var(--spectrum-alias-grid-baseline);
   }
 
+  .item :global(.spectrum-Tags-itemLabel) {
+    cursor: pointer;
+  }
+
   .item {
     cursor: pointer;
     grid-gap: var(--spectrum-alias-grid-margin-xsmall);
@@ -243,6 +244,8 @@
     border-radius: 5px;
     box-sizing: border-box;
     border-width: 2px;
+    min-height: 3.5rem;
+    display: flex;
   }
   .item:not(.disabled):hover,
   .selected {
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
index e81d6d0f5c..f3dea4885f 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
@@ -1,6 +1,13 @@
 <script>
   import { automationStore, selectedAutomation } from "@/stores/builder"
-  import { Icon, Body, AbsTooltip, StatusLight } from "@budibase/bbui"
+  import {
+    Icon,
+    Body,
+    AbsTooltip,
+    StatusLight,
+    Tags,
+    Tag,
+  } from "@budibase/bbui"
   import { externalActions } from "./ExternalActions"
   import { createEventDispatcher } from "svelte"
   import { Features } from "@/constants/backend/automations"
@@ -24,6 +31,7 @@
   $: blockRefs = $selectedAutomation?.blockRefs || {}
   $: stepNames = automation?.definition.stepNames || {}
   $: allSteps = automation?.definition.steps || []
+  $: blockDefinition = $automationStore.blockDefinitions.ACTION[block.stepId]
   $: automationName = itemName || stepNames?.[block.id] || block?.name || ""
   $: automationNameError = getAutomationNameError(automationName)
   $: status = updateStatus(testResult)
@@ -135,7 +143,16 @@
         {#if isHeaderTrigger}
           <Body size="XS"><b>Trigger</b></Body>
         {:else}
-          <Body size="XS"><b>{isBranch ? "Branch" : "Step"}</b></Body>
+          <Body size="XS">
+            <div style="display: flex; gap: 0.5rem; align-items: center;">
+              <b>{isBranch ? "Branch" : "Step"}</b>
+              {#if blockDefinition.deprecated}
+                <Tags>
+                  <Tag invalid>Deprecated</Tag>
+                </Tags>
+              {/if}
+            </div>
+          </Body>
         {/if}
 
         {#if enableNaming}
diff --git a/packages/builder/src/stores/builder/automations.ts b/packages/builder/src/stores/builder/automations.ts
index c44bad9eeb..25930e953b 100644
--- a/packages/builder/src/stores/builder/automations.ts
+++ b/packages/builder/src/stores/builder/automations.ts
@@ -30,6 +30,8 @@ import {
   AutomationTriggerSchema,
   BranchPath,
   BlockDefinitions,
+  GetAutomationTriggerDefinitionsResponse,
+  GetAutomationActionDefinitionsResponse,
 } from "@budibase/types"
 import { ActionStepID } from "@/constants/backend/automations"
 import { FIELDS } from "@/constants/backend"
@@ -65,16 +67,19 @@ const initialAutomationState: AutomationState = {
 }
 
 const getFinalDefinitions = (
-  triggers: Record<string, any>,
-  actions: Record<string, any>
+  triggers: GetAutomationTriggerDefinitionsResponse,
+  actions: GetAutomationActionDefinitionsResponse
 ): BlockDefinitions => {
-  const creatable: Record<string, any> = {}
-  Object.entries(triggers).forEach(entry => {
-    if (entry[0] === AutomationTriggerStepId.ROW_ACTION) {
-      return
+  const creatable: Partial<GetAutomationTriggerDefinitionsResponse> = {}
+  for (const [key, trigger] of Object.entries(triggers)) {
+    if (key === AutomationTriggerStepId.ROW_ACTION) {
+      continue
     }
-    creatable[entry[0]] = entry[1]
-  })
+    if (trigger.deprecated === true) {
+      continue
+    }
+    creatable[key as keyof GetAutomationTriggerDefinitionsResponse] = trigger
+  }
   return {
     TRIGGER: triggers,
     CREATABLE_TRIGGER: creatable,
diff --git a/packages/server/src/api/controllers/automation.ts b/packages/server/src/api/controllers/automation.ts
index abc0e492c0..3fb7155ce0 100644
--- a/packages/server/src/api/controllers/automation.ts
+++ b/packages/server/src/api/controllers/automation.ts
@@ -1,7 +1,7 @@
 import * as triggers from "../../automations/triggers"
 import { sdk as coreSdk } from "@budibase/shared-core"
 import { DocumentType } from "../../db/utils"
-import { updateTestHistory, removeDeprecated } from "../../automations/utils"
+import { updateTestHistory } from "../../automations/utils"
 import { setTestFlag, clearTestFlag } from "../../utilities/redis"
 import { context, cache, events, db as dbCore } from "@budibase/backend-core"
 import { automations, features } from "@budibase/pro"
@@ -34,14 +34,6 @@ import sdk from "../../sdk"
 import { builderSocket } from "../../websockets"
 import env from "../../environment"
 
-async function getActionDefinitions() {
-  return removeDeprecated(await actionDefs())
-}
-
-function getTriggerDefinitions() {
-  return removeDeprecated(triggers.TRIGGER_DEFINITIONS)
-}
-
 /*************************
  *                       *
  *   BUILDER FUNCTIONS   *
@@ -141,21 +133,21 @@ export async function clearLogError(
 export async function getActionList(
   ctx: UserCtx<void, GetAutomationActionDefinitionsResponse>
 ) {
-  ctx.body = await getActionDefinitions()
+  ctx.body = await actionDefs()
 }
 
 export async function getTriggerList(
   ctx: UserCtx<void, GetAutomationTriggerDefinitionsResponse>
 ) {
-  ctx.body = getTriggerDefinitions()
+  ctx.body = triggers.TRIGGER_DEFINITIONS
 }
 
 export async function getDefinitionList(
   ctx: UserCtx<void, GetAutomationStepDefinitionsResponse>
 ) {
   ctx.body = {
-    trigger: getTriggerDefinitions(),
-    action: await getActionDefinitions(),
+    trigger: triggers.TRIGGER_DEFINITIONS,
+    action: await actionDefs(),
   }
 }
 
diff --git a/packages/server/src/api/routes/tests/automation.spec.ts b/packages/server/src/api/routes/tests/automation.spec.ts
index a517346c82..b964cbab5f 100644
--- a/packages/server/src/api/routes/tests/automation.spec.ts
+++ b/packages/server/src/api/routes/tests/automation.spec.ts
@@ -20,7 +20,6 @@ import {
 } from "@budibase/types"
 import { mocks } from "@budibase/backend-core/tests"
 import { FilterConditions } from "../../../automations/steps/filter"
-import { removeDeprecated } from "../../../automations/utils"
 import { createAutomationBuilder } from "../../../automations/tests/utilities/AutomationTestBuilder"
 
 const MAX_RETRIES = 4
@@ -76,15 +75,11 @@ describe("/automations", () => {
         .expect("Content-Type", /json/)
         .expect(200)
 
-      let definitionsLength = Object.keys(
-        removeDeprecated(BUILTIN_ACTION_DEFINITIONS)
-      ).length
-
       expect(Object.keys(res.body.action).length).toBeGreaterThanOrEqual(
-        definitionsLength
+        Object.keys(BUILTIN_ACTION_DEFINITIONS).length
       )
       expect(Object.keys(res.body.trigger).length).toEqual(
-        Object.keys(removeDeprecated(TRIGGER_DEFINITIONS)).length
+        Object.keys(TRIGGER_DEFINITIONS).length
       )
     })
   })
diff --git a/packages/server/src/automations/steps/executeScriptV2.ts b/packages/server/src/automations/steps/executeScriptV2.ts
index f5edf20f7d..a14457e856 100644
--- a/packages/server/src/automations/steps/executeScriptV2.ts
+++ b/packages/server/src/automations/steps/executeScriptV2.ts
@@ -12,9 +12,9 @@ import {
 import { processStringSync } from "@budibase/string-templates"
 
 export const definition: AutomationStepDefinition = {
-  name: "JS Scripting",
+  name: "JavaScript",
   tagline: "Execute JavaScript Code",
-  icon: "Code",
+  icon: "Brackets",
   description: "Run a piece of JavaScript code in your automation",
   type: AutomationStepType.ACTION,
   internal: true,
diff --git a/packages/server/src/automations/utils.ts b/packages/server/src/automations/utils.ts
index 292b288a70..1828260c92 100644
--- a/packages/server/src/automations/utils.ts
+++ b/packages/server/src/automations/utils.ts
@@ -4,17 +4,8 @@ import { automationQueue } from "./bullboard"
 import { updateEntityMetadata } from "../utilities"
 import { context, db as dbCore, utils } from "@budibase/backend-core"
 import { getAutomationMetadataParams } from "../db/utils"
-import { cloneDeep } from "lodash/fp"
 import { quotas } from "@budibase/pro"
-import {
-  Automation,
-  AutomationActionStepId,
-  AutomationJob,
-  AutomationStepDefinition,
-  AutomationTriggerDefinition,
-  AutomationTriggerStepId,
-  MetadataType,
-} from "@budibase/types"
+import { Automation, AutomationJob, MetadataType } from "@budibase/types"
 import { automationsEnabled } from "../features"
 import { helpers, REBOOT_CRON } from "@budibase/shared-core"
 import tracer from "dd-trace"
@@ -122,23 +113,6 @@ export async function updateTestHistory(
   )
 }
 
-export function removeDeprecated<
-  T extends
-    | Record<keyof typeof AutomationTriggerStepId, AutomationTriggerDefinition>
-    | Record<keyof typeof AutomationActionStepId, AutomationStepDefinition>
->(definitions: T): T {
-  const base: Record<
-    string,
-    AutomationTriggerDefinition | AutomationStepDefinition
-  > = cloneDeep(definitions)
-  for (let key of Object.keys(base)) {
-    if (base[key].deprecated) {
-      delete base[key]
-    }
-  }
-  return base as T
-}
-
 // end the repetition and the job itself
 export async function disableAllCrons(appId: any) {
   const promises = []
diff --git a/packages/types/src/ui/stores/automations.ts b/packages/types/src/ui/stores/automations.ts
index 7e85ceee38..0af4be0c1a 100644
--- a/packages/types/src/ui/stores/automations.ts
+++ b/packages/types/src/ui/stores/automations.ts
@@ -1,3 +1,8 @@
+import {
+  GetAutomationActionDefinitionsResponse,
+  GetAutomationTriggerDefinitionsResponse,
+} from "../../api"
+
 export interface BranchPath {
   stepIdx: number
   branchIdx: number
@@ -6,7 +11,7 @@ export interface BranchPath {
 }
 
 export interface BlockDefinitions {
-  TRIGGER: Record<string, any>
-  CREATABLE_TRIGGER: Record<string, any>
-  ACTION: Record<string, any>
+  TRIGGER: Partial<GetAutomationTriggerDefinitionsResponse>
+  CREATABLE_TRIGGER: Partial<GetAutomationTriggerDefinitionsResponse>
+  ACTION: Partial<GetAutomationActionDefinitionsResponse>
 }

From 910296e25ce8d6eb44ac68cde599006a9e14379c Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Wed, 15 Jan 2025 16:11:00 +0000
Subject: [PATCH 6/9] Add tests for executeScriptV2

---
 .../src/automations/steps/executeScriptV2.ts  |   2 +-
 .../automations/tests/executeScriptV2.spec.ts | 165 ++++++++++++++++++
 packages/server/src/threads/automation.ts     |  14 +-
 3 files changed, 176 insertions(+), 5 deletions(-)
 create mode 100644 packages/server/src/automations/tests/executeScriptV2.spec.ts

diff --git a/packages/server/src/automations/steps/executeScriptV2.ts b/packages/server/src/automations/steps/executeScriptV2.ts
index a14457e856..f2b2a1b364 100644
--- a/packages/server/src/automations/steps/executeScriptV2.ts
+++ b/packages/server/src/automations/steps/executeScriptV2.ts
@@ -83,7 +83,7 @@ export async function run({
   try {
     return {
       success: true,
-      value: processStringSync(inputs.code, context),
+      value: processStringSync(inputs.code, context, { noThrow: false }),
     }
   } catch (err) {
     return {
diff --git a/packages/server/src/automations/tests/executeScriptV2.spec.ts b/packages/server/src/automations/tests/executeScriptV2.spec.ts
new file mode 100644
index 0000000000..3091fd8292
--- /dev/null
+++ b/packages/server/src/automations/tests/executeScriptV2.spec.ts
@@ -0,0 +1,165 @@
+import { createAutomationBuilder } from "./utilities/AutomationTestBuilder"
+import * as automation from "../index"
+import * as setup from "./utilities"
+import { Table } from "@budibase/types"
+
+function encodeJS(js: string): string {
+  return `{{ js "${Buffer.from(js, "utf-8").toString("base64")}" }}`
+}
+
+describe("Execute Script Automations", () => {
+  let config = setup.getConfig(),
+    table: Table
+
+  beforeEach(async () => {
+    await automation.init()
+    await config.init()
+    table = await config.createTable()
+    await config.createRow()
+  })
+
+  afterAll(setup.afterAll)
+
+  it("should execute a basic script and return the result", async () => {
+    const builder = createAutomationBuilder({
+      name: "Basic Script Execution",
+    })
+
+    const results = await builder
+      .appAction({ fields: {} })
+      .executeScriptV2({ code: encodeJS("return 2 + 2") })
+      .run()
+
+    expect(results.steps[0].outputs.value).toEqual(4)
+  })
+
+  it("should access bindings from previous steps", async () => {
+    const builder = createAutomationBuilder({
+      name: "Access Bindings",
+    })
+
+    const results = await builder
+      .appAction({ fields: { data: [1, 2, 3] } })
+      .executeScriptV2(
+        {
+          code: encodeJS(`return $("trigger.fields.data").map(x => x * 2)`),
+        },
+        { stepId: "binding-script-step" }
+      )
+      .run()
+
+    expect(results.steps[0].outputs.value).toEqual([2, 4, 6])
+  })
+
+  it("should handle script execution errors gracefully", async () => {
+    const builder = createAutomationBuilder({
+      name: "Handle Script Errors",
+    })
+
+    const results = await builder
+      .appAction({ fields: {} })
+      .executeScriptV2({
+        code: encodeJS("return nonexistentVariable.map(x => x)"),
+      })
+      .run()
+
+    expect(results.steps[0].outputs.response).toContain(
+      "ReferenceError: nonexistentVariable is not defined"
+    )
+    expect(results.steps[0].outputs.success).toEqual(false)
+  })
+
+  it("should handle conditional logic in scripts", async () => {
+    const builder = createAutomationBuilder({
+      name: "Conditional Script Logic",
+    })
+
+    const results = await builder
+      .appAction({ fields: { value: 10 } })
+      .executeScriptV2({
+        code: encodeJS(`
+            if ($("trigger.fields.value") > 5) {
+              return "Value is greater than 5";
+            } else {
+              return "Value is 5 or less";
+            }
+          `),
+      })
+      .run()
+
+    expect(results.steps[0].outputs.value).toEqual("Value is greater than 5")
+  })
+
+  it("should use multiple steps and validate script execution", async () => {
+    const builder = createAutomationBuilder({
+      name: "Multi-Step Script Execution",
+    })
+
+    const results = await builder
+      .appAction({ fields: {} })
+      .serverLog(
+        { text: "Starting multi-step automation" },
+        { stepId: "start-log-step" }
+      )
+      .createRow(
+        { row: { name: "Test Row", value: 42, tableId: table._id } },
+        { stepId: "abc123" }
+      )
+      .executeScriptV2(
+        {
+          code: encodeJS(`
+            const createdRow = $("steps")['abc123'];
+            return createdRow.row.value * 2;
+          `),
+        },
+        { stepId: "ScriptingStep1" }
+      )
+      .serverLog({
+        text: `Final result is {{ steps.ScriptingStep1.value }}`,
+      })
+      .run()
+
+    expect(results.steps[0].outputs.message).toContain(
+      "Starting multi-step automation"
+    )
+    expect(results.steps[1].outputs.row.value).toEqual(42)
+    expect(results.steps[2].outputs.value).toEqual(84)
+    expect(results.steps[3].outputs.message).toContain("Final result is 84")
+  })
+
+  it("should fail if the code has not been encoded as a handlebars template", async () => {
+    const builder = createAutomationBuilder({
+      name: "Invalid Code Encoding",
+    })
+
+    const results = await builder
+      .appAction({ fields: {} })
+      .executeScriptV2({
+        code: "return 2 + 2",
+      })
+      .run()
+
+    expect(results.steps[0].outputs.response.message).toEqual(
+      "Expected code to be a {{ js }} template block"
+    )
+    expect(results.steps[0].outputs.success).toEqual(false)
+  })
+
+  it("does not process embedded handlebars templates", async () => {
+    const builder = createAutomationBuilder({
+      name: "Embedded Handlebars",
+    })
+
+    const results = await builder
+      .appAction({ fields: {} })
+      .executeScriptV2({
+        code: encodeJS(`return "{{ triggers.row.whatever }}"`),
+      })
+      .run()
+
+    expect(results.steps[0].outputs.value).toEqual(
+      "{{ triggers.row.whatever }}"
+    )
+    expect(results.steps[0].outputs.success).toEqual(true)
+  })
+})
diff --git a/packages/server/src/threads/automation.ts b/packages/server/src/threads/automation.ts
index 2d10f5d1fb..8a420e4086 100644
--- a/packages/server/src/threads/automation.ts
+++ b/packages/server/src/threads/automation.ts
@@ -633,10 +633,16 @@ class Orchestrator {
         }
 
         const stepFn = await this.getStepFunctionality(step.stepId)
-        let inputs = await processObject(
-          originalStepInput,
-          this.mergeContexts(this.context)
-        )
+        let inputs = originalStepInput
+        if (step.stepId !== AutomationActionStepId.EXECUTE_SCRIPT_V2) {
+          // The EXECUTE_SCRIPT_V2 step saves its input.code value as a `{{ js
+          // "..." }}` template, and expects to receive it that way in the
+          // function that runs it. So we skip this next bit for that step.
+          inputs = await processObject(
+            originalStepInput,
+            this.mergeContexts(this.context)
+          )
+        }
         inputs = automationUtils.cleanInputValues(inputs, step.schema.inputs)
 
         const outputs = await stepFn({

From a2003701622846774071fb0fe2fd83d36e092d00 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Fri, 7 Feb 2025 09:37:21 +0000
Subject: [PATCH 7/9] Updated executev2 tests

---
 .../automations/tests/executeScriptV2.spec.ts | 63 +++++++++----------
 .../tests/utilities/AutomationTestBuilder.ts  |  1 +
 .../src/tests/utilities/TestConfiguration.ts  |  1 +
 3 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/packages/server/src/automations/tests/executeScriptV2.spec.ts b/packages/server/src/automations/tests/executeScriptV2.spec.ts
index 3091fd8292..539af3cc66 100644
--- a/packages/server/src/automations/tests/executeScriptV2.spec.ts
+++ b/packages/server/src/automations/tests/executeScriptV2.spec.ts
@@ -21,47 +21,44 @@ describe("Execute Script Automations", () => {
   afterAll(setup.afterAll)
 
   it("should execute a basic script and return the result", async () => {
-    const builder = createAutomationBuilder({
-      name: "Basic Script Execution",
-    })
+    config.name = "Basic Script Execution"
+    const builder = createAutomationBuilder(config)
 
     const results = await builder
-      .appAction({ fields: {} })
+      .onAppAction()
       .executeScriptV2({ code: encodeJS("return 2 + 2") })
-      .run()
+      .test({ fields: {} })
 
     expect(results.steps[0].outputs.value).toEqual(4)
   })
 
   it("should access bindings from previous steps", async () => {
-    const builder = createAutomationBuilder({
-      name: "Access Bindings",
-    })
+    config.name = "Access Bindings"
+    const builder = createAutomationBuilder(config)
 
     const results = await builder
-      .appAction({ fields: { data: [1, 2, 3] } })
+      .onAppAction()
       .executeScriptV2(
         {
           code: encodeJS(`return $("trigger.fields.data").map(x => x * 2)`),
         },
         { stepId: "binding-script-step" }
       )
-      .run()
+      .test({ fields: { data: [1, 2, 3] } })
 
     expect(results.steps[0].outputs.value).toEqual([2, 4, 6])
   })
 
   it("should handle script execution errors gracefully", async () => {
-    const builder = createAutomationBuilder({
-      name: "Handle Script Errors",
-    })
+    config.name = "Handle Script Errors"
+    const builder = createAutomationBuilder(config)
 
     const results = await builder
-      .appAction({ fields: {} })
+      .onAppAction()
       .executeScriptV2({
         code: encodeJS("return nonexistentVariable.map(x => x)"),
       })
-      .run()
+      .test({ fields: {} })
 
     expect(results.steps[0].outputs.response).toContain(
       "ReferenceError: nonexistentVariable is not defined"
@@ -70,12 +67,11 @@ describe("Execute Script Automations", () => {
   })
 
   it("should handle conditional logic in scripts", async () => {
-    const builder = createAutomationBuilder({
-      name: "Conditional Script Logic",
-    })
+    config.name = "Conditional Script Logic"
+    const builder = createAutomationBuilder(config)
 
     const results = await builder
-      .appAction({ fields: { value: 10 } })
+      .onAppAction()
       .executeScriptV2({
         code: encodeJS(`
             if ($("trigger.fields.value") > 5) {
@@ -85,18 +81,17 @@ describe("Execute Script Automations", () => {
             }
           `),
       })
-      .run()
+      .test({ fields: { value: 10 } })
 
     expect(results.steps[0].outputs.value).toEqual("Value is greater than 5")
   })
 
   it("should use multiple steps and validate script execution", async () => {
-    const builder = createAutomationBuilder({
-      name: "Multi-Step Script Execution",
-    })
+    config.name = "Multi-Step Script Execution"
+    const builder = createAutomationBuilder(config)
 
     const results = await builder
-      .appAction({ fields: {} })
+      .onAppAction()
       .serverLog(
         { text: "Starting multi-step automation" },
         { stepId: "start-log-step" }
@@ -117,7 +112,7 @@ describe("Execute Script Automations", () => {
       .serverLog({
         text: `Final result is {{ steps.ScriptingStep1.value }}`,
       })
-      .run()
+      .test({ fields: {} })
 
     expect(results.steps[0].outputs.message).toContain(
       "Starting multi-step automation"
@@ -128,16 +123,15 @@ describe("Execute Script Automations", () => {
   })
 
   it("should fail if the code has not been encoded as a handlebars template", async () => {
-    const builder = createAutomationBuilder({
-      name: "Invalid Code Encoding",
-    })
+    config.name = "Invalid Code Encoding"
+    const builder = createAutomationBuilder(config)
 
     const results = await builder
-      .appAction({ fields: {} })
+      .onAppAction()
       .executeScriptV2({
         code: "return 2 + 2",
       })
-      .run()
+      .test({ fields: {} })
 
     expect(results.steps[0].outputs.response.message).toEqual(
       "Expected code to be a {{ js }} template block"
@@ -146,16 +140,15 @@ describe("Execute Script Automations", () => {
   })
 
   it("does not process embedded handlebars templates", async () => {
-    const builder = createAutomationBuilder({
-      name: "Embedded Handlebars",
-    })
+    config.name = "Embedded Handlebars"
+    const builder = createAutomationBuilder(config)
 
     const results = await builder
-      .appAction({ fields: {} })
+      .onAppAction()
       .executeScriptV2({
         code: encodeJS(`return "{{ triggers.row.whatever }}"`),
       })
-      .run()
+      .test({ fields: {} })
 
     expect(results.steps[0].outputs.value).toEqual(
       "{{ triggers.row.whatever }}"
diff --git a/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts b/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts
index 835a177ea8..0d8f6f2231 100644
--- a/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts
+++ b/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts
@@ -97,6 +97,7 @@ class BranchStepBuilder<TStep extends AutomationTriggerStepId> {
   loop = this.step(AutomationActionStepId.LOOP)
   serverLog = this.step(AutomationActionStepId.SERVER_LOG)
   executeScript = this.step(AutomationActionStepId.EXECUTE_SCRIPT)
+  executeScriptV2 = this.step(AutomationActionStepId.EXECUTE_SCRIPT_V2)
   filter = this.step(AutomationActionStepId.FILTER)
   bash = this.step(AutomationActionStepId.EXECUTE_BASH)
   openai = this.step(AutomationActionStepId.OPENAI)
diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts
index 1f464b2ea4..ce7c0bc3e4 100644
--- a/packages/server/src/tests/utilities/TestConfiguration.ts
+++ b/packages/server/src/tests/utilities/TestConfiguration.ts
@@ -98,6 +98,7 @@ export default class TestConfiguration {
   request?: supertest.SuperTest<supertest.Test>
   started: boolean
   appId?: string
+  name?: string
   allApps: App[]
   app?: App
   prodApp?: App

From abe5443cf5c0cbcccd1e76ec07853ed3d7727be5 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Mon, 24 Feb 2025 10:53:57 +0000
Subject: [PATCH 8/9] Update pro reference.

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

diff --git a/packages/pro b/packages/pro
index eb96d8b2f2..45f5673d5e 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit eb96d8b2f2029033b0f758078ed30c888e8fb249
+Subproject commit 45f5673d5e5ab3c22deb6663cea2e31a628aa133

From e0c74eede4fbfd55c43e8d92a41b43828946a882 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Thu, 6 Mar 2025 12:44:36 +0000
Subject: [PATCH 9/9] Fix tests.

---
 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 01581b4fe4..e2d16b0a6a 100644
--- a/packages/server/src/threads/automation.ts
+++ b/packages/server/src/threads/automation.ts
@@ -564,7 +564,7 @@ class Orchestrator {
       }
 
       inputs = automationUtils.cleanInputValues(
-        await processObject(cloneDeep(step.inputs), ctx),
+        inputs,
         step.schema.inputs.properties
       )