Merge branch 'master' into fix/more-less-than-sql

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.10.6",
+  "version": "2.10.8",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

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

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,

qa-core/src/integrations/external-schema/postgres.integration.spec.ts

@@ -17,8 +17,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()