From fa30769ddb351d09a47166ac2ba9754eb4215dff Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Tue, 28 Mar 2023 14:58:22 +0100
Subject: [PATCH 01/33] fix auto columns in sample data

---
 packages/server/src/api/controllers/table/utils.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/server/src/api/controllers/table/utils.ts b/packages/server/src/api/controllers/table/utils.ts
index 7c5c81939a..755fef1f37 100644
--- a/packages/server/src/api/controllers/table/utils.ts
+++ b/packages/server/src/api/controllers/table/utils.ts
@@ -109,6 +109,7 @@ export function importToRows(data: any, table: any, user: any = {}) {
       noAutoRelationships: true,
     })
     row = processed.row
+    table = processed.table
 
     let fieldName: any
     let schema: any

From 0a6c6a9d1b792d3cc14877fe55b43e47c96279ef Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 29 Mar 2023 11:43:04 +0000
Subject: [PATCH 02/33] Update pro version to 2.4.41

---
 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 d671b5c02a..00615f385c 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.41",
     "@budibase/client": "^2.4.41",
-    "@budibase/pro": "2.4.40",
+    "@budibase/pro": "2.4.41",
     "@budibase/shared-core": "^2.4.41",
     "@budibase/string-templates": "^2.4.41",
     "@budibase/types": "^2.4.41",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index c803d67672..af04a8bc06 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.40":
-  version "2.4.40"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.40.tgz#770158f360bcb30251aa2e50b0df40052e8ae3ce"
-  integrity sha512-ISN5100YjUwaJV5FJGr/4jccbottPhcp9CVBVxw90r0qKtlLVkG3zMRKJ9brSo3qx0Q8H3f1n7MrII3xoRyk3A==
+"@budibase/backend-core@2.4.41":
+  version "2.4.41"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.41.tgz#2c99d9382f92ca3d5b884ea01c67f615c37c4837"
+  integrity sha512-ffVc0O5+CPACLAzN7pLvzCuccbGrhdUnbC7N4zxjQOPpczhmzUFCDOy/UAN0go2/oKMHs2SzCwiMunf3Y+cBFA==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "^2.4.40"
+    "@budibase/types" "^2.4.41"
     "@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.40":
-  version "2.4.40"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.40.tgz#2c1812fe35344ce8edf1401f2d8e4f289066c841"
-  integrity sha512-6ZXEv2J/AdaOAa2i/2XVDdCbgn2V//MN9LHx1/tr6ixcP/nCnBXjnBXrYqLrXsHcB6IiFXJwjOtirSrn3eXyuA==
+"@budibase/pro@2.4.41":
+  version "2.4.41"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.41.tgz#4b4d395f38a8a2a86a3275a43f9270b7edfd5788"
+  integrity sha512-DBebpbYUsTchDvitdnTXuQGYjhUyZl7pPFKokvvlgI8Pu0YK4eXtbiMMbd2BVH7wwuJL5o3tUN+pii4IqmXofw==
   dependencies:
-    "@budibase/backend-core" "2.4.40"
+    "@budibase/backend-core" "2.4.41"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.40"
+    "@budibase/types" "2.4.41"
     "@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.40", "@budibase/types@^2.4.40":
-  version "2.4.40"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.40.tgz#12d02240e6d31f47a91eb93c971f0f835da6f950"
-  integrity sha512-3rk626nhpeH88l4WzU7bjG4fo8SDELSEuko7Jb+DmZdEGxrP+5NVCyNTswndXa7oSuvmg/Wg17W/aatCBNCkxA==
+"@budibase/types@2.4.41", "@budibase/types@^2.4.41":
+  version "2.4.41"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.41.tgz#582328dd0037b4b0ad30d39e6524eac256e7320a"
+  integrity sha512-N3Jp46UH2wZ66iOUcSID1Nh8f+hVApytn7vgTT2mOiRwyXzWSxJQFjv9TUh8A8lLV6Qe/rLQVcp/GIQyyIFtDw==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 7759015679..cbb93c8170 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.41",
-    "@budibase/pro": "2.4.40",
+    "@budibase/pro": "2.4.41",
     "@budibase/string-templates": "^2.4.41",
     "@budibase/types": "^2.4.41",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 3e46a1117b..bb51443833 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.40":
-  version "2.4.40"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.40.tgz#770158f360bcb30251aa2e50b0df40052e8ae3ce"
-  integrity sha512-ISN5100YjUwaJV5FJGr/4jccbottPhcp9CVBVxw90r0qKtlLVkG3zMRKJ9brSo3qx0Q8H3f1n7MrII3xoRyk3A==
+"@budibase/backend-core@2.4.41":
+  version "2.4.41"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.41.tgz#2c99d9382f92ca3d5b884ea01c67f615c37c4837"
+  integrity sha512-ffVc0O5+CPACLAzN7pLvzCuccbGrhdUnbC7N4zxjQOPpczhmzUFCDOy/UAN0go2/oKMHs2SzCwiMunf3Y+cBFA==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "^2.4.40"
+    "@budibase/types" "^2.4.41"
     "@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.40":
-  version "2.4.40"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.40.tgz#2c1812fe35344ce8edf1401f2d8e4f289066c841"
-  integrity sha512-6ZXEv2J/AdaOAa2i/2XVDdCbgn2V//MN9LHx1/tr6ixcP/nCnBXjnBXrYqLrXsHcB6IiFXJwjOtirSrn3eXyuA==
+"@budibase/pro@2.4.41":
+  version "2.4.41"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.41.tgz#4b4d395f38a8a2a86a3275a43f9270b7edfd5788"
+  integrity sha512-DBebpbYUsTchDvitdnTXuQGYjhUyZl7pPFKokvvlgI8Pu0YK4eXtbiMMbd2BVH7wwuJL5o3tUN+pii4IqmXofw==
   dependencies:
-    "@budibase/backend-core" "2.4.40"
+    "@budibase/backend-core" "2.4.41"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.40"
+    "@budibase/types" "2.4.41"
     "@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.40", "@budibase/types@^2.4.40":
-  version "2.4.40"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.40.tgz#12d02240e6d31f47a91eb93c971f0f835da6f950"
-  integrity sha512-3rk626nhpeH88l4WzU7bjG4fo8SDELSEuko7Jb+DmZdEGxrP+5NVCyNTswndXa7oSuvmg/Wg17W/aatCBNCkxA==
+"@budibase/types@2.4.41", "@budibase/types@^2.4.41":
+  version "2.4.41"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.41.tgz#582328dd0037b4b0ad30d39e6524eac256e7320a"
+  integrity sha512-N3Jp46UH2wZ66iOUcSID1Nh8f+hVApytn7vgTT2mOiRwyXzWSxJQFjv9TUh8A8lLV6Qe/rLQVcp/GIQyyIFtDw==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From e25429632b9d9e306f9e3b5d6287936c725d9882 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Wed, 29 Mar 2023 15:35:55 +0100
Subject: [PATCH 03/33] Remove users that should not be there anymore when
 syncGlobalUsers

---
 packages/server/src/sdk/users/utils.ts | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/server/src/sdk/users/utils.ts b/packages/server/src/sdk/users/utils.ts
index 5c369754a1..82a46acfac 100644
--- a/packages/server/src/sdk/users/utils.ts
+++ b/packages/server/src/sdk/users/utils.ts
@@ -6,25 +6,33 @@ import {
   InternalTables,
 } from "../../db/utils"
 import { isEqual } from "lodash"
+import { ContextUser, UserMetadata } from "@budibase/types"
 
-export function combineMetadataAndUser(user: any, metadata: any) {
+export function combineMetadataAndUser(
+  user: ContextUser,
+  metadata: UserMetadata | UserMetadata[]
+) {
+  const metadataId = generateUserMetadataID(user._id!)
+  const found = Array.isArray(metadata)
+    ? metadata.find(doc => doc._id === metadataId)
+    : metadata
   // skip users with no access
   if (
     user.roleId == null ||
     user.roleId === rolesCore.BUILTIN_ROLE_IDS.PUBLIC
   ) {
+    // If it exists and it should not, we must remove it
+    if (found) {
+      return { ...found, _deleted: true }
+    }
     return null
   }
   delete user._rev
-  const metadataId = generateUserMetadataID(user._id)
   const newDoc = {
     ...user,
     _id: metadataId,
     tableId: InternalTables.USER_METADATA,
   }
-  const found = Array.isArray(metadata)
-    ? metadata.find(doc => doc._id === metadataId)
-    : metadata
   // copy rev over for the purposes of equality check
   if (found) {
     newDoc._rev = found._rev
@@ -58,7 +66,7 @@ export async function syncGlobalUsers() {
   ])
   const toWrite = []
   for (let user of users) {
-    const combined = await combineMetadataAndUser(user, metadata)
+    const combined = combineMetadataAndUser(user, metadata)
     if (combined) {
       toWrite.push(combined)
     }

From b368c143087a8d8068212cd2368c001eeb3be023 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Wed, 29 Mar 2023 16:18:32 +0100
Subject: [PATCH 04/33] Add unit tests to test new users

---
 .../server/src/sdk/users/tests/utils.spec.ts  | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 packages/server/src/sdk/users/tests/utils.spec.ts

diff --git a/packages/server/src/sdk/users/tests/utils.spec.ts b/packages/server/src/sdk/users/tests/utils.spec.ts
new file mode 100644
index 0000000000..3178978c46
--- /dev/null
+++ b/packages/server/src/sdk/users/tests/utils.spec.ts
@@ -0,0 +1,49 @@
+import { db } from "@budibase/backend-core"
+import TestConfiguration from "../../../tests/utilities/TestConfiguration"
+import { rawUserMetadata, syncGlobalUsers } from "../utils"
+
+describe("syncGlobalUsers", () => {
+  const config = new TestConfiguration()
+
+  beforeAll(async () => {
+    await config.init()
+  })
+
+  afterAll(config.end)
+
+  it("the default user is synced", async () => {
+    await config.doInContext(config.appId, async () => {
+      await syncGlobalUsers()
+
+      const metadata = await rawUserMetadata()
+      expect(metadata).toHaveLength(1)
+      expect(metadata).toEqual([
+        expect.objectContaining({
+          _id: db.generateUserMetadataID(config.user._id),
+        }),
+      ])
+    })
+  })
+
+  it("app users are synced", async () => {
+    await config.doInContext(config.appId, async () => {
+      const user1 = await config.createUser()
+      const user2 = await config.createUser()
+
+      await syncGlobalUsers()
+
+      const metadata = await rawUserMetadata()
+      expect(metadata).toHaveLength(3)
+      expect(metadata).toContainEqual(
+        expect.objectContaining({
+          _id: db.generateUserMetadataID(user1._id),
+        })
+      )
+      expect(metadata).toContainEqual(
+        expect.objectContaining({
+          _id: db.generateUserMetadataID(user2._id),
+        })
+      )
+    })
+  })
+})

From 8783f0123d51f0b95490151004c59458eb33d2fe Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Wed, 29 Mar 2023 16:42:31 +0100
Subject: [PATCH 05/33] Add tests for admins vs app users

---
 .../server/src/sdk/users/tests/utils.spec.ts  | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/packages/server/src/sdk/users/tests/utils.spec.ts b/packages/server/src/sdk/users/tests/utils.spec.ts
index 3178978c46..8eba6db5b6 100644
--- a/packages/server/src/sdk/users/tests/utils.spec.ts
+++ b/packages/server/src/sdk/users/tests/utils.spec.ts
@@ -5,7 +5,7 @@ import { rawUserMetadata, syncGlobalUsers } from "../utils"
 describe("syncGlobalUsers", () => {
   const config = new TestConfiguration()
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
   })
 
@@ -25,11 +25,10 @@ describe("syncGlobalUsers", () => {
     })
   })
 
-  it("app users are synced", async () => {
+  it("admin and builders users are synced", async () => {
+    const user1 = await config.createUser({ admin: true })
+    const user2 = await config.createUser({ admin: false, builder: true })
     await config.doInContext(config.appId, async () => {
-      const user1 = await config.createUser()
-      const user2 = await config.createUser()
-
       await syncGlobalUsers()
 
       const metadata = await rawUserMetadata()
@@ -46,4 +45,19 @@ describe("syncGlobalUsers", () => {
       )
     })
   })
+
+  it("app users are not synced if not specified", async () => {
+    const user = await config.createUser({ admin: false, builder: false })
+    await config.doInContext(config.appId, async () => {
+      await syncGlobalUsers()
+
+      const metadata = await rawUserMetadata()
+      expect(metadata).toHaveLength(1)
+      expect(metadata).not.toContainEqual(
+        expect.objectContaining({
+          _id: db.generateUserMetadataID(user._id),
+        })
+      )
+    })
+  })
 })

From 4cb6b99982e6f651d4a9380954f323cf1ee96518 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Wed, 29 Mar 2023 16:42:55 +0100
Subject: [PATCH 06/33] Types

---
 packages/server/src/tests/utilities/TestConfiguration.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts
index cf337c689f..3e0ea331b8 100644
--- a/packages/server/src/tests/utilities/TestConfiguration.ts
+++ b/packages/server/src/tests/utilities/TestConfiguration.ts
@@ -47,6 +47,7 @@ import {
   SourceName,
   Table,
   SearchFilters,
+  UserRoles,
 } from "@budibase/types"
 
 type DefaultUserValues = {
@@ -277,7 +278,7 @@ class TestConfiguration {
       email?: string
       builder?: boolean
       admin?: boolean
-      roles?: any
+      roles?: UserRoles
     } = {}
   ) {
     let { id, firstName, lastName, email, builder, admin, roles } = user

From efff31e181c1b4afb48b58c031b8225451d6ad6a Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Wed, 29 Mar 2023 17:02:56 +0100
Subject: [PATCH 07/33] Test user groups

---
 .../tests/utilities/structures/index.ts       |  1 +
 .../tests/utilities/structures/userGroups.ts  | 10 +++++
 .../server/src/sdk/users/tests/utils.spec.ts  | 39 ++++++++++++++++++-
 3 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 packages/backend-core/tests/utilities/structures/userGroups.ts

diff --git a/packages/backend-core/tests/utilities/structures/index.ts b/packages/backend-core/tests/utilities/structures/index.ts
index ca77f476d0..ff2e5b147f 100644
--- a/packages/backend-core/tests/utilities/structures/index.ts
+++ b/packages/backend-core/tests/utilities/structures/index.ts
@@ -8,4 +8,5 @@ export * as plugins from "./plugins"
 export * as sso from "./sso"
 export * as tenant from "./tenants"
 export * as users from "./users"
+export * as userGroups from "./userGroups"
 export { generator } from "./generator"
diff --git a/packages/backend-core/tests/utilities/structures/userGroups.ts b/packages/backend-core/tests/utilities/structures/userGroups.ts
new file mode 100644
index 0000000000..4dc870a00a
--- /dev/null
+++ b/packages/backend-core/tests/utilities/structures/userGroups.ts
@@ -0,0 +1,10 @@
+import { UserGroup } from "@budibase/types"
+import { generator } from "./generator"
+
+export function userGroup(): UserGroup {
+  return {
+    name: generator.word(),
+    icon: generator.word(),
+    color: generator.word(),
+  }
+}
diff --git a/packages/server/src/sdk/users/tests/utils.spec.ts b/packages/server/src/sdk/users/tests/utils.spec.ts
index 8eba6db5b6..97381a2628 100644
--- a/packages/server/src/sdk/users/tests/utils.spec.ts
+++ b/packages/server/src/sdk/users/tests/utils.spec.ts
@@ -1,4 +1,7 @@
-import { db } from "@budibase/backend-core"
+import { db, roles } from "@budibase/backend-core"
+import { structures } from "@budibase/backend-core/tests"
+import { sdk as proSdk } from "@budibase/pro"
+
 import TestConfiguration from "../../../tests/utilities/TestConfiguration"
 import { rawUserMetadata, syncGlobalUsers } from "../utils"
 
@@ -60,4 +63,38 @@ describe("syncGlobalUsers", () => {
       )
     })
   })
