From 6d8cb1d1aa7137cb7f097274ed99387eab4355d1 Mon Sep 17 00:00:00 2001 From: Christos Alexiou Date: Wed, 2 Oct 2024 17:02:19 +0300 Subject: [PATCH 1/2] Adapt the payloads for the change in the deployment --- .github/workflows/deploy-featurebranch.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy-featurebranch.yml b/.github/workflows/deploy-featurebranch.yml index d86d301507..a676fe75f0 100644 --- a/.github/workflows/deploy-featurebranch.yml +++ b/.github/workflows/deploy-featurebranch.yml @@ -23,6 +23,7 @@ jobs: PAYLOAD_BRANCH: ${{ github.head_ref }} PAYLOAD_PR_NUMBER: ${{ github.event.pull_request.number }} PAYLOAD_LICENSE_TYPE: "free" + PAYLOAD_DEPLOY: "true" with: repository: budibase/budibase-deploys event: featurebranch-qa-deploy From 73613ce8bfda5720aca62a3a65dd35ca97d3113e Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Wed, 2 Oct 2024 16:52:40 +0100 Subject: [PATCH 2/2] Fix spread operator use. --- packages/server/src/sdk/app/views/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/sdk/app/views/index.ts b/packages/server/src/sdk/app/views/index.ts index 2bd90822c7..83ee78e165 100644 --- a/packages/server/src/sdk/app/views/index.ts +++ b/packages/server/src/sdk/app/views/index.ts @@ -307,7 +307,7 @@ export async function enrichSchema( // if nothing specified in view, then it is not visible const ui = viewSchema[key] || { visible: false } schema[key] = { - ...(tableSchema[key] || {}), + ...tableSchema[key], ...ui, order: anyViewOrder ? ui?.order ?? undefined : tableSchema[key]?.order, columns: undefined,