From 608a38489fdc90b91507621f7a986978cef39793 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 25 Apr 2023 12:34:50 +0100
Subject: [PATCH 01/16] Export undefineds as empty values in csv, instead of
 empty strings

---
 packages/server/src/api/controllers/row/internal.ts   | 5 ++++-
 packages/server/src/api/controllers/row/utils.ts      | 4 ++--
 packages/server/src/api/controllers/view/exporters.ts | 4 +++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/server/src/api/controllers/row/internal.ts b/packages/server/src/api/controllers/row/internal.ts
index a0bebc2490..cc1450060c 100644
--- a/packages/server/src/api/controllers/row/internal.ts
+++ b/packages/server/src/api/controllers/row/internal.ts
@@ -37,7 +37,7 @@ import {
   Table,
 } from "@budibase/types"
 
-const { cleanExportRows } = require("./utils")
+import { cleanExportRows } from "./utils"
 
 const CALCULATION_TYPES = {
   SUM: "sum",
@@ -391,6 +391,9 @@ export async function exportRows(ctx: UserCtx) {
   const table = await db.get(ctx.params.tableId)
   const rowIds = ctx.request.body.rows
   let format = ctx.query.format
+  if (typeof format !== "string") {
+    ctx.throw(400, "Format parameter is not valid")
+  }
   const { columns, query } = ctx.request.body
 
   let result
diff --git a/packages/server/src/api/controllers/row/utils.ts b/packages/server/src/api/controllers/row/utils.ts
index e96a4fe6ee..a7c467ea61 100644
--- a/packages/server/src/api/controllers/row/utils.ts
+++ b/packages/server/src/api/controllers/row/utils.ts
@@ -137,8 +137,8 @@ export function cleanExportRows(
     delete schema[column]
   })
 
-  // Intended to avoid 'undefined' in export
   if (format === Format.CSV) {
+    // Intended to append empty values in export
     const schemaKeys = Object.keys(schema)
     for (let key of schemaKeys) {
       if (columns?.length && columns.indexOf(key) > 0) {
@@ -146,7 +146,7 @@ export function cleanExportRows(
       }
       for (let row of cleanRows) {
         if (row[key] == null) {
-          row[key] = ""
+          row[key] = undefined
         }
       }
     }
diff --git a/packages/server/src/api/controllers/view/exporters.ts b/packages/server/src/api/controllers/view/exporters.ts
index 4d927bca27..ec0aca95a9 100644
--- a/packages/server/src/api/controllers/view/exporters.ts
+++ b/packages/server/src/api/controllers/view/exporters.ts
@@ -10,7 +10,9 @@ export function csv(headers: string[], rows: Row[]) {
         val =
           typeof val === "object" && !(val instanceof Date)
             ? `"${JSON.stringify(val).replace(/"/g, "'")}"`
-            : `"${val}"`
+            : val !== undefined
+            ? `"${val}"`
+            : ""
         return val.trim()
       })
       .join(",")}`

From 50336c80e3aba56c86374e014e8b97686a6fda1f Mon Sep 17 00:00:00 2001
From: Gerard Burns <gjburns9@hotmail.com>
Date: Thu, 27 Apr 2023 12:01:36 +0100
Subject: [PATCH 02/16] Stop Multiple onClick Events from Firing

---
 packages/client/src/components/app/Button.svelte | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/app/Button.svelte b/packages/client/src/components/app/Button.svelte
index 018f21c583..51452de199 100644
--- a/packages/client/src/components/app/Button.svelte
+++ b/packages/client/src/components/app/Button.svelte
@@ -5,6 +5,8 @@
   const { styleable, builderStore } = getContext("sdk")
   const component = getContext("component")
 
+  let handlingOnClick = false
+
   export let disabled = false
   export let text = ""
   export let onClick
@@ -16,6 +18,16 @@
   export let icon = null
   export let active = false
 
+  const handleOnClick = async () => {
+    if (handlingOnClick) {
+      return
+    }
+
+    handlingOnClick = true
+    await onClick()
+    handlingOnClick = false
+  }
+
   let node
 
   $: $component.editing && node?.focus()
@@ -39,7 +51,7 @@
     class:spectrum-Button--quiet={quiet}
     {disabled}
     use:styleable={$component.styles}
-    on:click={onClick}
+    on:click={handleOnClick}
     contenteditable={$component.editing && !icon}
     on:blur={$component.editing ? updateText : null}
     bind:this={node}

From 8d6c00644a4604938f4e97222a977d2ed64d3105 Mon Sep 17 00:00:00 2001
From: Gerard Burns <gjburns9@hotmail.com>
Date: Thu, 27 Apr 2023 13:33:22 +0100
Subject: [PATCH 03/16] Improve Automations Error Message

---
 packages/builder/src/builderStore/store/automation/index.js    | 3 +++
 .../AutomationBuilder/FlowChart/TestDataModal.svelte           | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/builderStore/store/automation/index.js b/packages/builder/src/builderStore/store/automation/index.js
index dc1e2a2cc1..9e5516c512 100644
--- a/packages/builder/src/builderStore/store/automation/index.js
+++ b/packages/builder/src/builderStore/store/automation/index.js
@@ -147,6 +147,9 @@ const automationActions = store => ({
       testData,
     })
     if (!result?.trigger && !result?.steps?.length) {
+      if (result?.err?.code === "usage_limit_exceeded") {
+        throw "You have exceeded your automation quota"
+      }
       throw "Something went wrong testing your automation"
     }
     store.update(state => {
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
index cd170142e4..17d5b35575 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
@@ -52,7 +52,7 @@
       await automationStore.actions.test($selectedAutomation, testData)
       $automationStore.showTestPanel = true
     } catch (error) {
-      notifications.error("Error testing automation")
+      notifications.error(error)
     }
   }
 </script>

From e74d4b4ddb3212db11095a7a969957bfc795f5fb Mon Sep 17 00:00:00 2001
From: Gerard Burns <gjburns9@hotmail.com>
Date: Thu, 27 Apr 2023 14:17:09 +0100
Subject: [PATCH 04/16] PR Feedback

---
 packages/client/src/components/app/Button.svelte | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/components/app/Button.svelte b/packages/client/src/components/app/Button.svelte
index 51452de199..a074986342 100644
--- a/packages/client/src/components/app/Button.svelte
+++ b/packages/client/src/components/app/Button.svelte
@@ -19,12 +19,12 @@
   export let active = false
 
   const handleOnClick = async () => {
-    if (handlingOnClick) {
-      return
+    handlingOnClick = true
+
+    if (onClick) {
+      await onClick()
     }
 
-    handlingOnClick = true
-    await onClick()
     handlingOnClick = false
   }
 
@@ -49,7 +49,7 @@
   <button
     class={`spectrum-Button spectrum-Button--size${size} spectrum-Button--${type}`}
     class:spectrum-Button--quiet={quiet}
-    {disabled}
+    disabled={disabled || handlingOnClick}
     use:styleable={$component.styles}
     on:click={handleOnClick}
     contenteditable={$component.editing && !icon}

From 29df12c247a473944c436953e470088bd51f2d94 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 2 May 2023 10:34:45 +0100
Subject: [PATCH 05/16] Add csvutils

---
 packages/server/src/api/controllers/table/index.ts | 4 ++--
 packages/server/src/utilities/csv.ts               | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 packages/server/src/utilities/csv.ts

diff --git a/packages/server/src/api/controllers/table/index.ts b/packages/server/src/api/controllers/table/index.ts
index 2ab7ad7b38..bc967a90f4 100644
--- a/packages/server/src/api/controllers/table/index.ts
+++ b/packages/server/src/api/controllers/table/index.ts
@@ -10,7 +10,7 @@ import { getDatasourceParams } from "../../../db/utils"
 import { context, events } from "@budibase/backend-core"
 import { Table, UserCtx } from "@budibase/types"
 import sdk from "../../../sdk"
-import csv from "csvtojson"
+import { jsonFromCsvString } from "../../../utilities/csv"
 
 function pickApi({ tableId, table }: { tableId?: string; table?: Table }) {
   if (table && !tableId) {
@@ -104,7 +104,7 @@ export async function bulkImport(ctx: UserCtx) {
 export async function csvToJson(ctx: UserCtx) {
   const { csvString } = ctx.request.body
 
-  const result = await csv().fromString(csvString)
+  const result = await jsonFromCsvString(csvString)
 
   ctx.status = 200
   ctx.body = result
diff --git a/packages/server/src/utilities/csv.ts b/packages/server/src/utilities/csv.ts
new file mode 100644
index 0000000000..0fab14db45
--- /dev/null
+++ b/packages/server/src/utilities/csv.ts
@@ -0,0 +1,6 @@
+import csv from "csvtojson"
+
+export async function jsonFromCsvString(csvString: string) {
+  const result = await csv().fromString(csvString)
+  return result
+}

From c87cc39cea5fa4e379eecb9156a58846a5788811 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 2 May 2023 10:44:25 +0100
Subject: [PATCH 06/16] Add basic tests

---
 packages/server/src/utilities/tests/csv.spec.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 packages/server/src/utilities/tests/csv.spec.ts

diff --git a/packages/server/src/utilities/tests/csv.spec.ts b/packages/server/src/utilities/tests/csv.spec.ts
new file mode 100644
index 0000000000..aab5917a9a
--- /dev/null
+++ b/packages/server/src/utilities/tests/csv.spec.ts
@@ -0,0 +1,16 @@
+import { jsonFromCsvString } from "../csv"
+
+describe("csv", () => {
+  describe("jsonFromCsvString", () => {
+    test("multiple lines csv can be casted", async () => {
+      const csvString = '"id","title"\n"1","aaa"\n"2","bbb"'
+
+      const result = await jsonFromCsvString(csvString)
+
+      expect(result).toEqual([
+        { id: "1", title: "aaa" },
+        { id: "2", title: "bbb" },
+      ])
+    })
+  })
+})

From 650cbc1f011b0fbb8011efa87aca802f19b9fc8c Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 2 May 2023 11:57:18 +0100
Subject: [PATCH 07/16] Handle cast as undefineds

---
 packages/server/src/utilities/csv.ts            | 15 ++++++++++++++-
 packages/server/src/utilities/tests/csv.spec.ts | 17 +++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/utilities/csv.ts b/packages/server/src/utilities/csv.ts
index 0fab14db45..454f467a9a 100644
--- a/packages/server/src/utilities/csv.ts
+++ b/packages/server/src/utilities/csv.ts
@@ -1,6 +1,19 @@
 import csv from "csvtojson"
 
 export async function jsonFromCsvString(csvString: string) {
-  const result = await csv().fromString(csvString)
+  const castedWithEmptyStrings = await csv().fromString(csvString)
+  if (!castedWithEmptyStrings.length) {
+    return []
+  }
+
+  // By default the csvtojson library casts empty values as empty strings. This is causing issues on conversion.
+  // ignoreEmpty will remove the key completly if empty, so creating this empty object will ensure we return the values with the keys but empty values
+  const emptyObject = Object.keys(castedWithEmptyStrings[0]).reduce(
+    (p, v) => ({ ...p, [v]: undefined }),
+    {}
+  )
+
+  let result = await csv({ ignoreEmpty: true }).fromString(csvString)
+  result = result.map(r => ({ ...emptyObject, ...r }))
   return result
 }
diff --git a/packages/server/src/utilities/tests/csv.spec.ts b/packages/server/src/utilities/tests/csv.spec.ts
index aab5917a9a..9ee0ae4c87 100644
--- a/packages/server/src/utilities/tests/csv.spec.ts
+++ b/packages/server/src/utilities/tests/csv.spec.ts
@@ -11,6 +11,23 @@ describe("csv", () => {
         { id: "1", title: "aaa" },
         { id: "2", title: "bbb" },
       ])
+      result.forEach(r => expect(Object.keys(r)).toEqual(["id", "title"]))
+    })
+
+    test("empty values are casted as undefined", async () => {
+      const csvString =
+        '"id","optional","title"\n1,,"aaa"\n2,"value","bbb"\n3,,"ccc"'
+
+      const result = await jsonFromCsvString(csvString)
+
+      expect(result).toEqual([
+        { id: "1", optional: undefined, title: "aaa" },
+        { id: "2", optional: "value", title: "bbb" },
+        { id: "3", optional: undefined, title: "ccc" },
+      ])
+      result.forEach(r =>
+        expect(Object.keys(r)).toEqual(["id", "optional", "title"])
+      )
     })
   })
 })

From 6e7c78362ea5ee6cc91e37d58f447c45db8c57e4 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 2 May 2023 12:46:53 +0100
Subject: [PATCH 08/16] Return null instead of undefined

---
 packages/server/src/utilities/csv.ts          | 23 +++++++++++--------
 .../server/src/utilities/tests/csv.spec.ts    |  4 ++--
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/packages/server/src/utilities/csv.ts b/packages/server/src/utilities/csv.ts
index 454f467a9a..477ebb896d 100644
--- a/packages/server/src/utilities/csv.ts
+++ b/packages/server/src/utilities/csv.ts
@@ -1,19 +1,22 @@
 import csv from "csvtojson"
 
 export async function jsonFromCsvString(csvString: string) {
-  const castedWithEmptyStrings = await csv().fromString(csvString)
-  if (!castedWithEmptyStrings.length) {
-    return []
-  }
+  const castedWithEmptyValues = await csv({ ignoreEmpty: true }).fromString(
+    csvString
+  )
 
   // By default the csvtojson library casts empty values as empty strings. This is causing issues on conversion.
   // ignoreEmpty will remove the key completly if empty, so creating this empty object will ensure we return the values with the keys but empty values
-  const emptyObject = Object.keys(castedWithEmptyStrings[0]).reduce(
-    (p, v) => ({ ...p, [v]: undefined }),
-    {}
-  )
+  const result = await csv({ ignoreEmpty: false }).fromString(csvString)
+  result.forEach((r, i) => {
+    for (const [key] of Object.entries(r).filter(
+      ([key, value]) => value === ""
+    )) {
+      if (castedWithEmptyValues[i][key] === undefined) {
+        r[key] = null
+      }
+    }
+  })
 
-  let result = await csv({ ignoreEmpty: true }).fromString(csvString)
-  result = result.map(r => ({ ...emptyObject, ...r }))
   return result
 }
diff --git a/packages/server/src/utilities/tests/csv.spec.ts b/packages/server/src/utilities/tests/csv.spec.ts
index 9ee0ae4c87..14063d0e8e 100644
--- a/packages/server/src/utilities/tests/csv.spec.ts
+++ b/packages/server/src/utilities/tests/csv.spec.ts
@@ -21,9 +21,9 @@ describe("csv", () => {
       const result = await jsonFromCsvString(csvString)
 
       expect(result).toEqual([
-        { id: "1", optional: undefined, title: "aaa" },
+        { id: "1", optional: null, title: "aaa" },
         { id: "2", optional: "value", title: "bbb" },
-        { id: "3", optional: undefined, title: "ccc" },
+        { id: "3", optional: null, title: "ccc" },
       ])
       result.forEach(r =>
         expect(Object.keys(r)).toEqual(["id", "optional", "title"])

From 1d041a3dd5c857817e065f5e3f8e41d372694f2b Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 2 May 2023 12:48:05 +0100
Subject: [PATCH 09/16] Support nulls when optional

---
 packages/server/src/utilities/schema.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/server/src/utilities/schema.ts b/packages/server/src/utilities/schema.ts
index f3d98d35c9..7b5de7898a 100644
--- a/packages/server/src/utilities/schema.ts
+++ b/packages/server/src/utilities/schema.ts
@@ -4,6 +4,9 @@ interface SchemaColumn {
   readonly name: string
   readonly type: FieldTypes
   readonly autocolumn?: boolean
+  readonly constraints?: {
+    presence: boolean
+  }
 }
 
 interface Schema {
@@ -76,6 +79,11 @@ export function validate(rows: Rows, schema: Schema): ValidationResults {
       // If the columnType is not a string, then it's not present in the schema, and should be added to the invalid columns array
       if (typeof columnType !== "string") {
         results.invalidColumns.push(columnName)
+      } else if (
+        columnData == null &&
+        !schema[columnName].constraints?.presence
+      ) {
+        results.schemaValidation[columnName] = true
       } else if (
         // If there's no data for this field don't bother with further checks
         // If the field is already marked as invalid there's no need for further checks

From 991e91e2045a0d6cab5ae62e674af67e73147de1 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 3 May 2023 17:28:55 +0000
Subject: [PATCH 10/16] v2.5.10-alpha.1

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

diff --git a/lerna.json b/lerna.json
index d9c7eca7ef..c226dea49e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.5.10-alpha.0",
+  "version": "2.5.10-alpha.1",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": ["packages/*"],
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index f151e75623..b66112e8de 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.5.10-alpha.0",
+  "version": "2.5.10-alpha.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.5.10-alpha.0",
+    "@budibase/types": "2.5.10-alpha.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 6f50176780..0e99b34384 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.5.10-alpha.0",
+  "version": "2.5.10-alpha.1",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,8 +38,8 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/shared-core": "2.5.10-alpha.0",
-    "@budibase/string-templates": "2.5.10-alpha.0",
+    "@budibase/shared-core": "2.5.10-alpha.1",
+    "@budibase/string-templates": "2.5.10-alpha.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 25adb35aaf..9607e51344 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.5.10-alpha.0",
+  "version": "2.5.10-alpha.1",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.5.10-alpha.0",
-    "@budibase/frontend-core": "2.5.10-alpha.0",
-    "@budibase/shared-core": "2.5.10-alpha.0",
-    "@budibase/string-templates": "2.5.10-alpha.0",
+    "@budibase/bbui": "2.5.10-alpha.1",
+    "@budibase/frontend-core": "2.5.10-alpha.1",
+    "@budibase/shared-core": "2.5.10-alpha.1",
+    "@budibase/string-templates": "2.5.10-alpha.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 6037da7e4d..3d663babd5 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.5.10-alpha.0",
+  "version": "2.5.10-alpha.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.5.10-alpha.0",
-    "@budibase/string-templates": "2.5.10-alpha.0",
-    "@budibase/types": "2.5.10-alpha.0",
+    "@budibase/backend-core": "2.5.10-alpha.1",
+    "@budibase/string-templates": "2.5.10-alpha.1",
+    "@budibase/types": "2.5.10-alpha.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 e8770c5cb1..4016899f8c 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.5.10-alpha.0",
+  "version": "2.5.10-alpha.1",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,11 +19,11 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "2.5.10-alpha.0",
-    "@budibase/frontend-core": "2.5.10-alpha.0",
-    "@budibase/shared-core": "2.5.10-alpha.0",
-    "@budibase/string-templates": "2.5.10-alpha.0",
-    "@budibase/types": "2.5.10-alpha.0",
+    "@budibase/bbui": "2.5.10-alpha.1",
+    "@budibase/frontend-core": "2.5.10-alpha.1",
+    "@budibase/shared-core": "2.5.10-alpha.1",
+    "@budibase/string-templates": "2.5.10-alpha.1",
+    "@budibase/types": "2.5.10-alpha.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 680756aa38..937574814e 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.5.10-alpha.0",
+  "version": "2.5.10-alpha.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.5.10-alpha.0",
-    "@budibase/shared-core": "2.5.10-alpha.0",
+    "@budibase/bbui": "2.5.10-alpha.1",
+    "@budibase/shared-core": "2.5.10-alpha.1",
     "dayjs": "^1.11.7",
     "lodash": "^4.17.21",
     "socket.io-client": "^4.6.1",
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 6730ad8e76..0843bd509f 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.5.10-alpha.0",
+  "version": "2.5.10-alpha.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 5003e6bdc5..1a8b18c6da 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.5.10-alpha.0",
+  "version": "2.5.10-alpha.1",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -45,12 +45,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.5.10-alpha.0",
-    "@budibase/client": "2.5.10-alpha.0",
+    "@budibase/backend-core": "2.5.10-alpha.1",
+    "@budibase/client": "2.5.10-alpha.1",
     "@budibase/pro": "2.5.10-alpha.0",
-    "@budibase/shared-core": "2.5.10-alpha.0",
-    "@budibase/string-templates": "2.5.10-alpha.0",
-    "@budibase/types": "2.5.10-alpha.0",
+    "@budibase/shared-core": "2.5.10-alpha.1",
+    "@budibase/string-templates": "2.5.10-alpha.1",
+    "@budibase/types": "2.5.10-alpha.1",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json
index e29fea93af..2b8f75f738 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.5.10-alpha.0",
+  "version": "2.5.10-alpha.1",
   "description": "Shared data utils",
   "main": "dist/cjs/src/index.js",
   "types": "dist/mjs/src/index.d.ts",
@@ -20,7 +20,7 @@
     "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\""
   },
   "dependencies": {
-    "@budibase/types": "2.5.10-alpha.0"
+    "@budibase/types": "2.5.10-alpha.1"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 14af9c2afb..3349aad7ba 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.5.10-alpha.0",
+  "version": "2.5.10-alpha.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 0c84a25627..4367270c85 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.5.10-alpha.0",
+  "version": "2.5.10-alpha.1",
   "description": "Budibase types",
   "main": "dist/cjs/index.js",
   "types": "dist/mjs/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 104ca9db31..2894ce0e13 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.5.10-alpha.0",
+  "version": "2.5.10-alpha.1",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -37,10 +37,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.5.10-alpha.0",
+    "@budibase/backend-core": "2.5.10-alpha.1",
     "@budibase/pro": "2.5.10-alpha.0",
-    "@budibase/string-templates": "2.5.10-alpha.0",
-    "@budibase/types": "2.5.10-alpha.0",
+    "@budibase/string-templates": "2.5.10-alpha.1",
+    "@budibase/types": "2.5.10-alpha.1",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 77116bf4c2ca93ec9ef008e5070d4c2f3bf56643 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 3 May 2023 17:30:27 +0000
Subject: [PATCH 11/16] Update pro version to 2.5.10-alpha.1

---
 packages/server/package.json |  2 +-
 packages/worker/package.json |  2 +-
 yarn.lock                    | 43 ++++++++++++++++++++++++------------
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 1a8b18c6da..d0ff56531b 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -47,7 +47,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.5.10-alpha.1",
     "@budibase/client": "2.5.10-alpha.1",
-    "@budibase/pro": "2.5.10-alpha.0",
+    "@budibase/pro": "2.5.10-alpha.1",
     "@budibase/shared-core": "2.5.10-alpha.1",
     "@budibase/string-templates": "2.5.10-alpha.1",
     "@budibase/types": "2.5.10-alpha.1",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 2894ce0e13..165689cf7c 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -38,7 +38,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.5.10-alpha.1",
-    "@budibase/pro": "2.5.10-alpha.0",
+    "@budibase/pro": "2.5.10-alpha.1",
     "@budibase/string-templates": "2.5.10-alpha.1",
     "@budibase/types": "2.5.10-alpha.1",
     "@koa/router": "8.0.8",
diff --git a/yarn.lock b/yarn.lock
index ca3f44d9a8..5f17870a6f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1486,14 +1486,15 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.5.9":
-  version "2.5.9"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.9.tgz#0c27da00c1c71260cf10295177fd8904277c9edc"
-  integrity sha512-EKYW+ud0SPwWjCtW9cDrRkBrxf7j/266btWuaqMLYHpR/s15vtN6h/jPvNt0RSpDbTAEgwt3A7QNQ1GjEI6YjQ==
+"@budibase/pro@2.5.10-alpha.0":
+  version "2.5.10-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.10-alpha.0.tgz#f3688cc61d2130fbf8b191e515b8ac9789f2a9df"
+  integrity sha512-vYa1F4NhMh7veSZyhgrE54iziwZLHiuRwXbU+unEo3xqyFZIvERAAQZ88nrnwssubWBWnPhpN/8JMHrsyM8mXg==
   dependencies:
-    "@budibase/backend-core" "2.5.9"
-    "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.5.9"
+    "@budibase/backend-core" "2.5.10-alpha.0"
+    "@budibase/shared-core" "2.5.9"
+    "@budibase/string-templates" "2.5.9"
+    "@budibase/types" "2.5.10-alpha.0"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1501,6 +1502,15 @@
     lru-cache "^7.14.1"
     memorystream "^0.3.1"
     node-fetch "^2.6.1"
+    scim-patch "^0.7.0"
+    scim2-parse-filter "^0.2.8"
+
+"@budibase/shared-core@2.5.9":
+  version "2.5.9"
+  resolved "https://registry.yarnpkg.com/@budibase/shared-core/-/shared-core-2.5.9.tgz#f22f22637fb7618ded1c7292b10793d7969827ce"
+  integrity sha512-l417Rb2+1tuXbjNL42wJHmqIQQyla2pPglOnapxfOdRuvzng+5GqlrTV1caLNf/53TS9U6ueGJdPOtxZTTFGUA==
+  dependencies:
+    "@budibase/types" "^2.5.9"
 
 "@budibase/standard-components@^0.9.139":
   version "0.9.139"
@@ -1520,17 +1530,22 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/string-templates@2.3.20":
-  version "2.3.20"
-  resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.3.20.tgz#35f74b6f515e8127cc375ee0a4679b0a7c117588"
-  integrity sha512-wMKau3IzVF6M+dRu99aKV1yMdrrK5lghVm9qYtR1B163SMbHEwC8JmZFGPLIi1XsG0T+vw+xfcemfJ2zcATWwg==
+"@budibase/string-templates@2.5.9":
+  version "2.5.9"
+  resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.5.9.tgz#64582730421801e1e829b430136b449b1adc0314"
+  integrity sha512-Szu06M0JFHuUVIil2aHZWU8hvsROYpDx9raX9uIv4DcwBOAtyvVzD16wOCHzlmj8wWeV8fbKe4JF4q4GXnilJg==
   dependencies:
     "@budibase/handlebars-helpers" "^0.11.8"
     dayjs "^1.10.4"
     handlebars "^4.7.6"
     handlebars-utils "^1.0.6"
     lodash "^4.17.20"
-    vm2 "^3.9.4"
+    vm2 "^3.9.15"
+
+"@budibase/types@^2.5.9":
+  version "2.5.9"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.9.tgz#4b1253e76b95cd8d6a42e86ebc3363a305c62653"
+  integrity sha512-7NELdWB3iV5y+pmXhm9g/v1AlN+wqHtoy67DZxKY5dlcK4DCcTdlqkToGiiw9d3sDPgDAVznjdZYnB5pGzd3TQ==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
@@ -21627,7 +21642,7 @@ scim-patch@^0.7.0:
     fast-deep-equal "3.1.3"
     scim2-parse-filter "0.2.8"
 
-scim2-parse-filter@0.2.8:
+scim2-parse-filter@0.2.8, scim2-parse-filter@^0.2.8:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/scim2-parse-filter/-/scim2-parse-filter-0.2.8.tgz#12e836514b9a55ae51218dd6e7fbea91daccfa4d"
   integrity sha512-1V+6FIMIiP+gDiFkC3dIw86KfoXhnQRXhfPaiQImeeFukpLtEkTtYq/Vmy1yDgHQcIHQxQQqOWyGLKX0FTvvaA==
@@ -24487,7 +24502,7 @@ vm2@3.9.17:
     acorn "^8.7.0"
     acorn-walk "^8.2.0"
 
-vm2@^3.9.11, vm2@^3.9.15, vm2@^3.9.4:
+vm2@^3.9.11, vm2@^3.9.15:
   version "3.9.16"
   resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.16.tgz#0fbc2a265f7bf8b837cea6f4a908f88a3f93b8e6"
   integrity sha512-3T9LscojNTxdOyG+e8gFeyBXkMlOBYDoF6dqZbj+MPVHi9x10UfiTAJIobuchRCp3QvC+inybTbMJIUrLsig0w==

From dbd101733f0bae8628caff09bebe9a832a9d078f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 May 2023 01:53:57 +0000
Subject: [PATCH 12/16] Bump engine.io from 6.4.1 to 6.4.2

Bumps [engine.io](https://github.com/socketio/engine.io) from 6.4.1 to 6.4.2.
- [Release notes](https://github.com/socketio/engine.io/releases)
- [Changelog](https://github.com/socketio/engine.io/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/engine.io/compare/6.4.1...6.4.2)

---
updated-dependencies:
- dependency-name: engine.io
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 5f17870a6f..0e5c80f96a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1486,15 +1486,15 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.5.10-alpha.0":
-  version "2.5.10-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.10-alpha.0.tgz#f3688cc61d2130fbf8b191e515b8ac9789f2a9df"
-  integrity sha512-vYa1F4NhMh7veSZyhgrE54iziwZLHiuRwXbU+unEo3xqyFZIvERAAQZ88nrnwssubWBWnPhpN/8JMHrsyM8mXg==
+"@budibase/pro@2.5.10-alpha.1":
+  version "2.5.10-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.10-alpha.1.tgz#9b3241809330860a0c38bcd08a31c8ddfe4f7fe8"
+  integrity sha512-Bhy9fb0HmfLpmaknfE+qxxRB4X4CWKHho2WMVugqLqzpLIyYJIksNucJgIu4EHPP6By24R0PtcCoJNZNgn6xNw==
   dependencies:
-    "@budibase/backend-core" "2.5.10-alpha.0"
+    "@budibase/backend-core" "2.5.10-alpha.1"
     "@budibase/shared-core" "2.5.9"
     "@budibase/string-templates" "2.5.9"
-    "@budibase/types" "2.5.10-alpha.0"
+    "@budibase/types" "2.5.10-alpha.1"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -9977,9 +9977,9 @@ engine.io-parser@~5.0.3:
   integrity sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==
 
 engine.io@~6.4.1:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.4.1.tgz#8056b4526a88e779f9c280d820422d4e3eeaaae5"
-  integrity sha512-JFYQurD/nbsA5BSPmbaOSLa3tSVj8L6o4srSwXXY3NqE+gGUNmmPTbhn8tjzcCtSqhFgIeqef81ngny8JM25hw==
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.4.2.tgz#ffeaf68f69b1364b0286badddf15ff633476473f"
+  integrity sha512-FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg==
   dependencies:
     "@types/cookie" "^0.4.1"
     "@types/cors" "^2.8.12"

From 4cd5b39c3a219d28f416a879d166de345c6f314b Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 5 May 2023 10:55:55 +0000
Subject: [PATCH 13/16] v2.5.10-alpha.2

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

diff --git a/lerna.json b/lerna.json
index c226dea49e..3bd09ccb88 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.5.10-alpha.1",
+  "version": "2.5.10-alpha.2",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": ["packages/*"],
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index b66112e8de..e3369150a7 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.5.10-alpha.1",
+  "version": "2.5.10-alpha.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.5.10-alpha.1",
+    "@budibase/types": "2.5.10-alpha.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 0e99b34384..55e3916304 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.5.10-alpha.1",
+  "version": "2.5.10-alpha.2",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,8 +38,8 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/shared-core": "2.5.10-alpha.1",
-    "@budibase/string-templates": "2.5.10-alpha.1",
+    "@budibase/shared-core": "2.5.10-alpha.2",
+    "@budibase/string-templates": "2.5.10-alpha.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 9607e51344..8fe3d48a15 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.5.10-alpha.1",
+  "version": "2.5.10-alpha.2",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.5.10-alpha.1",
-    "@budibase/frontend-core": "2.5.10-alpha.1",
-    "@budibase/shared-core": "2.5.10-alpha.1",
-    "@budibase/string-templates": "2.5.10-alpha.1",
+    "@budibase/bbui": "2.5.10-alpha.2",
+    "@budibase/frontend-core": "2.5.10-alpha.2",
+    "@budibase/shared-core": "2.5.10-alpha.2",
+    "@budibase/string-templates": "2.5.10-alpha.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 3d663babd5..110189d822 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.5.10-alpha.1",
+  "version": "2.5.10-alpha.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.5.10-alpha.1",
-    "@budibase/string-templates": "2.5.10-alpha.1",
-    "@budibase/types": "2.5.10-alpha.1",
+    "@budibase/backend-core": "2.5.10-alpha.2",
+    "@budibase/string-templates": "2.5.10-alpha.2",
+    "@budibase/types": "2.5.10-alpha.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 4016899f8c..7e61138442 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.5.10-alpha.1",
+  "version": "2.5.10-alpha.2",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,11 +19,11 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "2.5.10-alpha.1",
-    "@budibase/frontend-core": "2.5.10-alpha.1",
-    "@budibase/shared-core": "2.5.10-alpha.1",
-    "@budibase/string-templates": "2.5.10-alpha.1",
-    "@budibase/types": "2.5.10-alpha.1",
+    "@budibase/bbui": "2.5.10-alpha.2",
+    "@budibase/frontend-core": "2.5.10-alpha.2",
+    "@budibase/shared-core": "2.5.10-alpha.2",
+    "@budibase/string-templates": "2.5.10-alpha.2",
+    "@budibase/types": "2.5.10-alpha.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 937574814e..1ec879c6da 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.5.10-alpha.1",
+  "version": "2.5.10-alpha.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.5.10-alpha.1",
-    "@budibase/shared-core": "2.5.10-alpha.1",
+    "@budibase/bbui": "2.5.10-alpha.2",
+    "@budibase/shared-core": "2.5.10-alpha.2",
     "dayjs": "^1.11.7",
     "lodash": "^4.17.21",
     "socket.io-client": "^4.6.1",
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 0843bd509f..2a4b6f0577 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.5.10-alpha.1",
+  "version": "2.5.10-alpha.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 d0ff56531b..e968d846ce 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.5.10-alpha.1",
+  "version": "2.5.10-alpha.2",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -45,12 +45,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.5.10-alpha.1",
-    "@budibase/client": "2.5.10-alpha.1",
+    "@budibase/backend-core": "2.5.10-alpha.2",
+    "@budibase/client": "2.5.10-alpha.2",
     "@budibase/pro": "2.5.10-alpha.1",
-    "@budibase/shared-core": "2.5.10-alpha.1",
-    "@budibase/string-templates": "2.5.10-alpha.1",
-    "@budibase/types": "2.5.10-alpha.1",
+    "@budibase/shared-core": "2.5.10-alpha.2",
+    "@budibase/string-templates": "2.5.10-alpha.2",
+    "@budibase/types": "2.5.10-alpha.2",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json
index 2b8f75f738..278668c16c 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.5.10-alpha.1",
+  "version": "2.5.10-alpha.2",
   "description": "Shared data utils",
   "main": "dist/cjs/src/index.js",
   "types": "dist/mjs/src/index.d.ts",
@@ -20,7 +20,7 @@
     "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\""
   },
   "dependencies": {
-    "@budibase/types": "2.5.10-alpha.1"
+    "@budibase/types": "2.5.10-alpha.2"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 3349aad7ba..b5d9c4dec0 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.5.10-alpha.1",
+  "version": "2.5.10-alpha.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 4367270c85..4b043a8ec1 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.5.10-alpha.1",
+  "version": "2.5.10-alpha.2",
   "description": "Budibase types",
   "main": "dist/cjs/index.js",
   "types": "dist/mjs/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 165689cf7c..d216c20fc8 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.5.10-alpha.1",
+  "version": "2.5.10-alpha.2",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -37,10 +37,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.5.10-alpha.1",
+    "@budibase/backend-core": "2.5.10-alpha.2",
     "@budibase/pro": "2.5.10-alpha.1",
-    "@budibase/string-templates": "2.5.10-alpha.1",
-    "@budibase/types": "2.5.10-alpha.1",
+    "@budibase/string-templates": "2.5.10-alpha.2",
+    "@budibase/types": "2.5.10-alpha.2",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 87f5c9353ac5bd033ad631f25825769943fbc0eb Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 5 May 2023 10:57:40 +0000
Subject: [PATCH 14/16] Update pro version to 2.5.10-alpha.2

---
 packages/server/package.json | 2 +-
 packages/worker/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index e968d846ce..7f29b46ab3 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -47,7 +47,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.5.10-alpha.2",
     "@budibase/client": "2.5.10-alpha.2",
-    "@budibase/pro": "2.5.10-alpha.1",
+    "@budibase/pro": "2.5.10-alpha.2",
     "@budibase/shared-core": "2.5.10-alpha.2",
     "@budibase/string-templates": "2.5.10-alpha.2",
     "@budibase/types": "2.5.10-alpha.2",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index d216c20fc8..3fb2e395a9 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -38,7 +38,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.5.10-alpha.2",
-    "@budibase/pro": "2.5.10-alpha.1",
+    "@budibase/pro": "2.5.10-alpha.2",
     "@budibase/string-templates": "2.5.10-alpha.2",
     "@budibase/types": "2.5.10-alpha.2",
     "@koa/router": "8.0.8",

From 58e2ea7c6c2e3e4d7b1d057148b6ef91ba87fb5e Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 5 May 2023 11:19:15 +0000
Subject: [PATCH 15/16] v2.5.10-alpha.3

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

diff --git a/lerna.json b/lerna.json
index 3bd09ccb88..de5e61bf5c 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.5.10-alpha.2",
+  "version": "2.5.10-alpha.3",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": ["packages/*"],
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index e3369150a7..52af631b3a 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.5.10-alpha.2",
+  "version": "2.5.10-alpha.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.5.10-alpha.2",
+    "@budibase/types": "2.5.10-alpha.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 55e3916304..8f74e41cb3 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.5.10-alpha.2",
+  "version": "2.5.10-alpha.3",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,8 +38,8 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/shared-core": "2.5.10-alpha.2",
-    "@budibase/string-templates": "2.5.10-alpha.2",
+    "@budibase/shared-core": "2.5.10-alpha.3",
+    "@budibase/string-templates": "2.5.10-alpha.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 8fe3d48a15..bfed220ef4 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.5.10-alpha.2",
+  "version": "2.5.10-alpha.3",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.5.10-alpha.2",
-    "@budibase/frontend-core": "2.5.10-alpha.2",
-    "@budibase/shared-core": "2.5.10-alpha.2",
-    "@budibase/string-templates": "2.5.10-alpha.2",
+    "@budibase/bbui": "2.5.10-alpha.3",
+    "@budibase/frontend-core": "2.5.10-alpha.3",
+    "@budibase/shared-core": "2.5.10-alpha.3",
+    "@budibase/string-templates": "2.5.10-alpha.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 110189d822..cc48c4d17a 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.5.10-alpha.2",
+  "version": "2.5.10-alpha.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.5.10-alpha.2",
-    "@budibase/string-templates": "2.5.10-alpha.2",
-    "@budibase/types": "2.5.10-alpha.2",
+    "@budibase/backend-core": "2.5.10-alpha.3",
+    "@budibase/string-templates": "2.5.10-alpha.3",
+    "@budibase/types": "2.5.10-alpha.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 7e61138442..3c886bccc8 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.5.10-alpha.2",
+  "version": "2.5.10-alpha.3",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,11 +19,11 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "2.5.10-alpha.2",
-    "@budibase/frontend-core": "2.5.10-alpha.2",
-    "@budibase/shared-core": "2.5.10-alpha.2",
-    "@budibase/string-templates": "2.5.10-alpha.2",
-    "@budibase/types": "2.5.10-alpha.2",
+    "@budibase/bbui": "2.5.10-alpha.3",
+    "@budibase/frontend-core": "2.5.10-alpha.3",
+    "@budibase/shared-core": "2.5.10-alpha.3",
+    "@budibase/string-templates": "2.5.10-alpha.3",
+    "@budibase/types": "2.5.10-alpha.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 1ec879c6da..ae2bbbac7a 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.5.10-alpha.2",
+  "version": "2.5.10-alpha.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.5.10-alpha.2",
-    "@budibase/shared-core": "2.5.10-alpha.2",
+    "@budibase/bbui": "2.5.10-alpha.3",
+    "@budibase/shared-core": "2.5.10-alpha.3",
     "dayjs": "^1.11.7",
     "lodash": "^4.17.21",
     "socket.io-client": "^4.6.1",
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 2a4b6f0577..79579da1fe 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.5.10-alpha.2",
+  "version": "2.5.10-alpha.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 7f29b46ab3..0fcaa91803 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.5.10-alpha.2",
+  "version": "2.5.10-alpha.3",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -45,12 +45,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.5.10-alpha.2",
-    "@budibase/client": "2.5.10-alpha.2",
+    "@budibase/backend-core": "2.5.10-alpha.3",
+    "@budibase/client": "2.5.10-alpha.3",
     "@budibase/pro": "2.5.10-alpha.2",
-    "@budibase/shared-core": "2.5.10-alpha.2",
-    "@budibase/string-templates": "2.5.10-alpha.2",
-    "@budibase/types": "2.5.10-alpha.2",
+    "@budibase/shared-core": "2.5.10-alpha.3",
+    "@budibase/string-templates": "2.5.10-alpha.3",
+    "@budibase/types": "2.5.10-alpha.3",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json
index 278668c16c..518df47dcc 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.5.10-alpha.2",
+  "version": "2.5.10-alpha.3",
   "description": "Shared data utils",
   "main": "dist/cjs/src/index.js",
   "types": "dist/mjs/src/index.d.ts",
@@ -20,7 +20,7 @@
     "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\""
   },
   "dependencies": {
-    "@budibase/types": "2.5.10-alpha.2"
+    "@budibase/types": "2.5.10-alpha.3"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index b5d9c4dec0..e74eb2d6d8 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.5.10-alpha.2",
+  "version": "2.5.10-alpha.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 4b043a8ec1..0fdc75ed65 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.5.10-alpha.2",
+  "version": "2.5.10-alpha.3",
   "description": "Budibase types",
   "main": "dist/cjs/index.js",
   "types": "dist/mjs/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 3fb2e395a9..a8f44bc79c 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.5.10-alpha.2",
+  "version": "2.5.10-alpha.3",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -37,10 +37,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.5.10-alpha.2",
+    "@budibase/backend-core": "2.5.10-alpha.3",
     "@budibase/pro": "2.5.10-alpha.2",
-    "@budibase/string-templates": "2.5.10-alpha.2",
-    "@budibase/types": "2.5.10-alpha.2",
+    "@budibase/string-templates": "2.5.10-alpha.3",
+    "@budibase/types": "2.5.10-alpha.3",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 21ffea56c4128ab100953bde0f5bbc6365b09dac Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 5 May 2023 11:20:50 +0000
Subject: [PATCH 16/16] Update pro version to 2.5.10-alpha.3

---
 packages/server/package.json |  2 +-
 packages/worker/package.json |  2 +-
 yarn.lock                    | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 0fcaa91803..ab0bf8bea1 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -47,7 +47,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.5.10-alpha.3",
     "@budibase/client": "2.5.10-alpha.3",
-    "@budibase/pro": "2.5.10-alpha.2",
+    "@budibase/pro": "2.5.10-alpha.3",
     "@budibase/shared-core": "2.5.10-alpha.3",
     "@budibase/string-templates": "2.5.10-alpha.3",
     "@budibase/types": "2.5.10-alpha.3",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index a8f44bc79c..23c037bfc5 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -38,7 +38,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.5.10-alpha.3",
-    "@budibase/pro": "2.5.10-alpha.2",
+    "@budibase/pro": "2.5.10-alpha.3",
     "@budibase/string-templates": "2.5.10-alpha.3",
     "@budibase/types": "2.5.10-alpha.3",
     "@koa/router": "8.0.8",
diff --git a/yarn.lock b/yarn.lock
index 0e5c80f96a..1882b1d408 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1486,15 +1486,15 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.5.10-alpha.1":
-  version "2.5.10-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.10-alpha.1.tgz#9b3241809330860a0c38bcd08a31c8ddfe4f7fe8"
-  integrity sha512-Bhy9fb0HmfLpmaknfE+qxxRB4X4CWKHho2WMVugqLqzpLIyYJIksNucJgIu4EHPP6By24R0PtcCoJNZNgn6xNw==
+"@budibase/pro@2.5.10-alpha.2":
+  version "2.5.10-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.10-alpha.2.tgz#7f3e831748b7b9503e49a1fe49531be030ffbe49"
+  integrity sha512-bXI6UrFWKrUZLZzTlCRU0fKfnoZvUIAV8IeZREF+AqN0TKx5hlxTmyj4ACoBLy3ABm1+AanMMpg8Bu4kLiue3g==
   dependencies:
-    "@budibase/backend-core" "2.5.10-alpha.1"
+    "@budibase/backend-core" "2.5.10-alpha.2"
     "@budibase/shared-core" "2.5.9"
     "@budibase/string-templates" "2.5.9"
-    "@budibase/types" "2.5.10-alpha.1"
+    "@budibase/types" "2.5.10-alpha.2"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"