Merge branch 'master' into fix/formula-response-types

2024-11-18 16:17:24 +01:00 · 2024-11-18 16:17:24 +01:00 · 0f349de9d5
parent 83b1919019 a8a35dd4a8
commit 0f349de9d5
10 changed files with 36 additions and 34 deletions
--- 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')
--- 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/*",
--- 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 {
--- 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)
--- 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",
--- 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,
@ -8,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
@ -63,8 +63,7 @@
    return true
  }

-  const memoTestData = memo(parseTestData($selectedAutomation.data.testData))
-  $: memoTestData.set(parseTestData($selectedAutomation.data.testData))
+  $: testData = testData || parseTestData($selectedAutomation.data.testData)

  $: {
    // clone the trigger so we're not mutating the reference
@ -83,7 +82,7 @@
  $: isError =
    !isTriggerValid(trigger) ||
    !(trigger.schema.outputs.required || []).every(
-      required => $memoTestData?.[required] || required !== "row"
+      required => testData?.[required] || required !== "row"
    )

  function parseTestJSON(e) {
@ -110,11 +109,10 @@
  }

  const testAutomation = async () => {
+    // Ensure testData reactiveness is processed
+    await tick()
    try {
-      await automationStore.actions.test(
-        $selectedAutomation.data,
-        $memoTestData
-      )
+      await automationStore.actions.test($selectedAutomation.data, testData)
      $automationStore.showTestPanel = true
    } catch (error) {
      notifications.error(error)
@ -152,7 +150,7 @@
  {#if selectedValues}
    <div class="tab-content-padding">
      <AutomationBlockSetup
-        testData={$memoTestData}
+        bind:testData
        {schemaProperties}
        isTestModal
        block={trigger}
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@ -503,7 +503,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) {
--- 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}
--- 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>
--- 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",