From 1d0a42b59fb2c1482e55c466703e6470028f75b7 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Tue, 12 Sep 2023 11:26:26 +0100
Subject: [PATCH 1/5] pin version of postgres in QA core tests so it works with
 pg dump

---
 .../integrations/external-schema/postgres.integration.spec.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa-core/src/integrations/external-schema/postgres.integration.spec.ts b/qa-core/src/integrations/external-schema/postgres.integration.spec.ts
index 762a16b221..bb7c8de932 100644
--- a/qa-core/src/integrations/external-schema/postgres.integration.spec.ts
+++ b/qa-core/src/integrations/external-schema/postgres.integration.spec.ts
@@ -18,7 +18,7 @@ describe("getExternalSchema", () => {
 
     beforeAll(async () => {
       // This is left on propose without a tag, so if a new version introduces a breaking change we will be notified
-      const container = await new GenericContainer("postgres")
+      const container = await new GenericContainer("postgres:13.12")
         .withExposedPorts(5432)
         .withEnv("POSTGRES_PASSWORD", "password")
         .start()

From 9fc1811b0c2b7a72c8e6ae5e575c922efaff6085 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Tue, 12 Sep 2023 11:26:38 +0100
Subject: [PATCH 2/5] remove comment

---
 .../integrations/external-schema/postgres.integration.spec.ts    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qa-core/src/integrations/external-schema/postgres.integration.spec.ts b/qa-core/src/integrations/external-schema/postgres.integration.spec.ts
index bb7c8de932..a0812c9677 100644
--- a/qa-core/src/integrations/external-schema/postgres.integration.spec.ts
+++ b/qa-core/src/integrations/external-schema/postgres.integration.spec.ts
@@ -17,7 +17,6 @@ describe("getExternalSchema", () => {
     }
 
     beforeAll(async () => {
-      // This is left on propose without a tag, so if a new version introduces a breaking change we will be notified
       const container = await new GenericContainer("postgres:13.12")
         .withExposedPorts(5432)
         .withEnv("POSTGRES_PASSWORD", "password")

From 2dd2dcc2cb0dabb3416157ef6d9c665943b7383c Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 12 Sep 2023 17:26:41 +0100
Subject: [PATCH 3/5] Role fixes

---
 .../app/[application]/_components/BuilderSidePanel.svelte       | 2 +-
 .../src/pages/builder/portal/users/users/[userId].svelte        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index 7c4d3db7ce..c93a41f541 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -126,7 +126,7 @@
           user,
           prodAppId
         )
-        const isAppBuilder = sdk.users.hasAppBuilderPermissions(user, prodAppId)
+        const isAppBuilder = user.builder?.apps?.includes(prodAppId)
         let role
         if (isAdminOrGlobalBuilder) {
           role = Constants.Roles.ADMIN
diff --git a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
index 2a74cd9de5..ec10ec8316 100644
--- a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
@@ -111,7 +111,7 @@
       })
     }
     return availableApps.map(app => {
-      const prodAppId = apps.getProdAppID(app.appId)
+      const prodAppId = apps.getProdAppID(app.devId)
       return {
         name: app.name,
         devId: app.devId,

From be5e8005b2d6b2a2c0e5a8339d25e034914e506a Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 13 Sep 2023 14:06:52 +0000
Subject: [PATCH 4/5] Bump version to 2.10.7

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

diff --git a/lerna.json b/lerna.json
index 63466ceedb..77f38e67ed 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.10.6",
+  "version": "2.10.7",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From 6d74bb4063bc7580bad2c822a325f291d638aa7d Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 13 Sep 2023 18:01:20 +0000
Subject: [PATCH 5/5] Bump version to 2.10.8

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

diff --git a/lerna.json b/lerna.json
index 77f38e67ed..30aa2afa3c 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.10.7",
+  "version": "2.10.8",
   "npmClient": "yarn",
   "packages": [
     "packages/*"