+
+  it("app users are removed when removed from the tenant", async () => {
+    await config.doInTenant(async () => {
+      const group = await proSdk.groups.save(structures.userGroups.userGroup())
+      const user1 = await config.createUser({ admin: false, builder: false })
+      const user2 = await config.createUser({ admin: false, builder: false })
+      await proSdk.groups.addUsers(group.id, [user1._id, user2._id])
+
+      await config.doInContext(config.appId, async () => {
+        await syncGlobalUsers()
+        expect(await rawUserMetadata()).toHaveLength(1)
+
+        await proSdk.groups.updateGroupApps(group.id, {
+          appsToAdd: [
+            { appId: config.prodAppId!, roleId: roles.BUILTIN_ROLE_IDS.BASIC },
+          ],
+        })
+        await syncGlobalUsers()
+
+        const metadata = await rawUserMetadata()
+        expect(metadata).toHaveLength(3)
+        expect(metadata).toContainEqual(
+          expect.objectContaining({
+            _id: db.generateUserMetadataID(user1._id),
+          })
+        )
+        expect(metadata).toContainEqual(
+          expect.objectContaining({
+            _id: db.generateUserMetadataID(user2._id),
+          })
+        )
+      })
+    })
+  })
 })

From 301ad598ada0e94d05e678d56ba74c933e21c51a Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Wed, 29 Mar 2023 17:05:32 +0100
Subject: [PATCH 08/33] Test user group deletion

---
 .../server/src/sdk/users/tests/utils.spec.ts  | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/sdk/users/tests/utils.spec.ts b/packages/server/src/sdk/users/tests/utils.spec.ts
index 97381a2628..69f1bdf9e6 100644
--- a/packages/server/src/sdk/users/tests/utils.spec.ts
+++ b/packages/server/src/sdk/users/tests/utils.spec.ts
@@ -64,7 +64,7 @@ describe("syncGlobalUsers", () => {
     })
   })
 
-  it("app users are removed when removed from the tenant", async () => {
+  it("app users are added when group is assigned to app", async () => {
     await config.doInTenant(async () => {
       const group = await proSdk.groups.save(structures.userGroups.userGroup())
       const user1 = await config.createUser({ admin: false, builder: false })
@@ -97,4 +97,31 @@ describe("syncGlobalUsers", () => {
       })
     })
   })
+
+  it("app users are removed when user removed from user group", async () => {
+    await config.doInTenant(async () => {
+      const group = await proSdk.groups.save(structures.userGroups.userGroup())
+      const user1 = await config.createUser({ admin: false, builder: false })
+      const user2 = await config.createUser({ admin: false, builder: false })
+      await proSdk.groups.updateGroupApps(group.id, {
+        appsToAdd: [
+          { appId: config.prodAppId!, roleId: roles.BUILTIN_ROLE_IDS.BASIC },
+        ],
+      })
+      await proSdk.groups.addUsers(group.id, [user1._id, user2._id])
+
+      await config.doInContext(config.appId, async () => {
+        await syncGlobalUsers()
+        expect(await rawUserMetadata()).toHaveLength(3)
+
+        await proSdk.groups.updateGroupApps(group.id, {
+          appsToRemove: [{ appId: config.prodAppId! }],
+        })
+        await syncGlobalUsers()
+
+        const metadata = await rawUserMetadata()
+        expect(metadata).toHaveLength(1)
+      })
+    })
+  })
 })

From 32c78ec9bfcec40ddea60a08bb27dee11251a30c Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 29 Mar 2023 19:58:24 +0100
Subject: [PATCH 09/33] This makes it so that Googlesheets works correctly as
 part of onboarding in the Cloud, in self host the googlesheets onboarding
 option has been hidden as it is too complex to get the user to setup the
 correct integrations with their google account while doing the first time
 onboarding to an app.

---
 packages/backend-core/src/configs/configs.ts  | 18 +++----
 .../middleware/passport/datasource/google.ts  | 15 ++++--
 .../_components/GoogleButton.svelte           | 16 +++++-
 .../_components/DatasourceConfigPanel.svelte  | 17 ++++--
 .../portal/apps/onboarding/index.svelte       | 52 +++++++++++++++----
 .../server/src/integrations/googlesheets.ts   |  4 ++
 .../shared-core/src/{ => helpers}/helpers.ts  |  0
 packages/shared-core/src/helpers/index.ts     |  2 +
 .../shared-core/src/helpers/integrations.ts   |  5 ++
 9 files changed, 100 insertions(+), 29 deletions(-)
 rename packages/shared-core/src/{ => helpers}/helpers.ts (100%)
 create mode 100644 packages/shared-core/src/helpers/index.ts
 create mode 100644 packages/shared-core/src/helpers/integrations.ts

