From ef7281716acd7799b3c3c92a6eff411e86db35cf Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 5 Nov 2024 13:14:45 +0100
Subject: [PATCH 1/8] Wait for test data to be processed before running the
 test

---
 .../AutomationBuilder/FlowChart/TestDataModal.svelte           | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
index 21cdc4b893..4bc1e8d496 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
@@ -1,4 +1,5 @@
 <script>
+  import { tick } from "svelte"
   import {
     ModalContent,
     TextArea,
@@ -110,6 +111,8 @@
   }
 
   const testAutomation = async () => {
+    // Ensure $memoTestData rectiveness is processed
+    await tick()
     try {
       await automationStore.actions.test($selectedAutomation, $memoTestData)
       $automationStore.showTestPanel = true

From cddc64d38b81806a779dc1e95d6e0ef9d253d8c4 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 5 Nov 2024 13:18:40 +0100
Subject: [PATCH 2/8] Fix typo

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

diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
index 4bc1e8d496..c2890c50c1 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
@@ -111,7 +111,7 @@
   }
 
   const testAutomation = async () => {
-    // Ensure $memoTestData rectiveness is processed
+    // Ensure $memoTestData reactiveness is processed
     await tick()
     try {
       await automationStore.actions.test($selectedAutomation, $memoTestData)

From b59b4e1736f1654e598aba62174eaec470475ae3 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 5 Nov 2024 16:08:24 +0100
Subject: [PATCH 3/8] Use updated test data

---
 .../AutomationBuilder/FlowChart/TestDataModal.svelte  | 11 +++++------
 .../automation/SetupPanel/AutomationBlockSetup.svelte | 10 +++++++++-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
index c2890c50c1..914fcd2f62 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
@@ -64,8 +64,7 @@
     return true
   }
 
-  const memoTestData = memo(parseTestData($selectedAutomation.testData))
-  $: memoTestData.set(parseTestData($selectedAutomation.testData))
+  $: testData = testData || parseTestData($selectedAutomation.testData)
 
   $: {
     // clone the trigger so we're not mutating the reference
@@ -84,7 +83,7 @@
   $: isError =
     !isTriggerValid(trigger) ||
     !(trigger.schema.outputs.required || []).every(
-      required => $memoTestData?.[required] || required !== "row"
+      required => testData?.[required] || required !== "row"
     )
 
   function parseTestJSON(e) {
@@ -111,10 +110,10 @@
   }
 
   const testAutomation = async () => {
-    // Ensure $memoTestData reactiveness is processed
+    // Ensure testData reactiveness is processed
     await tick()
     try {
-      await automationStore.actions.test($selectedAutomation, $memoTestData)
+      await automationStore.actions.test($selectedAutomation, testData)
       $automationStore.showTestPanel = true
     } catch (error) {
       notifications.error(error)
@@ -152,7 +151,7 @@
   {#if selectedValues}
     <div class="tab-content-padding">
       <AutomationBlockSetup
-        testData={$memoTestData}
+        bind:testData
         {schemaProperties}
         isTestModal
         block={trigger}
diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index b422154290..903c1b7863 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -529,7 +529,15 @@
       row: { "Active": true, "Order Id" : 14, ... }
     })
    */
-  const onChange = Utils.sequential(async update => {
+  const onChange = async update => {
+    if (isTestModal) {
+      testData = update
+    }
+
+    updateAutomation(update)
+  }
+
+  const updateAutomation = Utils.sequential(async update => {
     const request = cloneDeep(update)
     // Process app trigger updates
     if (isTrigger && !isTestModal) {

From b937f97a60a4f41a7115dda72fedbe53f0629ea1 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 5 Nov 2024 16:13:22 +0100
Subject: [PATCH 4/8] Lint

---
 .../automation/AutomationBuilder/FlowChart/TestDataModal.svelte  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
index 914fcd2f62..1691e07b7b 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
@@ -9,7 +9,6 @@
   import { automationStore, selectedAutomation } from "stores/builder"
   import AutomationBlockSetup from "../../SetupPanel/AutomationBlockSetup.svelte"
   import { cloneDeep } from "lodash/fp"
-  import { memo } from "@budibase/frontend-core"
   import { AutomationEventType } from "@budibase/types"
 
   let failedParse = null

From 4750e9faca0a3dd2796900b88520b4b08888a0f6 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 18 Nov 2024 13:18:45 +0100
Subject: [PATCH 5/8] Move atrament dependency

---
 packages/bbui/package.json   | 1 +
 packages/client/package.json | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 0830f8ab6f..aeb7418526 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -81,6 +81,7 @@
     "@spectrum-css/typography": "3.0.1",
     "@spectrum-css/underlay": "2.0.9",
     "@spectrum-css/vars": "3.0.1",
+    "atrament": "^4.3.0",
     "dayjs": "^1.10.8",
     "easymde": "^2.16.1",
     "svelte-dnd-action": "^0.9.8",
diff --git a/packages/client/package.json b/packages/client/package.json
index d3b0f098cb..fb9851e0a1 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -33,8 +33,7 @@
     "sanitize-html": "^2.13.0",
     "screenfull": "^6.0.1",
     "shortid": "^2.2.15",
-    "svelte-spa-router": "^4.0.1",
-    "atrament": "^4.3.0"
+    "svelte-spa-router": "^4.0.1"
   },
   "devDependencies": {
     "@rollup/plugin-alias": "^5.1.0",

From 62be25c15785bfafd493a45d0240dd6ff811a137 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 18 Nov 2024 13:20:31 +0000
Subject: [PATCH 6/8] fix dnd handlers

---
 packages/backend-core/src/environment.ts                     | 3 ---
 .../backend-core/src/middleware/contentSecurityPolicy.ts     | 5 -----
 packages/builder/src/components/common/NavItem.svelte        | 4 ++--
 .../_components/ComponentList/ComponentScrollWrapper.svelte  | 4 ++--
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts
index b808dca72c..2763944d2f 100644
--- a/packages/backend-core/src/environment.ts
+++ b/packages/backend-core/src/environment.ts
@@ -231,9 +231,6 @@ const environment = {
   MIN_VERSION_WITHOUT_POWER_ROLE:
     process.env.MIN_VERSION_WITHOUT_POWER_ROLE || "3.0.0",
   DISABLE_CONTENT_SECURITY_POLICY: process.env.DISABLE_CONTENT_SECURITY_POLICY,
-  // stopgap migration strategy until we can ensure backwards compat without unsafe-inline in CSP
-  DISABLE_CSP_UNSAFE_INLINE_SCRIPTS:
-    process.env.DISABLE_CSP_UNSAFE_INLINE_SCRIPTS,
 }
 
 export function setEnv(newEnvVars: Partial<typeof environment>): () => void {
diff --git a/packages/backend-core/src/middleware/contentSecurityPolicy.ts b/packages/backend-core/src/middleware/contentSecurityPolicy.ts
index e0dfbe6f64..d1668d3dd5 100644
--- a/packages/backend-core/src/middleware/contentSecurityPolicy.ts
+++ b/packages/backend-core/src/middleware/contentSecurityPolicy.ts
@@ -1,5 +1,4 @@
 import crypto from "crypto"
-import env from "../environment"
 
 const CSP_DIRECTIVES = {
   "default-src": ["'self'"],
@@ -97,10 +96,6 @@ export async function contentSecurityPolicy(ctx: any, next: any) {
       `'nonce-${nonce}'`,
     ]
 
-    if (!env.DISABLE_CSP_UNSAFE_INLINE_SCRIPTS) {
-      directives["script-src"].push("'unsafe-inline'")
-    }
-
     ctx.state.nonce = nonce
 
     const cspHeader = Object.entries(directives)
diff --git a/packages/builder/src/components/common/NavItem.svelte b/packages/builder/src/components/common/NavItem.svelte
index 039f94bbc0..ea61c8cecf 100644
--- a/packages/builder/src/components/common/NavItem.svelte
+++ b/packages/builder/src/components/common/NavItem.svelte
@@ -84,8 +84,8 @@
   on:mouseleave
   on:click={onClick}
   on:contextmenu
-  ondragover="return false"
-  ondragenter="return false"
+  on:dragover={e => e.preventDefault()}
+  on:dragenter={e => e.preventDefault()}
   {id}
   {style}
   {draggable}
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentScrollWrapper.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentScrollWrapper.svelte
index c64877e3e6..4bcb74fdd9 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentScrollWrapper.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentScrollWrapper.svelte
@@ -68,8 +68,8 @@
   on:scroll
   bind:this={scrollRef}
   on:drop={onDrop}
-  ondragover="return false"
-  ondragenter="return false"
+  on:dragover={e => e.preventDefault()}
+  on:dragenter={e => e.preventDefault()}
 >
   <slot />
 </div>

From 0e742807dec4eed023b29a2dc32cca1f4899a45f Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Mon, 18 Nov 2024 14:19:41 +0000
Subject: [PATCH 7/8] Fix the NX check that looks for only affected packages
 when running tests in CI

---
 .github/workflows/budibase_ci.yml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 128b38a704..e894a91703 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -199,18 +199,22 @@ jobs:
         env:
           DATASOURCE: ${{ matrix.datasource }}
         run: |
-          AFFECTED=$(yarn --silent nx show projects --affected -t test --base=${{ env.NX_BASE_BRANCH }} -p @budibase/server)
-          if [ -n "$AFFECTED" ]; then
-            cd packages/server
-            if [ "${{ matrix.datasource }}" == "none" ]; then
-              yarn test --filter ./src/tests/filters/non-datasource-tests.js --passWithNoTests
-            else
-              yarn test --filter ./src/tests/filters/datasource-tests.js --passWithNoTests
+          if ${{ env.ONLY_AFFECTED_TASKS }}; then
+            AFFECTED=$(yarn --silent nx show projects --affected -t test --base=${{ env.NX_BASE_BRANCH }} -p @budibase/server)
+            if [ -z "$AFFECTED" ]; then
+              echo "No affected tests to run"
+              exit 0
             fi
-          else
-            echo "No affected tests to run"
           fi
 
+          FILTER="./src/tests/filters/datasource-tests.js"
+          if [ "${{ matrix.datasource }}" == "none" ]; then
+            FILTER="./src/tests/filters/non-datasource-tests.js"
+          fi
+
+          cd packages/server
+          yarn test --filter $FILTER --passWithNoTests
+
   check-pro-submodule:
     runs-on: ubuntu-latest
     if: inputs.run_as_oss != true  && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase')

From dd7259219bd352239cae23768bc89047eca12ba1 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 18 Nov 2024 15:03:59 +0000
Subject: [PATCH 8/8] Bump version to 3.2.4

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index 582f95b303..a214415508 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "npmClient": "yarn",
   "packages": [
     "packages/*",