From 7988f8c2d9c32e9a29c3739c6bfd46a034e43d8e Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Fri, 3 Mar 2023 14:51:54 +0000
Subject: [PATCH 01/41] Added error handling for leaflet initialisation errors

---
 .../app/embedded-map/EmbeddedMap.svelte       | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/packages/client/src/components/app/embedded-map/EmbeddedMap.svelte b/packages/client/src/components/app/embedded-map/EmbeddedMap.svelte
index 2cfe3f497f..3bb7d5606d 100644
--- a/packages/client/src/components/app/embedded-map/EmbeddedMap.svelte
+++ b/packages/client/src/components/app/embedded-map/EmbeddedMap.svelte
@@ -283,27 +283,32 @@
     if (mapInstance) {
       mapInstance.remove()
     }
-    mapInstance = L.map(embeddedMapId, mapOptions)
-    mapMarkerGroup.addTo(mapInstance)
-    candidateMarkerGroup.addTo(mapInstance)
 
-    // Add attribution
-    const cleanAttribution = sanitizeHtml(attribution, {
-      allowedTags: ["a"],
-      allowedAttributes: {
-        a: ["href", "target"],
-      },
-    })
-    L.tileLayer(tileURL, {
-      attribution: "&copy; " + cleanAttribution,
-      zoom,
-    }).addTo(mapInstance)
+    try {
+      mapInstance = L.map(embeddedMapId, mapOptions)
+      mapMarkerGroup.addTo(mapInstance)
+      candidateMarkerGroup.addTo(mapInstance)
 
-    // Add click handler
-    mapInstance.on("click", handleMapClick)
+      // Add attribution
+      const cleanAttribution = sanitizeHtml(attribution, {
+        allowedTags: ["a"],
+        allowedAttributes: {
+          a: ["href", "target"],
+        },
+      })
+      L.tileLayer(tileURL, {
+        attribution: "&copy; " + cleanAttribution,
+        zoom,
+      }).addTo(mapInstance)
 
-    // Reset view
-    resetView()
+      // Add click handler
+      mapInstance.on("click", handleMapClick)
+
+      // Reset view
+      resetView()
+    } catch (e) {
+      console.log("There was a problem with the map", e)
+    }
   }
 
   const handleMapClick = e => {

From e8c73cdee0f1814b29af376f54bcc30be419720b Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 6 Mar 2023 10:22:32 +0000
Subject: [PATCH 02/41] return gsheets config in test regardless

---
 packages/backend-core/src/configs/configs.ts                | 2 +-
 packages/server/src/integrations/tests/googlesheets.spec.ts | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/backend-core/src/configs/configs.ts b/packages/backend-core/src/configs/configs.ts
index b461497747..0ec4fb4434 100644
--- a/packages/backend-core/src/configs/configs.ts
+++ b/packages/backend-core/src/configs/configs.ts
@@ -179,7 +179,7 @@ export async function getGoogleDatasourceConfig(): Promise<
 }
 
 export function getDefaultGoogleConfig(): GoogleInnerConfig | undefined {
-  if (environment.GOOGLE_CLIENT_ID && environment.GOOGLE_CLIENT_SECRET) {
+  if (env.isTest() || (environment.GOOGLE_CLIENT_ID && environment.GOOGLE_CLIENT_SECRET)) {
     return {
       clientID: environment.GOOGLE_CLIENT_ID!,
       clientSecret: environment.GOOGLE_CLIENT_SECRET!,
diff --git a/packages/server/src/integrations/tests/googlesheets.spec.ts b/packages/server/src/integrations/tests/googlesheets.spec.ts
index 1e28be33c6..f832f86954 100644
--- a/packages/server/src/integrations/tests/googlesheets.spec.ts
+++ b/packages/server/src/integrations/tests/googlesheets.spec.ts
@@ -30,6 +30,7 @@ import { structures } from "@budibase/backend-core/tests"
 import TestConfiguration from "../../tests/utilities/TestConfiguration"
 import GoogleSheetsIntegration from "../googlesheets"
 import { FieldType, Table, TableSchema } from "../../../../types/src/documents"
+import environment from "../../environment"
 
 describe("Google Sheets Integration", () => {
   let integration: any,

From edac525424cf580e1e0e82c54339d0da12ca7b92 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 6 Mar 2023 10:24:45 +0000
Subject: [PATCH 03/41] remove import

---
 packages/server/src/integrations/tests/googlesheets.spec.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/server/src/integrations/tests/googlesheets.spec.ts b/packages/server/src/integrations/tests/googlesheets.spec.ts
index f832f86954..1e28be33c6 100644
--- a/packages/server/src/integrations/tests/googlesheets.spec.ts
+++ b/packages/server/src/integrations/tests/googlesheets.spec.ts
@@ -30,7 +30,6 @@ import { structures } from "@budibase/backend-core/tests"
 import TestConfiguration from "../../tests/utilities/TestConfiguration"
 import GoogleSheetsIntegration from "../googlesheets"
 import { FieldType, Table, TableSchema } from "../../../../types/src/documents"
-import environment from "../../environment"
 
 describe("Google Sheets Integration", () => {
   let integration: any,

From 26660b12fb5ff477b729b20d631933d8700e5750 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 6 Mar 2023 10:33:49 +0000
Subject: [PATCH 04/41] PR comments

---
 packages/backend-core/src/configs/configs.ts               | 2 +-
 .../server/src/integrations/tests/googlesheets.spec.ts     | 4 ++++
 packages/server/src/tests/utilities/TestConfiguration.ts   | 7 +++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/backend-core/src/configs/configs.ts b/packages/backend-core/src/configs/configs.ts
index 0ec4fb4434..b461497747 100644
--- a/packages/backend-core/src/configs/configs.ts
+++ b/packages/backend-core/src/configs/configs.ts
@@ -179,7 +179,7 @@ export async function getGoogleDatasourceConfig(): Promise<
 }
 
 export function getDefaultGoogleConfig(): GoogleInnerConfig | undefined {
-  if (env.isTest() || (environment.GOOGLE_CLIENT_ID && environment.GOOGLE_CLIENT_SECRET)) {
+  if (environment.GOOGLE_CLIENT_ID && environment.GOOGLE_CLIENT_SECRET) {
     return {
       clientID: environment.GOOGLE_CLIENT_ID!,
       clientSecret: environment.GOOGLE_CLIENT_SECRET!,
diff --git a/packages/server/src/integrations/tests/googlesheets.spec.ts b/packages/server/src/integrations/tests/googlesheets.spec.ts
index 1e28be33c6..5d7c184abd 100644
--- a/packages/server/src/integrations/tests/googlesheets.spec.ts
+++ b/packages/server/src/integrations/tests/googlesheets.spec.ts
@@ -35,6 +35,10 @@ describe("Google Sheets Integration", () => {
   let integration: any,
     config = new TestConfiguration()
 
+  beforeAll(() => {
+    config.setGoogleAuth("test")
+  })
+
   beforeEach(async () => {
     integration = new GoogleSheetsIntegration.integration({
       spreadsheetId: "randomId",
diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts
index e9b770229f..9aab76ba4d 100644
--- a/packages/server/src/tests/utilities/TestConfiguration.ts
+++ b/packages/server/src/tests/utilities/TestConfiguration.ts
@@ -181,6 +181,13 @@ class TestConfiguration {
     coreEnv._set("SELF_HOSTED", value)
   }
 
+  setGoogleAuth = (value: string) => {
+    env._set("GOOGLE_CLIENT_ID", value)
+    env._set("GOOGLE_CLIENT_SECRET", value)
+    coreEnv._set("GOOGLE_CLIENT_ID", value)
+    coreEnv._set("GOOGLE_CLIENT_SECRET", value)
+  }
+
   modeCloud = () => {
     this.setSelfHosted(false)
   }

From 195868b9b1f338f0cad0de393a4ddbb1321de19e Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 6 Mar 2023 11:27:32 +0000
Subject: [PATCH 05/41] increasing max-old-space-size

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

diff --git a/package.json b/package.json
index 815e470916..bb3896ffb5 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "dev": "yarn run kill-all && lerna link && lerna run --parallel dev:builder --concurrency 1",
     "dev:noserver": "yarn run kill-builder && lerna link && lerna run dev:stack:up && lerna run --parallel dev:builder --concurrency 1 --ignore @budibase/backend-core --ignore @budibase/server --ignore @budibase/worker",
     "dev:server": "yarn run kill-server && lerna run --parallel dev:builder --concurrency 1 --scope @budibase/backend-core --scope @budibase/worker --scope @budibase/server",
-    "test": "lerna run test",
+    "test": "NODE_OPTIONS=--max-old-space-size=8192 lerna run test",
     "test:pro": "bash scripts/pro/test.sh",
     "lint:eslint": "eslint packages && eslint qa-core",
     "lint:prettier": "prettier --check \"packages/**/*.{js,ts,svelte}\" && prettier --write \"examples/**/*.{js,ts,svelte}\" && prettier --check \"qa-core/**/*.{js,ts,svelte}\"",

From 97f0b76d82b9a32bb59a8265031de54524d01bda Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 6 Mar 2023 11:30:21 +0000
Subject: [PATCH 06/41] removing test step from release

---
 .github/workflows/release.yml | 1 -
 package.json                  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a24537ccd4..9cf34a99f6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -57,7 +57,6 @@ jobs:
       - run: yarn lint
       - run: yarn build
       - run: yarn build:sdk
-      - run: yarn test
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
diff --git a/package.json b/package.json
index bb3896ffb5..815e470916 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "dev": "yarn run kill-all && lerna link && lerna run --parallel dev:builder --concurrency 1",
     "dev:noserver": "yarn run kill-builder && lerna link && lerna run dev:stack:up && lerna run --parallel dev:builder --concurrency 1 --ignore @budibase/backend-core --ignore @budibase/server --ignore @budibase/worker",
     "dev:server": "yarn run kill-server && lerna run --parallel dev:builder --concurrency 1 --scope @budibase/backend-core --scope @budibase/worker --scope @budibase/server",
-    "test": "NODE_OPTIONS=--max-old-space-size=8192 lerna run test",
+    "test": "lerna run test",
     "test:pro": "bash scripts/pro/test.sh",
     "lint:eslint": "eslint packages && eslint qa-core",
     "lint:prettier": "prettier --check \"packages/**/*.{js,ts,svelte}\" && prettier --write \"examples/**/*.{js,ts,svelte}\" && prettier --check \"qa-core/**/*.{js,ts,svelte}\"",

From f8173d97677c560701ae3b6f3f0bacdc2960a9fc Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 6 Mar 2023 11:43:39 +0000
Subject: [PATCH 07/41] v2.3.21

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index 67b7904a53..8767cb7e05 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.21-alpha.1",
+  "version": "2.3.21",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 421304809c..da9dd8d5ff 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.21-alpha.1",
+  "version": "2.3.21",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.21-alpha.1",
+    "@budibase/types": "^2.3.21",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 502d32c7b0..2074d2ff47 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.3.21-alpha.1",
+  "version": "2.3.21",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/string-templates": "2.3.21-alpha.1",
+    "@budibase/string-templates": "^2.3.21",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index acc537e593..a3f7b71371 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.21-alpha.1",
+  "version": "2.3.21",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.21-alpha.1",
-    "@budibase/client": "2.3.21-alpha.1",
-    "@budibase/frontend-core": "2.3.21-alpha.1",
-    "@budibase/string-templates": "2.3.21-alpha.1",
+    "@budibase/bbui": "^2.3.21",
+    "@budibase/client": "^2.3.21",
+    "@budibase/frontend-core": "^2.3.21",
+    "@budibase/string-templates": "^2.3.21",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index bfced9355d..d4175e207d 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.21-alpha.1",
+  "version": "2.3.21",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "dist/index.js",
   "bin": {
@@ -29,9 +29,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.3.21-alpha.1",
-    "@budibase/string-templates": "2.3.21-alpha.1",
-    "@budibase/types": "2.3.21-alpha.1",
+    "@budibase/backend-core": "^2.3.21",
+    "@budibase/string-templates": "^2.3.21",
+    "@budibase/types": "^2.3.21",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 067f25e790..621ec88454 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.21-alpha.1",
+  "version": "2.3.21",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.21-alpha.1",
-    "@budibase/frontend-core": "2.3.21-alpha.1",
-    "@budibase/string-templates": "2.3.21-alpha.1",
+    "@budibase/bbui": "^2.3.21",
+    "@budibase/frontend-core": "^2.3.21",
+    "@budibase/string-templates": "^2.3.21",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 90040e88c3..b784ea4955 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.21-alpha.1",
+  "version": "2.3.21",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.21-alpha.1",
+    "@budibase/bbui": "^2.3.21",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 4745854121..4104de71e2 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.21-alpha.1",
+  "version": "2.3.21",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index d9b1e1a9a1..9f13ab2b73 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.21-alpha.1",
+  "version": "2.3.21",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.21-alpha.1",
-    "@budibase/client": "2.3.21-alpha.1",
+    "@budibase/backend-core": "^2.3.21",
+    "@budibase/client": "^2.3.21",
     "@budibase/pro": "2.3.21-alpha.1",
-    "@budibase/string-templates": "2.3.21-alpha.1",
-    "@budibase/types": "2.3.21-alpha.1",
+    "@budibase/string-templates": "^2.3.21",
+    "@budibase/types": "^2.3.21",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 5e3fcecbcb..4e63b40059 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.21-alpha.1",
+  "version": "2.3.21",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index c4b238276d..71a3b76ffd 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.21-alpha.1",
+  "version": "2.3.21",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 913f0378bf..b96d71d318 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.21-alpha.1",
+  "version": "2.3.21",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.21-alpha.1",
+    "@budibase/backend-core": "^2.3.21",
     "@budibase/pro": "2.3.21-alpha.1",
-    "@budibase/string-templates": "2.3.21-alpha.1",
-    "@budibase/types": "2.3.21-alpha.1",
+    "@budibase/string-templates": "^2.3.21",
+    "@budibase/types": "^2.3.21",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From a1d99065295526bfae6aed39ef93b579bab920b6 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 6 Mar 2023 11:46:28 +0000
Subject: [PATCH 08/41] Update pro version to 2.3.21

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 9f13ab2b73..a77f86efd7 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.3.21",
     "@budibase/client": "^2.3.21",
-    "@budibase/pro": "2.3.21-alpha.1",
+    "@budibase/pro": "2.3.21",
     "@budibase/string-templates": "^2.3.21",
     "@budibase/types": "^2.3.21",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index b3996e5a3c..c02be0fb8a 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.21-alpha.1":
-  version "2.3.21-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.21-alpha.1.tgz#151eaee7f30a3c9bf8e5ab3c30bdbb67a34f9b26"
-  integrity sha512-YyclBgY7YGjlzjI2fNRSj4vJfudXB+1KjZBvZ5EhGKvPZDqhIE+I+7nXRxxFxTtEe0m+p673KjntgREybXPZaQ==
+"@budibase/backend-core@2.3.21":
+  version "2.3.21"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.21.tgz#8342b33b30b3aff130425adfe54b54d28239385d"
+  integrity sha512-bL0d8483uF8jqGp/ua+BZqbhO44YxW3s9moOifqv2/AeyWPgQMiq/itN/PjXDHvEl/9JjkVJqxWXGZFDCrD0hA==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.21-alpha.1"
+    "@budibase/types" "^2.3.21"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1417,14 +1417,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.21-alpha.1":
-  version "2.3.21-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.21-alpha.1.tgz#c7ccff06c36b7dafbdaafdfb525c2ca72ebfd050"
-  integrity sha512-oxOM+0le4SNk2b9jI9sym8qBwi4Uu1soJG68TSdoLluHXzQsXJNrwueO5FY8PS+50Y2HmeIQPCVw2fGWRC7Cjg==
+"@budibase/pro@2.3.21":
+  version "2.3.21"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.21.tgz#3d6476b73a8235266aae628b08904bcc4e2d7b5a"
+  integrity sha512-2iNmyOZMSDClDEG6Fabf08rcdbpppN3G0avlD4u45eR3oPhDNvSzX8fHTtzeAkZEZraCLU+EC5Pj7IHuBz3IKA==
   dependencies:
-    "@budibase/backend-core" "2.3.21-alpha.1"
+    "@budibase/backend-core" "2.3.21"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.3.21-alpha.1"
+    "@budibase/types" "2.3.21"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1463,10 +1463,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.21-alpha.1":
-  version "2.3.21-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.21-alpha.1.tgz#d606f5f8d47ad5e50f80b09ae0434802b810c041"
-  integrity sha512-55Hk7/s7IV4+u1IjuKwlHKPKutsKbHbNbKPK0FStiZgCMG7/+GPysRWdSY9VgLL9XPHOlQ5dtI6jzuWU7ihH/g==
+"@budibase/types@2.3.21", "@budibase/types@^2.3.21":
+  version "2.3.21"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.21.tgz#07b916b6b967ef9bc52f15a3db6976e2503d10a2"
+  integrity sha512-CIoR0dXm1MeqMO7uNDpMn61oRoKyUofvXWCABOdSjrM9LTic4hvNjtboWRlD1AcyHW5pjPOygbtEhUnAbFRAIg==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index b96d71d318..0759c47fe3 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.3.21",
-    "@budibase/pro": "2.3.21-alpha.1",
+    "@budibase/pro": "2.3.21",
     "@budibase/string-templates": "^2.3.21",
     "@budibase/types": "^2.3.21",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 0b5f083bb4..ac62ee4113 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.21-alpha.1":
-  version "2.3.21-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.21-alpha.1.tgz#151eaee7f30a3c9bf8e5ab3c30bdbb67a34f9b26"
-  integrity sha512-YyclBgY7YGjlzjI2fNRSj4vJfudXB+1KjZBvZ5EhGKvPZDqhIE+I+7nXRxxFxTtEe0m+p673KjntgREybXPZaQ==
+"@budibase/backend-core@2.3.21":
+  version "2.3.21"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.21.tgz#8342b33b30b3aff130425adfe54b54d28239385d"
+  integrity sha512-bL0d8483uF8jqGp/ua+BZqbhO44YxW3s9moOifqv2/AeyWPgQMiq/itN/PjXDHvEl/9JjkVJqxWXGZFDCrD0hA==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.21-alpha.1"
+    "@budibase/types" "^2.3.21"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.21-alpha.1":
-  version "2.3.21-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.21-alpha.1.tgz#c7ccff06c36b7dafbdaafdfb525c2ca72ebfd050"
-  integrity sha512-oxOM+0le4SNk2b9jI9sym8qBwi4Uu1soJG68TSdoLluHXzQsXJNrwueO5FY8PS+50Y2HmeIQPCVw2fGWRC7Cjg==
+"@budibase/pro@2.3.21":
+  version "2.3.21"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.21.tgz#3d6476b73a8235266aae628b08904bcc4e2d7b5a"
+  integrity sha512-2iNmyOZMSDClDEG6Fabf08rcdbpppN3G0avlD4u45eR3oPhDNvSzX8fHTtzeAkZEZraCLU+EC5Pj7IHuBz3IKA==
   dependencies:
-    "@budibase/backend-core" "2.3.21-alpha.1"
+    "@budibase/backend-core" "2.3.21"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.3.21-alpha.1"
+    "@budibase/types" "2.3.21"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.21-alpha.1":
-  version "2.3.21-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.21-alpha.1.tgz#d606f5f8d47ad5e50f80b09ae0434802b810c041"
-  integrity sha512-55Hk7/s7IV4+u1IjuKwlHKPKutsKbHbNbKPK0FStiZgCMG7/+GPysRWdSY9VgLL9XPHOlQ5dtI6jzuWU7ihH/g==
+"@budibase/types@2.3.21", "@budibase/types@^2.3.21":
+  version "2.3.21"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.21.tgz#07b916b6b967ef9bc52f15a3db6976e2503d10a2"
+  integrity sha512-CIoR0dXm1MeqMO7uNDpMn61oRoKyUofvXWCABOdSjrM9LTic4hvNjtboWRlD1AcyHW5pjPOygbtEhUnAbFRAIg==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From bf903dc956a79655cf54d9c7a8c01f670c08de89 Mon Sep 17 00:00:00 2001
From: andz-bb <andrew.thompson@budibase.com>
Date: Mon, 6 Mar 2023 17:33:56 +0000
Subject: [PATCH 09/41] update csp media-src to allow media from budi cdn

---
 hosting/proxy/nginx.prod.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosting/proxy/nginx.prod.conf b/hosting/proxy/nginx.prod.conf
index 4d8b3466bf..bad70baa66 100644
--- a/hosting/proxy/nginx.prod.conf
+++ b/hosting/proxy/nginx.prod.conf
@@ -60,7 +60,7 @@ http {
     set $csp_frame "frame-src 'self' https:";
     set $csp_img "img-src http: https: data: blob:";
     set $csp_manifest "manifest-src 'self'";
-    set $csp_media "media-src 'self' https://js.intercomcdn.com";
+    set $csp_media "media-src 'self' https://js.intercomcdn.com https://cdn.budi.live"; 
     set $csp_worker "worker-src 'none'";
 
     error_page 502 503 504 /error.html;

From ea5e5644284ef94243144f0f31f4f1c430d8dd8d Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Tue, 7 Mar 2023 09:45:39 +0000
Subject: [PATCH 10/41] fix tenant filtering issue

---
 packages/frontend-core/src/api/user.js | 3 +--
 packages/worker/src/utilities/redis.ts | 9 +--------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/packages/frontend-core/src/api/user.js b/packages/frontend-core/src/api/user.js
index cb8a8f6555..d8723a649c 100644
--- a/packages/frontend-core/src/api/user.js
+++ b/packages/frontend-core/src/api/user.js
@@ -194,8 +194,7 @@ export const buildUserEndpoints = API => ({
   },
 
   /**
-   * Retrieves the invitation associated with a provided code.
-   * @param code The unique code for the target invite
+   * Retrieves all user invitations for the current tenant.
    */
   getUserInvites: async () => {
     return await API.get({
diff --git a/packages/worker/src/utilities/redis.ts b/packages/worker/src/utilities/redis.ts
index 7b3f251c0e..ecafee649b 100644
--- a/packages/worker/src/utilities/redis.ts
+++ b/packages/worker/src/utilities/redis.ts
@@ -142,12 +142,5 @@ export async function getInviteCodes(tenantIds?: string[]) {
       code: invite.key,
     }
   })
-  return results.reduce((acc, invite) => {
-    if (tenantIds?.length && tenantIds.includes(invite.info.tenantId)) {
-      acc.push(invite)
-    } else {
-      acc.push(invite)
-    }
-    return acc
-  }, [])
+  return results.filter(invite => tenantIds?.length && tenantIds.includes(invite.info.tenantId))
 }

From b839eafbe390db9597c2f3766f4f31bd820bf2ef Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Tue, 7 Mar 2023 09:49:58 +0000
Subject: [PATCH 11/41] return all when in single tenant env

---
 packages/worker/src/utilities/redis.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/worker/src/utilities/redis.ts b/packages/worker/src/utilities/redis.ts
index ecafee649b..fe9991f0a2 100644
--- a/packages/worker/src/utilities/redis.ts
+++ b/packages/worker/src/utilities/redis.ts
@@ -1,4 +1,5 @@
 import { redis, utils } from "@budibase/backend-core"
+import env from "../environment"
 
 function getExpirySecondsForDB(db: string) {
   switch (db) {
@@ -142,5 +143,8 @@ export async function getInviteCodes(tenantIds?: string[]) {
       code: invite.key,
     }
   })
+  if (!env.MULTI_TENANCY) {
+    return results
+  }
   return results.filter(invite => tenantIds?.length && tenantIds.includes(invite.info.tenantId))
 }

From fd8488d4d35a9e4578d74de7d12e6126606a1866 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Tue, 7 Mar 2023 09:56:12 +0000
Subject: [PATCH 12/41] remove array of tenantIds

---
 packages/worker/src/api/controllers/global/users.ts | 2 +-
 packages/worker/src/utilities/redis.ts              | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts
index d68e726e71..921f99fa31 100644
--- a/packages/worker/src/api/controllers/global/users.ts
+++ b/packages/worker/src/api/controllers/global/users.ts
@@ -341,7 +341,7 @@ export const getUserInvites = async (ctx: any) => {
   let invites
   try {
     // Restricted to the currently authenticated tenant
-    invites = await getInviteCodes([ctx.user.tenantId])
+    invites = await getInviteCodes()
   } catch (e) {
     ctx.throw(400, "There was a problem fetching invites")
   }
diff --git a/packages/worker/src/utilities/redis.ts b/packages/worker/src/utilities/redis.ts
index fe9991f0a2..7ebe858ade 100644
--- a/packages/worker/src/utilities/redis.ts
+++ b/packages/worker/src/utilities/redis.ts
@@ -1,4 +1,5 @@
 import { redis, utils } from "@budibase/backend-core"
+import { getTenantId } from "@budibase/backend-core/src/context"
 import env from "../environment"
 
 function getExpirySecondsForDB(db: string) {
@@ -130,10 +131,9 @@ export async function checkInviteCode(
 }
 
 /** 
-  Get all currently available user invitations.
-  @return {Object[]} A list of all objects containing invite metadata
+  Get all currently available user invitations for the current tenant.
 **/
-export async function getInviteCodes(tenantIds?: string[]) {
+export async function getInviteCodes() {
   const client = await getClient(redis.utils.Databases.INVITATIONS)
   const invites: any[] = await client.scan()
 
@@ -146,5 +146,6 @@ export async function getInviteCodes(tenantIds?: string[]) {
   if (!env.MULTI_TENANCY) {
     return results
   }
-  return results.filter(invite => tenantIds?.length && tenantIds.includes(invite.info.tenantId))
+  const tenantId = getTenantId()
+  return results.filter(invite => tenantId === invite.info.tenantId)
 }

From 63e7d9d97e29065e18c5646d2536b2c8e98fc69b Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Tue, 7 Mar 2023 10:01:19 +0000
Subject: [PATCH 13/41] update imports

---
 packages/worker/src/utilities/redis.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/worker/src/utilities/redis.ts b/packages/worker/src/utilities/redis.ts
index 7ebe858ade..d77e44cd9f 100644
--- a/packages/worker/src/utilities/redis.ts
+++ b/packages/worker/src/utilities/redis.ts
@@ -1,5 +1,4 @@
-import { redis, utils } from "@budibase/backend-core"
-import { getTenantId } from "@budibase/backend-core/src/context"
+import { redis, utils, tenancy } from "@budibase/backend-core"
 import env from "../environment"
 
 function getExpirySecondsForDB(db: string) {
@@ -146,6 +145,6 @@ export async function getInviteCodes() {
   if (!env.MULTI_TENANCY) {
     return results
   }
-  const tenantId = getTenantId()
+  const tenantId = tenancy.getTenantId()
   return results.filter(invite => tenantId === invite.info.tenantId)
 }

From 1cdb1152f32f4dc1a08410065d3895b0142c4251 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 7 Mar 2023 10:28:11 +0000
Subject: [PATCH 14/41] v2.3.22

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index 8767cb7e05..dba29377e8 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.21",
+  "version": "2.3.22",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index da9dd8d5ff..1145fd42f6 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.21",
+  "version": "2.3.22",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.3.21",
+    "@budibase/types": "^2.3.22",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 2074d2ff47..cfbfa582c3 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.3.21",
+  "version": "2.3.22",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/string-templates": "^2.3.21",
+    "@budibase/string-templates": "^2.3.22",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index a3f7b71371..cc4aff5459 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.21",
+  "version": "2.3.22",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.3.21",
-    "@budibase/client": "^2.3.21",
-    "@budibase/frontend-core": "^2.3.21",
-    "@budibase/string-templates": "^2.3.21",
+    "@budibase/bbui": "^2.3.22",
+    "@budibase/client": "^2.3.22",
+    "@budibase/frontend-core": "^2.3.22",
+    "@budibase/string-templates": "^2.3.22",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index d4175e207d..f47ac5defd 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.21",
+  "version": "2.3.22",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "dist/index.js",
   "bin": {
@@ -29,9 +29,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.3.21",
-    "@budibase/string-templates": "^2.3.21",
-    "@budibase/types": "^2.3.21",
+    "@budibase/backend-core": "^2.3.22",
+    "@budibase/string-templates": "^2.3.22",
+    "@budibase/types": "^2.3.22",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 621ec88454..faf04a418c 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.21",
+  "version": "2.3.22",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.3.21",
-    "@budibase/frontend-core": "^2.3.21",
-    "@budibase/string-templates": "^2.3.21",
+    "@budibase/bbui": "^2.3.22",
+    "@budibase/frontend-core": "^2.3.22",
+    "@budibase/string-templates": "^2.3.22",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index b784ea4955..46eccdb75e 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.21",
+  "version": "2.3.22",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.3.21",
+    "@budibase/bbui": "^2.3.22",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 4104de71e2..52c3c68047 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.21",
+  "version": "2.3.22",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index a77f86efd7..2255a6e2cf 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.21",
+  "version": "2.3.22",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.3.21",
-    "@budibase/client": "^2.3.21",
+    "@budibase/backend-core": "^2.3.22",
+    "@budibase/client": "^2.3.22",
     "@budibase/pro": "2.3.21",
-    "@budibase/string-templates": "^2.3.21",
-    "@budibase/types": "^2.3.21",
+    "@budibase/string-templates": "^2.3.22",
+    "@budibase/types": "^2.3.22",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 4e63b40059..5e9c319b85 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.21",
+  "version": "2.3.22",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 71a3b76ffd..559d31a1bf 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.21",
+  "version": "2.3.22",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 0759c47fe3..450c0739d5 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.21",
+  "version": "2.3.22",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.3.21",
+    "@budibase/backend-core": "^2.3.22",
     "@budibase/pro": "2.3.21",
-    "@budibase/string-templates": "^2.3.21",
-    "@budibase/types": "^2.3.21",
+    "@budibase/string-templates": "^2.3.22",
+    "@budibase/types": "^2.3.22",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From c1f38699a562b28ff8499e3e5c7620bac5d4a2a9 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 7 Mar 2023 10:30:58 +0000
Subject: [PATCH 15/41] Update pro version to 2.3.22

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 2255a6e2cf..05caa4d23d 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.3.22",
     "@budibase/client": "^2.3.22",
-    "@budibase/pro": "2.3.21",
+    "@budibase/pro": "2.3.22",
     "@budibase/string-templates": "^2.3.22",
     "@budibase/types": "^2.3.22",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index c02be0fb8a..e994ad5c22 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.21":
-  version "2.3.21"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.21.tgz#8342b33b30b3aff130425adfe54b54d28239385d"
-  integrity sha512-bL0d8483uF8jqGp/ua+BZqbhO44YxW3s9moOifqv2/AeyWPgQMiq/itN/PjXDHvEl/9JjkVJqxWXGZFDCrD0hA==
+"@budibase/backend-core@2.3.22":
+  version "2.3.22"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.22.tgz#e98937b22040177a5b8a8edcc1329e72acbacc3b"
+  integrity sha512-j7Ixc3AlXrcidT+h5oAjL/1313BZnz9BLIR5kM8F4CbdS8Ip4SnQxTm8nDtNtwuyG1oYOylRl+JpzR5Vk9mTMQ==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "^2.3.21"
+    "@budibase/types" "^2.3.22"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1417,14 +1417,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.21":
-  version "2.3.21"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.21.tgz#3d6476b73a8235266aae628b08904bcc4e2d7b5a"
-  integrity sha512-2iNmyOZMSDClDEG6Fabf08rcdbpppN3G0avlD4u45eR3oPhDNvSzX8fHTtzeAkZEZraCLU+EC5Pj7IHuBz3IKA==
+"@budibase/pro@2.3.22":
+  version "2.3.22"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.22.tgz#5e927329fc2bac60983b2b57b19fd36e1c79f1e7"
+  integrity sha512-uDWjuCQLmbw+Y14mLSVoRNEfMLsVUirO5tpahdXbm6PTgRUvN4BNQHtVKhb493dA+vyym2hVDzekD4CGO+G3SA==
   dependencies:
-    "@budibase/backend-core" "2.3.21"
+    "@budibase/backend-core" "2.3.22"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.3.21"
+    "@budibase/types" "2.3.22"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1463,10 +1463,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.21", "@budibase/types@^2.3.21":
-  version "2.3.21"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.21.tgz#07b916b6b967ef9bc52f15a3db6976e2503d10a2"
-  integrity sha512-CIoR0dXm1MeqMO7uNDpMn61oRoKyUofvXWCABOdSjrM9LTic4hvNjtboWRlD1AcyHW5pjPOygbtEhUnAbFRAIg==
+"@budibase/types@2.3.22", "@budibase/types@^2.3.22":
+  version "2.3.22"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.22.tgz#ded791f4786eaaf0962af068997ca09c660523bd"
+  integrity sha512-eshZcYYB6XZ+1y9gUMSxjX3y7dIbxmkeDRN/903m5AOTitlFegylOlZodJy4lrK9khVdWjVRYrjOKu4KyVgQ7Q==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 450c0739d5..c0a985dbe2 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.3.22",
-    "@budibase/pro": "2.3.21",
+    "@budibase/pro": "2.3.22",
     "@budibase/string-templates": "^2.3.22",
     "@budibase/types": "^2.3.22",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index ac62ee4113..00b53366cf 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.21":
-  version "2.3.21"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.21.tgz#8342b33b30b3aff130425adfe54b54d28239385d"
-  integrity sha512-bL0d8483uF8jqGp/ua+BZqbhO44YxW3s9moOifqv2/AeyWPgQMiq/itN/PjXDHvEl/9JjkVJqxWXGZFDCrD0hA==
+"@budibase/backend-core@2.3.22":
+  version "2.3.22"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.22.tgz#e98937b22040177a5b8a8edcc1329e72acbacc3b"
+  integrity sha512-j7Ixc3AlXrcidT+h5oAjL/1313BZnz9BLIR5kM8F4CbdS8Ip4SnQxTm8nDtNtwuyG1oYOylRl+JpzR5Vk9mTMQ==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "^2.3.21"
+    "@budibase/types" "^2.3.22"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.21":
-  version "2.3.21"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.21.tgz#3d6476b73a8235266aae628b08904bcc4e2d7b5a"
-  integrity sha512-2iNmyOZMSDClDEG6Fabf08rcdbpppN3G0avlD4u45eR3oPhDNvSzX8fHTtzeAkZEZraCLU+EC5Pj7IHuBz3IKA==
+"@budibase/pro@2.3.22":
+  version "2.3.22"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.22.tgz#5e927329fc2bac60983b2b57b19fd36e1c79f1e7"
+  integrity sha512-uDWjuCQLmbw+Y14mLSVoRNEfMLsVUirO5tpahdXbm6PTgRUvN4BNQHtVKhb493dA+vyym2hVDzekD4CGO+G3SA==
   dependencies:
-    "@budibase/backend-core" "2.3.21"
+    "@budibase/backend-core" "2.3.22"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.3.21"
+    "@budibase/types" "2.3.22"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.21", "@budibase/types@^2.3.21":
-  version "2.3.21"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.21.tgz#07b916b6b967ef9bc52f15a3db6976e2503d10a2"
-  integrity sha512-CIoR0dXm1MeqMO7uNDpMn61oRoKyUofvXWCABOdSjrM9LTic4hvNjtboWRlD1AcyHW5pjPOygbtEhUnAbFRAIg==
+"@budibase/types@2.3.22", "@budibase/types@^2.3.22":
+  version "2.3.22"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.22.tgz#ded791f4786eaaf0962af068997ca09c660523bd"
+  integrity sha512-eshZcYYB6XZ+1y9gUMSxjX3y7dIbxmkeDRN/903m5AOTitlFegylOlZodJy4lrK9khVdWjVRYrjOKu4KyVgQ7Q==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 09cf4f8bbcd68eed115777d298b4a79648371f83 Mon Sep 17 00:00:00 2001
From: melohagan <101575380+melohagan@users.noreply.github.com>
Date: Tue, 7 Mar 2023 10:32:52 +0000
Subject: [PATCH 16/41] Dynamic filter: Enrich columns (#9877)

* WIP

* Allow related fields in Dynamic Filter

* REST URL check https first

* Only allow related fields in dynamic filter column editor
---
 .../settings/controls/ColumnEditor/ColumnEditor.svelte    | 8 +++++++-
 .../src/components/integration/RestQueryViewer.svelte     | 2 +-
 .../src/components/app/dynamic-filter/FilterModal.svelte  | 3 +++
 packages/client/src/utils/schema.js                       | 1 +
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte
index 36cc9f619d..098a8f7ed7 100644
--- a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte
@@ -8,6 +8,7 @@
     getSchemaForDatasource,
   } from "builderStore/dataBinding"
   import { currentAsset } from "builderStore"
+  import { getFields } from "helpers/searchFields"
 
   export let componentInstance
   export let value = []
@@ -21,9 +22,14 @@
 
   $: datasource = getDatasourceForProvider($currentAsset, componentInstance)
   $: schema = getSchema($currentAsset, datasource)
-  $: options = Object.keys(schema || {})
+  $: options = allowCellEditing
+    ? Object.keys(schema || {})
+    : enrichedSchemaFields?.map(field => field.name)
   $: sanitisedValue = getValidColumns(value, options)
   $: updateBoundValue(sanitisedValue)
+  $: enrichedSchemaFields = getFields(Object.values(schema) || [], {
+    allowLinks: true,
+  })
 
   const getSchema = (asset, datasource) => {
     const schema = getSchemaForDatasource(asset, datasource).schema
diff --git a/packages/builder/src/components/integration/RestQueryViewer.svelte b/packages/builder/src/components/integration/RestQueryViewer.svelte
index 0ba232cbdb..1f21ae897e 100644
--- a/packages/builder/src/components/integration/RestQueryViewer.svelte
+++ b/packages/builder/src/components/integration/RestQueryViewer.svelte
@@ -120,7 +120,7 @@
 
   const cleanUrl = inputUrl =>
     url
-      ?.replace(/(http)|(https)|[{}:]/g, "")
+      ?.replace(/(https)|(http)|[{}:]/g, "")
       ?.replaceAll(".", "_")
       ?.replaceAll("/", " ")
       ?.trim() || inputUrl
diff --git a/packages/client/src/components/app/dynamic-filter/FilterModal.svelte b/packages/client/src/components/app/dynamic-filter/FilterModal.svelte
index 5bc3e500a1..3b397761cc 100644
--- a/packages/client/src/components/app/dynamic-filter/FilterModal.svelte
+++ b/packages/client/src/components/app/dynamic-filter/FilterModal.svelte
@@ -57,6 +57,9 @@
   const onFieldChange = (expression, field) => {
     // Update the field type
     expression.type = schemaFields.find(x => x.name === field)?.type
+    expression.externalType = schemaFields.find(
+      x => x.name === field
+    )?.externalType
 
     // Ensure a valid operator is set
     const validOperators = LuceneUtils.getValidOperatorsForType(
diff --git a/packages/client/src/utils/schema.js b/packages/client/src/utils/schema.js
index 433a1c5fee..e450c516d7 100644
--- a/packages/client/src/utils/schema.js
+++ b/packages/client/src/utils/schema.js
@@ -81,6 +81,7 @@ export const getRelationshipSchemaAdditions = async schema => {
       Object.keys(linkSchema || {}).forEach(linkKey => {
         relationshipAdditions[`${fieldKey}.${linkKey}`] = {
           type: linkSchema[linkKey].type,
+          externalType: linkSchema[linkKey].externalType,
         }
       })
     }

From 7dae3272fd8e1de744ebf589cde3d484d1d8d78d Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 7 Mar 2023 10:54:24 +0000
Subject: [PATCH 17/41] v2.3.23

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index dba29377e8..6179a904af 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.22",
+  "version": "2.3.23",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 1145fd42f6..db7e8638b1 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.22",
+  "version": "2.3.23",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.3.22",
+    "@budibase/types": "^2.3.23",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index cfbfa582c3..06a8151943 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.3.22",
+  "version": "2.3.23",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/string-templates": "^2.3.22",
+    "@budibase/string-templates": "^2.3.23",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index cc4aff5459..526d2ed2b3 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.22",
+  "version": "2.3.23",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.3.22",
-    "@budibase/client": "^2.3.22",
-    "@budibase/frontend-core": "^2.3.22",
-    "@budibase/string-templates": "^2.3.22",
+    "@budibase/bbui": "^2.3.23",
+    "@budibase/client": "^2.3.23",
+    "@budibase/frontend-core": "^2.3.23",
+    "@budibase/string-templates": "^2.3.23",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index f47ac5defd..a40c1fc470 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.22",
+  "version": "2.3.23",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "dist/index.js",
   "bin": {
@@ -29,9 +29,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.3.22",
-    "@budibase/string-templates": "^2.3.22",
-    "@budibase/types": "^2.3.22",
+    "@budibase/backend-core": "^2.3.23",
+    "@budibase/string-templates": "^2.3.23",
+    "@budibase/types": "^2.3.23",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index faf04a418c..5a1e0cdc22 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.22",
+  "version": "2.3.23",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.3.22",
-    "@budibase/frontend-core": "^2.3.22",
-    "@budibase/string-templates": "^2.3.22",
+    "@budibase/bbui": "^2.3.23",
+    "@budibase/frontend-core": "^2.3.23",
+    "@budibase/string-templates": "^2.3.23",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 46eccdb75e..99a11bb194 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.22",
+  "version": "2.3.23",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.3.22",
+    "@budibase/bbui": "^2.3.23",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 52c3c68047..acf3f55622 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.22",
+  "version": "2.3.23",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 05caa4d23d..376bf93d6e 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.22",
+  "version": "2.3.23",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.3.22",
-    "@budibase/client": "^2.3.22",
+    "@budibase/backend-core": "^2.3.23",
+    "@budibase/client": "^2.3.23",
     "@budibase/pro": "2.3.22",
-    "@budibase/string-templates": "^2.3.22",
-    "@budibase/types": "^2.3.22",
+    "@budibase/string-templates": "^2.3.23",
+    "@budibase/types": "^2.3.23",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 5e9c319b85..fc7abb8a63 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.22",
+  "version": "2.3.23",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 559d31a1bf..0a72abc521 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.22",
+  "version": "2.3.23",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index c0a985dbe2..034c9d15da 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.22",
+  "version": "2.3.23",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.3.22",
+    "@budibase/backend-core": "^2.3.23",
     "@budibase/pro": "2.3.22",
-    "@budibase/string-templates": "^2.3.22",
-    "@budibase/types": "^2.3.22",
+    "@budibase/string-templates": "^2.3.23",
+    "@budibase/types": "^2.3.23",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 745db45e4109fd195c3b8aad07c1585d4da1f2ea Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 7 Mar 2023 10:57:39 +0000
Subject: [PATCH 18/41] Update pro version to 2.3.23

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 376bf93d6e..d7c5d1114e 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.3.23",
     "@budibase/client": "^2.3.23",
-    "@budibase/pro": "2.3.22",
+    "@budibase/pro": "2.3.23",
     "@budibase/string-templates": "^2.3.23",
     "@budibase/types": "^2.3.23",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index e994ad5c22..f94febe21b 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.22":
-  version "2.3.22"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.22.tgz#e98937b22040177a5b8a8edcc1329e72acbacc3b"
-  integrity sha512-j7Ixc3AlXrcidT+h5oAjL/1313BZnz9BLIR5kM8F4CbdS8Ip4SnQxTm8nDtNtwuyG1oYOylRl+JpzR5Vk9mTMQ==
+"@budibase/backend-core@2.3.23":
+  version "2.3.23"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.23.tgz#b6066ac6989be4425cea1a6fe1c826695c88b83e"
+  integrity sha512-p5mv4w6YFCMj5PkHIZdvwsmQbSxHS8yv9YcMeQ5p17TY/lVKI+s6OX1zoVnO7NEmyV8JIiHxuey7gn3EjX1ktQ==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "^2.3.22"
+    "@budibase/types" "^2.3.23"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1417,14 +1417,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.22":
-  version "2.3.22"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.22.tgz#5e927329fc2bac60983b2b57b19fd36e1c79f1e7"
-  integrity sha512-uDWjuCQLmbw+Y14mLSVoRNEfMLsVUirO5tpahdXbm6PTgRUvN4BNQHtVKhb493dA+vyym2hVDzekD4CGO+G3SA==
+"@budibase/pro@2.3.23":
+  version "2.3.23"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.23.tgz#7451b0866fe6ea172718aa71d26dd99aa883656f"
+  integrity sha512-3ug1336o2V9OIzLADHNrpwf4kTjHfkfWs/blUDUmqXJKo6Hkq2I4eMUf0mEFvTMO29uZ7wZKQz8AkGA6wts5vA==
   dependencies:
-    "@budibase/backend-core" "2.3.22"
+    "@budibase/backend-core" "2.3.23"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.3.22"
+    "@budibase/types" "2.3.23"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1463,10 +1463,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.22", "@budibase/types@^2.3.22":
-  version "2.3.22"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.22.tgz#ded791f4786eaaf0962af068997ca09c660523bd"
-  integrity sha512-eshZcYYB6XZ+1y9gUMSxjX3y7dIbxmkeDRN/903m5AOTitlFegylOlZodJy4lrK9khVdWjVRYrjOKu4KyVgQ7Q==
+"@budibase/types@2.3.23", "@budibase/types@^2.3.23":
+  version "2.3.23"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.23.tgz#9a3da27e56a94b6959d3517ebe2125a97d919536"
+  integrity sha512-XL3FOQ0WlkKdNf1dS+RAcDgSgwtRY4c/HbQaOGDJgmQMnQAS2j357woxlLM9367541+Sdu9dsBKJFPBssUZl2Q==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 034c9d15da..566989bd41 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.3.23",
-    "@budibase/pro": "2.3.22",
+    "@budibase/pro": "2.3.23",
     "@budibase/string-templates": "^2.3.23",
     "@budibase/types": "^2.3.23",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 00b53366cf..38f92af358 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.22":
-  version "2.3.22"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.22.tgz#e98937b22040177a5b8a8edcc1329e72acbacc3b"
-  integrity sha512-j7Ixc3AlXrcidT+h5oAjL/1313BZnz9BLIR5kM8F4CbdS8Ip4SnQxTm8nDtNtwuyG1oYOylRl+JpzR5Vk9mTMQ==
+"@budibase/backend-core@2.3.23":
+  version "2.3.23"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.23.tgz#b6066ac6989be4425cea1a6fe1c826695c88b83e"
+  integrity sha512-p5mv4w6YFCMj5PkHIZdvwsmQbSxHS8yv9YcMeQ5p17TY/lVKI+s6OX1zoVnO7NEmyV8JIiHxuey7gn3EjX1ktQ==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "^2.3.22"
+    "@budibase/types" "^2.3.23"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.22":
-  version "2.3.22"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.22.tgz#5e927329fc2bac60983b2b57b19fd36e1c79f1e7"
-  integrity sha512-uDWjuCQLmbw+Y14mLSVoRNEfMLsVUirO5tpahdXbm6PTgRUvN4BNQHtVKhb493dA+vyym2hVDzekD4CGO+G3SA==
+"@budibase/pro@2.3.23":
+  version "2.3.23"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.23.tgz#7451b0866fe6ea172718aa71d26dd99aa883656f"
+  integrity sha512-3ug1336o2V9OIzLADHNrpwf4kTjHfkfWs/blUDUmqXJKo6Hkq2I4eMUf0mEFvTMO29uZ7wZKQz8AkGA6wts5vA==
   dependencies:
-    "@budibase/backend-core" "2.3.22"
+    "@budibase/backend-core" "2.3.23"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.3.22"
+    "@budibase/types" "2.3.23"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.22", "@budibase/types@^2.3.22":
-  version "2.3.22"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.22.tgz#ded791f4786eaaf0962af068997ca09c660523bd"
-  integrity sha512-eshZcYYB6XZ+1y9gUMSxjX3y7dIbxmkeDRN/903m5AOTitlFegylOlZodJy4lrK9khVdWjVRYrjOKu4KyVgQ7Q==
+"@budibase/types@2.3.23", "@budibase/types@^2.3.23":
+  version "2.3.23"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.23.tgz#9a3da27e56a94b6959d3517ebe2125a97d919536"
+  integrity sha512-XL3FOQ0WlkKdNf1dS+RAcDgSgwtRY4c/HbQaOGDJgmQMnQAS2j357woxlLM9367541+Sdu9dsBKJFPBssUZl2Q==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From f5b513f5a521e0eeaf0b5b564d44fae07c364202 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Tue, 7 Mar 2023 11:17:22 +0000
Subject: [PATCH 19/41] Minor UI fixes for the user side panel header height
 and user email overflow

---
 .../app/[application]/_components/BuilderSidePanel.svelte      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index a38751f5d4..31b16cefe0 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -661,6 +661,7 @@
     align-items: center;
     gap: var(--spacing-m);
     color: var(--spectrum-global-color-gray-900);
+    overflow: hidden;
   }
 
   .auth-entity .user-email {
@@ -741,11 +742,11 @@
   }
 
   .builder-side-panel-header {
-    height: 58px;
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     align-items: center;
+    flex: 0 0 58px;
   }
 
   .invite-header {

From 99bdcb1b8737b1e6c939c44eea1cd01812af4a9e Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 7 Mar 2023 11:41:28 +0000
Subject: [PATCH 20/41] v2.3.24

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index 6179a904af..7ecca60760 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.23",
+  "version": "2.3.24",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index db7e8638b1..db316f0d0d 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.23",
+  "version": "2.3.24",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.3.23",
+    "@budibase/types": "^2.3.24",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 06a8151943..0b4e4d2603 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.3.23",
+  "version": "2.3.24",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/string-templates": "^2.3.23",
+    "@budibase/string-templates": "^2.3.24",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 526d2ed2b3..090e30a805 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.23",
+  "version": "2.3.24",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.3.23",
-    "@budibase/client": "^2.3.23",
-    "@budibase/frontend-core": "^2.3.23",
-    "@budibase/string-templates": "^2.3.23",
+    "@budibase/bbui": "^2.3.24",
+    "@budibase/client": "^2.3.24",
+    "@budibase/frontend-core": "^2.3.24",
+    "@budibase/string-templates": "^2.3.24",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index a40c1fc470..53b7ec8e29 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.23",
+  "version": "2.3.24",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "dist/index.js",
   "bin": {
@@ -29,9 +29,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.3.23",
-    "@budibase/string-templates": "^2.3.23",
-    "@budibase/types": "^2.3.23",
+    "@budibase/backend-core": "^2.3.24",
+    "@budibase/string-templates": "^2.3.24",
+    "@budibase/types": "^2.3.24",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 5a1e0cdc22..36bd692c17 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.23",
+  "version": "2.3.24",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.3.23",
-    "@budibase/frontend-core": "^2.3.23",
-    "@budibase/string-templates": "^2.3.23",
+    "@budibase/bbui": "^2.3.24",
+    "@budibase/frontend-core": "^2.3.24",
+    "@budibase/string-templates": "^2.3.24",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 99a11bb194..f5c8db3a4f 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.23",
+  "version": "2.3.24",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.3.23",
+    "@budibase/bbui": "^2.3.24",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index acf3f55622..03f571f380 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.23",
+  "version": "2.3.24",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index d7c5d1114e..2c4524756b 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.23",
+  "version": "2.3.24",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.3.23",
-    "@budibase/client": "^2.3.23",
+    "@budibase/backend-core": "^2.3.24",
+    "@budibase/client": "^2.3.24",
     "@budibase/pro": "2.3.23",
-    "@budibase/string-templates": "^2.3.23",
-    "@budibase/types": "^2.3.23",
+    "@budibase/string-templates": "^2.3.24",
+    "@budibase/types": "^2.3.24",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index fc7abb8a63..217114d23e 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.23",
+  "version": "2.3.24",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 0a72abc521..08de6bc472 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.23",
+  "version": "2.3.24",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 566989bd41..3d92c8715e 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.23",
+  "version": "2.3.24",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.3.23",
+    "@budibase/backend-core": "^2.3.24",
     "@budibase/pro": "2.3.23",
-    "@budibase/string-templates": "^2.3.23",
-    "@budibase/types": "^2.3.23",
+    "@budibase/string-templates": "^2.3.24",
+    "@budibase/types": "^2.3.24",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From e5716633b28a4d95b0ddc240f1df82e0b936860d Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 7 Mar 2023 11:44:13 +0000
Subject: [PATCH 21/41] Update pro version to 2.3.24

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 2c4524756b..9e82dd35d2 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.3.24",
     "@budibase/client": "^2.3.24",
-    "@budibase/pro": "2.3.23",
+    "@budibase/pro": "2.3.24",
     "@budibase/string-templates": "^2.3.24",
     "@budibase/types": "^2.3.24",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index f94febe21b..7555d0e28d 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.23":
-  version "2.3.23"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.23.tgz#b6066ac6989be4425cea1a6fe1c826695c88b83e"
-  integrity sha512-p5mv4w6YFCMj5PkHIZdvwsmQbSxHS8yv9YcMeQ5p17TY/lVKI+s6OX1zoVnO7NEmyV8JIiHxuey7gn3EjX1ktQ==
+"@budibase/backend-core@2.3.24":
+  version "2.3.24"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.24.tgz#f3bdc29e2ce092095cd5774c2ba80a18ca891a8e"
+  integrity sha512-aW4WdhvJGkctS4gkAJ8SbYvmihBSVFwW/HTGNCUxaZ6OWn+DbafJgalwdmTvSKqa1yYii/X4MtWMhhsFRUJwcQ==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "^2.3.23"
+    "@budibase/types" "^2.3.24"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1417,14 +1417,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.23":
-  version "2.3.23"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.23.tgz#7451b0866fe6ea172718aa71d26dd99aa883656f"
-  integrity sha512-3ug1336o2V9OIzLADHNrpwf4kTjHfkfWs/blUDUmqXJKo6Hkq2I4eMUf0mEFvTMO29uZ7wZKQz8AkGA6wts5vA==
+"@budibase/pro@2.3.24":
+  version "2.3.24"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.24.tgz#86f113229acf8a107e766365a1808e29c9072bd5"
+  integrity sha512-dSEkpDN6gqJLouUDDXWAgK4tX3sD1s/DdL49hjnI+6Mw+IHmZrNesB2KH2pResMJ9vehDJySre9jYYtNc658/w==
   dependencies:
-    "@budibase/backend-core" "2.3.23"
+    "@budibase/backend-core" "2.3.24"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.3.23"
+    "@budibase/types" "2.3.24"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1463,10 +1463,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.23", "@budibase/types@^2.3.23":
-  version "2.3.23"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.23.tgz#9a3da27e56a94b6959d3517ebe2125a97d919536"
-  integrity sha512-XL3FOQ0WlkKdNf1dS+RAcDgSgwtRY4c/HbQaOGDJgmQMnQAS2j357woxlLM9367541+Sdu9dsBKJFPBssUZl2Q==
+"@budibase/types@2.3.24", "@budibase/types@^2.3.24":
+  version "2.3.24"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.24.tgz#270863670b27370872d49c5298aa299c167c6eba"
+  integrity sha512-r7iKJ0TqKP83oI/Anzn3PnEwXj/oNXuwXaaMLboQRaIHAmhoa5xB0LZRxqYj/XIIHhQJyvHjtN/6prLqRYFwIA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 3d92c8715e..11065eb08f 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.3.24",
-    "@budibase/pro": "2.3.23",
+    "@budibase/pro": "2.3.24",
     "@budibase/string-templates": "^2.3.24",
     "@budibase/types": "^2.3.24",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 38f92af358..620d9b9021 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.23":
-  version "2.3.23"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.23.tgz#b6066ac6989be4425cea1a6fe1c826695c88b83e"
-  integrity sha512-p5mv4w6YFCMj5PkHIZdvwsmQbSxHS8yv9YcMeQ5p17TY/lVKI+s6OX1zoVnO7NEmyV8JIiHxuey7gn3EjX1ktQ==
+"@budibase/backend-core@2.3.24":
+  version "2.3.24"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.24.tgz#f3bdc29e2ce092095cd5774c2ba80a18ca891a8e"
+  integrity sha512-aW4WdhvJGkctS4gkAJ8SbYvmihBSVFwW/HTGNCUxaZ6OWn+DbafJgalwdmTvSKqa1yYii/X4MtWMhhsFRUJwcQ==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "^2.3.23"
+    "@budibase/types" "^2.3.24"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.23":
-  version "2.3.23"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.23.tgz#7451b0866fe6ea172718aa71d26dd99aa883656f"
-  integrity sha512-3ug1336o2V9OIzLADHNrpwf4kTjHfkfWs/blUDUmqXJKo6Hkq2I4eMUf0mEFvTMO29uZ7wZKQz8AkGA6wts5vA==
+"@budibase/pro@2.3.24":
+  version "2.3.24"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.24.tgz#86f113229acf8a107e766365a1808e29c9072bd5"
+  integrity sha512-dSEkpDN6gqJLouUDDXWAgK4tX3sD1s/DdL49hjnI+6Mw+IHmZrNesB2KH2pResMJ9vehDJySre9jYYtNc658/w==
   dependencies:
-    "@budibase/backend-core" "2.3.23"
+    "@budibase/backend-core" "2.3.24"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.3.23"
+    "@budibase/types" "2.3.24"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.23", "@budibase/types@^2.3.23":
-  version "2.3.23"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.23.tgz#9a3da27e56a94b6959d3517ebe2125a97d919536"
-  integrity sha512-XL3FOQ0WlkKdNf1dS+RAcDgSgwtRY4c/HbQaOGDJgmQMnQAS2j357woxlLM9367541+Sdu9dsBKJFPBssUZl2Q==
+"@budibase/types@2.3.24", "@budibase/types@^2.3.24":
+  version "2.3.24"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.24.tgz#270863670b27370872d49c5298aa299c167c6eba"
+  integrity sha512-r7iKJ0TqKP83oI/Anzn3PnEwXj/oNXuwXaaMLboQRaIHAmhoa5xB0LZRxqYj/XIIHhQJyvHjtN/6prLqRYFwIA==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 485a9d5f3c3deb12c6695f5d934aa34f3e0067bf Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 7 Mar 2023 11:44:23 +0000
Subject: [PATCH 22/41] Fixing an issue with the CLI dependencies, the version
 of docker-compose we were using didn't support ES6 imports, despite appearing
 as if it did, upgrading to a version this is properly supported.

---
 packages/cli/package.json |  2 +-
 packages/cli/yarn.lock    | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 53b7ec8e29..4dbf888ef1 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -36,7 +36,7 @@
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
     "commander": "7.1.0",
-    "docker-compose": "0.23.6",
+    "docker-compose": "0.23.12",
     "dotenv": "16.0.1",
     "download": "8.0.0",
     "find-free-port": "^2.0.0",
diff --git a/packages/cli/yarn.lock b/packages/cli/yarn.lock
index 89e1f7c5cb..dddb04137b 100644
--- a/packages/cli/yarn.lock
+++ b/packages/cli/yarn.lock
@@ -1235,10 +1235,12 @@ dir-glob@^3.0.1:
   dependencies:
     path-type "^4.0.0"
 
-docker-compose@0.23.6:
-  version "0.23.6"
-  resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-0.23.6.tgz#bd21e17d599f17fcf7a4b5d607cff0358a9c378b"
-  integrity sha512-y3Q8MkwG862rNqkvEQG59/7Fi2/fzs3NYDCvqUAAD+z0WGs2qcJ9hRcn34hWgWv9ouPkFqe3Vwca0h+4bIIRWw==
+docker-compose@0.23.12:
+  version "0.23.12"
+  resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-0.23.12.tgz#fa883b98be08f6926143d06bf9e522ef7ed3210c"
+  integrity sha512-KFbSMqQBuHjTGZGmYDOCO0L4SaML3BsWTId5oSUyaBa22vALuFHNv+UdDWs3HcMylHWKsxCbLB7hnM/nCosWZw==
+  dependencies:
+    yaml "^1.10.2"
 
 doctrine@^3.0.0:
   version "3.0.0"
@@ -3689,6 +3691,11 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
+yaml@^1.10.2:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
+  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
+
 yaml@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.1.1.tgz#1e06fb4ca46e60d9da07e4f786ea370ed3c3cfec"

From 7cfe8a01e6767b64289afc1ffd649c614b267658 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 7 Mar 2023 12:05:45 +0000
Subject: [PATCH 23/41] v2.3.25

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index 7ecca60760..fd5ea82207 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.24",
+  "version": "2.3.25",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index db316f0d0d..83ed4273c5 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.24",
+  "version": "2.3.25",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.3.24",
+    "@budibase/types": "^2.3.25",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 0b4e4d2603..3bab1ba689 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.3.24",
+  "version": "2.3.25",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/string-templates": "^2.3.24",
+    "@budibase/string-templates": "^2.3.25",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 090e30a805..23282c417c 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.24",
+  "version": "2.3.25",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.3.24",
-    "@budibase/client": "^2.3.24",
-    "@budibase/frontend-core": "^2.3.24",
-    "@budibase/string-templates": "^2.3.24",
+    "@budibase/bbui": "^2.3.25",
+    "@budibase/client": "^2.3.25",
+    "@budibase/frontend-core": "^2.3.25",
+    "@budibase/string-templates": "^2.3.25",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 4dbf888ef1..33a0862688 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.24",
+  "version": "2.3.25",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "dist/index.js",
   "bin": {
@@ -29,9 +29,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.3.24",
-    "@budibase/string-templates": "^2.3.24",
-    "@budibase/types": "^2.3.24",
+    "@budibase/backend-core": "^2.3.25",
+    "@budibase/string-templates": "^2.3.25",
+    "@budibase/types": "^2.3.25",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 36bd692c17..d3d4f56ca8 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.24",
+  "version": "2.3.25",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.3.24",
-    "@budibase/frontend-core": "^2.3.24",
-    "@budibase/string-templates": "^2.3.24",
+    "@budibase/bbui": "^2.3.25",
+    "@budibase/frontend-core": "^2.3.25",
+    "@budibase/string-templates": "^2.3.25",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index f5c8db3a4f..07aa42ebb0 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.24",
+  "version": "2.3.25",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.3.24",
+    "@budibase/bbui": "^2.3.25",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 03f571f380..16d1bfc809 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.24",
+  "version": "2.3.25",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 9e82dd35d2..1f2c471d32 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.24",
+  "version": "2.3.25",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.3.24",
-    "@budibase/client": "^2.3.24",
+    "@budibase/backend-core": "^2.3.25",
+    "@budibase/client": "^2.3.25",
     "@budibase/pro": "2.3.24",
-    "@budibase/string-templates": "^2.3.24",
-    "@budibase/types": "^2.3.24",
+    "@budibase/string-templates": "^2.3.25",
+    "@budibase/types": "^2.3.25",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 217114d23e..5f3b6ae877 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.24",
+  "version": "2.3.25",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 08de6bc472..baddfd6514 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.24",
+  "version": "2.3.25",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 11065eb08f..5946a284fc 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.24",
+  "version": "2.3.25",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.3.24",
+    "@budibase/backend-core": "^2.3.25",
     "@budibase/pro": "2.3.24",
-    "@budibase/string-templates": "^2.3.24",
-    "@budibase/types": "^2.3.24",
+    "@budibase/string-templates": "^2.3.25",
+    "@budibase/types": "^2.3.25",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From ccbe02f976d46794ef03aa0bf7031c2bda016521 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 7 Mar 2023 12:08:48 +0000
Subject: [PATCH 24/41] Update pro version to 2.3.25

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 1f2c471d32..1882c844e7 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.3.25",
     "@budibase/client": "^2.3.25",
-    "@budibase/pro": "2.3.24",
+    "@budibase/pro": "2.3.25",
     "@budibase/string-templates": "^2.3.25",
     "@budibase/types": "^2.3.25",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 7555d0e28d..6a4ee51a4b 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.24":
-  version "2.3.24"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.24.tgz#f3bdc29e2ce092095cd5774c2ba80a18ca891a8e"
-  integrity sha512-aW4WdhvJGkctS4gkAJ8SbYvmihBSVFwW/HTGNCUxaZ6OWn+DbafJgalwdmTvSKqa1yYii/X4MtWMhhsFRUJwcQ==
+"@budibase/backend-core@2.3.25":
+  version "2.3.25"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.25.tgz#6dc3f082826d89bfee637e4789116c9aec98e348"
+  integrity sha512-+rM4i9mbjf+oqk7O3pfrKVE0r9dok2Xm4nqFpPUxAiXwNIxkR07O5Q1lYNuwdDrULXJqDyYmvjOVUNWHHAelQQ==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "^2.3.24"
+    "@budibase/types" "^2.3.25"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1417,14 +1417,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.24":
-  version "2.3.24"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.24.tgz#86f113229acf8a107e766365a1808e29c9072bd5"
-  integrity sha512-dSEkpDN6gqJLouUDDXWAgK4tX3sD1s/DdL49hjnI+6Mw+IHmZrNesB2KH2pResMJ9vehDJySre9jYYtNc658/w==
+"@budibase/pro@2.3.25":
+  version "2.3.25"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.25.tgz#87e53041699610871301d332f3822a91af06f41b"
+  integrity sha512-z6AUNDEc8uuzdKy5b06KMKuWtTnW0ScjiuX4IsdvT4G7xSrcWmMZPg7qd7IhraF2KoWh5euCci2k/y5l/60+EA==
   dependencies:
-    "@budibase/backend-core" "2.3.24"
+    "@budibase/backend-core" "2.3.25"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.3.24"
+    "@budibase/types" "2.3.25"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1463,10 +1463,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.24", "@budibase/types@^2.3.24":
-  version "2.3.24"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.24.tgz#270863670b27370872d49c5298aa299c167c6eba"
-  integrity sha512-r7iKJ0TqKP83oI/Anzn3PnEwXj/oNXuwXaaMLboQRaIHAmhoa5xB0LZRxqYj/XIIHhQJyvHjtN/6prLqRYFwIA==
+"@budibase/types@2.3.25", "@budibase/types@^2.3.25":
+  version "2.3.25"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.25.tgz#daab40128baedacb7795f5709234aa0e840d9502"
+  integrity sha512-wFX6MPhqw9uKFqx9GhT0haDJnJyJGb7K4F/2LTFXF6vBXQk9Ang4WdHXOZSBPv0R1SYfpx8Nz3KB3OuZG1279A==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 5946a284fc..ff83fc2e3b 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.3.25",
-    "@budibase/pro": "2.3.24",
+    "@budibase/pro": "2.3.25",
     "@budibase/string-templates": "^2.3.25",
     "@budibase/types": "^2.3.25",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 620d9b9021..b218a39bbb 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.24":
-  version "2.3.24"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.24.tgz#f3bdc29e2ce092095cd5774c2ba80a18ca891a8e"
-  integrity sha512-aW4WdhvJGkctS4gkAJ8SbYvmihBSVFwW/HTGNCUxaZ6OWn+DbafJgalwdmTvSKqa1yYii/X4MtWMhhsFRUJwcQ==
+"@budibase/backend-core@2.3.25":
+  version "2.3.25"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.25.tgz#6dc3f082826d89bfee637e4789116c9aec98e348"
+  integrity sha512-+rM4i9mbjf+oqk7O3pfrKVE0r9dok2Xm4nqFpPUxAiXwNIxkR07O5Q1lYNuwdDrULXJqDyYmvjOVUNWHHAelQQ==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "^2.3.24"
+    "@budibase/types" "^2.3.25"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.24":
-  version "2.3.24"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.24.tgz#86f113229acf8a107e766365a1808e29c9072bd5"
-  integrity sha512-dSEkpDN6gqJLouUDDXWAgK4tX3sD1s/DdL49hjnI+6Mw+IHmZrNesB2KH2pResMJ9vehDJySre9jYYtNc658/w==
+"@budibase/pro@2.3.25":
+  version "2.3.25"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.25.tgz#87e53041699610871301d332f3822a91af06f41b"
+  integrity sha512-z6AUNDEc8uuzdKy5b06KMKuWtTnW0ScjiuX4IsdvT4G7xSrcWmMZPg7qd7IhraF2KoWh5euCci2k/y5l/60+EA==
   dependencies:
-    "@budibase/backend-core" "2.3.24"
+    "@budibase/backend-core" "2.3.25"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.3.24"
+    "@budibase/types" "2.3.25"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.24", "@budibase/types@^2.3.24":
-  version "2.3.24"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.24.tgz#270863670b27370872d49c5298aa299c167c6eba"
-  integrity sha512-r7iKJ0TqKP83oI/Anzn3PnEwXj/oNXuwXaaMLboQRaIHAmhoa5xB0LZRxqYj/XIIHhQJyvHjtN/6prLqRYFwIA==
+"@budibase/types@2.3.25", "@budibase/types@^2.3.25":
+  version "2.3.25"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.25.tgz#daab40128baedacb7795f5709234aa0e840d9502"
+  integrity sha512-wFX6MPhqw9uKFqx9GhT0haDJnJyJGb7K4F/2LTFXF6vBXQk9Ang4WdHXOZSBPv0R1SYfpx8Nz3KB3OuZG1279A==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 09797d1fb5a4500068ef6d6be6e4b83a6005590b Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 7 Mar 2023 12:47:07 +0000
Subject: [PATCH 25/41] v2.4.0

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index fd5ea82207..14b37d461a 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.25",
+  "version": "2.4.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 83ed4273c5..6e4a3e94d7 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.25",
+  "version": "2.4.0",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.3.25",
+    "@budibase/types": "^2.4.0",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 3bab1ba689..b4d010a3aa 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.3.25",
+  "version": "2.4.0",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/string-templates": "^2.3.25",
+    "@budibase/string-templates": "^2.4.0",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 23282c417c..713e488aa2 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.25",
+  "version": "2.4.0",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.3.25",
-    "@budibase/client": "^2.3.25",
-    "@budibase/frontend-core": "^2.3.25",
-    "@budibase/string-templates": "^2.3.25",
+    "@budibase/bbui": "^2.4.0",
+    "@budibase/client": "^2.4.0",
+    "@budibase/frontend-core": "^2.4.0",
+    "@budibase/string-templates": "^2.4.0",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 33a0862688..48790d561a 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.25",
+  "version": "2.4.0",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "dist/index.js",
   "bin": {
@@ -29,9 +29,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.3.25",
-    "@budibase/string-templates": "^2.3.25",
-    "@budibase/types": "^2.3.25",
+    "@budibase/backend-core": "^2.4.0",
+    "@budibase/string-templates": "^2.4.0",
+    "@budibase/types": "^2.4.0",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index d3d4f56ca8..2da15923fd 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.25",
+  "version": "2.4.0",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.3.25",
-    "@budibase/frontend-core": "^2.3.25",
-    "@budibase/string-templates": "^2.3.25",
+    "@budibase/bbui": "^2.4.0",
+    "@budibase/frontend-core": "^2.4.0",
+    "@budibase/string-templates": "^2.4.0",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 07aa42ebb0..2d24d757ba 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.25",
+  "version": "2.4.0",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.3.25",
+    "@budibase/bbui": "^2.4.0",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 16d1bfc809..ee897aefcb 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.25",
+  "version": "2.4.0",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 1882c844e7..4fae8a0c73 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.25",
+  "version": "2.4.0",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.3.25",
-    "@budibase/client": "^2.3.25",
+    "@budibase/backend-core": "^2.4.0",
+    "@budibase/client": "^2.4.0",
     "@budibase/pro": "2.3.25",
-    "@budibase/string-templates": "^2.3.25",
-    "@budibase/types": "^2.3.25",
+    "@budibase/string-templates": "^2.4.0",
+    "@budibase/types": "^2.4.0",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 5f3b6ae877..05de5f1a66 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.25",
+  "version": "2.4.0",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index baddfd6514..9b45181fbc 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.25",
+  "version": "2.4.0",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index ff83fc2e3b..08d5c2d314 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.25",
+  "version": "2.4.0",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.3.25",
+    "@budibase/backend-core": "^2.4.0",
     "@budibase/pro": "2.3.25",
-    "@budibase/string-templates": "^2.3.25",
-    "@budibase/types": "^2.3.25",
+    "@budibase/string-templates": "^2.4.0",
+    "@budibase/types": "^2.4.0",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 434ebfdb6758e1703c034cdbc6f9a661935b958c Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 7 Mar 2023 12:50:08 +0000
Subject: [PATCH 26/41] Update pro version to 2.4.0

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 4fae8a0c73..663a627a41 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.4.0",
     "@budibase/client": "^2.4.0",
-    "@budibase/pro": "2.3.25",
+    "@budibase/pro": "2.4.0",
     "@budibase/string-templates": "^2.4.0",
     "@budibase/types": "^2.4.0",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 6a4ee51a4b..029528129a 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.25":
-  version "2.3.25"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.25.tgz#6dc3f082826d89bfee637e4789116c9aec98e348"
-  integrity sha512-+rM4i9mbjf+oqk7O3pfrKVE0r9dok2Xm4nqFpPUxAiXwNIxkR07O5Q1lYNuwdDrULXJqDyYmvjOVUNWHHAelQQ==
+"@budibase/backend-core@2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.0.tgz#9848e969de0ed3461168af7710e37bbc8ca53660"
+  integrity sha512-UkOE0pR4LB6SA/wCrfIov3HP6vcrWyt11gEAxvDbGi3grJcWdDsMwuWG+GKZx+pEOLEyEI+J3sE19onFKh5lvw==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "^2.3.25"
+    "@budibase/types" "^2.4.0"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1417,14 +1417,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.25":
-  version "2.3.25"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.25.tgz#87e53041699610871301d332f3822a91af06f41b"
-  integrity sha512-z6AUNDEc8uuzdKy5b06KMKuWtTnW0ScjiuX4IsdvT4G7xSrcWmMZPg7qd7IhraF2KoWh5euCci2k/y5l/60+EA==
+"@budibase/pro@2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.0.tgz#76c63530af437b28f4ef85fcbe30179e96adcc0f"
+  integrity sha512-ibCN13vsaXZmcefWZl2kqL/JaQoKQlhGmlkN8i7qG60wfsmlLuwcxaui+/Jb6dYZxrh0SfeEDGS7FOdfd9DzGw==
   dependencies:
-    "@budibase/backend-core" "2.3.25"
+    "@budibase/backend-core" "2.4.0"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.3.25"
+    "@budibase/types" "2.4.0"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1463,10 +1463,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.25", "@budibase/types@^2.3.25":
-  version "2.3.25"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.25.tgz#daab40128baedacb7795f5709234aa0e840d9502"
-  integrity sha512-wFX6MPhqw9uKFqx9GhT0haDJnJyJGb7K4F/2LTFXF6vBXQk9Ang4WdHXOZSBPv0R1SYfpx8Nz3KB3OuZG1279A==
+"@budibase/types@2.4.0", "@budibase/types@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.0.tgz#32af1e2bc981dab5496a6c25a849f83cbda7b4e8"
+  integrity sha512-5U8+07GsLuNTeFzS7yhAT1mbDrM+SO1O7YlSgoLRcibF/sIe97TlN5z65VSVtpsmPGxCXLZrbNjgpXyuZ8C4sw==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 08d5c2d314..6e39a72da7 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.4.0",
-    "@budibase/pro": "2.3.25",
+    "@budibase/pro": "2.4.0",
     "@budibase/string-templates": "^2.4.0",
     "@budibase/types": "^2.4.0",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index b218a39bbb..9427500a5a 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.25":
-  version "2.3.25"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.25.tgz#6dc3f082826d89bfee637e4789116c9aec98e348"
-  integrity sha512-+rM4i9mbjf+oqk7O3pfrKVE0r9dok2Xm4nqFpPUxAiXwNIxkR07O5Q1lYNuwdDrULXJqDyYmvjOVUNWHHAelQQ==
+"@budibase/backend-core@2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.0.tgz#9848e969de0ed3461168af7710e37bbc8ca53660"
+  integrity sha512-UkOE0pR4LB6SA/wCrfIov3HP6vcrWyt11gEAxvDbGi3grJcWdDsMwuWG+GKZx+pEOLEyEI+J3sE19onFKh5lvw==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "^2.3.25"
+    "@budibase/types" "^2.4.0"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.25":
-  version "2.3.25"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.25.tgz#87e53041699610871301d332f3822a91af06f41b"
-  integrity sha512-z6AUNDEc8uuzdKy5b06KMKuWtTnW0ScjiuX4IsdvT4G7xSrcWmMZPg7qd7IhraF2KoWh5euCci2k/y5l/60+EA==
+"@budibase/pro@2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.0.tgz#76c63530af437b28f4ef85fcbe30179e96adcc0f"
+  integrity sha512-ibCN13vsaXZmcefWZl2kqL/JaQoKQlhGmlkN8i7qG60wfsmlLuwcxaui+/Jb6dYZxrh0SfeEDGS7FOdfd9DzGw==
   dependencies:
-    "@budibase/backend-core" "2.3.25"
+    "@budibase/backend-core" "2.4.0"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.3.25"
+    "@budibase/types" "2.4.0"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.25", "@budibase/types@^2.3.25":
-  version "2.3.25"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.25.tgz#daab40128baedacb7795f5709234aa0e840d9502"
-  integrity sha512-wFX6MPhqw9uKFqx9GhT0haDJnJyJGb7K4F/2LTFXF6vBXQk9Ang4WdHXOZSBPv0R1SYfpx8Nz3KB3OuZG1279A==
+"@budibase/types@2.4.0", "@budibase/types@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.0.tgz#32af1e2bc981dab5496a6c25a849f83cbda7b4e8"
+  integrity sha512-5U8+07GsLuNTeFzS7yhAT1mbDrM+SO1O7YlSgoLRcibF/sIe97TlN5z65VSVtpsmPGxCXLZrbNjgpXyuZ8C4sw==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 1cb03c7603494a2ccd14d73e9a24466d948bc698 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 7 Mar 2023 13:30:24 +0000
Subject: [PATCH 27/41] fix roleId being undefined leading to groups override

---
 packages/server/src/utilities/global.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/server/src/utilities/global.ts b/packages/server/src/utilities/global.ts
index c9161aa426..45e58c8419 100644
--- a/packages/server/src/utilities/global.ts
+++ b/packages/server/src/utilities/global.ts
@@ -35,8 +35,6 @@ export function updateAppRole(
     user.roleId = roles.BUILTIN_ROLE_IDS.ADMIN
   } else if (!user.roleId && !user?.userGroups?.length) {
     user.roleId = roles.BUILTIN_ROLE_IDS.PUBLIC
-  } else if (user?.userGroups?.length) {
-    user.roleId = undefined
   }
 
   delete user.roles

From e251b84d60428131dd3abffc1eb690a9903e7444 Mon Sep 17 00:00:00 2001
From: Jonny McCullagh <jonnymccullagh@users.noreply.github.com>
Date: Tue, 7 Mar 2023 13:34:18 +0000
Subject: [PATCH 28/41] replace preprod with new EKS deployment (#9889)

---
 .github/workflows/release-develop.yml |  2 +-
 .github/workflows/release.yml         | 50 ++++++---------------------
 2 files changed, 11 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml
index e986179cfc..68c949447c 100644
--- a/.github/workflows/release-develop.yml
+++ b/.github/workflows/release-develop.yml
@@ -117,4 +117,4 @@ jobs:
         with:
           repository: budibase/budibase-deploys
           event: budicloud-qa-deploy
-          github_pat: ${{ secrets.GH_ACCESS_TOKEN }}
\ No newline at end of file
+          github_pat: ${{ secrets.GH_ACCESS_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9cf34a99f6..60272fb325 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -89,46 +89,16 @@ jobs:
           DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
           BUDIBASE_RELEASE_VERSION: ${{ steps.previoustag.outputs.tag }}
-      
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: eu-west-1
 
-      - name: Pull values.yaml from budibase-infra
-        run: | 
-          curl -H "Authorization: token ${{ secrets.GH_PERSONAL_TOKEN }}" \
-          -H 'Accept: application/vnd.github.v3.raw' \
-          -o values.preprod.yaml \
-          -L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/budibase-preprod/values.yaml
-          wc -l values.preprod.yaml
-
-      - name: Deploy to Preprod Environment
-        uses: budibase/helm@v1.8.0
-        with:
-          release: budibase-preprod
-          namespace: budibase
-          chart: charts/budibase
-          token: ${{ github.token }}
-          helm: helm3
-          values: |
-            globals: 
-              appVersion: ${{ steps.previoustag.outputs.tag }}
-            ingress:
-              enabled: true
-              nginx: true
-          value-files: >-
-            [
-              "values.preprod.yaml"
-            ]
+  # Trigger deploy to new EKS preprod environment
+  trigger-deploy-to-preprod-env:
+    needs: [release-helm-chart]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: passeidireto/trigger-external-workflow-action@main
         env:
-          KUBECONFIG_FILE: '${{ secrets.PREPROD_KUBECONFIG }}'
-
-      - name: Discord Webhook Action
-        uses: tsickert/discord-webhook@v4.0.0
+          PAYLOAD_VERSION: ${{ env.RELEASE_VERSION }}
         with:
-          webhook-url: ${{ secrets.PROD_DEPLOY_WEBHOOK_URL }}
-          content: "Preprod Deployment Complete: ${{ steps.previoustag.outputs.tag }} deployed to Budibase Pre-prod."
-          embed-title: ${{ steps.previoustag.outputs.tag }}
+          repository: budibase/budibase-deploys
+          event: budicloud-preprod-deploy
+          github_pat: ${{ secrets.GH_ACCESS_TOKEN }}

From 9f3f4d37bcafaf42fba2aa2b9d841e09b546fea4 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 7 Mar 2023 14:37:35 +0000
Subject: [PATCH 29/41] Fix s3 csp

---
 hosting/proxy/nginx.prod.conf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hosting/proxy/nginx.prod.conf b/hosting/proxy/nginx.prod.conf
index 4d8b3466bf..64c8c770ba 100644
--- a/hosting/proxy/nginx.prod.conf
+++ b/hosting/proxy/nginx.prod.conf
@@ -55,8 +55,7 @@ http {
     set $csp_style "style-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net https://fonts.googleapis.com https://rsms.me https://maxcdn.bootstrapcdn.com";
     set $csp_object "object-src 'none'";
     set $csp_base_uri "base-uri 'self'";
-    set $csp_connect "connect-src 'self' https://*.budibase.net https://api-iam.intercom.io https://api-iam.intercom.io  https://api-ping.intercom.io https://app.posthog.com wss://nexus-websocket-a.intercom.io  wss://nexus-websocket-b.intercom.io https://nexus-websocket-a.intercom.io https://nexus-websocket-b.intercom.io  https://uploads.intercomcdn.com  https://uploads.intercomusercontent.com https://*.s3.*.amazonaws.com https://s3.*.amazonaws.com https://api.github.com";
-    set $csp_font "font-src 'self' data: https://cdn.jsdelivr.net https://fonts.gstatic.com https://rsms.me https://maxcdn.bootstrapcdn.com  https://js.intercomcdn.com  https://fonts.intercomcdn.com";
+set $csp_connect "connect-src 'self' https://*.budibase.net https://api-iam.intercom.io https://api-iam.intercom.io  https://api-ping.intercom.io https://app.posthog.com wss://nexus-websocket-a.intercom.io  wss://nexus-websocket-b.intercom.io https://nexus-websocket-a.intercom.io https://nexus-websocket-b.intercom.io  https://uploads.intercomcdn.com  https://uploads.intercomusercontent.com https://*.s3.amazonaws.com https://*.s3.us-east-2.amazonaws.com https://*.s3.us-east-1.amazonaws.com https://*.s3.us-west-1.amazonaws.com https://*.s3.us-west-2.amazonaws.com https://*.s3.af-south-1.amazonaws.com https://*.s3.ap-east-1.amazonaws.com https://*.s3.ap-southeast-3.amazonaws.com https://*.s3.ap-south-1.amazonaws.com https://*.s3.ap-northeast-3.amazonaws.com https://*.s3.ap-northeast-2.amazonaws.com https://*.s3.ap-southeast-1.amazonaws.com https://*.s3.ap-southeast-2.amazonaws.com https://*.s3.ap-northeast-1.amazonaws.com https://*.s3.ca-central-1.amazonaws.com https://*.s3.cn-north-1.amazonaws.com https://*.s3.cn-northwest-1.amazonaws.com https://*.s3.eu-central-1.amazonaws.com https://*.s3.eu-west-1.amazonaws.com https://*.s3.eu-west-2.amazonaws.com https://*.s3.eu-south-1.amazonaws.com https://*.s3.eu-west-3.amazonaws.com https://*.s3.eu-north-1.amazonaws.com https://*.s3.sa-east-1.amazonaws.com https://*.s3.me-south-1.amazonaws.com https://*.s3.us-gov-east-1.amazonaws.com https://*.s3.us-gov-west-1.amazonaws.com https://api.github.com";    set $csp_font "font-src 'self' data: https://cdn.jsdelivr.net https://fonts.gstatic.com https://rsms.me https://maxcdn.bootstrapcdn.com  https://js.intercomcdn.com  https://fonts.intercomcdn.com";
     set $csp_frame "frame-src 'self' https:";
     set $csp_img "img-src http: https: data: blob:";
     set $csp_manifest "manifest-src 'self'";

From 1a0e71f4aaa228a53f4400d9fb5e3125cea9204c Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 7 Mar 2023 14:39:54 +0000
Subject: [PATCH 30/41] Add release helm chart to release job (#9918)

* Add release helm chart to release job

* Update job name from release to release-images

* add get previous tag to all jobs
---
 .github/workflows/release.yml | 47 ++++++++++++++++++++++++++++++++---
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 60272fb325..86af15c9a2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -35,9 +35,8 @@ env:
   PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }}
 
 jobs:
-  release:
+  release-images:
     runs-on: ubuntu-latest
-
     steps:
       - name: Fail if branch is not master
         if: github.ref != 'refs/heads/master' 
@@ -90,14 +89,56 @@ jobs:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
           BUDIBASE_RELEASE_VERSION: ${{ steps.previoustag.outputs.tag }}
 
+  release-helm-chart:
+    needs: [release-images]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Helm
+        uses: azure/setup-helm@v1
+        id: helm-install
+
+      - name: 'Get Previous tag'
+        id: previoustag
+        uses: "WyriHaximus/github-action-get-previous-tag@v1"
+
+      # due to helm repo index issue: https://github.com/helm/helm/issues/7363
+      # we need to create new package in a different dir, merge the index and move the package back
+      - name: Build and release helm chart
+        run: |
+          git config user.name "Budibase Helm Bot"
+          git config user.email "<>"
+          git reset --hard
+          git pull
+          mkdir sync
+          echo "Packaging chart to sync dir"
+          helm package charts/budibase --version 0.0.0-master --app-version "$RELEASE_VERSION" --destination sync
+          echo "Packaging successful"
+          git checkout gh-pages
+          echo "Indexing helm repo"         
+          helm repo index --merge docs/index.yaml sync
+          mv -f sync/* docs
+          rm -rf sync
+          echo "Pushing new helm release"
+          git add -A
+          git commit -m "Helm Release: ${{ env.RELEASE_VERSION }}"
+          git push
+        env:
+          RELEASE_VERSION: ${{ steps.previoustag.outputs.tag }}
+
+
   # Trigger deploy to new EKS preprod environment
   trigger-deploy-to-preprod-env:
     needs: [release-helm-chart]
     runs-on: ubuntu-latest
     steps:
+      - name: 'Get Previous tag'
+        id: previoustag
+        uses: "WyriHaximus/github-action-get-previous-tag@v1"
+        
       - uses: passeidireto/trigger-external-workflow-action@main
         env:
-          PAYLOAD_VERSION: ${{ env.RELEASE_VERSION }}
+          PAYLOAD_VERSION: ${{ steps.previoustag.outputs.tag }}
         with:
           repository: budibase/budibase-deploys
           event: budicloud-preprod-deploy

From f3b7445dcb02fb6b367c956786eee7715936d053 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 7 Mar 2023 14:45:11 +0000
Subject: [PATCH 31/41] fix formatting

---
 hosting/proxy/nginx.prod.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hosting/proxy/nginx.prod.conf b/hosting/proxy/nginx.prod.conf
index 64c8c770ba..16e9ab277b 100644
--- a/hosting/proxy/nginx.prod.conf
+++ b/hosting/proxy/nginx.prod.conf
@@ -55,7 +55,8 @@ http {
     set $csp_style "style-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net https://fonts.googleapis.com https://rsms.me https://maxcdn.bootstrapcdn.com";
     set $csp_object "object-src 'none'";
     set $csp_base_uri "base-uri 'self'";
-set $csp_connect "connect-src 'self' https://*.budibase.net https://api-iam.intercom.io https://api-iam.intercom.io  https://api-ping.intercom.io https://app.posthog.com wss://nexus-websocket-a.intercom.io  wss://nexus-websocket-b.intercom.io https://nexus-websocket-a.intercom.io https://nexus-websocket-b.intercom.io  https://uploads.intercomcdn.com  https://uploads.intercomusercontent.com https://*.s3.amazonaws.com https://*.s3.us-east-2.amazonaws.com https://*.s3.us-east-1.amazonaws.com https://*.s3.us-west-1.amazonaws.com https://*.s3.us-west-2.amazonaws.com https://*.s3.af-south-1.amazonaws.com https://*.s3.ap-east-1.amazonaws.com https://*.s3.ap-southeast-3.amazonaws.com https://*.s3.ap-south-1.amazonaws.com https://*.s3.ap-northeast-3.amazonaws.com https://*.s3.ap-northeast-2.amazonaws.com https://*.s3.ap-southeast-1.amazonaws.com https://*.s3.ap-southeast-2.amazonaws.com https://*.s3.ap-northeast-1.amazonaws.com https://*.s3.ca-central-1.amazonaws.com https://*.s3.cn-north-1.amazonaws.com https://*.s3.cn-northwest-1.amazonaws.com https://*.s3.eu-central-1.amazonaws.com https://*.s3.eu-west-1.amazonaws.com https://*.s3.eu-west-2.amazonaws.com https://*.s3.eu-south-1.amazonaws.com https://*.s3.eu-west-3.amazonaws.com https://*.s3.eu-north-1.amazonaws.com https://*.s3.sa-east-1.amazonaws.com https://*.s3.me-south-1.amazonaws.com https://*.s3.us-gov-east-1.amazonaws.com https://*.s3.us-gov-west-1.amazonaws.com https://api.github.com";    set $csp_font "font-src 'self' data: https://cdn.jsdelivr.net https://fonts.gstatic.com https://rsms.me https://maxcdn.bootstrapcdn.com  https://js.intercomcdn.com  https://fonts.intercomcdn.com";
+    set $csp_connect "connect-src 'self' https://*.budibase.net https://api-iam.intercom.io https://api-iam.intercom.io  https://api-ping.intercom.io https://app.posthog.com wss://nexus-websocket-a.intercom.io  wss://nexus-websocket-b.intercom.io https://nexus-websocket-a.intercom.io https://nexus-websocket-b.intercom.io  https://uploads.intercomcdn.com  https://uploads.intercomusercontent.com https://*.s3.amazonaws.com https://*.s3.us-east-2.amazonaws.com https://*.s3.us-east-1.amazonaws.com https://*.s3.us-west-1.amazonaws.com https://*.s3.us-west-2.amazonaws.com https://*.s3.af-south-1.amazonaws.com https://*.s3.ap-east-1.amazonaws.com https://*.s3.ap-southeast-3.amazonaws.com https://*.s3.ap-south-1.amazonaws.com https://*.s3.ap-northeast-3.amazonaws.com https://*.s3.ap-northeast-2.amazonaws.com https://*.s3.ap-southeast-1.amazonaws.com https://*.s3.ap-southeast-2.amazonaws.com https://*.s3.ap-northeast-1.amazonaws.com https://*.s3.ca-central-1.amazonaws.com https://*.s3.cn-north-1.amazonaws.com https://*.s3.cn-northwest-1.amazonaws.com https://*.s3.eu-central-1.amazonaws.com https://*.s3.eu-west-1.amazonaws.com https://*.s3.eu-west-2.amazonaws.com https://*.s3.eu-south-1.amazonaws.com https://*.s3.eu-west-3.amazonaws.com https://*.s3.eu-north-1.amazonaws.com https://*.s3.sa-east-1.amazonaws.com https://*.s3.me-south-1.amazonaws.com https://*.s3.us-gov-east-1.amazonaws.com https://*.s3.us-gov-west-1.amazonaws.com https://api.github.com";    
+    set $csp_font "font-src 'self' data: https://cdn.jsdelivr.net https://fonts.gstatic.com https://rsms.me https://maxcdn.bootstrapcdn.com  https://js.intercomcdn.com  https://fonts.intercomcdn.com";
     set $csp_frame "frame-src 'self' https:";
     set $csp_img "img-src http: https: data: blob:";
     set $csp_manifest "manifest-src 'self'";

From 2c56ec7671f86e456a18ba8f76bee6e8743f15a3 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 7 Mar 2023 14:50:14 +0000
Subject: [PATCH 32/41] v2.4.1

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index 14b37d461a..9c5d223e50 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.4.0",
+  "version": "2.4.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 6e4a3e94d7..e6c484118e 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.4.0",
+    "@budibase/types": "^2.4.1",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index b4d010a3aa..b51ac72992 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/string-templates": "^2.4.0",
+    "@budibase/string-templates": "^2.4.1",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 713e488aa2..d3c521234c 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.4.0",
-    "@budibase/client": "^2.4.0",
-    "@budibase/frontend-core": "^2.4.0",
-    "@budibase/string-templates": "^2.4.0",
+    "@budibase/bbui": "^2.4.1",
+    "@budibase/client": "^2.4.1",
+    "@budibase/frontend-core": "^2.4.1",
+    "@budibase/string-templates": "^2.4.1",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 48790d561a..2aacbafdd5 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "dist/index.js",
   "bin": {
@@ -29,9 +29,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.4.0",
-    "@budibase/string-templates": "^2.4.0",
-    "@budibase/types": "^2.4.0",
+    "@budibase/backend-core": "^2.4.1",
+    "@budibase/string-templates": "^2.4.1",
+    "@budibase/types": "^2.4.1",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 2da15923fd..353ae7c723 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.4.0",
-    "@budibase/frontend-core": "^2.4.0",
-    "@budibase/string-templates": "^2.4.0",
+    "@budibase/bbui": "^2.4.1",
+    "@budibase/frontend-core": "^2.4.1",
+    "@budibase/string-templates": "^2.4.1",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 2d24d757ba..3c367a7be3 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.4.0",
+    "@budibase/bbui": "^2.4.1",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index ee897aefcb..166bd17906 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 663a627a41..2d74f67619 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.4.0",
-    "@budibase/client": "^2.4.0",
+    "@budibase/backend-core": "^2.4.1",
+    "@budibase/client": "^2.4.1",
     "@budibase/pro": "2.4.0",
-    "@budibase/string-templates": "^2.4.0",
-    "@budibase/types": "^2.4.0",
+    "@budibase/string-templates": "^2.4.1",
+    "@budibase/types": "^2.4.1",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 05de5f1a66..83dc96f4f5 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 9b45181fbc..f60c07d882 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 6e39a72da7..ece9ce42d0 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.4.0",
+    "@budibase/backend-core": "^2.4.1",
     "@budibase/pro": "2.4.0",
-    "@budibase/string-templates": "^2.4.0",
-    "@budibase/types": "^2.4.0",
+    "@budibase/string-templates": "^2.4.1",
+    "@budibase/types": "^2.4.1",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 5b264d021be765c63e17605bd3e2c935353a3959 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 7 Mar 2023 14:53:17 +0000
Subject: [PATCH 33/41] Update pro version to 2.4.1

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 2d74f67619..be59ac69eb 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.4.1",
     "@budibase/client": "^2.4.1",
-    "@budibase/pro": "2.4.0",
+    "@budibase/pro": "2.4.1",
     "@budibase/string-templates": "^2.4.1",
     "@budibase/types": "^2.4.1",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 029528129a..8d40a58273 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.0.tgz#9848e969de0ed3461168af7710e37bbc8ca53660"
-  integrity sha512-UkOE0pR4LB6SA/wCrfIov3HP6vcrWyt11gEAxvDbGi3grJcWdDsMwuWG+GKZx+pEOLEyEI+J3sE19onFKh5lvw==
+"@budibase/backend-core@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.1.tgz#c05eee43d11aea826e1d491c0f030557138f85ac"
+  integrity sha512-ATps0MAKJtzLYSKT8OoymfNy73Y6e5qEKpTu8bhoqgBoQGHY5LLa7cE2v2q06f3ahNbsB1K/zqv4cz1+3EN2MA==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "^2.4.0"
+    "@budibase/types" "^2.4.1"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1417,14 +1417,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.0.tgz#76c63530af437b28f4ef85fcbe30179e96adcc0f"
-  integrity sha512-ibCN13vsaXZmcefWZl2kqL/JaQoKQlhGmlkN8i7qG60wfsmlLuwcxaui+/Jb6dYZxrh0SfeEDGS7FOdfd9DzGw==
+"@budibase/pro@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.1.tgz#99eef8588b6f20b42451422325feeb2c60efb985"
+  integrity sha512-scXB/TvZ1LbthnrnilTD/pTwVokQu3vczgqhGRbE006iDlT9B0ng+ma8JZwmgmU6iJ1eYakjZjkjHbe/r7vn6w==
   dependencies:
-    "@budibase/backend-core" "2.4.0"
+    "@budibase/backend-core" "2.4.1"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.0"
+    "@budibase/types" "2.4.1"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1463,10 +1463,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.4.0", "@budibase/types@^2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.0.tgz#32af1e2bc981dab5496a6c25a849f83cbda7b4e8"
-  integrity sha512-5U8+07GsLuNTeFzS7yhAT1mbDrM+SO1O7YlSgoLRcibF/sIe97TlN5z65VSVtpsmPGxCXLZrbNjgpXyuZ8C4sw==
+"@budibase/types@2.4.1", "@budibase/types@^2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.1.tgz#6cbf85320169d009f9e145f472f1642119c8fa44"
+  integrity sha512-BWzyoWF5jpGQwi/O+V8Baef6cG9rK5cwGC+GAffa8CnpUmD4/EvMSeGHbvjoWr+1GGgg0yRkEf1mBjvxMOofNQ==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index ece9ce42d0..415a3b3f6c 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.4.1",
-    "@budibase/pro": "2.4.0",
+    "@budibase/pro": "2.4.1",
     "@budibase/string-templates": "^2.4.1",
     "@budibase/types": "^2.4.1",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 9427500a5a..5456baface 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.0.tgz#9848e969de0ed3461168af7710e37bbc8ca53660"
-  integrity sha512-UkOE0pR4LB6SA/wCrfIov3HP6vcrWyt11gEAxvDbGi3grJcWdDsMwuWG+GKZx+pEOLEyEI+J3sE19onFKh5lvw==
+"@budibase/backend-core@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.1.tgz#c05eee43d11aea826e1d491c0f030557138f85ac"
+  integrity sha512-ATps0MAKJtzLYSKT8OoymfNy73Y6e5qEKpTu8bhoqgBoQGHY5LLa7cE2v2q06f3ahNbsB1K/zqv4cz1+3EN2MA==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "^2.4.0"
+    "@budibase/types" "^2.4.1"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.0.tgz#76c63530af437b28f4ef85fcbe30179e96adcc0f"
-  integrity sha512-ibCN13vsaXZmcefWZl2kqL/JaQoKQlhGmlkN8i7qG60wfsmlLuwcxaui+/Jb6dYZxrh0SfeEDGS7FOdfd9DzGw==
+"@budibase/pro@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.1.tgz#99eef8588b6f20b42451422325feeb2c60efb985"
+  integrity sha512-scXB/TvZ1LbthnrnilTD/pTwVokQu3vczgqhGRbE006iDlT9B0ng+ma8JZwmgmU6iJ1eYakjZjkjHbe/r7vn6w==
   dependencies:
-    "@budibase/backend-core" "2.4.0"
+    "@budibase/backend-core" "2.4.1"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.0"
+    "@budibase/types" "2.4.1"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.4.0", "@budibase/types@^2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.0.tgz#32af1e2bc981dab5496a6c25a849f83cbda7b4e8"
-  integrity sha512-5U8+07GsLuNTeFzS7yhAT1mbDrM+SO1O7YlSgoLRcibF/sIe97TlN5z65VSVtpsmPGxCXLZrbNjgpXyuZ8C4sw==
+"@budibase/types@2.4.1", "@budibase/types@^2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.1.tgz#6cbf85320169d009f9e145f472f1642119c8fa44"
+  integrity sha512-BWzyoWF5jpGQwi/O+V8Baef6cG9rK5cwGC+GAffa8CnpUmD4/EvMSeGHbvjoWr+1GGgg0yRkEf1mBjvxMOofNQ==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From a946b8e399a075dc8a975207d93ebcfae4c4db81 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 7 Mar 2023 14:58:58 +0000
Subject: [PATCH 34/41] Update dev setup docs for file descriptor issues
 (#9920)

---
 docs/DEV-SETUP-DEBIAN.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/DEV-SETUP-DEBIAN.md b/docs/DEV-SETUP-DEBIAN.md
index 9edd8286cb..cfd7eebf47 100644
--- a/docs/DEV-SETUP-DEBIAN.md
+++ b/docs/DEV-SETUP-DEBIAN.md
@@ -52,4 +52,14 @@ So this command will actually run the application in dev mode. It creates .env f
 
 The dev version will be available on port 10000 i.e.
 
-http://127.0.0.1:10000/builder/admin
\ No newline at end of file
+http://127.0.0.1:10000/builder/admin
+
+### File descriptor issues with Vite and Chrome in Linux
+If your dev environment stalls forever, with some network requests stuck in flight, it's likely that Chrome is trying to open more file descriptors than your system allows.
+To fix this, apply the following tweaks.
+
+Debian based distros:
+Add `* - nofile 65536` to `/etc/security/limits.conf`.
+
+Arch:
+Add `DefaultLimitNOFILE=65536` to `/etc/systemd/system.conf`.
\ No newline at end of file

From f1a5ffcaea8da4f995ec0afe5e22670c6305f920 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 7 Mar 2023 15:14:39 +0000
Subject: [PATCH 35/41] Add checkout to preprod deploy (#9921)

---
 .github/workflows/release.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 86af15c9a2..8ff03aa2c1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -132,10 +132,11 @@ jobs:
     needs: [release-helm-chart]
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v2
       - name: 'Get Previous tag'
         id: previoustag
         uses: "WyriHaximus/github-action-get-previous-tag@v1"
-        
+
       - uses: passeidireto/trigger-external-workflow-action@main
         env:
           PAYLOAD_VERSION: ${{ steps.previoustag.outputs.tag }}

From bc556440fbcdc48c6e5de24ad8e959d739231280 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 7 Mar 2023 15:22:57 +0000
Subject: [PATCH 36/41] v2.4.2

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index 9c5d223e50..f15d089753 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.4.1",
+  "version": "2.4.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index e6c484118e..2afba16de4 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.4.1",
+    "@budibase/types": "^2.4.2",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index b51ac72992..9e796783f5 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/string-templates": "^2.4.1",
+    "@budibase/string-templates": "^2.4.2",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index d3c521234c..6d193654f0 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.4.1",
-    "@budibase/client": "^2.4.1",
-    "@budibase/frontend-core": "^2.4.1",
-    "@budibase/string-templates": "^2.4.1",
+    "@budibase/bbui": "^2.4.2",
+    "@budibase/client": "^2.4.2",
+    "@budibase/frontend-core": "^2.4.2",
+    "@budibase/string-templates": "^2.4.2",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 2aacbafdd5..1f9ba19089 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "dist/index.js",
   "bin": {
@@ -29,9 +29,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.4.1",
-    "@budibase/string-templates": "^2.4.1",
-    "@budibase/types": "^2.4.1",
+    "@budibase/backend-core": "^2.4.2",
+    "@budibase/string-templates": "^2.4.2",
+    "@budibase/types": "^2.4.2",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 353ae7c723..3a84bd89f8 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.4.1",
-    "@budibase/frontend-core": "^2.4.1",
-    "@budibase/string-templates": "^2.4.1",
+    "@budibase/bbui": "^2.4.2",
+    "@budibase/frontend-core": "^2.4.2",
+    "@budibase/string-templates": "^2.4.2",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 3c367a7be3..33b6f7d2e9 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.4.1",
+    "@budibase/bbui": "^2.4.2",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 166bd17906..7aa8d62158 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index be59ac69eb..b596a39cfc 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.4.1",
-    "@budibase/client": "^2.4.1",
+    "@budibase/backend-core": "^2.4.2",
+    "@budibase/client": "^2.4.2",
     "@budibase/pro": "2.4.1",
-    "@budibase/string-templates": "^2.4.1",
-    "@budibase/types": "^2.4.1",
+    "@budibase/string-templates": "^2.4.2",
+    "@budibase/types": "^2.4.2",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 83dc96f4f5..a5b9acf6b1 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index f60c07d882..c4e82efb2d 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 415a3b3f6c..abba76de0d 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.4.1",
+    "@budibase/backend-core": "^2.4.2",
     "@budibase/pro": "2.4.1",
-    "@budibase/string-templates": "^2.4.1",
-    "@budibase/types": "^2.4.1",
+    "@budibase/string-templates": "^2.4.2",
+    "@budibase/types": "^2.4.2",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From f13096140a6494cb7700f12b1cccf4dbcf02d0f9 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 7 Mar 2023 15:25:56 +0000
Subject: [PATCH 37/41] Update pro version to 2.4.2

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index b596a39cfc..89eab873e2 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.4.2",
     "@budibase/client": "^2.4.2",
-    "@budibase/pro": "2.4.1",
+    "@budibase/pro": "2.4.2",
     "@budibase/string-templates": "^2.4.2",
     "@budibase/types": "^2.4.2",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 8d40a58273..70a26a20c4 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.1.tgz#c05eee43d11aea826e1d491c0f030557138f85ac"
-  integrity sha512-ATps0MAKJtzLYSKT8OoymfNy73Y6e5qEKpTu8bhoqgBoQGHY5LLa7cE2v2q06f3ahNbsB1K/zqv4cz1+3EN2MA==
+"@budibase/backend-core@2.4.2":
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.2.tgz#57c106cb1727a5e87700c5a49cc2f2413489f9ba"
+  integrity sha512-b0mzMfddc8DmmFGPcaHGc5OmqXEl63HBhvM6Kk8Sb2bXiyhRy3uOIvptVYn/mNCfCI8eL6NPYJUpOKhQB/DHKA==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "^2.4.1"
+    "@budibase/types" "^2.4.2"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1417,14 +1417,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.1.tgz#99eef8588b6f20b42451422325feeb2c60efb985"
-  integrity sha512-scXB/TvZ1LbthnrnilTD/pTwVokQu3vczgqhGRbE006iDlT9B0ng+ma8JZwmgmU6iJ1eYakjZjkjHbe/r7vn6w==
+"@budibase/pro@2.4.2":
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.2.tgz#c4ee3c9af899a5c8d5a9b29db38ee5c01b188914"
+  integrity sha512-e3i0mZmSkhX2Y64pnZDuXu1XPo4vZaaO5S2uaFZ2vQXCyrs7Ld0XDE5yEu/5lZHzOvTlAeCI/7gzL9jD39wMsA==
   dependencies:
-    "@budibase/backend-core" "2.4.1"
+    "@budibase/backend-core" "2.4.2"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.1"
+    "@budibase/types" "2.4.2"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1463,10 +1463,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.4.1", "@budibase/types@^2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.1.tgz#6cbf85320169d009f9e145f472f1642119c8fa44"
-  integrity sha512-BWzyoWF5jpGQwi/O+V8Baef6cG9rK5cwGC+GAffa8CnpUmD4/EvMSeGHbvjoWr+1GGgg0yRkEf1mBjvxMOofNQ==
+"@budibase/types@2.4.2", "@budibase/types@^2.4.2":
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.2.tgz#418a756ef8bcf5ea5fac63cfba009f5a6cfaadb5"
+  integrity sha512-e0VL5VuqkXbdxjJjJXyKCFC4unHhhTzKjUNjSB8zYzubmRRvZV2zRXO5HuIn3NC1eK8krkJIVIdHvKYMJZn+vA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index abba76de0d..3a1f97c130 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.4.2",
-    "@budibase/pro": "2.4.1",
+    "@budibase/pro": "2.4.2",
     "@budibase/string-templates": "^2.4.2",
     "@budibase/types": "^2.4.2",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 5456baface..12397e3365 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.1.tgz#c05eee43d11aea826e1d491c0f030557138f85ac"
-  integrity sha512-ATps0MAKJtzLYSKT8OoymfNy73Y6e5qEKpTu8bhoqgBoQGHY5LLa7cE2v2q06f3ahNbsB1K/zqv4cz1+3EN2MA==
+"@budibase/backend-core@2.4.2":
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.2.tgz#57c106cb1727a5e87700c5a49cc2f2413489f9ba"
+  integrity sha512-b0mzMfddc8DmmFGPcaHGc5OmqXEl63HBhvM6Kk8Sb2bXiyhRy3uOIvptVYn/mNCfCI8eL6NPYJUpOKhQB/DHKA==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "^2.4.1"
+    "@budibase/types" "^2.4.2"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.1.tgz#99eef8588b6f20b42451422325feeb2c60efb985"
-  integrity sha512-scXB/TvZ1LbthnrnilTD/pTwVokQu3vczgqhGRbE006iDlT9B0ng+ma8JZwmgmU6iJ1eYakjZjkjHbe/r7vn6w==
+"@budibase/pro@2.4.2":
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.2.tgz#c4ee3c9af899a5c8d5a9b29db38ee5c01b188914"
+  integrity sha512-e3i0mZmSkhX2Y64pnZDuXu1XPo4vZaaO5S2uaFZ2vQXCyrs7Ld0XDE5yEu/5lZHzOvTlAeCI/7gzL9jD39wMsA==
   dependencies:
-    "@budibase/backend-core" "2.4.1"
+    "@budibase/backend-core" "2.4.2"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.1"
+    "@budibase/types" "2.4.2"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.4.1", "@budibase/types@^2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.1.tgz#6cbf85320169d009f9e145f472f1642119c8fa44"
-  integrity sha512-BWzyoWF5jpGQwi/O+V8Baef6cG9rK5cwGC+GAffa8CnpUmD4/EvMSeGHbvjoWr+1GGgg0yRkEf1mBjvxMOofNQ==
+"@budibase/types@2.4.2", "@budibase/types@^2.4.2":
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.2.tgz#418a756ef8bcf5ea5fac63cfba009f5a6cfaadb5"
+  integrity sha512-e0VL5VuqkXbdxjJjJXyKCFC4unHhhTzKjUNjSB8zYzubmRRvZV2zRXO5HuIn3NC1eK8krkJIVIdHvKYMJZn+vA==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 0342d409c3a8a53011d995bba52804d86b1fe0dd Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 7 Mar 2023 15:29:58 +0000
Subject: [PATCH 38/41] Fix for #9790 - formulas never exist in the database
 and so were always being considered deleted, handling this.

---
 packages/server/src/integrations/utils.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/integrations/utils.ts b/packages/server/src/integrations/utils.ts
index 4681cd4f2a..356a08f4a0 100644
--- a/packages/server/src/integrations/utils.ts
+++ b/packages/server/src/integrations/utils.ts
@@ -223,14 +223,15 @@ function shouldCopySpecialColumn(
   column: { type: string },
   fetchedColumn: { type: string } | undefined
 ) {
+  const isFormula = column.type === FieldTypes.FORMULA
   const specialTypes = [
     FieldTypes.OPTIONS,
     FieldTypes.LONGFORM,
     FieldTypes.ARRAY,
     FieldTypes.FORMULA,
   ]
-  // column has been deleted, remove
-  if (column && !fetchedColumn) {
+  // column has been deleted, remove - formulas will never exist, always copy
+  if (!isFormula && column && !fetchedColumn) {
     return false
   }
   const fetchedIsNumber =

From 25005273542ea3d9e433b49469691bfba4d64168 Mon Sep 17 00:00:00 2001
From: Jonny McCullagh <jonnymccullagh@users.noreply.github.com>
Date: Tue, 7 Mar 2023 16:03:02 +0000
Subject: [PATCH 39/41] tidy actions (#9922)

* tidy actions
---
 .github/workflows/deploy-preprod.yml          | 65 --------------
 .github/workflows/deploy-release.yml          | 88 -------------------
 .../{release.yml => release-master.yml}       |  7 --
 ...ngle-image.yml => release-singleimage.yml} |  0
 .github/workflows/smoke_test.yaml             | 31 -------
 5 files changed, 191 deletions(-)
 delete mode 100644 .github/workflows/deploy-preprod.yml
 delete mode 100644 .github/workflows/deploy-release.yml
 rename .github/workflows/{release.yml => release-master.yml} (93%)
 rename .github/workflows/{deploy-single-image.yml => release-singleimage.yml} (100%)
 delete mode 100644 .github/workflows/smoke_test.yaml

diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml
deleted file mode 100644
index eec5546444..0000000000
--- a/.github/workflows/deploy-preprod.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-name: Budibase Deploy Preprod
-
-on:
- workflow_dispatch:
-
-env:
-  INTERCOM_TOKEN: ${{ secrets.INTERCOM_TOKEN }}
-  SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: eu-west-1
-
-
-      - name: Get the latest budibase release version
-        id: version
-        run: | 
-          release_version=$(cat lerna.json | jq -r '.version')
-          echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV
-
-      - name: Pull values.yaml from budibase-infra
-        run: | 
-          curl -H "Authorization: token ${{ secrets.GH_PERSONAL_TOKEN }}" \
-          -H 'Accept: application/vnd.github.v3.raw' \
-          -o values.preprod.yaml \
-          -L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/budibase-preprod/values.yaml
-          wc -l values.preprod.yaml
-
-      - name: Deploy to Preprod Environment
-        uses: budibase/helm@v1.8.0
-        with:
-          release: budibase-preprod
-          namespace: budibase
-          chart: charts/budibase
-          token: ${{ github.token }}
-          helm: helm3
-          values: |
-            globals: 
-              appVersion: v${{ env.RELEASE_VERSION }}
-            ingress:
-              enabled: true
-              nginx: true
-          value-files: >-
-            [
-              "values.preprod.yaml"
-            ]
-        env:
-          KUBECONFIG_FILE: '${{ secrets.PREPROD_KUBECONFIG }}'
-
-      - name: Discord Webhook Action
-        uses: tsickert/discord-webhook@v4.0.0
-        with:
-          webhook-url: ${{ secrets.PROD_DEPLOY_WEBHOOK_URL }}
-          content: "Preprod Deployment Complete: ${{ env.RELEASE_VERSION }} deployed to Budibase Pre-prod."
-          embed-title: ${{ env.RELEASE_VERSION }}
diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
deleted file mode 100644
index 1f7a5ebfd4..0000000000
--- a/.github/workflows/deploy-release.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-name: Budibase Deploy Release
-
-on:
- workflow_dispatch:
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: eu-west-1
-
-      - name: Fail if branch is not develop
-        if: github.ref != 'refs/heads/develop'
-        run: | 
-          echo "Ref is not develop, you must run this job from develop."
-          exit 1
-
-      - name: Get the latest budibase release version
-        id: version
-        run: | 
-          release_version=$(cat lerna.json | jq -r '.version')
-          echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV
-
-      - name: Pull values.yaml from budibase-infra
-        run: | 
-          curl -H "Authorization: token ${{ secrets.GH_PERSONAL_TOKEN }}" \
-          -H 'Accept: application/vnd.github.v3.raw' \
-          -o values.release.yaml \
-          -L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/budibase-release/values.yaml
-          wc -l values.release.yaml
-
-      - name: Deploy to Release Environment
-        uses: budibase/helm@v1.8.0
-        with:
-          release: budibase-release
-          namespace: budibase
-          chart: charts/budibase
-          token: ${{ github.token }}
-          helm: helm3
-          values: |
-            globals: 
-              appVersion: develop
-            ingress:
-              enabled: true
-              nginx: true
-          value-files: >-
-            [
-              "values.release.yaml"
-            ]
-        env:
-          KUBECONFIG_FILE: '${{ secrets.RELEASE_KUBECONFIG }}'
-
-      - name: Re roll app-service
-        uses: actions-hub/kubectl@master
-        env:
-          KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG_BASE64 }}
-        with:
-          args: rollout restart deployment app-service -n budibase
-
-      - name: Re roll proxy-service
-        uses: actions-hub/kubectl@master
-        env:
-          KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG_BASE64 }}
-        with:
-          args: rollout restart deployment proxy-service -n budibase
-
-      - name: Re roll worker-service
-        uses: actions-hub/kubectl@master
-        env:
-          KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG_BASE64 }}
-        with:
-          args: rollout restart deployment worker-service -n budibase
-
-
-      - name: Discord Webhook Action
-        uses: tsickert/discord-webhook@v4.0.0
-        with:
-          webhook-url: ${{ secrets.PROD_DEPLOY_WEBHOOK_URL }}
-          content: "Release Env Deployment Complete: ${{ env.RELEASE_VERSION }} deployed to Budibase Release Env."
-          embed-title: ${{ env.RELEASE_VERSION }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release-master.yml
similarity index 93%
rename from .github/workflows/release.yml
rename to .github/workflows/release-master.yml
index 8ff03aa2c1..7d113a3719 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release-master.yml
@@ -57,13 +57,6 @@ jobs:
       - run: yarn build
       - run: yarn build:sdk
 
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: eu-west-1
-
       - name: Publish budibase packages to NPM
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/deploy-single-image.yml b/.github/workflows/release-singleimage.yml
similarity index 100%
rename from .github/workflows/deploy-single-image.yml
rename to .github/workflows/release-singleimage.yml
diff --git a/.github/workflows/smoke_test.yaml b/.github/workflows/smoke_test.yaml
deleted file mode 100644
index 3fd61cd9c5..0000000000
--- a/.github/workflows/smoke_test.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Budibase Nightly Tests
-
-on:
- workflow_dispatch:
- schedule:
-  - cron: "0 5 * * *" # every day at 5AM
-
-jobs:
-  nightly:
-    runs-on: [self-hosted, qa]
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js 14.x
-        uses: actions/setup-node@v1
-        with:
-          node-version: 14.x
-      - name: QA Core Integration Tests
-        run: | 
-          cd qa-core
-          yarn
-          yarn api:test:ci
-        env:
-          BUDIBASE_HOST: budicloud.qa.budibase.net
-          BUDIBASE_ACCOUNTS_URL: https://account-portal.budicloud.qa.budibase.net
-
-      - name: Cypress Discord Notify
-        run: yarn test:notify
-        env:
-          WEBHOOK_URL: ${{ secrets.BUDI_QA_WEBHOOK }}
-          GITHUB_RUN_URL: $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID
\ No newline at end of file

From 3e154ba851e6a918b67a2e88738c11cc0ff25d5e Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 7 Mar 2023 16:15:01 +0000
Subject: [PATCH 40/41] v2.4.3

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index f15d089753..0b9b91a9f2 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.4.2",
+  "version": "2.4.3",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 2afba16de4..9a6ed6fd89 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.4.2",
+    "@budibase/types": "^2.4.3",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 9e796783f5..dd74ac16a5 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/string-templates": "^2.4.2",
+    "@budibase/string-templates": "^2.4.3",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 6d193654f0..14945e03cb 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.4.2",
-    "@budibase/client": "^2.4.2",
-    "@budibase/frontend-core": "^2.4.2",
-    "@budibase/string-templates": "^2.4.2",
+    "@budibase/bbui": "^2.4.3",
+    "@budibase/client": "^2.4.3",
+    "@budibase/frontend-core": "^2.4.3",
+    "@budibase/string-templates": "^2.4.3",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 1f9ba19089..2d8ed4e834 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "dist/index.js",
   "bin": {
@@ -29,9 +29,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.4.2",
-    "@budibase/string-templates": "^2.4.2",
-    "@budibase/types": "^2.4.2",
+    "@budibase/backend-core": "^2.4.3",
+    "@budibase/string-templates": "^2.4.3",
+    "@budibase/types": "^2.4.3",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 3a84bd89f8..0aed94f14d 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.4.2",
-    "@budibase/frontend-core": "^2.4.2",
-    "@budibase/string-templates": "^2.4.2",
+    "@budibase/bbui": "^2.4.3",
+    "@budibase/frontend-core": "^2.4.3",
+    "@budibase/string-templates": "^2.4.3",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 33b6f7d2e9..7fc6397697 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.4.2",
+    "@budibase/bbui": "^2.4.3",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 7aa8d62158..bfffc58fb4 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 89eab873e2..cbd945f0b3 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.4.2",
-    "@budibase/client": "^2.4.2",
+    "@budibase/backend-core": "^2.4.3",
+    "@budibase/client": "^2.4.3",
     "@budibase/pro": "2.4.2",
-    "@budibase/string-templates": "^2.4.2",
-    "@budibase/types": "^2.4.2",
+    "@budibase/string-templates": "^2.4.3",
+    "@budibase/types": "^2.4.3",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index a5b9acf6b1..30ea9c0087 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index c4e82efb2d..13381ebd56 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 3a1f97c130..0fd059bf64 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.4.2",
+    "@budibase/backend-core": "^2.4.3",
     "@budibase/pro": "2.4.2",
-    "@budibase/string-templates": "^2.4.2",
-    "@budibase/types": "^2.4.2",
+    "@budibase/string-templates": "^2.4.3",
+    "@budibase/types": "^2.4.3",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 9edea70f820c8fa58b5c8248bbd769366323b5e5 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 7 Mar 2023 16:18:07 +0000
Subject: [PATCH 41/41] Update pro version to 2.4.3

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index cbd945f0b3..14bf586f55 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.4.3",
     "@budibase/client": "^2.4.3",
-    "@budibase/pro": "2.4.2",
+    "@budibase/pro": "2.4.3",
     "@budibase/string-templates": "^2.4.3",
     "@budibase/types": "^2.4.3",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 70a26a20c4..84913ada03 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.4.2":
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.2.tgz#57c106cb1727a5e87700c5a49cc2f2413489f9ba"
-  integrity sha512-b0mzMfddc8DmmFGPcaHGc5OmqXEl63HBhvM6Kk8Sb2bXiyhRy3uOIvptVYn/mNCfCI8eL6NPYJUpOKhQB/DHKA==
+"@budibase/backend-core@2.4.3":
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.3.tgz#e1d1cbf4dc27ed78a82aed7523ee0ab012ad8ecc"
+  integrity sha512-230oKJPpsMWuM0R82B2HB57/1z/jMqhyNNvxZ5XQSozX/qKmcWzFtvcXIp/UIHwe4s/Bq9PCc0imia8EasrAmg==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "^2.4.2"
+    "@budibase/types" "^2.4.3"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1417,14 +1417,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.4.2":
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.2.tgz#c4ee3c9af899a5c8d5a9b29db38ee5c01b188914"
-  integrity sha512-e3i0mZmSkhX2Y64pnZDuXu1XPo4vZaaO5S2uaFZ2vQXCyrs7Ld0XDE5yEu/5lZHzOvTlAeCI/7gzL9jD39wMsA==
+"@budibase/pro@2.4.3":
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.3.tgz#4bc1c21d25573d562960f372d21564e782ab7078"
+  integrity sha512-MKbpEW8zXZ3yrU6kz0wt5auNWibfLRDKMOvh/epmJcrirtrtFboij5VZ+kt+A7KD5cmNJKCKYdfrJQjz46cf+w==
   dependencies:
-    "@budibase/backend-core" "2.4.2"
+    "@budibase/backend-core" "2.4.3"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.2"
+    "@budibase/types" "2.4.3"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1463,10 +1463,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.4.2", "@budibase/types@^2.4.2":
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.2.tgz#418a756ef8bcf5ea5fac63cfba009f5a6cfaadb5"
-  integrity sha512-e0VL5VuqkXbdxjJjJXyKCFC4unHhhTzKjUNjSB8zYzubmRRvZV2zRXO5HuIn3NC1eK8krkJIVIdHvKYMJZn+vA==
+"@budibase/types@2.4.3", "@budibase/types@^2.4.3":
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.3.tgz#7990ea96b97d0237254a75365c115940f076bdaf"
+  integrity sha512-mKMa7IV3JF9OV8K3A2JEABhPXNMy9yQ65XP+Bf8hb0oG1T9DApMsEX+6gIBwQHSs2F2zCMKjtQ0rMyk7mFewQg==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 0fd059bf64..d9f0c5be24 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.4.3",
-    "@budibase/pro": "2.4.2",
+    "@budibase/pro": "2.4.3",
     "@budibase/string-templates": "^2.4.3",
     "@budibase/types": "^2.4.3",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 12397e3365..ed3316b722 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.4.2":
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.2.tgz#57c106cb1727a5e87700c5a49cc2f2413489f9ba"
-  integrity sha512-b0mzMfddc8DmmFGPcaHGc5OmqXEl63HBhvM6Kk8Sb2bXiyhRy3uOIvptVYn/mNCfCI8eL6NPYJUpOKhQB/DHKA==
+"@budibase/backend-core@2.4.3":
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.3.tgz#e1d1cbf4dc27ed78a82aed7523ee0ab012ad8ecc"
+  integrity sha512-230oKJPpsMWuM0R82B2HB57/1z/jMqhyNNvxZ5XQSozX/qKmcWzFtvcXIp/UIHwe4s/Bq9PCc0imia8EasrAmg==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "^2.4.2"
+    "@budibase/types" "^2.4.3"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.4.2":
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.2.tgz#c4ee3c9af899a5c8d5a9b29db38ee5c01b188914"
-  integrity sha512-e3i0mZmSkhX2Y64pnZDuXu1XPo4vZaaO5S2uaFZ2vQXCyrs7Ld0XDE5yEu/5lZHzOvTlAeCI/7gzL9jD39wMsA==
+"@budibase/pro@2.4.3":
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.3.tgz#4bc1c21d25573d562960f372d21564e782ab7078"
+  integrity sha512-MKbpEW8zXZ3yrU6kz0wt5auNWibfLRDKMOvh/epmJcrirtrtFboij5VZ+kt+A7KD5cmNJKCKYdfrJQjz46cf+w==
   dependencies:
-    "@budibase/backend-core" "2.4.2"
+    "@budibase/backend-core" "2.4.3"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.2"
+    "@budibase/types" "2.4.3"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.4.2", "@budibase/types@^2.4.2":
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.2.tgz#418a756ef8bcf5ea5fac63cfba009f5a6cfaadb5"
-  integrity sha512-e0VL5VuqkXbdxjJjJXyKCFC4unHhhTzKjUNjSB8zYzubmRRvZV2zRXO5HuIn3NC1eK8krkJIVIdHvKYMJZn+vA==
+"@budibase/types@2.4.3", "@budibase/types@^2.4.3":
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.3.tgz#7990ea96b97d0237254a75365c115940f076bdaf"
+  integrity sha512-mKMa7IV3JF9OV8K3A2JEABhPXNMy9yQ65XP+Bf8hb0oG1T9DApMsEX+6gIBwQHSs2F2zCMKjtQ0rMyk7mFewQg==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"