diff --git a/packages/backend-core/src/configs/configs.ts b/packages/backend-core/src/configs/configs.ts
index 305a074152..79fd409308 100644
--- a/packages/backend-core/src/configs/configs.ts
+++ b/packages/backend-core/src/configs/configs.ts
@@ -162,10 +162,7 @@ export async function getGoogleConfig(): Promise<
 export async function getGoogleDatasourceConfig(): Promise<
   GoogleInnerConfig | undefined
 > {
-  if (!env.isDev() && !env.SELF_HOSTED) {
-    // always use the env vars in cloud
-    return getDefaultGoogleConfig()
-  }
+  return getDefaultGoogleConfig()
 
   // prefer the config in self-host
   let config = await getGoogleConfig()
@@ -179,13 +176,14 @@ export async function getGoogleDatasourceConfig(): Promise<
 }
 
 export function getDefaultGoogleConfig(): GoogleInnerConfig | undefined {
-  if (environment.GOOGLE_CLIENT_ID && environment.GOOGLE_CLIENT_SECRET) {
-    return {
-      clientID: environment.GOOGLE_CLIENT_ID!,
-      clientSecret: environment.GOOGLE_CLIENT_SECRET!,
-      activated: true,
-    }
+  //if (environment.GOOGLE_CLIENT_ID && environment.GOOGLE_CLIENT_SECRET) {
+  return {
+    clientID:
+      "77746844610-62k43m9b4so4gcmf6ibs7p3l7jv81rug.apps.googleusercontent.com",
+    clientSecret: "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",
+    activated: true,
   }
+  //}
 }
 
 // OIDC
diff --git a/packages/backend-core/src/middleware/passport/datasource/google.ts b/packages/backend-core/src/middleware/passport/datasource/google.ts
index 32451cb8d2..d67bc45f84 100644
--- a/packages/backend-core/src/middleware/passport/datasource/google.ts
+++ b/packages/backend-core/src/middleware/passport/datasource/google.ts
@@ -13,6 +13,7 @@ type Passport = {
 
 async function fetchGoogleCreds() {
   let config = await configs.getGoogleDatasourceConfig()
+  console.log(config)
 
   if (!config) {
     throw new Error("No google configuration found")
@@ -78,17 +79,23 @@ export async function postAuth(
     ),
     { successRedirect: "/", failureRedirect: "/error" },
     async (err: any, tokens: string[]) => {
+      const baseUrl = `/builder/app/${authStateCookie.appId}/data`
       // update the DB for the datasource with all the user info
       await doWithDB(authStateCookie.appId, async (db: Database) => {
-        const datasource = await db.get(authStateCookie.datasourceId)
+        let datasource
+        try {
+          datasource = await db.get(authStateCookie.datasourceId)
+        } catch (err: any) {
+          if (err.status === 404) {
+            ctx.redirect(baseUrl)
+          }
+        }
         if (!datasource.config) {
           datasource.config = {}
         }
         datasource.config.auth = { type: "google", ...tokens }
         await db.put(datasource)
-        ctx.redirect(
-          `/builder/app/${authStateCookie.appId}/data/datasource/${authStateCookie.datasourceId}`
-        )
+        ctx.redirect(`${baseUrl}/datasource/${authStateCookie.datasourceId}`)
       })
     }
   )(ctx, next)
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte b/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte
index 4622bd7b19..efe5158398 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte
@@ -5,18 +5,26 @@
 
   export let preAuthStep
   export let datasource
+  export let disabled
 
   $: tenantId = $auth.tenantId
 </script>
 
 <button
+  class:disabled
+  {disabled}
   on:click={async () => {
     let ds = datasource
+    let appId = $store.appId
     if (!ds) {
-      ds = await preAuthStep()
+      const resp = await preAuthStep()
+      if (resp.datasource && resp.appId) {
+        ds = resp.datasource
+        appId = resp.appId
+      }
     }
     window.open(
-      `/api/global/auth/${tenantId}/datasource/google?datasourceId=${ds._id}&appId=${$store.appId}`,
+      `/api/global/auth/${tenantId}/datasource/google?datasourceId=${ds._id}&appId=${appId}`,
       "_blank"
     )
   }}
@@ -26,6 +34,10 @@
 </button>
 
 <style>
+  .disabled {
+    opacity: 0.5;
+  }
+
   button {
     width: 195px;
     height: 40px;
diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/DatasourceConfigPanel.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/DatasourceConfigPanel.svelte
index a5f0fc138d..333cfdb0c6 100644
--- a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/DatasourceConfigPanel.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/DatasourceConfigPanel.svelte
@@ -1,12 +1,15 @@
 <script>
   import { Button, FancyForm, FancyInput, FancyCheckbox } from "@budibase/bbui"
+  import GoogleButton from "components/backend/DatasourceNavigator/_components/GoogleButton.svelte"
   import { capitalise } from "helpers/helpers"
   import PanelHeader from "./PanelHeader.svelte"
+  import { helpers } from "@budibase/shared-core"
 
   export let title = ""
   export let onBack = null
   export let onNext = () => {}
   export let fields = {}
+  export let type = ""
 
   let errors = {}
 
@@ -57,8 +60,9 @@
   }
 
   $: isValid = getIsValid(fields, errors, values)
+  $: isGoogle = helpers.isGoogleSheets(type)
 
-  const handleNext = () => {
+  const handleNext = async () => {
     const parsedValues = {}
 
     Object.entries(values).forEach(([name, value]) => {
@@ -69,7 +73,10 @@
       }
     })
 
-    return onNext(parsedValues)
+    if (isGoogle) {
+      parsedValues.isGoogle = isGoogle
+    }
+    return await onNext(parsedValues)
   }
 </script>
 
@@ -99,7 +106,11 @@
       {/each}
     </FancyForm>
   </div>
-  <Button cta disabled={!isValid} on:click={handleNext}>Connect</Button>
+  {#if isGoogle}
+    <GoogleButton disabled={!isValid} preAuthStep={handleNext} />
+  {:else}
+    <Button cta disabled={!isValid} on:click={handleNext}>Connect</Button>
+  {/if}
 </div>
 
 <style>
diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
index 1fa64526da..ab1b9c2331 100644
--- a/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
@@ -4,7 +4,7 @@
   import DataPanel from "./_components/DataPanel.svelte"
   import DatasourceConfigPanel from "./_components/DatasourceConfigPanel.svelte"
   import ExampleApp from "./_components/ExampleApp.svelte"
-  import { FancyButton, notifications, Modal } from "@budibase/bbui"
+  import { FancyButton, notifications, Modal, Body } from "@budibase/bbui"
   import IntegrationIcon from "components/backend/DatasourceNavigator/IntegrationIcon.svelte"
   import { SplitPage } from "@budibase/frontend-core"
   import { API } from "api"
@@ -17,6 +17,7 @@
   import createFromScratchScreen from "builderStore/store/screenTemplates/createFromScratchScreen"
   import { Roles } from "constants/backend"
   import Spinner from "components/common/Spinner.svelte"
+  import { helpers } from "@budibase/shared-core"
 
   let name = "My first app"
   let url = "my-first-app"
@@ -25,10 +26,12 @@
 
   let plusIntegrations = {}
   let integrationsLoading = true
-  $: getIntegrations()
   let creationLoading = false
-
   let uploadModal
+  let googleComplete = false
+
+  $: getIntegrations()
+  $: cloudHosted = $admin.cloud
 
   const createApp = async useSampleData => {
     creationLoading = true
@@ -62,6 +65,7 @@
       await store.actions.screens.save(defaultScreenTemplate)
 
       appId = createdApp.instance._id
+      return createdApp
     } catch (e) {
       creationLoading = false
       throw e
@@ -74,6 +78,10 @@
       const newPlusIntegrations = {}
 
       Object.entries($integrations).forEach(([integrationType, schema]) => {
+        // google sheets not available in self-host
+        if (helpers.isGoogleSheets(integrationType) && !cloudHosted) {
+          return
+        }
         if (schema?.plus) {
           newPlusIntegrations[integrationType] = schema
         }
@@ -92,12 +100,17 @@
     notifications.success(`App created successfully`)
   }
 
-  const handleCreateApp = async ({ datasourceConfig, useSampleData }) => {
+  const handleCreateApp = async ({
+    datasourceConfig,
+    useSampleData,
+    isGoogle,
+  }) => {
     try {
-      await createApp(useSampleData)
+      const app = await createApp(useSampleData)
 
+      let datasource
       if (datasourceConfig) {
-        await saveDatasource({
+        datasource = await saveDatasource({
           plus: true,
           auth: undefined,
           name: plusIntegrations[stage].friendlyName,
@@ -107,7 +120,14 @@
         })
       }
 
-      goToApp()
+      store.set()
+
+      if (isGoogle) {
+        googleComplete = true
+        return { datasource, appId: app.appId }
+      } else {
+        goToApp()
+      }
     } catch (e) {
       console.log(e)
       creationLoading = false
@@ -127,8 +147,15 @@
 <SplitPage>
   {#if stage === "name"}
     <NamePanel bind:name bind:url onNext={() => (stage = "data")} />
+  {:else if googleComplete}
+    <div class="centered">
+      <Body
+        >Please login to your Google account in the new tab which as opened to
+        continue.</Body
+      >
+    </div>
   {:else if integrationsLoading || creationLoading}
-    <div class="spinner">
+    <div class="centered">
       <Spinner />
     </div>
   {:else if stage === "data"}
@@ -174,8 +201,13 @@
     <DatasourceConfigPanel
       title={plusIntegrations[stage].friendlyName}
       fields={plusIntegrations[stage].datasource}
+      type={stage}
       onBack={() => (stage = "data")}
-      onNext={data => handleCreateApp({ datasourceConfig: data })}
+      onNext={data => {
+        const isGoogle = data.isGoogle
+        delete data.isGoogle
+        return handleCreateApp({ datasourceConfig: data, isGoogle })
+      }}
     />
   {:else}
     <p>There was an problem. Please refresh the page and try again.</p>
@@ -186,7 +218,7 @@
 </SplitPage>
 
 <style>
-  .spinner {
+  .centered {
     display: flex;
     justify-content: center;
     align-items: center;
diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts
index f8bc84adea..476a6511e9 100644
--- a/packages/server/src/integrations/googlesheets.ts
+++ b/packages/server/src/integrations/googlesheets.ts
@@ -245,6 +245,10 @@ class GoogleSheetsIntegration implements DatasourcePlus {
   }
 
   async buildSchema(datasourceId: string, entities: Record<string, Table>) {
+    // not fully configured yet
+    if (!this.config.auth) {
+      return
+    }
     await this.connect()
     const sheets = this.client.sheetsByIndex
     const tables: Record<string, Table> = {}
diff --git a/packages/shared-core/src/helpers.ts b/packages/shared-core/src/helpers/helpers.ts
similarity index 100%
rename from packages/shared-core/src/helpers.ts
rename to packages/shared-core/src/helpers/helpers.ts
diff --git a/packages/shared-core/src/helpers/index.ts b/packages/shared-core/src/helpers/index.ts
new file mode 100644
index 0000000000..fd185aa1e9
--- /dev/null
+++ b/packages/shared-core/src/helpers/index.ts
@@ -0,0 +1,2 @@
+export * from "./helpers"
+export * from "./integrations"
diff --git a/packages/shared-core/src/helpers/integrations.ts b/packages/shared-core/src/helpers/integrations.ts
new file mode 100644
index 0000000000..a7b74885d8
--- /dev/null
+++ b/packages/shared-core/src/helpers/integrations.ts
@@ -0,0 +1,5 @@
+import { SourceName } from "@budibase/types"
+
+export function isGoogleSheets(type: SourceName) {
+  return type === SourceName.GOOGLE_SHEETS
+}

From 420cfd0f96c7e5f53a0bd8e8a87215d8c0ce5c63 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Thu, 30 Mar 2023 10:12:50 +0100
Subject: [PATCH 10/33] Fix autoids when importing internal data

---
 packages/server/src/api/controllers/table/utils.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/api/controllers/table/utils.ts b/packages/server/src/api/controllers/table/utils.ts
index 7c5c81939a..3de4f856f6 100644
--- a/packages/server/src/api/controllers/table/utils.ts
+++ b/packages/server/src/api/controllers/table/utils.ts
@@ -99,16 +99,17 @@ export function makeSureTableUpToDate(table: any, tableToSave: any) {
   return tableToSave
 }
 
-export function importToRows(data: any, table: any, user: any = {}) {
+export function importToRows(data: any, table: Table, user: any = {}) {
   let finalData: any = []
   for (let i = 0; i < data.length; i++) {
     let row = data[i]
-    row._id = generateRowID(table._id)
+    row._id = generateRowID(table._id!)
     row.tableId = table._id
-    const processed: any = inputProcessing(user, table, row, {
+    const processed = inputProcessing(user, table, row, {
       noAutoRelationships: true,
     })
     row = processed.row
+    table = processed.table
 
     let fieldName: any
     let schema: any

From 6c610a31819e26d7aba19e633a5d545dd898e259 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Thu, 30 Mar 2023 10:21:50 +0100
Subject: [PATCH 11/33] Types (with forced checks!)

---
 packages/server/src/api/controllers/table/utils.ts | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/server/src/api/controllers/table/utils.ts b/packages/server/src/api/controllers/table/utils.ts
index 3de4f856f6..7052b8e107 100644
--- a/packages/server/src/api/controllers/table/utils.ts
+++ b/packages/server/src/api/controllers/table/utils.ts
@@ -111,21 +111,19 @@ export function importToRows(data: any, table: Table, user: any = {}) {
     row = processed.row
     table = processed.table
 
-    let fieldName: any
-    let schema: any
-    for ([fieldName, schema] of Object.entries(table.schema)) {
+    for (const [fieldName, schema] of Object.entries(table.schema)) {
       // check whether the options need to be updated for inclusion as part of the data import
       if (
         schema.type === FieldTypes.OPTIONS &&
         row[fieldName] &&
-        (!schema.constraints.inclusion ||
-          schema.constraints.inclusion.indexOf(row[fieldName]) === -1)
+        (!schema.constraints!.inclusion ||
+          schema.constraints!.inclusion.indexOf(row[fieldName]) === -1)
       ) {
-        schema.constraints.inclusion = [
-          ...schema.constraints.inclusion,
+        schema.constraints!.inclusion = [
+          ...schema.constraints!.inclusion!,
           row[fieldName],
         ]
-        schema.constraints.inclusion.sort()
+        schema.constraints!.inclusion.sort()
       }
     }
 

From eb0d4452958c0503c839a04b98ca6498a7af1548 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Thu, 30 Mar 2023 10:37:38 +0100
Subject: [PATCH 12/33] Add test for autoid when importing

---
 .../api/controllers/table/tests/utils.spec.ts | 63 +++++++++++++++++++
 .../server/src/api/controllers/table/utils.ts | 10 ++-
 2 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 packages/server/src/api/controllers/table/tests/utils.spec.ts

diff --git a/packages/server/src/api/controllers/table/tests/utils.spec.ts b/packages/server/src/api/controllers/table/tests/utils.spec.ts
new file mode 100644
index 0000000000..ef143100a4
--- /dev/null
+++ b/packages/server/src/api/controllers/table/tests/utils.spec.ts
@@ -0,0 +1,63 @@
+import { FieldType } from "@budibase/types"
+import { AutoFieldSubTypes } from "../../../../constants"
+import TestConfiguration from "../../../../tests/utilities/TestConfiguration"
+import { importToRows } from "../utils"
+
+describe("utils", () => {
+  const config = new TestConfiguration()
+
+  beforeEach(async () => {
+    await config.init()
+  })
+
+  afterAll(config.end)
+
+  describe("importToRows", () => {
+    it("consecutive row have consecutive auto ids", async () => {
+      await config.doInContext(config.appId, async () => {
+        const table = await config.createTable({
+          name: "table",
+          type: "table",
+          schema: {
+            autoId: {
+              name: "autoId",
+              type: FieldType.NUMBER,
+              subtype: AutoFieldSubTypes.AUTO_ID,
+              autocolumn: true,
+              constraints: {
+                type: FieldType.NUMBER,
+                presence: true,
+              },
+            },
+            name: {
+              name: "name",
+              type: FieldType.STRING,
+              constraints: {
+                type: FieldType.STRING,
+                presence: true,
+              },
+            },
+          },
+        })
+
+        const data = [{ name: "Alice" }, { name: "Bob" }, { name: "Claire" }]
+
+        const result = importToRows(data, table, config.user)
+        expect(result).toEqual([
+          expect.objectContaining({
+            autoId: 1,
+            name: "Alice",
+          }),
+          expect.objectContaining({
+            autoId: 2,
+            name: "Bob",
+          }),
+          expect.objectContaining({
+            autoId: 3,
+            name: "Claire",
+          }),
+        ])
+      })
+    })
+  })
+})
diff --git a/packages/server/src/api/controllers/table/utils.ts b/packages/server/src/api/controllers/table/utils.ts
index 7052b8e107..337b8fc5ed 100644
--- a/packages/server/src/api/controllers/table/utils.ts
+++ b/packages/server/src/api/controllers/table/utils.ts
@@ -20,7 +20,13 @@ import viewTemplate from "../view/viewBuilder"
 import { cloneDeep } from "lodash/fp"
 import { quotas } from "@budibase/pro"
 import { events, context } from "@budibase/backend-core"
-import { Database, Datasource, SourceName, Table } from "@budibase/types"
+import {
+  ContextUser,
+  Database,
+  Datasource,
+  SourceName,
+  Table,
+} from "@budibase/types"
 
 export async function clearColumns(table: any, columnNames: any) {
   const db: Database = context.getAppDB()
@@ -99,7 +105,7 @@ export function makeSureTableUpToDate(table: any, tableToSave: any) {
   return tableToSave
 }
 
-export function importToRows(data: any, table: Table, user: any = {}) {
+export function importToRows(data: any[], table: Table, user: ContextUser) {
   let finalData: any = []
   for (let i = 0; i < data.length; i++) {
     let row = data[i]

From 8d45e44e2f4c811b4ddd3af382dcf3750bb8a295 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Thu, 30 Mar 2023 11:30:35 +0100
Subject: [PATCH 13/33] Fix types

---
 .../api/controllers/table/tests/utils.spec.ts | 34 +++++++++++++++++++
 .../server/src/api/controllers/table/utils.ts |  6 +++-
 .../db/defaultData/datasource_bb_default.ts   |  2 +-
 .../src/utilities/rowProcessor/index.ts       |  2 +-
 4 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/api/controllers/table/tests/utils.spec.ts b/packages/server/src/api/controllers/table/tests/utils.spec.ts
index ef143100a4..957cf51ecd 100644
--- a/packages/server/src/api/controllers/table/tests/utils.spec.ts
+++ b/packages/server/src/api/controllers/table/tests/utils.spec.ts
@@ -59,5 +59,39 @@ describe("utils", () => {
         ])
       })
     })
+
+    it("can import data without a specific user performing the action", async () => {
+      await config.doInContext(config.appId, async () => {
+        const table = await config.createTable({
+          name: "table",
+          type: "table",
+          schema: {
+            autoId: {
+              name: "autoId",
+              type: FieldType.NUMBER,
+              subtype: AutoFieldSubTypes.AUTO_ID,
+              autocolumn: true,
+              constraints: {
+                type: FieldType.NUMBER,
+                presence: true,
+              },
+            },
+            name: {
+              name: "name",
+              type: FieldType.STRING,
+              constraints: {
+                type: FieldType.STRING,
+                presence: true,
+              },
+            },
+          },
+        })
+
+        const data = [{ name: "Alice" }, { name: "Bob" }, { name: "Claire" }]
+
+        const result = importToRows(data, table)
+        expect(result).toHaveLength(3)
+      })
+    })
   })
 })
diff --git a/packages/server/src/api/controllers/table/utils.ts b/packages/server/src/api/controllers/table/utils.ts
index 337b8fc5ed..cf1883c083 100644
--- a/packages/server/src/api/controllers/table/utils.ts
+++ b/packages/server/src/api/controllers/table/utils.ts
@@ -105,7 +105,11 @@ export function makeSureTableUpToDate(table: any, tableToSave: any) {
   return tableToSave
 }
 
-export function importToRows(data: any[], table: Table, user: ContextUser) {
+export function importToRows(
+  data: any[],
+  table: Table,
+  user: ContextUser | null = null
+) {
   let finalData: any = []
   for (let i = 0; i < data.length; i++) {
     let row = data[i]
diff --git a/packages/server/src/db/defaultData/datasource_bb_default.ts b/packages/server/src/db/defaultData/datasource_bb_default.ts
index 516783ed31..6ffbf601c8 100644
--- a/packages/server/src/db/defaultData/datasource_bb_default.ts
+++ b/packages/server/src/db/defaultData/datasource_bb_default.ts
@@ -34,7 +34,7 @@ function syncLastIds(table: Table, rowCount: number) {
   })
 }
 
-function tableImport(table: Table, data: Row) {
+function tableImport(table: Table, data: Row[]) {
   const cloneTable = cloneDeep(table)
   const rowDocs = importToRows(data, cloneTable)
   syncLastIds(cloneTable, rowDocs.length)
diff --git a/packages/server/src/utilities/rowProcessor/index.ts b/packages/server/src/utilities/rowProcessor/index.ts
index 9e1029fa1a..a5bb352eeb 100644
--- a/packages/server/src/utilities/rowProcessor/index.ts
+++ b/packages/server/src/utilities/rowProcessor/index.ts
@@ -131,7 +131,7 @@ export function coerce(row: any, type: string) {
  * @returns {object} the row which has been prepared to be written to the DB.
  */
 export function inputProcessing(
-  user: ContextUser,
+  user: ContextUser | null,
   table: Table,
   row: Row,
   opts?: AutoColumnProcessingOpts

From 01c9908696a570745d61c8ef7885d80e144eded2 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Thu, 30 Mar 2023 11:37:03 +0000
Subject: [PATCH 14/33] v2.4.42

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  6 +++---
 packages/builder/package.json          | 12 ++++++------
 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, 40 insertions(+), 40 deletions(-)

diff --git a/lerna.json b/lerna.json
index 2ef1df9a1f..9c9246f71a 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.4.41",
+  "version": "2.4.42",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 5a1fa4c83c..2503c56dbb 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.4.41",
+  "version": "2.4.42",
   "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.41",
+    "@budibase/types": "^2.4.42",
     "@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 71ab358bbf..33f801ac98 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.41",
+  "version": "2.4.42",
   "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.4.41",
-    "@budibase/string-templates": "^2.4.41",
+    "@budibase/shared-core": "^2.4.42",
+    "@budibase/string-templates": "^2.4.42",
     "@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 74420ec679..1e98a23416 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.4.41",
+  "version": "2.4.42",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,11 +58,11 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.4.41",
-    "@budibase/client": "^2.4.41",
-    "@budibase/frontend-core": "^2.4.41",
-    "@budibase/shared-core": "^2.4.41",
-    "@budibase/string-templates": "^2.4.41",
+    "@budibase/bbui": "^2.4.42",
+    "@budibase/client": "^2.4.42",
+    "@budibase/frontend-core": "^2.4.42",
+    "@budibase/shared-core": "^2.4.42",
+    "@budibase/string-templates": "^2.4.42",
     "@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 0bdccdcf89..15266bc063 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.4.41",
+  "version": "2.4.42",
   "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.41",
-    "@budibase/string-templates": "^2.4.41",
-    "@budibase/types": "^2.4.41",
+    "@budibase/backend-core": "^2.4.42",
+    "@budibase/string-templates": "^2.4.42",
+    "@budibase/types": "^2.4.42",
     "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 a3b82b0931..21e1066b05 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.4.41",
+  "version": "2.4.42",
   "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.4.41",
-    "@budibase/frontend-core": "^2.4.41",
-    "@budibase/shared-core": "^2.4.41",
-    "@budibase/string-templates": "^2.4.41",
-    "@budibase/types": "^2.4.41",
+    "@budibase/bbui": "^2.4.42",
+    "@budibase/frontend-core": "^2.4.42",
+    "@budibase/shared-core": "^2.4.42",
+    "@budibase/string-templates": "^2.4.42",
+    "@budibase/types": "^2.4.42",
     "@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 e4ce0bbd0c..324e33060d 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.4.41",
+  "version": "2.4.42",
   "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.41",
-    "@budibase/shared-core": "^2.4.41",
+    "@budibase/bbui": "^2.4.42",
+    "@budibase/shared-core": "^2.4.42",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 64be4c725c..8b3f3b4239 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.4.41",
+  "version": "2.4.42",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 00615f385c..f07d863547 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.41",
+  "version": "2.4.42",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,12 +43,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.4.41",
-    "@budibase/client": "^2.4.41",
+    "@budibase/backend-core": "^2.4.42",
+    "@budibase/client": "^2.4.42",
     "@budibase/pro": "2.4.41",
-    "@budibase/shared-core": "^2.4.41",
-    "@budibase/string-templates": "^2.4.41",
-    "@budibase/types": "^2.4.41",
+    "@budibase/shared-core": "^2.4.42",
+    "@budibase/string-templates": "^2.4.42",
+    "@budibase/types": "^2.4.42",
     "@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 56ffacfa2f..ceb66da7fe 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.4.41",
+  "version": "2.4.42",
   "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.4.41"
+    "@budibase/types": "^2.4.42"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 06a52e8be6..c2cc46de09 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.4.41",
+  "version": "2.4.42",
   "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 bba3281944..3fcf7aac7e 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.4.41",
+  "version": "2.4.42",
   "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 cbb93c8170..37fc6fb826 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.41",
+  "version": "2.4.42",
   "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.41",
+    "@budibase/backend-core": "^2.4.42",
     "@budibase/pro": "2.4.41",
-    "@budibase/string-templates": "^2.4.41",
-    "@budibase/types": "^2.4.41",
+    "@budibase/string-templates": "^2.4.42",
+    "@budibase/types": "^2.4.42",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From de2aecb11e5fd6f26847831d84335ac1e817f7e6 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Thu, 30 Mar 2023 11:40:28 +0000
Subject: [PATCH 15/33] Update pro version to 2.4.42

---
 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 f07d863547..c68b0725a3 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.42",
     "@budibase/client": "^2.4.42",
-    "@budibase/pro": "2.4.41",
+    "@budibase/pro": "2.4.42",
     "@budibase/shared-core": "^2.4.42",
     "@budibase/string-templates": "^2.4.42",
     "@budibase/types": "^2.4.42",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index af04a8bc06..e450d26ae2 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.41":
-  version "2.4.41"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.41.tgz#2c99d9382f92ca3d5b884ea01c67f615c37c4837"
-  integrity sha512-ffVc0O5+CPACLAzN7pLvzCuccbGrhdUnbC7N4zxjQOPpczhmzUFCDOy/UAN0go2/oKMHs2SzCwiMunf3Y+cBFA==
+"@budibase/backend-core@2.4.42":
+  version "2.4.42"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42.tgz#28efa415b09363f47b8e3a0baf4b8f83e1a74a6c"
+  integrity sha512-snokFmHarDqNZm0BWCYeo1mZFuyYI4typAXk8HRX477xdS5g/3cM//aesV4UHceWw6V1cwczKZYqAd22VSfCfA==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "^2.4.41"
+    "@budibase/types" "^2.4.42"
     "@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.41":
-  version "2.4.41"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.41.tgz#4b4d395f38a8a2a86a3275a43f9270b7edfd5788"
-  integrity sha512-DBebpbYUsTchDvitdnTXuQGYjhUyZl7pPFKokvvlgI8Pu0YK4eXtbiMMbd2BVH7wwuJL5o3tUN+pii4IqmXofw==
+"@budibase/pro@2.4.42":
+  version "2.4.42"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42.tgz#c55b26e39f449f223532d922240261157b12b6e0"
+  integrity sha512-2FuDiv5xPMEVbQR1QiwGYkah+zeEU7qclP2JYLpwnFjmwxpUvldAVGQuG1q/LMZddFLIdwHd3tVnIEHHGK76TQ==
   dependencies:
-    "@budibase/backend-core" "2.4.41"
+    "@budibase/backend-core" "2.4.42"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.41"
+    "@budibase/types" "2.4.42"
     "@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.41", "@budibase/types@^2.4.41":
-  version "2.4.41"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.41.tgz#582328dd0037b4b0ad30d39e6524eac256e7320a"
-  integrity sha512-N3Jp46UH2wZ66iOUcSID1Nh8f+hVApytn7vgTT2mOiRwyXzWSxJQFjv9TUh8A8lLV6Qe/rLQVcp/GIQyyIFtDw==
+"@budibase/types@2.4.42", "@budibase/types@^2.4.42":
+  version "2.4.42"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42.tgz#04ac509acda1960179c526ba3af92a9331c951b6"
+  integrity sha512-Dxql/99o4AAkRkZDLrKeDK2ON2qiV0q/nYffdyJ8uCQiyFNKA9e1GyQlbsJORmqYCqkEGzTtcmW+zBtdvmtB3Q==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 37fc6fb826..c929cb31a9 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.42",
-    "@budibase/pro": "2.4.41",
+    "@budibase/pro": "2.4.42",
     "@budibase/string-templates": "^2.4.42",
     "@budibase/types": "^2.4.42",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index bb51443833..32f57398a0 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.41":
-  version "2.4.41"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.41.tgz#2c99d9382f92ca3d5b884ea01c67f615c37c4837"
-  integrity sha512-ffVc0O5+CPACLAzN7pLvzCuccbGrhdUnbC7N4zxjQOPpczhmzUFCDOy/UAN0go2/oKMHs2SzCwiMunf3Y+cBFA==
+"@budibase/backend-core@2.4.42":
+  version "2.4.42"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42.tgz#28efa415b09363f47b8e3a0baf4b8f83e1a74a6c"
+  integrity sha512-snokFmHarDqNZm0BWCYeo1mZFuyYI4typAXk8HRX477xdS5g/3cM//aesV4UHceWw6V1cwczKZYqAd22VSfCfA==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "^2.4.41"
+    "@budibase/types" "^2.4.42"
     "@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.41":
-  version "2.4.41"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.41.tgz#4b4d395f38a8a2a86a3275a43f9270b7edfd5788"
-  integrity sha512-DBebpbYUsTchDvitdnTXuQGYjhUyZl7pPFKokvvlgI8Pu0YK4eXtbiMMbd2BVH7wwuJL5o3tUN+pii4IqmXofw==
+"@budibase/pro@2.4.42":
+  version "2.4.42"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42.tgz#c55b26e39f449f223532d922240261157b12b6e0"
+  integrity sha512-2FuDiv5xPMEVbQR1QiwGYkah+zeEU7qclP2JYLpwnFjmwxpUvldAVGQuG1q/LMZddFLIdwHd3tVnIEHHGK76TQ==
   dependencies:
-    "@budibase/backend-core" "2.4.41"
+    "@budibase/backend-core" "2.4.42"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.41"
+    "@budibase/types" "2.4.42"
     "@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.41", "@budibase/types@^2.4.41":
-  version "2.4.41"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.41.tgz#582328dd0037b4b0ad30d39e6524eac256e7320a"
-  integrity sha512-N3Jp46UH2wZ66iOUcSID1Nh8f+hVApytn7vgTT2mOiRwyXzWSxJQFjv9TUh8A8lLV6Qe/rLQVcp/GIQyyIFtDw==
+"@budibase/types@2.4.42", "@budibase/types@^2.4.42":
+  version "2.4.42"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42.tgz#04ac509acda1960179c526ba3af92a9331c951b6"
+  integrity sha512-Dxql/99o4AAkRkZDLrKeDK2ON2qiV0q/nYffdyJ8uCQiyFNKA9e1GyQlbsJORmqYCqkEGzTtcmW+zBtdvmtB3Q==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From b8fe9671b126d6e2f7579c1c70a23fefec8e725e Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Thu, 30 Mar 2023 15:12:40 +0100
Subject: [PATCH 16/33] Rename test

---
 packages/server/src/sdk/users/tests/utils.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/sdk/users/tests/utils.spec.ts b/packages/server/src/sdk/users/tests/utils.spec.ts
index 69f1bdf9e6..a31f66752e 100644
--- a/packages/server/src/sdk/users/tests/utils.spec.ts
+++ b/packages/server/src/sdk/users/tests/utils.spec.ts
@@ -98,7 +98,7 @@ describe("syncGlobalUsers", () => {
     })
   })
 
-  it("app users are removed when user removed from user group", async () => {
+  it("app users are removed when app is removed from user group", async () => {
     await config.doInTenant(async () => {
       const group = await proSdk.groups.save(structures.userGroups.userGroup())
       const user1 = await config.createUser({ admin: false, builder: false })

From 2dd8b078e577d1ddde66c9a056daeb1391f3b639 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Thu, 30 Mar 2023 15:14:16 +0100
Subject: [PATCH 17/33] Test removing users from group

---
 .../server/src/sdk/users/tests/utils.spec.ts  | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/packages/server/src/sdk/users/tests/utils.spec.ts b/packages/server/src/sdk/users/tests/utils.spec.ts
index a31f66752e..d5d43a0c04 100644
--- a/packages/server/src/sdk/users/tests/utils.spec.ts
+++ b/packages/server/src/sdk/users/tests/utils.spec.ts
@@ -124,4 +124,35 @@ describe("syncGlobalUsers", () => {
       })
     })
   })
+
+  it("app users are removed when app is removed from user group", async () => {
+    await config.doInTenant(async () => {
+      const group = await proSdk.groups.save(structures.userGroups.userGroup())
+      const user1 = await config.createUser({ admin: false, builder: false })
+      const user2 = await config.createUser({ admin: false, builder: false })
+      await proSdk.groups.updateGroupApps(group.id, {
+        appsToAdd: [
+          { appId: config.prodAppId!, roleId: roles.BUILTIN_ROLE_IDS.BASIC },
+        ],
+      })
+      await proSdk.groups.addUsers(group.id, [user1._id, user2._id])
+
+      await config.doInContext(config.appId, async () => {
+        await syncGlobalUsers()
+        expect(await rawUserMetadata()).toHaveLength(3)
+
+        await proSdk.groups.removeUsers(group.id, [user1._id])
+        await syncGlobalUsers()
+
+        const metadata = await rawUserMetadata()
+        expect(metadata).toHaveLength(2)
+
+        expect(metadata).not.toContainEqual(
+          expect.objectContaining({
+            _id: db.generateUserMetadataID(user1._id),
+          })
+        )
+      })
+    })
+  })
 })

From 8e8f4ac02d55d3d33bb10601ae96d390b4858333 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Thu, 30 Mar 2023 15:16:45 +0100
Subject: [PATCH 18/33] Add extra assertion

---
 packages/server/src/sdk/users/tests/utils.spec.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/server/src/sdk/users/tests/utils.spec.ts b/packages/server/src/sdk/users/tests/utils.spec.ts
index d5d43a0c04..11c2c53643 100644
--- a/packages/server/src/sdk/users/tests/utils.spec.ts
+++ b/packages/server/src/sdk/users/tests/utils.spec.ts
@@ -32,6 +32,7 @@ describe("syncGlobalUsers", () => {
     const user1 = await config.createUser({ admin: true })
     const user2 = await config.createUser({ admin: false, builder: true })
     await config.doInContext(config.appId, async () => {
+      expect(await rawUserMetadata()).toHaveLength(1)
       await syncGlobalUsers()
 
       const metadata = await rawUserMetadata()

From 79bec7d86d3945771d787975c3d10226d6afb53a Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Fri, 31 Mar 2023 10:32:13 +0100
Subject: [PATCH 19/33] Add force exit, -e flag and streaming to tests (#10151)

* Add force exit, -e flag and streaming to tests

* Temp remove script usage from worker tests

* Revert "Temp remove script usage from worker tests"

This reverts commit 5e0ed2e92d01bbc6d1434f1b7daa88a15f9dba3b.

* Always fail test

* Ignore server test package from coverage report

* Unscope server only

* Run all server tests again

* Update backend core test script to fail when any command fails and force exit

* Don't try to require client in test

* Port memory limit fix from develop

* Remove always failing test and commented out block for client require

* Fixing some issues with test cases.

* Revert assertions in internalSearch.spec.js

---------

Co-authored-by: mike12345567 <me@michaeldrury.co.uk>
---
 package.json                                  |   2 +-
 packages/backend-core/scripts/test.sh         |   9 +-
 packages/backend-core/tests/jestEnv.ts        |   1 +
 packages/server/__mocks__/node-fetch.ts       |   7 +-
 packages/server/jest.config.ts                |   1 +
 packages/server/scripts/test.sh               |  10 +-
 .../server/src/api/controllers/row/utils.ts   |   7 +-
 .../src/api/routes/tests/appSync.spec.ts      |  31 ++++++
 .../api/routes/tests/internalSearch.spec.js   |   3 +-
 .../src/integration-test/postgres.spec.ts     | 104 +++++++++---------
 .../integrations/tests/googlesheets.spec.ts   |  22 ++--
 packages/server/src/tests/jestEnv.ts          |   1 +
 .../src/tests/utilities/TestConfiguration.ts  |  11 ++
 .../src/utilities/fileSystem/filesystem.ts    |   4 -
 packages/shared-core/yarn.lock                |   5 -
 packages/worker/scripts/test.sh               |   9 +-
 packages/worker/src/tests/jestEnv.ts          |   1 +
 17 files changed, 133 insertions(+), 95 deletions(-)
 create mode 100644 packages/server/src/api/routes/tests/appSync.spec.ts

diff --git a/package.json b/package.json
index 815e470916..1ae713f96c 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": "lerna run test --stream",
     "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}\"",
diff --git a/packages/backend-core/scripts/test.sh b/packages/backend-core/scripts/test.sh
index 4bf1900984..3d8240e65a 100644
--- a/packages/backend-core/scripts/test.sh
+++ b/packages/backend-core/scripts/test.sh
@@ -1,12 +1,13 @@
 #!/bin/bash
+set -e
 
 if [[ -n $CI ]]
 then
   # --runInBand performs better in ci where resources are limited
-  echo "jest --coverage --runInBand"
-  jest --coverage --runInBand
+  echo "jest --coverage --runInBand --forceExit"
+  jest --coverage --runInBand --forceExit
 else
   # --maxWorkers performs better in development
-  echo "jest --coverage"
-  jest --coverage
+  echo "jest --coverage --forceExit"
+  jest --coverage --forceExit
 fi
\ No newline at end of file
diff --git a/packages/backend-core/tests/jestEnv.ts b/packages/backend-core/tests/jestEnv.ts
index ec8de2942e..3555973928 100644
--- a/packages/backend-core/tests/jestEnv.ts
+++ b/packages/backend-core/tests/jestEnv.ts
@@ -4,3 +4,4 @@ process.env.NODE_ENV = "jest"
 process.env.MOCK_REDIS = "1"
 process.env.LOG_LEVEL = process.env.LOG_LEVEL || "error"
 process.env.ENABLE_4XX_HTTP_LOGGING = "0"
+process.env.REDIS_PASSWORD = "budibase"
diff --git a/packages/server/__mocks__/node-fetch.ts b/packages/server/__mocks__/node-fetch.ts
index fdf44d173d..acf0294e76 100644
--- a/packages/server/__mocks__/node-fetch.ts
+++ b/packages/server/__mocks__/node-fetch.ts
@@ -4,6 +4,7 @@ module FetchMock {
   // @ts-ignore
   const fetch = jest.requireActual("node-fetch")
   let failCount = 0
+  let mockSearch = false
 
   const func = async (url: any, opts: any) => {
     function json(body: any, status = 200) {
@@ -69,7 +70,7 @@ module FetchMock {
         },
         404
       )
-    } else if (url.includes("_search")) {
+    } else if (mockSearch && url.includes("_search")) {
       const body = opts.body
       const parts = body.split("tableId:")
       let tableId
@@ -192,5 +193,9 @@ module FetchMock {
 
   func.Headers = fetch.Headers
 
+  func.mockSearch = () => {
+    mockSearch = true
+  }
+
   module.exports = func
 }
diff --git a/packages/server/jest.config.ts b/packages/server/jest.config.ts
index 03eca3705b..7df9190af8 100644
--- a/packages/server/jest.config.ts
+++ b/packages/server/jest.config.ts
@@ -43,6 +43,7 @@ const config: Config.InitialOptions = {
     "../backend-core/src/**/*.{js,ts}",
     // The use of coverage with couchdb view functions breaks tests
     "!src/db/views/staticViews.*",
+    "!src/tests/**/*.{js,ts}",
   ],
   coverageReporters: ["lcov", "json", "clover"],
 }
diff --git a/packages/server/scripts/test.sh b/packages/server/scripts/test.sh
index 2f3f54cb25..f3f679c4da 100644
--- a/packages/server/scripts/test.sh
+++ b/packages/server/scripts/test.sh
@@ -1,12 +1,14 @@
 #!/bin/bash
+set -e
 
 if [[ -n $CI ]]
 then
   # --runInBand performs better in ci where resources are limited
-  echo "jest --coverage --runInBand"
-  jest --coverage --runInBand
+  export NODE_OPTIONS="--max-old-space-size=4096"
+  echo "jest --coverage --runInBand --forceExit"
+  jest --coverage --runInBand --forceExit
 else
   # --maxWorkers performs better in development
-  echo "jest --coverage --maxWorkers=2"
-  jest --coverage --maxWorkers=2
+  echo "jest --coverage --maxWorkers=2 --forceExit"
+  jest --coverage --maxWorkers=2 --forceExit
 fi
\ No newline at end of file
diff --git a/packages/server/src/api/controllers/row/utils.ts b/packages/server/src/api/controllers/row/utils.ts
index 2e8f2f4536..2cf3b5472f 100644
--- a/packages/server/src/api/controllers/row/utils.ts
+++ b/packages/server/src/api/controllers/row/utils.ts
@@ -62,10 +62,11 @@ export async function validate({
   }
   const errors: any = {}
   for (let fieldName of Object.keys(fetchedTable.schema)) {
-    const constraints = cloneDeep(fetchedTable.schema[fieldName].constraints)
-    const type = fetchedTable.schema[fieldName].type
+    const column = fetchedTable.schema[fieldName]
+    const constraints = cloneDeep(column.constraints)
+    const type = column.type
     // formulas shouldn't validated, data will be deleted anyway
-    if (type === FieldTypes.FORMULA) {
+    if (type === FieldTypes.FORMULA || column.autocolumn) {
       continue
     }
     // special case for options, need to always allow unselected (null)
diff --git a/packages/server/src/api/routes/tests/appSync.spec.ts b/packages/server/src/api/routes/tests/appSync.spec.ts
new file mode 100644
index 0000000000..f82f62405e
--- /dev/null
+++ b/packages/server/src/api/routes/tests/appSync.spec.ts
@@ -0,0 +1,31 @@
+import * as setup from "./utilities"
+import { roles, db as dbCore } from "@budibase/backend-core"
+
+describe("/api/applications/:appId/sync", () => {
+  let request = setup.getRequest()
+  let config = setup.getConfig()
+  let app
+
+  afterAll(setup.afterAll)
+
+  beforeAll(async () => {
+    app = await config.init()
+    // create some users which we will use throughout the tests
+    await config.createUser({
+      email: "sync1@test.com",
+      roles: {
+        [app._id!]: roles.BUILTIN_ROLE_IDS.BASIC,
+      },
+    })
+  })
+
+  async function getUserMetadata() {
+    const { rows } = await config.searchRows(dbCore.InternalTable.USER_METADATA)
+    return rows
+  }
+
+  it("make sure its empty initially", async () => {
+    const rows = await getUserMetadata()
+    expect(rows.length).toBe(1)
+  })
+})
diff --git a/packages/server/src/api/routes/tests/internalSearch.spec.js b/packages/server/src/api/routes/tests/internalSearch.spec.js
index 8b821ce741..daef03c451 100644
--- a/packages/server/src/api/routes/tests/internalSearch.spec.js
+++ b/packages/server/src/api/routes/tests/internalSearch.spec.js
@@ -1,6 +1,7 @@
+const fetch = require("node-fetch")
+fetch.mockSearch()
 const search = require("../../controllers/row/internalSearch")
 // this will be mocked out for _search endpoint
-const fetch = require("node-fetch")
 const PARAMS = {
   tableId: "ta_12345679abcdef",
   version: "1",
diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts
index 2afff8b786..fab1fcf618 100644
--- a/packages/server/src/integration-test/postgres.spec.ts
+++ b/packages/server/src/integration-test/postgres.spec.ts
@@ -1,3 +1,6 @@
+import fetch from "node-fetch"
+// @ts-ignore
+fetch.mockSearch()
 import {
   generateMakeRequest,
   MakeRequestResponse,
@@ -16,6 +19,7 @@ import _ from "lodash"
 import { generator } from "@budibase/backend-core/tests"
 import { utils } from "@budibase/backend-core"
 import { GenericContainer } from "testcontainers"
+import { generateRowIdField } from "../integrations/utils"
 
 const config = setup.getConfig()!
 
@@ -80,16 +84,10 @@ describe("row api - postgres", () => {
             name: "id",
             type: FieldType.AUTO,
             autocolumn: true,
-            constraints: {
-              presence: true,
-            },
           },
           title: {
             name: "title",
             type: FieldType.STRING,
-            constraints: {
-              presence: true,
-            },
           },
         },
         sourceId: postgresDatasource._id,
@@ -121,16 +119,10 @@ describe("row api - postgres", () => {
           name: "id",
           type: FieldType.AUTO,
           autocolumn: true,
-          constraints: {
-            presence: true,
-          },
         },
         name: {
           name: "name",
           type: FieldType.STRING,
-          constraints: {
-            presence: true,
-          },
         },
         description: {
           name: "description",
@@ -144,7 +136,6 @@ describe("row api - postgres", () => {
           type: FieldType.LINK,
           constraints: {
             type: "array",
-            presence: false,
           },
           fieldName: oneToManyRelationshipInfo.fieldName,
           name: "oneToManyRelation",
@@ -156,7 +147,6 @@ describe("row api - postgres", () => {
           type: FieldType.LINK,
           constraints: {
             type: "array",
-            presence: false,
           },
           fieldName: manyToOneRelationshipInfo.fieldName,
           name: "manyToOneRelation",
@@ -168,7 +158,6 @@ describe("row api - postgres", () => {
           type: FieldType.LINK,
           constraints: {
             type: "array",
-            presence: false,
           },
           fieldName: manyToManyRelationshipInfo.fieldName,
           name: "manyToManyRelation",
@@ -309,9 +298,6 @@ describe("row api - postgres", () => {
         id: {
           name: "id",
           type: FieldType.AUTO,
-          constraints: {
-            presence: true,
-          },
         },
       },
       sourceId: postgresDatasource._id,
@@ -921,47 +907,55 @@ describe("row api - postgres", () => {
             foreignRows,
             x => x.relationshipType
           )
-          expect(res.body).toEqual({
-            ...rowData,
-            [`fk_${oneToManyRelationshipInfo.table.name}_${oneToManyRelationshipInfo.fieldName}`]:
-              foreignRowsByType[RelationshipTypes.ONE_TO_MANY][0].row.id,
-            [oneToManyRelationshipInfo.fieldName]: [
+          const m2mFieldName = manyToManyRelationshipInfo.fieldName,
+            o2mFieldName = oneToManyRelationshipInfo.fieldName,
+            m2oFieldName = manyToOneRelationshipInfo.fieldName
+          const m2mRow1 = res.body[m2mFieldName].find(
+            (row: Row) => row.id === 1
+          )
+          const m2mRow2 = res.body[m2mFieldName].find(
+            (row: Row) => row.id === 2
+          )
+          expect(m2mRow1).toEqual({
+            ...foreignRowsByType[RelationshipTypes.MANY_TO_MANY][0].row,
+            [m2mFieldName]: [
               {
-                ...foreignRowsByType[RelationshipTypes.ONE_TO_MANY][0].row,
-                _id: expect.any(String),
-                _rev: expect.any(String),
+                _id: row._id,
               },
             ],
-            [manyToOneRelationshipInfo.fieldName]: [
-              {
-                ...foreignRowsByType[RelationshipTypes.MANY_TO_ONE][0].row,
-                [`fk_${manyToOneRelationshipInfo.table.name}_${manyToOneRelationshipInfo.fieldName}`]:
-                  row.id,
-              },
-              {
-                ...foreignRowsByType[RelationshipTypes.MANY_TO_ONE][1].row,
-                [`fk_${manyToOneRelationshipInfo.table.name}_${manyToOneRelationshipInfo.fieldName}`]:
-                  row.id,
-              },
-              {
-                ...foreignRowsByType[RelationshipTypes.MANY_TO_ONE][2].row,
-                [`fk_${manyToOneRelationshipInfo.table.name}_${manyToOneRelationshipInfo.fieldName}`]:
-                  row.id,
-              },
-            ],
-            [manyToManyRelationshipInfo.fieldName]: [
-              {
-                ...foreignRowsByType[RelationshipTypes.MANY_TO_MANY][0].row,
-              },
-              {
-                ...foreignRowsByType[RelationshipTypes.MANY_TO_MANY][1].row,
-              },
-            ],
-            id: row.id,
-            tableId: row.tableId,
-            _id: expect.any(String),
-            _rev: expect.any(String),
           })
+          expect(m2mRow2).toEqual({
+            ...foreignRowsByType[RelationshipTypes.MANY_TO_MANY][1].row,
+            [m2mFieldName]: [
+              {
+                _id: row._id,
+              },
+            ],
+          })
+          expect(res.body[m2oFieldName]).toEqual([
+            {
+              ...foreignRowsByType[RelationshipTypes.MANY_TO_ONE][0].row,
+              [`fk_${manyToOneRelationshipInfo.table.name}_${manyToOneRelationshipInfo.fieldName}`]:
+                row.id,
+            },
+            {
+              ...foreignRowsByType[RelationshipTypes.MANY_TO_ONE][1].row,
+              [`fk_${manyToOneRelationshipInfo.table.name}_${manyToOneRelationshipInfo.fieldName}`]:
+                row.id,
+            },
+            {
+              ...foreignRowsByType[RelationshipTypes.MANY_TO_ONE][2].row,
+              [`fk_${manyToOneRelationshipInfo.table.name}_${manyToOneRelationshipInfo.fieldName}`]:
+                row.id,
+            },
+          ])
+          expect(res.body[o2mFieldName]).toEqual([
+            {
+              ...foreignRowsByType[RelationshipTypes.ONE_TO_MANY][0].row,
+              _id: expect.any(String),
+              _rev: expect.any(String),
+            },
+          ])
         })
       })
     })
diff --git a/packages/server/src/integrations/tests/googlesheets.spec.ts b/packages/server/src/integrations/tests/googlesheets.spec.ts
index 5d7c184abd..eb263bd850 100644
--- a/packages/server/src/integrations/tests/googlesheets.spec.ts
+++ b/packages/server/src/integrations/tests/googlesheets.spec.ts
@@ -99,8 +99,8 @@ describe("Google Sheets Integration", () => {
       })
     })
 
-    test("removing an existing field will not remove the data from the spreadsheet", async () => {
-      await config.doInContext(structures.uuid(), async () => {
+    test("removing an existing field will remove the header from the google sheet", async () => {
+      const sheet = await config.doInContext(structures.uuid(), async () => {
         const tableColumns = ["name"]
         const table = createBasicTable(structures.uuid(), tableColumns)
 
@@ -109,18 +109,14 @@ describe("Google Sheets Integration", () => {
         })
         sheetsByTitle[table.name] = sheet
         await integration.updateTable(table)
-
-        expect(sheet.loadHeaderRow).toBeCalledTimes(1)
-        expect(sheet.setHeaderRow).toBeCalledTimes(1)
-        expect(sheet.setHeaderRow).toBeCalledWith([
-          "name",
-          "description",
-          "location",
-        ])
-
-        // No undefineds are sent
-        expect((sheet.setHeaderRow as any).mock.calls[0][0]).toHaveLength(3)
+        return sheet
       })
+      expect(sheet.loadHeaderRow).toBeCalledTimes(1)
+      expect(sheet.setHeaderRow).toBeCalledTimes(1)
+      expect(sheet.setHeaderRow).toBeCalledWith(["name"])
+
+      // No undefined are sent
+      expect((sheet.setHeaderRow as any).mock.calls[0][0]).toHaveLength(1)
     })
   })
 })
diff --git a/packages/server/src/tests/jestEnv.ts b/packages/server/src/tests/jestEnv.ts
index 7727bb6007..1f76bccd5f 100644
--- a/packages/server/src/tests/jestEnv.ts
+++ b/packages/server/src/tests/jestEnv.ts
@@ -9,3 +9,4 @@ process.env.LOG_LEVEL = process.env.LOG_LEVEL || "error"
 process.env.ENABLE_4XX_HTTP_LOGGING = "0"
 process.env.MOCK_REDIS = "1"
 process.env.PLATFORM_URL = "http://localhost:10000"
+process.env.REDIS_PASSWORD = "budibase"
diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts
index cf0585efd1..80f804d219 100644
--- a/packages/server/src/tests/utilities/TestConfiguration.ts
+++ b/packages/server/src/tests/utilities/TestConfiguration.ts
@@ -46,6 +46,7 @@ import {
   Row,
   SourceName,
   Table,
+  SearchFilters,
 } from "@budibase/types"
 
 type DefaultUserValues = {
@@ -568,6 +569,16 @@ class TestConfiguration {
     return this._req(null, { tableId }, controllers.row.fetch)
   }
 
+  async searchRows(tableId: string, searchParams: SearchFilters = {}) {
+    if (!tableId && this.table) {
+      tableId = this.table._id
+    }
+    const body = {
+      query: searchParams,
+    }
+    return this._req(body, { tableId }, controllers.row.search)
+  }
+
   // ROLE
 
   async createRole(config?: any) {
diff --git a/packages/server/src/utilities/fileSystem/filesystem.ts b/packages/server/src/utilities/fileSystem/filesystem.ts
index 086eaa835a..6d3c6d48f6 100644
--- a/packages/server/src/utilities/fileSystem/filesystem.ts
+++ b/packages/server/src/utilities/fileSystem/filesystem.ts
@@ -24,10 +24,6 @@ export const init = () => {
       }
     }
   }
-  const clientLibPath = join(budibaseTempDir(), "budibase-client.js")
-  if (env.isTest() && !fs.existsSync(clientLibPath)) {
-    fs.copyFileSync(require.resolve("@budibase/client"), clientLibPath)
-  }
 }
 
 /**
diff --git a/packages/shared-core/yarn.lock b/packages/shared-core/yarn.lock
index c1578954fc..95d82a9a94 100644
--- a/packages/shared-core/yarn.lock
+++ b/packages/shared-core/yarn.lock
@@ -2,11 +2,6 @@
 # yarn lockfile v1
 
 
-"@budibase/types@2.4.5-alpha.0":
-  version "2.4.5-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.5-alpha.0.tgz#70fea09b5e471fe8fa6a760a1a2dd0dd74caac3a"
-  integrity sha512-tVFM9XnKwcCOo7nw6v7C8ZsK9hQLQBv3kHDn7/MFWnDMFCj72pUdtP/iFrAKr2c3tE84lkkWJfNHIolMSktHZA==
-
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
diff --git a/packages/worker/scripts/test.sh b/packages/worker/scripts/test.sh
index 2f3f54cb25..d7659a9318 100644
--- a/packages/worker/scripts/test.sh
+++ b/packages/worker/scripts/test.sh
@@ -1,12 +1,13 @@
 #!/bin/bash
+set -e
 
 if [[ -n $CI ]]
 then
   # --runInBand performs better in ci where resources are limited
-  echo "jest --coverage --runInBand"
-  jest --coverage --runInBand
+  echo "jest --coverage --runInBand --forceExit"
+  jest --coverage --runInBand --forceExit
 else
   # --maxWorkers performs better in development
-  echo "jest --coverage --maxWorkers=2"
-  jest --coverage --maxWorkers=2
+  echo "jest --coverage --maxWorkers=2 --forceExit"
+  jest --coverage --maxWorkers=2 --forceExit
 fi
\ No newline at end of file
diff --git a/packages/worker/src/tests/jestEnv.ts b/packages/worker/src/tests/jestEnv.ts
index 061897451e..5784e44dcf 100644
--- a/packages/worker/src/tests/jestEnv.ts
+++ b/packages/worker/src/tests/jestEnv.ts
@@ -10,3 +10,4 @@ process.env.MINIO_SECRET_KEY = "test"
 process.env.PLATFORM_URL = "http://localhost:10000"
 process.env.INTERNAL_API_KEY = "tet"
 process.env.DISABLE_ACCOUNT_PORTAL = "0"
+process.env.REDIS_PASSWORD = "budibase"

From 2118bcea3abb6cd71b63e35f94bb303b459567c1 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 31 Mar 2023 09:42:50 +0000
Subject: [PATCH 20/33] v2.4.43

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  6 +++---
 packages/builder/package.json          | 12 ++++++------
 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, 40 insertions(+), 40 deletions(-)

diff --git a/lerna.json b/lerna.json
index 9c9246f71a..7db5c851c2 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.4.42",
+  "version": "2.4.43",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 2503c56dbb..fcc5acd8d3 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.4.42",
+  "version": "2.4.43",
   "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.42",
+    "@budibase/types": "^2.4.43",
     "@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 33f801ac98..c4cf512fce 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.42",
+  "version": "2.4.43",
   "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.4.42",
-    "@budibase/string-templates": "^2.4.42",
+    "@budibase/shared-core": "^2.4.43",
+    "@budibase/string-templates": "^2.4.43",
     "@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 1e98a23416..51bce9ab4a 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.4.42",
+  "version": "2.4.43",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,11 +58,11 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.4.42",
-    "@budibase/client": "^2.4.42",
-    "@budibase/frontend-core": "^2.4.42",
-    "@budibase/shared-core": "^2.4.42",
-    "@budibase/string-templates": "^2.4.42",
+    "@budibase/bbui": "^2.4.43",
+    "@budibase/client": "^2.4.43",
+    "@budibase/frontend-core": "^2.4.43",
+    "@budibase/shared-core": "^2.4.43",
+    "@budibase/string-templates": "^2.4.43",
     "@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 15266bc063..a2ee6f127b 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.4.42",
+  "version": "2.4.43",
   "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.42",
-    "@budibase/string-templates": "^2.4.42",
-    "@budibase/types": "^2.4.42",
+    "@budibase/backend-core": "^2.4.43",
+    "@budibase/string-templates": "^2.4.43",
+    "@budibase/types": "^2.4.43",
     "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 21e1066b05..314cb9604d 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.4.42",
+  "version": "2.4.43",
   "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.4.42",
-    "@budibase/frontend-core": "^2.4.42",
-    "@budibase/shared-core": "^2.4.42",
-    "@budibase/string-templates": "^2.4.42",
-    "@budibase/types": "^2.4.42",
+    "@budibase/bbui": "^2.4.43",
+    "@budibase/frontend-core": "^2.4.43",
+    "@budibase/shared-core": "^2.4.43",
+    "@budibase/string-templates": "^2.4.43",
+    "@budibase/types": "^2.4.43",
     "@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 324e33060d..ba04b519be 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.4.42",
+  "version": "2.4.43",
   "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.42",
-    "@budibase/shared-core": "^2.4.42",
+    "@budibase/bbui": "^2.4.43",
+    "@budibase/shared-core": "^2.4.43",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 8b3f3b4239..eecd104f0d 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.4.42",
+  "version": "2.4.43",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index c68b0725a3..3d303733f5 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.42",
+  "version": "2.4.43",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,12 +43,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.4.42",
-    "@budibase/client": "^2.4.42",
+    "@budibase/backend-core": "^2.4.43",
+    "@budibase/client": "^2.4.43",
     "@budibase/pro": "2.4.42",
-    "@budibase/shared-core": "^2.4.42",
-    "@budibase/string-templates": "^2.4.42",
-    "@budibase/types": "^2.4.42",
+    "@budibase/shared-core": "^2.4.43",
+    "@budibase/string-templates": "^2.4.43",
+    "@budibase/types": "^2.4.43",
     "@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 ceb66da7fe..9ea61a9af7 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.4.42",
+  "version": "2.4.43",
   "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.4.42"
+    "@budibase/types": "^2.4.43"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index c2cc46de09..24a0edc652 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.4.42",
+  "version": "2.4.43",
   "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 3fcf7aac7e..89bce8dc0d 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.4.42",
+  "version": "2.4.43",
   "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 c929cb31a9..fc084f3fff 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.42",
+  "version": "2.4.43",
   "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.42",
+    "@budibase/backend-core": "^2.4.43",
     "@budibase/pro": "2.4.42",
-    "@budibase/string-templates": "^2.4.42",
-    "@budibase/types": "^2.4.42",
+    "@budibase/string-templates": "^2.4.43",
+    "@budibase/types": "^2.4.43",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 78f76ca0dfc82f7824a2fceb395020bdccad5f3b Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 31 Mar 2023 09:46:24 +0000
Subject: [PATCH 21/33] Update pro version to 2.4.43

---
 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 3d303733f5..16670e2237 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.43",
     "@budibase/client": "^2.4.43",
-    "@budibase/pro": "2.4.42",
+    "@budibase/pro": "2.4.43",
     "@budibase/shared-core": "^2.4.43",
     "@budibase/string-templates": "^2.4.43",
     "@budibase/types": "^2.4.43",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index e450d26ae2..3550c6158d 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.42":
-  version "2.4.42"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42.tgz#28efa415b09363f47b8e3a0baf4b8f83e1a74a6c"
-  integrity sha512-snokFmHarDqNZm0BWCYeo1mZFuyYI4typAXk8HRX477xdS5g/3cM//aesV4UHceWw6V1cwczKZYqAd22VSfCfA==
+"@budibase/backend-core@2.4.43":
+  version "2.4.43"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.43.tgz#801cdad706a90f6718e9323dd66e7e664cc9b287"
+  integrity sha512-pxMjFsCugkR/lR6XsA4bAbBEnUta92jjeUIY4C//hjczHF0lwEUWqhhR8QRCMaNTrWoJfZBFGnJyNIqfguyDVw==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "^2.4.42"
+    "@budibase/types" "^2.4.43"
     "@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.42":
-  version "2.4.42"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42.tgz#c55b26e39f449f223532d922240261157b12b6e0"
-  integrity sha512-2FuDiv5xPMEVbQR1QiwGYkah+zeEU7qclP2JYLpwnFjmwxpUvldAVGQuG1q/LMZddFLIdwHd3tVnIEHHGK76TQ==
+"@budibase/pro@2.4.43":
+  version "2.4.43"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.43.tgz#e717000a26fd4c183a984a141965945a26ac83d9"
+  integrity sha512-J/Up28bSV5E2UTQBpaTOXvNG1jQqRj8fcZH5TSqS7ymJ2H4OyLOQvEGFL3roCGnN3Dgrzkfv9LBO0JyRORVtSw==
   dependencies:
-    "@budibase/backend-core" "2.4.42"
+    "@budibase/backend-core" "2.4.43"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.42"
+    "@budibase/types" "2.4.43"
     "@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.42", "@budibase/types@^2.4.42":
-  version "2.4.42"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42.tgz#04ac509acda1960179c526ba3af92a9331c951b6"
-  integrity sha512-Dxql/99o4AAkRkZDLrKeDK2ON2qiV0q/nYffdyJ8uCQiyFNKA9e1GyQlbsJORmqYCqkEGzTtcmW+zBtdvmtB3Q==
+"@budibase/types@2.4.43", "@budibase/types@^2.4.43":
+  version "2.4.43"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.43.tgz#2f6e609bada8855c83dfb26deb3b2d64dbb2d401"
+  integrity sha512-OWr8dNjk3VjjAJ4Rni/+AMGDtCDhz7LrZqxgedL0wKiRwgwkSiBNExh1eIZ/NKlt1vZrzH/GG5jhzlPkYqDTQg==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index fc084f3fff..a738524244 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.43",
-    "@budibase/pro": "2.4.42",
+    "@budibase/pro": "2.4.43",
     "@budibase/string-templates": "^2.4.43",
     "@budibase/types": "^2.4.43",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 32f57398a0..c5b9acf663 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.42":
-  version "2.4.42"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42.tgz#28efa415b09363f47b8e3a0baf4b8f83e1a74a6c"
-  integrity sha512-snokFmHarDqNZm0BWCYeo1mZFuyYI4typAXk8HRX477xdS5g/3cM//aesV4UHceWw6V1cwczKZYqAd22VSfCfA==
+"@budibase/backend-core@2.4.43":
+  version "2.4.43"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.43.tgz#801cdad706a90f6718e9323dd66e7e664cc9b287"
+  integrity sha512-pxMjFsCugkR/lR6XsA4bAbBEnUta92jjeUIY4C//hjczHF0lwEUWqhhR8QRCMaNTrWoJfZBFGnJyNIqfguyDVw==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "^2.4.42"
+    "@budibase/types" "^2.4.43"
     "@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.42":
-  version "2.4.42"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42.tgz#c55b26e39f449f223532d922240261157b12b6e0"
-  integrity sha512-2FuDiv5xPMEVbQR1QiwGYkah+zeEU7qclP2JYLpwnFjmwxpUvldAVGQuG1q/LMZddFLIdwHd3tVnIEHHGK76TQ==
+"@budibase/pro@2.4.43":
+  version "2.4.43"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.43.tgz#e717000a26fd4c183a984a141965945a26ac83d9"
+  integrity sha512-J/Up28bSV5E2UTQBpaTOXvNG1jQqRj8fcZH5TSqS7ymJ2H4OyLOQvEGFL3roCGnN3Dgrzkfv9LBO0JyRORVtSw==
   dependencies:
-    "@budibase/backend-core" "2.4.42"
+    "@budibase/backend-core" "2.4.43"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.42"
+    "@budibase/types" "2.4.43"
     "@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.42", "@budibase/types@^2.4.42":
-  version "2.4.42"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42.tgz#04ac509acda1960179c526ba3af92a9331c951b6"
-  integrity sha512-Dxql/99o4AAkRkZDLrKeDK2ON2qiV0q/nYffdyJ8uCQiyFNKA9e1GyQlbsJORmqYCqkEGzTtcmW+zBtdvmtB3Q==
+"@budibase/types@2.4.43", "@budibase/types@^2.4.43":
+  version "2.4.43"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.43.tgz#2f6e609bada8855c83dfb26deb3b2d64dbb2d401"
+  integrity sha512-OWr8dNjk3VjjAJ4Rni/+AMGDtCDhz7LrZqxgedL0wKiRwgwkSiBNExh1eIZ/NKlt1vZrzH/GG5jhzlPkYqDTQg==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 4ca6982d279ae8ee8ea037a93b78b0c8adeb31d2 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Fri, 31 Mar 2023 11:25:51 +0100
Subject: [PATCH 22/33] Prevent double deletions

---
 packages/server/src/sdk/users/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/sdk/users/utils.ts b/packages/server/src/sdk/users/utils.ts
index 82a46acfac..9b9ea04c56 100644
--- a/packages/server/src/sdk/users/utils.ts
+++ b/packages/server/src/sdk/users/utils.ts
@@ -22,7 +22,7 @@ export function combineMetadataAndUser(
     user.roleId === rolesCore.BUILTIN_ROLE_IDS.PUBLIC
   ) {
     // If it exists and it should not, we must remove it
-    if (found) {
+    if (found?._id) {
       return { ...found, _deleted: true }
     }
     return null

From 75baba76d6e40e19bcda644ba556aed627dc2fbe Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 31 Mar 2023 11:38:09 +0100
Subject: [PATCH 23/33] Resolving PR comments.

---
 .../src/middleware/passport/datasource/google.ts          | 1 -
 .../src/pages/builder/portal/apps/onboarding/index.svelte | 8 +++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/backend-core/src/middleware/passport/datasource/google.ts b/packages/backend-core/src/middleware/passport/datasource/google.ts
index d67bc45f84..6fd4e9ff32 100644
--- a/packages/backend-core/src/middleware/passport/datasource/google.ts
+++ b/packages/backend-core/src/middleware/passport/datasource/google.ts
@@ -13,7 +13,6 @@ type Passport = {
 
 async function fetchGoogleCreds() {
   let config = await configs.getGoogleDatasourceConfig()
-  console.log(config)
 
   if (!config) {
     throw new Error("No google configuration found")
diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
index ab1b9c2331..8e018ae907 100644
--- a/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
@@ -11,7 +11,7 @@
   import { store, automationStore } from "builderStore"
   import { saveDatasource } from "builderStore/datasource"
   import { integrations } from "stores/backend"
-  import { auth, admin } from "stores/portal"
+  import { auth, admin, organisation } from "stores/portal"
   import FontAwesomeIcon from "components/common/FontAwesomeIcon.svelte"
   import CreateTableModal from "components/backend/TableNavigator/modals/CreateTableModal.svelte"
   import createFromScratchScreen from "builderStore/store/screenTemplates/createFromScratchScreen"
@@ -31,7 +31,6 @@
   let googleComplete = false
 
   $: getIntegrations()
-  $: cloudHosted = $admin.cloud
 
   const createApp = async useSampleData => {
     creationLoading = true
@@ -79,7 +78,10 @@
 
       Object.entries($integrations).forEach(([integrationType, schema]) => {
         // google sheets not available in self-host
-        if (helpers.isGoogleSheets(integrationType) && !cloudHosted) {
+        if (
+          helpers.isGoogleSheets(integrationType) &&
+          !$organisation.googleDatasourceConfigured
+        ) {
           return
         }
         if (schema?.plus) {

From 9c8fcacf2adcd3c607a4661f742be1c97ad86e37 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 31 Mar 2023 11:08:33 +0000
Subject: [PATCH 24/33] v2.4.42-alpha.6

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  6 +++---
 packages/builder/package.json          | 12 ++++++------
 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, 40 insertions(+), 40 deletions(-)

diff --git a/lerna.json b/lerna.json
index 7926e03ecb..ec0b168f51 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.4.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index e7c6217cee..ee2b6f84d3 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.4.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "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.42-alpha.5",
+    "@budibase/types": "2.4.42-alpha.6",
     "@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 b4c0241a49..94da724d5c 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.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "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.4.42-alpha.5",
-    "@budibase/string-templates": "2.4.42-alpha.5",
+    "@budibase/shared-core": "2.4.42-alpha.6",
+    "@budibase/string-templates": "2.4.42-alpha.6",
     "@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 1e175eb757..adc480f842 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.4.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,11 +58,11 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.4.42-alpha.5",
-    "@budibase/client": "2.4.42-alpha.5",
-    "@budibase/frontend-core": "2.4.42-alpha.5",
-    "@budibase/shared-core": "2.4.42-alpha.5",
-    "@budibase/string-templates": "2.4.42-alpha.5",
+    "@budibase/bbui": "2.4.42-alpha.6",
+    "@budibase/client": "2.4.42-alpha.6",
+    "@budibase/frontend-core": "2.4.42-alpha.6",
+    "@budibase/shared-core": "2.4.42-alpha.6",
+    "@budibase/string-templates": "2.4.42-alpha.6",
     "@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 8dc178342f..fb14ceb887 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.4.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "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.42-alpha.5",
-    "@budibase/string-templates": "2.4.42-alpha.5",
-    "@budibase/types": "2.4.42-alpha.5",
+    "@budibase/backend-core": "2.4.42-alpha.6",
+    "@budibase/string-templates": "2.4.42-alpha.6",
+    "@budibase/types": "2.4.42-alpha.6",
     "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 b491cad175..7becd3c1a4 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.4.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "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.4.42-alpha.5",
-    "@budibase/frontend-core": "2.4.42-alpha.5",
-    "@budibase/shared-core": "2.4.42-alpha.5",
-    "@budibase/string-templates": "2.4.42-alpha.5",
-    "@budibase/types": "2.4.42-alpha.5",
+    "@budibase/bbui": "2.4.42-alpha.6",
+    "@budibase/frontend-core": "2.4.42-alpha.6",
+    "@budibase/shared-core": "2.4.42-alpha.6",
+    "@budibase/string-templates": "2.4.42-alpha.6",
+    "@budibase/types": "2.4.42-alpha.6",
     "@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 8c5c854bbd..eed2c50934 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.4.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "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.42-alpha.5",
-    "@budibase/shared-core": "2.4.42-alpha.5",
+    "@budibase/bbui": "2.4.42-alpha.6",
+    "@budibase/shared-core": "2.4.42-alpha.6",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 57d0973471..2f40008b29 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.4.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 8d92bd490d..6cf8392902 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.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -44,12 +44,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.4.42-alpha.5",
-    "@budibase/client": "2.4.42-alpha.5",
+    "@budibase/backend-core": "2.4.42-alpha.6",
+    "@budibase/client": "2.4.42-alpha.6",
     "@budibase/pro": "2.4.42-alpha.5",
-    "@budibase/shared-core": "2.4.42-alpha.5",
-    "@budibase/string-templates": "2.4.42-alpha.5",
-    "@budibase/types": "2.4.42-alpha.5",
+    "@budibase/shared-core": "2.4.42-alpha.6",
+    "@budibase/string-templates": "2.4.42-alpha.6",
+    "@budibase/types": "2.4.42-alpha.6",
     "@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 8a827b1969..c06b9645fb 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.4.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "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.4.42-alpha.5"
+    "@budibase/types": "2.4.42-alpha.6"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index d8609616b7..211045e065 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.4.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "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 c48a4fe708..e8d505fc2f 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.4.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "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 5dd8074b9f..72d68bb3e5 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.42-alpha.5",
+  "version": "2.4.42-alpha.6",
   "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.42-alpha.5",
+    "@budibase/backend-core": "2.4.42-alpha.6",
     "@budibase/pro": "2.4.42-alpha.5",
-    "@budibase/string-templates": "2.4.42-alpha.5",
-    "@budibase/types": "2.4.42-alpha.5",
+    "@budibase/string-templates": "2.4.42-alpha.6",
+    "@budibase/types": "2.4.42-alpha.6",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 175cbaf4b0695a7b903a42f79eeb05c6ea9ef7c5 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 31 Mar 2023 11:11:39 +0000
Subject: [PATCH 25/33] Update pro version to 2.4.42-alpha.6

---
 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 6cf8392902..e415c93309 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -46,7 +46,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.4.42-alpha.6",
     "@budibase/client": "2.4.42-alpha.6",
-    "@budibase/pro": "2.4.42-alpha.5",
+    "@budibase/pro": "2.4.42-alpha.6",
     "@budibase/shared-core": "2.4.42-alpha.6",
     "@budibase/string-templates": "2.4.42-alpha.6",
     "@budibase/types": "2.4.42-alpha.6",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 6e48c2c5ec..7a61c22469 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1290,14 +1290,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.4.42-alpha.5":
-  version "2.4.42-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.5.tgz#3e4b44c6e1b7f9c0652527a48dfa46dbe022e93b"
-  integrity sha512-vclysH06NASv9XZ55W9yonPIodVTCWklo6alfKPQTbvjINGBopfTglV9new+OVJoqlaYPyt4AyBVp0si29vuKg==
+"@budibase/backend-core@2.4.42-alpha.6":
+  version "2.4.42-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.6.tgz#58aec63492de6612d561609be3653203ab5de0c8"
+  integrity sha512-gwdG4cLrzadAC4q6bQLvixzOpVxvmnvr0WAM+glVgM2IaCNpCVA/Da/g0UyRzMXUV6cAUYA+UhLlpIO1HoOz9w==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.4.42-alpha.5"
+    "@budibase/types" "2.4.42-alpha.6"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1429,14 +1429,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.4.42-alpha.5":
-  version "2.4.42-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.5.tgz#99774e2e06fc22892c545b7208d78144395859db"
-  integrity sha512-Axxx4zqsBsu2fl5UKetNXCJWoMi2pcA/kVY88Z9BYNPmGp7k3s2pKU/kShy751I2fDF0TGgxSCGzpVzWqM8ZEg==
+"@budibase/pro@2.4.42-alpha.6":
+  version "2.4.42-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.6.tgz#86fdcf55a674c4642bc585e8697e122b85b83453"
+  integrity sha512-2xrtBsHEbw0XeRTOQl/t8I9Uw97wMGWGiWqSIa+jAGu2NUyznKQRXzBcgMRjRWDNvy1ALkuFvHQAxmHX4hk5qw==
   dependencies:
-    "@budibase/backend-core" "2.4.42-alpha.5"
+    "@budibase/backend-core" "2.4.42-alpha.6"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.42-alpha.5"
+    "@budibase/types" "2.4.42-alpha.6"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1475,10 +1475,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.4.42-alpha.5":
-  version "2.4.42-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.5.tgz#21408ab88b74833f176003f9e54dc109252d8080"
-  integrity sha512-3uZmKryzMcAxIrR0hnBwoNfuqR8yvCWjK880h4Mdi2ik/uYfndUAhdVi/Bh/oU3ZGu9KiJzqh/IE29IuRboiNg==
+"@budibase/types@2.4.42-alpha.6":
+  version "2.4.42-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.6.tgz#6d7d3f5b89bf05977e3e948e1ac73e876ac926a4"
+  integrity sha512-bYhUVgvQew+SNQK6DKWOS0jGwt5yR7V9qf3s+2H4+wFwilpbpHA00X67EvveDcR8NvXzyOnuL5TnDO5yuHzNEQ==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 72d68bb3e5..d54152ac38 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.42-alpha.6",
-    "@budibase/pro": "2.4.42-alpha.5",
+    "@budibase/pro": "2.4.42-alpha.6",
     "@budibase/string-templates": "2.4.42-alpha.6",
     "@budibase/types": "2.4.42-alpha.6",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index e090e273aa..d828e3e2e6 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.42-alpha.5":
-  version "2.4.42-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.5.tgz#3e4b44c6e1b7f9c0652527a48dfa46dbe022e93b"
-  integrity sha512-vclysH06NASv9XZ55W9yonPIodVTCWklo6alfKPQTbvjINGBopfTglV9new+OVJoqlaYPyt4AyBVp0si29vuKg==
+"@budibase/backend-core@2.4.42-alpha.6":
+  version "2.4.42-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.6.tgz#58aec63492de6612d561609be3653203ab5de0c8"
+  integrity sha512-gwdG4cLrzadAC4q6bQLvixzOpVxvmnvr0WAM+glVgM2IaCNpCVA/Da/g0UyRzMXUV6cAUYA+UhLlpIO1HoOz9w==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.4.42-alpha.5"
+    "@budibase/types" "2.4.42-alpha.6"
     "@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.42-alpha.5":
-  version "2.4.42-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.5.tgz#99774e2e06fc22892c545b7208d78144395859db"
-  integrity sha512-Axxx4zqsBsu2fl5UKetNXCJWoMi2pcA/kVY88Z9BYNPmGp7k3s2pKU/kShy751I2fDF0TGgxSCGzpVzWqM8ZEg==
+"@budibase/pro@2.4.42-alpha.6":
+  version "2.4.42-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.6.tgz#86fdcf55a674c4642bc585e8697e122b85b83453"
+  integrity sha512-2xrtBsHEbw0XeRTOQl/t8I9Uw97wMGWGiWqSIa+jAGu2NUyznKQRXzBcgMRjRWDNvy1ALkuFvHQAxmHX4hk5qw==
   dependencies:
-    "@budibase/backend-core" "2.4.42-alpha.5"
+    "@budibase/backend-core" "2.4.42-alpha.6"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.42-alpha.5"
+    "@budibase/types" "2.4.42-alpha.6"
     "@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.42-alpha.5":
-  version "2.4.42-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.5.tgz#21408ab88b74833f176003f9e54dc109252d8080"
-  integrity sha512-3uZmKryzMcAxIrR0hnBwoNfuqR8yvCWjK880h4Mdi2ik/uYfndUAhdVi/Bh/oU3ZGu9KiJzqh/IE29IuRboiNg==
+"@budibase/types@2.4.42-alpha.6":
+  version "2.4.42-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.6.tgz#6d7d3f5b89bf05977e3e948e1ac73e876ac926a4"
+  integrity sha512-bYhUVgvQew+SNQK6DKWOS0jGwt5yR7V9qf3s+2H4+wFwilpbpHA00X67EvveDcR8NvXzyOnuL5TnDO5yuHzNEQ==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 74995381f4bd6ec127ba809b9a9823bd65b1bc7b Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Fri, 31 Mar 2023 12:30:20 +0100
Subject: [PATCH 26/33] Remove client build in CI

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

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 1a2e74f863..a920ec0e2f 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -56,7 +56,6 @@ jobs:
         run: yarn install:pro $BRANCH $BASE_BRANCH
       - run: yarn
       - run: yarn bootstrap
-      - run: yarn build:client
       - run: yarn test
       - uses: codecov/codecov-action@v3
         with:
diff --git a/package.json b/package.json
index 027788dce7..1ae713f96c 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,6 @@
     "setup": "node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev",
     "bootstrap": "lerna bootstrap && lerna link && ./scripts/link-dependencies.sh",
     "build": "lerna run build",
-    "build:client": "lerna run build --ignore @budibase/backend-core --ignore @budibase/worker --ignore @budibase/server --ignore @budibase/builder --ignore @budibase/cli --ignore @budibase/sdk",
     "build:dev": "lerna run prebuild && tsc --build --watch --preserveWatchOutput",
     "build:backend": "lerna run build --ignore @budibase/client --ignore @budibase/bbui --ignore @budibase/builder --ignore @budibase/cli",
     "build:sdk": "lerna run build:sdk",

From 99bea8e7ced46ede7232048d6ca0651e23a3d709 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 31 Mar 2023 11:31:30 +0000
Subject: [PATCH 27/33] v2.4.42-alpha.7

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  6 +++---
 packages/builder/package.json          | 12 ++++++------
 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, 40 insertions(+), 40 deletions(-)

diff --git a/lerna.json b/lerna.json
index ec0b168f51..98e831263f 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.4.42-alpha.6",
+  "version": "2.4.42-alpha.7",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index ee2b6f84d3..975b42df89 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.4.42-alpha.6",
+  "version": "2.4.42-alpha.7",
   "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.42-alpha.6",
+    "@budibase/types": "2.4.42-alpha.7",
     "@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 94da724d5c..794e32baeb 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.42-alpha.6",
+  "version": "2.4.42-alpha.7",
   "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.4.42-alpha.6",
-    "@budibase/string-templates": "2.4.42-alpha.6",
+    "@budibase/shared-core": "2.4.42-alpha.7",
+    "@budibase/string-templates": "2.4.42-alpha.7",
     "@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 adc480f842..ced444e446 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.4.42-alpha.6",
+  "version": "2.4.42-alpha.7",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,11 +58,11 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.4.42-alpha.6",
-    "@budibase/client": "2.4.42-alpha.6",
-    "@budibase/frontend-core": "2.4.42-alpha.6",
-    "@budibase/shared-core": "2.4.42-alpha.6",
-    "@budibase/string-templates": "2.4.42-alpha.6",
+    "@budibase/bbui": "2.4.42-alpha.7",
+    "@budibase/client": "2.4.42-alpha.7",
+    "@budibase/frontend-core": "2.4.42-alpha.7",
+    "@budibase/shared-core": "2.4.42-alpha.7",
+    "@budibase/string-templates": "2.4.42-alpha.7",
     "@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 fb14ceb887..38aa7dc3f0 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.4.42-alpha.6",
+  "version": "2.4.42-alpha.7",
   "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.42-alpha.6",
-    "@budibase/string-templates": "2.4.42-alpha.6",
-    "@budibase/types": "2.4.42-alpha.6",
+    "@budibase/backend-core": "2.4.42-alpha.7",
+    "@budibase/string-templates": "2.4.42-alpha.7",
+    "@budibase/types": "2.4.42-alpha.7",
     "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 7becd3c1a4..abaee37c83 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.4.42-alpha.6",
+  "version": "2.4.42-alpha.7",
   "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.4.42-alpha.6",
-    "@budibase/frontend-core": "2.4.42-alpha.6",
-    "@budibase/shared-core": "2.4.42-alpha.6",
-    "@budibase/string-templates": "2.4.42-alpha.6",
-    "@budibase/types": "2.4.42-alpha.6",
+    "@budibase/bbui": "2.4.42-alpha.7",
+    "@budibase/frontend-core": "2.4.42-alpha.7",
+    "@budibase/shared-core": "2.4.42-alpha.7",
+    "@budibase/string-templates": "2.4.42-alpha.7",
+    "@budibase/types": "2.4.42-alpha.7",
     "@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 eed2c50934..632a35a07c 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.4.42-alpha.6",
+  "version": "2.4.42-alpha.7",
   "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.42-alpha.6",
-    "@budibase/shared-core": "2.4.42-alpha.6",
+    "@budibase/bbui": "2.4.42-alpha.7",
+    "@budibase/shared-core": "2.4.42-alpha.7",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 2f40008b29..1e01d29019 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.4.42-alpha.6",
+  "version": "2.4.42-alpha.7",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index e415c93309..292b610cf4 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.42-alpha.6",
+  "version": "2.4.42-alpha.7",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -44,12 +44,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.4.42-alpha.6",
-    "@budibase/client": "2.4.42-alpha.6",
+    "@budibase/backend-core": "2.4.42-alpha.7",
+    "@budibase/client": "2.4.42-alpha.7",
     "@budibase/pro": "2.4.42-alpha.6",
-    "@budibase/shared-core": "2.4.42-alpha.6",
-    "@budibase/string-templates": "2.4.42-alpha.6",
-    "@budibase/types": "2.4.42-alpha.6",
+    "@budibase/shared-core": "2.4.42-alpha.7",
+    "@budibase/string-templates": "2.4.42-alpha.7",
+    "@budibase/types": "2.4.42-alpha.7",
     "@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 c06b9645fb..1e7a260487 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.4.42-alpha.6",
+  "version": "2.4.42-alpha.7",
   "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.4.42-alpha.6"
+    "@budibase/types": "2.4.42-alpha.7"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 211045e065..cfa56a118c 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.4.42-alpha.6",
+  "version": "2.4.42-alpha.7",
   "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 e8d505fc2f..a7d9c10978 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.4.42-alpha.6",
+  "version": "2.4.42-alpha.7",
   "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 d54152ac38..2c73aa9186 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.42-alpha.6",
+  "version": "2.4.42-alpha.7",
   "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.42-alpha.6",
+    "@budibase/backend-core": "2.4.42-alpha.7",
     "@budibase/pro": "2.4.42-alpha.6",
-    "@budibase/string-templates": "2.4.42-alpha.6",
-    "@budibase/types": "2.4.42-alpha.6",
+    "@budibase/string-templates": "2.4.42-alpha.7",
+    "@budibase/types": "2.4.42-alpha.7",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From cdc545d0bb411534e91976f4f564ba010e196f60 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 31 Mar 2023 11:34:54 +0000
Subject: [PATCH 28/33] Update pro version to 2.4.42-alpha.7

---
 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 292b610cf4..8f23f10367 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -46,7 +46,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.4.42-alpha.7",
     "@budibase/client": "2.4.42-alpha.7",
-    "@budibase/pro": "2.4.42-alpha.6",
+    "@budibase/pro": "2.4.42-alpha.7",
     "@budibase/shared-core": "2.4.42-alpha.7",
     "@budibase/string-templates": "2.4.42-alpha.7",
     "@budibase/types": "2.4.42-alpha.7",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 7a61c22469..21487791b0 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1290,14 +1290,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.4.42-alpha.6":
-  version "2.4.42-alpha.6"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.6.tgz#58aec63492de6612d561609be3653203ab5de0c8"
-  integrity sha512-gwdG4cLrzadAC4q6bQLvixzOpVxvmnvr0WAM+glVgM2IaCNpCVA/Da/g0UyRzMXUV6cAUYA+UhLlpIO1HoOz9w==
+"@budibase/backend-core@2.4.42-alpha.7":
+  version "2.4.42-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.7.tgz#88359d7e2bd81e215cad3689c8c0c17056eda2d1"
+  integrity sha512-trsfQyrey8lKzzCTr5sUwbsy6K+/mtWaob3ur1MyqsqLvnEXhBKK/jE33+idlmbLxnwsL7/HbMB3m6XU5BmPIA==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.4.42-alpha.6"
+    "@budibase/types" "2.4.42-alpha.7"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1429,14 +1429,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.4.42-alpha.6":
-  version "2.4.42-alpha.6"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.6.tgz#86fdcf55a674c4642bc585e8697e122b85b83453"
-  integrity sha512-2xrtBsHEbw0XeRTOQl/t8I9Uw97wMGWGiWqSIa+jAGu2NUyznKQRXzBcgMRjRWDNvy1ALkuFvHQAxmHX4hk5qw==
+"@budibase/pro@2.4.42-alpha.7":
+  version "2.4.42-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.7.tgz#b7deeedf10ff569de033a8b0b6639559e064f6d4"
+  integrity sha512-z7sNUrTU0KBQUeQe2XdC6mD2A/FW6QhM6ADWH+7BFtyGfgyLQFsrHBEVDQkKrfEMccJRaQ72vDN0m1/r6ycjLA==
   dependencies:
-    "@budibase/backend-core" "2.4.42-alpha.6"
+    "@budibase/backend-core" "2.4.42-alpha.7"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.42-alpha.6"
+    "@budibase/types" "2.4.42-alpha.7"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1475,10 +1475,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.4.42-alpha.6":
-  version "2.4.42-alpha.6"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.6.tgz#6d7d3f5b89bf05977e3e948e1ac73e876ac926a4"
-  integrity sha512-bYhUVgvQew+SNQK6DKWOS0jGwt5yR7V9qf3s+2H4+wFwilpbpHA00X67EvveDcR8NvXzyOnuL5TnDO5yuHzNEQ==
+"@budibase/types@2.4.42-alpha.7":
+  version "2.4.42-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.7.tgz#ef5c55217c5d34f7c5bdd5e3343c348a028afa93"
+  integrity sha512-yDIW31xDWLf6hoHqpLHj5iqZHwcMFvf8Blwe2XCCM7shPQblDydyBU57kNRgoXj8/GddQ0l3aDrbQ6h4T8fpXw==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 2c73aa9186..481d668da0 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.42-alpha.7",
-    "@budibase/pro": "2.4.42-alpha.6",
+    "@budibase/pro": "2.4.42-alpha.7",
     "@budibase/string-templates": "2.4.42-alpha.7",
     "@budibase/types": "2.4.42-alpha.7",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index d828e3e2e6..2791bb47d6 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.42-alpha.6":
-  version "2.4.42-alpha.6"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.6.tgz#58aec63492de6612d561609be3653203ab5de0c8"
-  integrity sha512-gwdG4cLrzadAC4q6bQLvixzOpVxvmnvr0WAM+glVgM2IaCNpCVA/Da/g0UyRzMXUV6cAUYA+UhLlpIO1HoOz9w==
+"@budibase/backend-core@2.4.42-alpha.7":
+  version "2.4.42-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.7.tgz#88359d7e2bd81e215cad3689c8c0c17056eda2d1"
+  integrity sha512-trsfQyrey8lKzzCTr5sUwbsy6K+/mtWaob3ur1MyqsqLvnEXhBKK/jE33+idlmbLxnwsL7/HbMB3m6XU5BmPIA==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.4.42-alpha.6"
+    "@budibase/types" "2.4.42-alpha.7"
     "@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.42-alpha.6":
-  version "2.4.42-alpha.6"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.6.tgz#86fdcf55a674c4642bc585e8697e122b85b83453"
-  integrity sha512-2xrtBsHEbw0XeRTOQl/t8I9Uw97wMGWGiWqSIa+jAGu2NUyznKQRXzBcgMRjRWDNvy1ALkuFvHQAxmHX4hk5qw==
+"@budibase/pro@2.4.42-alpha.7":
+  version "2.4.42-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.7.tgz#b7deeedf10ff569de033a8b0b6639559e064f6d4"
+  integrity sha512-z7sNUrTU0KBQUeQe2XdC6mD2A/FW6QhM6ADWH+7BFtyGfgyLQFsrHBEVDQkKrfEMccJRaQ72vDN0m1/r6ycjLA==
   dependencies:
-    "@budibase/backend-core" "2.4.42-alpha.6"
+    "@budibase/backend-core" "2.4.42-alpha.7"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.42-alpha.6"
+    "@budibase/types" "2.4.42-alpha.7"
     "@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.42-alpha.6":
-  version "2.4.42-alpha.6"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.6.tgz#6d7d3f5b89bf05977e3e948e1ac73e876ac926a4"
-  integrity sha512-bYhUVgvQew+SNQK6DKWOS0jGwt5yR7V9qf3s+2H4+wFwilpbpHA00X67EvveDcR8NvXzyOnuL5TnDO5yuHzNEQ==
+"@budibase/types@2.4.42-alpha.7":
+  version "2.4.42-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.7.tgz#ef5c55217c5d34f7c5bdd5e3343c348a028afa93"
+  integrity sha512-yDIW31xDWLf6hoHqpLHj5iqZHwcMFvf8Blwe2XCCM7shPQblDydyBU57kNRgoXj8/GddQ0l3aDrbQ6h4T8fpXw==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From e9f69dcfea10e144b4d3f365aa726adec507f0d7 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 31 Mar 2023 12:51:45 +0100
Subject: [PATCH 29/33] Adding default state.

---
 .../backend/DatasourceNavigator/_components/GoogleButton.svelte | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte b/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte
index efe5158398..0cf92dde2b 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte
@@ -21,6 +21,8 @@
       if (resp.datasource && resp.appId) {
         ds = resp.datasource
         appId = resp.appId
+      } else {
+        ds = resp
       }
     }
     window.open(

From 329beee00dba8041ba8e6adbd7477b25bf8999a1 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 31 Mar 2023 12:34:45 +0000
Subject: [PATCH 30/33] v2.4.42-alpha.8

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  6 +++---
 packages/builder/package.json          | 12 ++++++------
 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, 40 insertions(+), 40 deletions(-)

diff --git a/lerna.json b/lerna.json
index 98e831263f..943f44a9c5 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.4.42-alpha.7",
+  "version": "2.4.42-alpha.8",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 975b42df89..ecb5a6b11c 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.4.42-alpha.7",
+  "version": "2.4.42-alpha.8",
   "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.42-alpha.7",
+    "@budibase/types": "2.4.42-alpha.8",
     "@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 794e32baeb..432202dd8e 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.42-alpha.7",
+  "version": "2.4.42-alpha.8",
   "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.4.42-alpha.7",
-    "@budibase/string-templates": "2.4.42-alpha.7",
+    "@budibase/shared-core": "2.4.42-alpha.8",
+    "@budibase/string-templates": "2.4.42-alpha.8",
     "@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 ced444e446..32624e550f 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.4.42-alpha.7",
+  "version": "2.4.42-alpha.8",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,11 +58,11 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.4.42-alpha.7",
-    "@budibase/client": "2.4.42-alpha.7",
-    "@budibase/frontend-core": "2.4.42-alpha.7",
-    "@budibase/shared-core": "2.4.42-alpha.7",
-    "@budibase/string-templates": "2.4.42-alpha.7",
+    "@budibase/bbui": "2.4.42-alpha.8",
+    "@budibase/client": "2.4.42-alpha.8",
+    "@budibase/frontend-core": "2.4.42-alpha.8",
+    "@budibase/shared-core": "2.4.42-alpha.8",
+    "@budibase/string-templates": "2.4.42-alpha.8",
     "@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 38aa7dc3f0..2090aaf34a 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.4.42-alpha.7",
+  "version": "2.4.42-alpha.8",
   "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.42-alpha.7",
-    "@budibase/string-templates": "2.4.42-alpha.7",
-    "@budibase/types": "2.4.42-alpha.7",
+    "@budibase/backend-core": "2.4.42-alpha.8",
+    "@budibase/string-templates": "2.4.42-alpha.8",
+    "@budibase/types": "2.4.42-alpha.8",
     "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 abaee37c83..e1c6b5a488 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.4.42-alpha.7",
+  "version": "2.4.42-alpha.8",
   "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.4.42-alpha.7",
-    "@budibase/frontend-core": "2.4.42-alpha.7",
-    "@budibase/shared-core": "2.4.42-alpha.7",
-    "@budibase/string-templates": "2.4.42-alpha.7",
-    "@budibase/types": "2.4.42-alpha.7",
+    "@budibase/bbui": "2.4.42-alpha.8",
+    "@budibase/frontend-core": "2.4.42-alpha.8",
+    "@budibase/shared-core": "2.4.42-alpha.8",
+    "@budibase/string-templates": "2.4.42-alpha.8",
+    "@budibase/types": "2.4.42-alpha.8",
     "@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 632a35a07c..2437d74295 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.4.42-alpha.7",
+  "version": "2.4.42-alpha.8",
   "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.42-alpha.7",
-    "@budibase/shared-core": "2.4.42-alpha.7",
+    "@budibase/bbui": "2.4.42-alpha.8",
+    "@budibase/shared-core": "2.4.42-alpha.8",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 1e01d29019..b35d91af27 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.4.42-alpha.7",
+  "version": "2.4.42-alpha.8",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 8f23f10367..e333c92c28 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.42-alpha.7",
+  "version": "2.4.42-alpha.8",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -44,12 +44,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.4.42-alpha.7",
-    "@budibase/client": "2.4.42-alpha.7",
+    "@budibase/backend-core": "2.4.42-alpha.8",
+    "@budibase/client": "2.4.42-alpha.8",
     "@budibase/pro": "2.4.42-alpha.7",
-    "@budibase/shared-core": "2.4.42-alpha.7",
-    "@budibase/string-templates": "2.4.42-alpha.7",
-    "@budibase/types": "2.4.42-alpha.7",
+    "@budibase/shared-core": "2.4.42-alpha.8",
+    "@budibase/string-templates": "2.4.42-alpha.8",
+    "@budibase/types": "2.4.42-alpha.8",
     "@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 1e7a260487..57df30e911 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.4.42-alpha.7",
+  "version": "2.4.42-alpha.8",
   "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.4.42-alpha.7"
+    "@budibase/types": "2.4.42-alpha.8"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index cfa56a118c..b5e44e551e 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.4.42-alpha.7",
+  "version": "2.4.42-alpha.8",
   "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 a7d9c10978..10d5b271b3 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.4.42-alpha.7",
+  "version": "2.4.42-alpha.8",
   "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 481d668da0..93d8888c43 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.42-alpha.7",
+  "version": "2.4.42-alpha.8",
   "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.42-alpha.7",
+    "@budibase/backend-core": "2.4.42-alpha.8",
     "@budibase/pro": "2.4.42-alpha.7",
-    "@budibase/string-templates": "2.4.42-alpha.7",
-    "@budibase/types": "2.4.42-alpha.7",
+    "@budibase/string-templates": "2.4.42-alpha.8",
+    "@budibase/types": "2.4.42-alpha.8",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 420190f5771de324d05aea51dd0573c749aa9994 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 31 Mar 2023 12:37:45 +0000
Subject: [PATCH 31/33] Update pro version to 2.4.42-alpha.8

---
 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 e333c92c28..ff0b3b5300 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -46,7 +46,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.4.42-alpha.8",
     "@budibase/client": "2.4.42-alpha.8",
-    "@budibase/pro": "2.4.42-alpha.7",
+    "@budibase/pro": "2.4.42-alpha.8",
     "@budibase/shared-core": "2.4.42-alpha.8",
     "@budibase/string-templates": "2.4.42-alpha.8",
     "@budibase/types": "2.4.42-alpha.8",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 21487791b0..102dd9232b 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1290,14 +1290,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.4.42-alpha.7":
-  version "2.4.42-alpha.7"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.7.tgz#88359d7e2bd81e215cad3689c8c0c17056eda2d1"
-  integrity sha512-trsfQyrey8lKzzCTr5sUwbsy6K+/mtWaob3ur1MyqsqLvnEXhBKK/jE33+idlmbLxnwsL7/HbMB3m6XU5BmPIA==
+"@budibase/backend-core@2.4.42-alpha.8":
+  version "2.4.42-alpha.8"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.8.tgz#4725f88985a99c11c43e2ef5a8d61419bb60cd60"
+  integrity sha512-G4ysFqSZKA/JT+jKs1a5C/3BttS7/Omk6HWGXvFdvtHNHrWbl+g3irKtvQjdT5QGks7veDuJoNRNbO2dSm3ArA==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.4.42-alpha.7"
+    "@budibase/types" "2.4.42-alpha.8"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1429,14 +1429,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.4.42-alpha.7":
-  version "2.4.42-alpha.7"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.7.tgz#b7deeedf10ff569de033a8b0b6639559e064f6d4"
-  integrity sha512-z7sNUrTU0KBQUeQe2XdC6mD2A/FW6QhM6ADWH+7BFtyGfgyLQFsrHBEVDQkKrfEMccJRaQ72vDN0m1/r6ycjLA==
+"@budibase/pro@2.4.42-alpha.8":
+  version "2.4.42-alpha.8"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.8.tgz#d248c8c26e5f6267c0f785271463e5ed6d828855"
+  integrity sha512-hUhHuwnq1if9H5xkmuXbsuT4RPz2Nh8LyAmcSnfBkEnvQosTuFSrvKNWO6ZAY4jOCrtjuE/6q1sSoGGDNlKqLA==
   dependencies:
-    "@budibase/backend-core" "2.4.42-alpha.7"
+    "@budibase/backend-core" "2.4.42-alpha.8"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.42-alpha.7"
+    "@budibase/types" "2.4.42-alpha.8"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1475,10 +1475,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.4.42-alpha.7":
-  version "2.4.42-alpha.7"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.7.tgz#ef5c55217c5d34f7c5bdd5e3343c348a028afa93"
-  integrity sha512-yDIW31xDWLf6hoHqpLHj5iqZHwcMFvf8Blwe2XCCM7shPQblDydyBU57kNRgoXj8/GddQ0l3aDrbQ6h4T8fpXw==
+"@budibase/types@2.4.42-alpha.8":
+  version "2.4.42-alpha.8"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.8.tgz#0973c9147eeb1aabfbeaa22a288ca5270b35343f"
+  integrity sha512-UyBmgI3WNaTNpEz8R1M95OAKXvGMQYZqfW78f2vWAMe12esfxjK7otv+vrxhmf9we3d59Yxf7HwLV0Q42Rp7TA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 93d8888c43..a0f6fab9d9 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.42-alpha.8",
-    "@budibase/pro": "2.4.42-alpha.7",
+    "@budibase/pro": "2.4.42-alpha.8",
     "@budibase/string-templates": "2.4.42-alpha.8",
     "@budibase/types": "2.4.42-alpha.8",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 2791bb47d6..1b48b26c61 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.42-alpha.7":
-  version "2.4.42-alpha.7"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.7.tgz#88359d7e2bd81e215cad3689c8c0c17056eda2d1"
-  integrity sha512-trsfQyrey8lKzzCTr5sUwbsy6K+/mtWaob3ur1MyqsqLvnEXhBKK/jE33+idlmbLxnwsL7/HbMB3m6XU5BmPIA==
+"@budibase/backend-core@2.4.42-alpha.8":
+  version "2.4.42-alpha.8"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.8.tgz#4725f88985a99c11c43e2ef5a8d61419bb60cd60"
+  integrity sha512-G4ysFqSZKA/JT+jKs1a5C/3BttS7/Omk6HWGXvFdvtHNHrWbl+g3irKtvQjdT5QGks7veDuJoNRNbO2dSm3ArA==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.4.42-alpha.7"
+    "@budibase/types" "2.4.42-alpha.8"
     "@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.42-alpha.7":
-  version "2.4.42-alpha.7"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.7.tgz#b7deeedf10ff569de033a8b0b6639559e064f6d4"
-  integrity sha512-z7sNUrTU0KBQUeQe2XdC6mD2A/FW6QhM6ADWH+7BFtyGfgyLQFsrHBEVDQkKrfEMccJRaQ72vDN0m1/r6ycjLA==
+"@budibase/pro@2.4.42-alpha.8":
+  version "2.4.42-alpha.8"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.8.tgz#d248c8c26e5f6267c0f785271463e5ed6d828855"
+  integrity sha512-hUhHuwnq1if9H5xkmuXbsuT4RPz2Nh8LyAmcSnfBkEnvQosTuFSrvKNWO6ZAY4jOCrtjuE/6q1sSoGGDNlKqLA==
   dependencies:
-    "@budibase/backend-core" "2.4.42-alpha.7"
+    "@budibase/backend-core" "2.4.42-alpha.8"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.42-alpha.7"
+    "@budibase/types" "2.4.42-alpha.8"
     "@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.42-alpha.7":
-  version "2.4.42-alpha.7"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.7.tgz#ef5c55217c5d34f7c5bdd5e3343c348a028afa93"
-  integrity sha512-yDIW31xDWLf6hoHqpLHj5iqZHwcMFvf8Blwe2XCCM7shPQblDydyBU57kNRgoXj8/GddQ0l3aDrbQ6h4T8fpXw==
+"@budibase/types@2.4.42-alpha.8":
+  version "2.4.42-alpha.8"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.8.tgz#0973c9147eeb1aabfbeaa22a288ca5270b35343f"
+  integrity sha512-UyBmgI3WNaTNpEz8R1M95OAKXvGMQYZqfW78f2vWAMe12esfxjK7otv+vrxhmf9we3d59Yxf7HwLV0Q42Rp7TA==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 2e80bab7ad53c1a95d87e6e670b089e9ae076c0f Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 31 Mar 2023 17:13:25 +0100
Subject: [PATCH 32/33] Removing requirement for built client library in
 component test case.

---
 packages/server/src/api/controllers/component.ts |  4 ++--
 packages/server/src/utilities/fileSystem/app.ts  | 11 ++---------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/packages/server/src/api/controllers/component.ts b/packages/server/src/api/controllers/component.ts
index 9b196ca289..52b1ac66bf 100644
--- a/packages/server/src/api/controllers/component.ts
+++ b/packages/server/src/api/controllers/component.ts
@@ -2,9 +2,9 @@ import { DocumentType } from "../../db/utils"
 import { Plugin } from "@budibase/types"
 import { db as dbCore, context, tenancy } from "@budibase/backend-core"
 import { getComponentLibraryManifest } from "../../utilities/fileSystem"
-import { BBContext } from "@budibase/types"
+import { UserCtx } from "@budibase/types"
 
-export async function fetchAppComponentDefinitions(ctx: BBContext) {
+export async function fetchAppComponentDefinitions(ctx: UserCtx) {
   try {
     const db = context.getAppDB()
     const app = await db.get(DocumentType.APP_METADATA)
diff --git a/packages/server/src/utilities/fileSystem/app.ts b/packages/server/src/utilities/fileSystem/app.ts
index b8976336ac..f5e1f6e40e 100644
--- a/packages/server/src/utilities/fileSystem/app.ts
+++ b/packages/server/src/utilities/fileSystem/app.ts
@@ -33,15 +33,8 @@ export const deleteApp = async (appId: string) => {
 export const getComponentLibraryManifest = async (library: string) => {
   const appId = context.getAppId()
   const filename = "manifest.json"
-  /* istanbul ignore next */
-  // when testing in cypress and so on we need to get the package
-  // as the environment may not be fully fleshed out for dev or prod
-  if (env.isTest()) {
-    library = library.replace("standard-components", "client")
-    const lib = library.split("/")[1]
-    const path = require.resolve(library).split(lib)[0]
-    return require(join(path, lib, filename))
-  } else if (env.isDev()) {
+
+  if (env.isDev() || env.isTest()) {
     const path = join(NODE_MODULES_PATH, "@budibase", "client", filename)
     // always load from new so that updates are refreshed
     delete require.cache[require.resolve(path)]

From 457262b0b4ab60dc9e90a3902309a4e9d4c3bc5c Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Fri, 31 Mar 2023 22:37:54 +0100
Subject: [PATCH 33/33] Remove integration test in ci. The CI runs currently
 run against the deprecated release env and don't run against the live code

---
 .github/workflows/budibase_ci.yml | 50 +++++++++++++++----------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index a920ec0e2f..d095e3c2a4 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -77,28 +77,28 @@ jobs:
       - run: yarn bootstrap
       - run: yarn test:pro
 
-  integration-test:
-    runs-on: ubuntu-latest
-    services:
-      couchdb:
-        image: ibmcom/couchdb3
-        env:
-          COUCHDB_PASSWORD: budibase
-          COUCHDB_USER: budibase
-        ports:
-          - 4567:5984
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js 14.x
-        uses: actions/setup-node@v1
-        with:
-          node-version: 14.x
-      - name: Install Pro
-        run: yarn install:pro $BRANCH $BASE_BRANCH
-      - run: yarn
-      - run: yarn bootstrap
-      - run: yarn build
-      - run: |
-          cd qa-core
-          yarn
-          yarn api:test:ci
+#  integration-test:
+#    runs-on: ubuntu-latest
+#    services:
+#      couchdb:
+#        image: ibmcom/couchdb3
+#        env:
+#          COUCHDB_PASSWORD: budibase
+#          COUCHDB_USER: budibase
+#        ports:
+#          - 4567:5984
+#    steps:
+#      - uses: actions/checkout@v2
+#      - name: Use Node.js 14.x
+#        uses: actions/setup-node@v1
+#        with:
+#          node-version: 14.x
+#      - name: Install Pro
+#        run: yarn install:pro $BRANCH $BASE_BRANCH
+#      - run: yarn
+#      - run: yarn bootstrap
+#      - run: yarn build
+#      - run: |
+#          cd qa-core
+#          yarn
+#          yarn api:test:ci