From 5365de6a8dd080f0da256862c5665be942624aba Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Tue, 29 Aug 2023 09:19:11 +0100
Subject: [PATCH 01/17] POC

---
 .../Component/ComponentSettingsPanel.svelte   | 34 ++++++++++++++++---
 .../context/DeviceBindingsProvider.svelte     |  6 ++++
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte
index 2ff605cc77..4d87619013 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte
@@ -1,6 +1,11 @@
 <script>
   import Panel from "components/design/Panel.svelte"
-  import { store, selectedComponent, selectedScreen } from "builderStore"
+  import {
+    store,
+    selectedComponent,
+    selectedScreen,
+    themeStore,
+  } from "builderStore"
   import ComponentSettingsSection from "./ComponentSettingsSection.svelte"
   import DesignSection from "./DesignSection.svelte"
   import CustomStylesSection from "./CustomStylesSection.svelte"
@@ -21,6 +26,21 @@
     $selectedScreen,
     $store.selectedComponentId
   )
+
+  // frontend Constant Themes
+  $: globalBindings = [
+    ...bindings,
+    {
+      type: "context",
+      runtimeBinding: `[device].[theme]`, //app.settings?
+      readableBinding: `App.Theme`,
+      category: "Settings",
+      icon: "Settings",
+      display: { type: "string", name: "Theme" },
+    },
+  ]
+  $: console.log(globalBindings)
+
   $: componentBindings = getComponentBindableProperties(
     $selectedScreen,
     $store.selectedComponentId
@@ -61,24 +81,28 @@
         <ComponentSettingsSection
           {componentInstance}
           {componentDefinition}
-          {bindings}
+          bindings={globalBindings}
           {componentBindings}
           {isScreen}
         />
       {/if}
       {#if section == "styles"}
-        <DesignSection {componentInstance} {componentDefinition} {bindings} />
+        <DesignSection
+          {componentInstance}
+          {componentDefinition}
+          bindings={globalBindings}
+        />
         <CustomStylesSection
           {componentInstance}
           {componentDefinition}
-          {bindings}
+          bindings={globalBindings}
         />
       {/if}
       {#if section == "conditions"}
         <ConditionalUISection
           {componentInstance}
           {componentDefinition}
-          {bindings}
+          bindings={globalBindings}
         />
       {/if}
     </Panel>
diff --git a/packages/client/src/components/context/DeviceBindingsProvider.svelte b/packages/client/src/components/context/DeviceBindingsProvider.svelte
index 508f7c78c5..165abd0027 100644
--- a/packages/client/src/components/context/DeviceBindingsProvider.svelte
+++ b/packages/client/src/components/context/DeviceBindingsProvider.svelte
@@ -1,6 +1,7 @@
 <script>
   import Provider from "./Provider.svelte"
   import { onMount, onDestroy } from "svelte"
+  import { themeStore } from "stores"
 
   let width = window.innerWidth
   let height = window.innerHeight
@@ -13,11 +14,16 @@
     }
   })
 
+  $: theme = $themeStore.theme
+  $: baseTheme = $themeStore.baseTheme
+
   $: data = {
     mobile: width && width < tabletBreakpoint,
     tablet: width && width >= tabletBreakpoint && width < desktopBreakpoint,
     width,
     height,
+    theme,
+    baseTheme,
   }
 
   onMount(() => {

From eb6269a0bb6359794b3e38d30f72d915f29aeaa9 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Wed, 30 Aug 2023 09:27:23 +0100
Subject: [PATCH 02/17] Refactor theme binding into device databindings fn

---
 .../builder/src/builderStore/dataBinding.js   | 43 ++++++++++++-------
 .../Component/ComponentSettingsPanel.svelte   | 33 +++-----------
 .../context/DeviceBindingsProvider.svelte     |  2 -
 3 files changed, 32 insertions(+), 46 deletions(-)

diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js
index 20172e4f9c..0510cff07d 100644
--- a/packages/builder/src/builderStore/dataBinding.js
+++ b/packages/builder/src/builderStore/dataBinding.js
@@ -497,22 +497,33 @@ const getDeviceBindings = () => {
   let bindings = []
   if (get(store).clientFeatures?.deviceAwareness) {
     const safeDevice = makePropSafe("device")
-    bindings.push({
-      type: "context",
-      runtimeBinding: `${safeDevice}.${makePropSafe("mobile")}`,
-      readableBinding: `Device.Mobile`,
-      category: "Device",
-      icon: "DevicePhone",
-      display: { type: "boolean", name: "mobile" },
-    })
-    bindings.push({
-      type: "context",
-      runtimeBinding: `${safeDevice}.${makePropSafe("tablet")}`,
-      readableBinding: `Device.Tablet`,
-      category: "Device",
-      icon: "DevicePhone",
-      display: { type: "boolean", name: "tablet" },
-    })
+
+    bindings = [
+      {
+        type: "context",
+        runtimeBinding: `${safeDevice}.${makePropSafe("mobile")}`,
+        readableBinding: `Device.Mobile`,
+        category: "Device",
+        icon: "DevicePhone",
+        display: { type: "boolean", name: "mobile" },
+      },
+      {
+        type: "context",
+        runtimeBinding: `${safeDevice}.${makePropSafe("tablet")}`,
+        readableBinding: `Device.Tablet`,
+        category: "Device",
+        icon: "DevicePhone",
+        display: { type: "boolean", name: "tablet" },
+      },
+      {
+        type: "context",
+        runtimeBinding: `${safeDevice}.${makePropSafe("theme")}`,
+        readableBinding: `App.Theme`,
+        category: "Device",
+        icon: "DevicePhone",
+        display: { type: "string", name: "App Theme" },
+      },
+    ]
   }
   return bindings
 }
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte
index 073160dc67..afcada4138 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte
@@ -1,11 +1,6 @@
 <script>
   import Panel from "components/design/Panel.svelte"
-  import {
-    store,
-    selectedComponent,
-    selectedScreen,
-    themeStore,
-  } from "builderStore"
+  import { store, selectedComponent, selectedScreen } from "builderStore"
   import ComponentSettingsSection from "./ComponentSettingsSection.svelte"
   import DesignSection from "./DesignSection.svelte"
   import CustomStylesSection from "./CustomStylesSection.svelte"
@@ -27,20 +22,6 @@
     $store.selectedComponentId
   )
 
-  // frontend Constant Themes
-  $: globalBindings = [
-    ...bindings,
-    {
-      type: "context",
-      runtimeBinding: `[device].[theme]`, //app.settings?
-      readableBinding: `App.Theme`,
-      category: "Settings",
-      icon: "Settings",
-      display: { type: "string", name: "Theme" },
-    },
-  ]
-  $: console.log(globalBindings)
-
   $: componentBindings = getComponentBindableProperties(
     $selectedScreen,
     $store.selectedComponentId
@@ -78,28 +59,24 @@
         <ComponentSettingsSection
           {componentInstance}
           {componentDefinition}
-          bindings={globalBindings}
+          {bindings}
           {componentBindings}
           {isScreen}
         />
       {/if}
       {#if section == "styles"}
-        <DesignSection
-          {componentInstance}
-          {componentDefinition}
-          bindings={globalBindings}
-        />
+        <DesignSection {componentInstance} {componentDefinition} {bindings} />
         <CustomStylesSection
           {componentInstance}
           {componentDefinition}
-          bindings={globalBindings}
+          {bindings}
         />
       {/if}
       {#if section == "conditions"}
         <ConditionalUISection
           {componentInstance}
           {componentDefinition}
-          bindings={globalBindings}
+          {bindings}
         />
       {/if}
     </Panel>
diff --git a/packages/client/src/components/context/DeviceBindingsProvider.svelte b/packages/client/src/components/context/DeviceBindingsProvider.svelte
index 165abd0027..2bd21d02e7 100644
--- a/packages/client/src/components/context/DeviceBindingsProvider.svelte
+++ b/packages/client/src/components/context/DeviceBindingsProvider.svelte
@@ -15,7 +15,6 @@
   })
 
   $: theme = $themeStore.theme
-  $: baseTheme = $themeStore.baseTheme
 
   $: data = {
     mobile: width && width < tabletBreakpoint,
@@ -23,7 +22,6 @@
     width,
     height,
     theme,
-    baseTheme,
   }
 
   onMount(() => {

From 3fb67ffe4feda02b1e45d655f61388ed487367c4 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 7 Sep 2023 10:42:07 +0100
Subject: [PATCH 03/17] Updating pro reference checking to work for master
 branch.

---
 .github/workflows/budibase_ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 3e4b2221d2..66fbd7abb2 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -225,10 +225,12 @@ jobs:
           echo "Running on branch '$branch' (base_ref=${{ github.base_ref }}, ref_name=${{ github.head_ref }})"
 
           if [[ $branch == "master" ]]; then
-            base_commit=$(git rev-parse origin/master)
+            base_branch=master
           else
-            base_commit=$(git rev-parse origin/develop)
+            base_branch=develop
           fi
+          git fetch origin $base_branch
+          base_commit=$(git rev-parse $base_branch)
 
           echo "target_branch=$branch"
           echo "target_branch=$branch" >> "$GITHUB_OUTPUT"

From ef9c0f7f042876ffed772008830f3c287a1d4ca0 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 7 Sep 2023 10:46:02 +0100
Subject: [PATCH 04/17] Pure git fetch for checking pro ref.

---
 .github/workflows/budibase_ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 66fbd7abb2..579f656301 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -229,7 +229,7 @@ jobs:
           else
             base_branch=develop
           fi
-          git fetch origin $base_branch
+          git fetch
           base_commit=$(git rev-parse $base_branch)
 
           echo "target_branch=$branch"

From f17a0acb17c335bda163748339b5c02fb6f7797c Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 7 Sep 2023 10:48:08 +0100
Subject: [PATCH 05/17] Better logging.

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

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 579f656301..4db4b3064c 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -229,7 +229,9 @@ jobs:
           else
             base_branch=develop
           fi
+          echo "Running git fetch"
           git fetch
+          echo "Running git rev-parse $base_branch"
           base_commit=$(git rev-parse $base_branch)
 
           echo "target_branch=$branch"

From 25287173e25b0715215132c7b5774b38a50ebf18 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 7 Sep 2023 10:59:29 +0100
Subject: [PATCH 06/17] Switching to fetch-depth 0.

---
 .github/workflows/budibase_ci.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 4db4b3064c..d670e222d3 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -214,6 +214,7 @@ jobs:
         with:
           submodules: true
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
+          fetch-depth: 0
 
       - name: Check pro commit
         id: get_pro_commits
@@ -225,14 +226,10 @@ jobs:
           echo "Running on branch '$branch' (base_ref=${{ github.base_ref }}, ref_name=${{ github.head_ref }})"
 
           if [[ $branch == "master" ]]; then
-            base_branch=master
+            base_commit=$(git rev-parse origin/master)
           else
-            base_branch=develop
+            base_commit=$(git rev-parse origin/develop)
           fi
-          echo "Running git fetch"
-          git fetch
-          echo "Running git rev-parse $base_branch"
-          base_commit=$(git rev-parse $base_branch)
 
           echo "target_branch=$branch"
           echo "target_branch=$branch" >> "$GITHUB_OUTPUT"
@@ -255,4 +252,4 @@ jobs:
               process.exit(1);
             } else {
               console.log('All good, the submodule had been merged and setup correctly!')
-            }
+            }
\ No newline at end of file

From ee396b983b3637d1cf21d8a29e1d8ebd183e9cd8 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 7 Sep 2023 11:29:18 +0000
Subject: [PATCH 07/17] Bump version to 2.9.39

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

diff --git a/lerna.json b/lerna.json
index a662b691ed..9c5cd65aa0 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.9.39-alpha.14",
+  "version": "2.9.39",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From 10e3cccb9f2bb004840f5c60f8bd111338d6609e Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 7 Sep 2023 13:33:53 +0000
Subject: [PATCH 08/17] Bump version to 2.10.0

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

diff --git a/lerna.json b/lerna.json
index 9c5cd65aa0..fd2bdb2f65 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.9.39",
+  "version": "2.10.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From 662e8d9c31c168bb7ea3953c90c870d901490e76 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 7 Sep 2023 17:02:11 +0100
Subject: [PATCH 09/17] Quick fix for disabling formula changing, swapping
 between static and dynamic can cause problems.

---
 .../backend/DataTable/modals/CreateEditColumn.svelte         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index fdfbff7b14..fd13767a63 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -55,7 +55,7 @@
   let linkEditDisabled
   let primaryDisplay
   let indexes = [...($tables.selected.indexes || [])]
-  let isCreating
+  let isCreating = undefined
 
   let table = $tables.selected
   let confirmDeleteDialog
@@ -75,11 +75,11 @@
   }
 
   const initialiseField = (field, savingColumn) => {
+    isCreating = !field
     if (field && !savingColumn) {
       editableColumn = cloneDeep(field)
       originalName = editableColumn.name ? editableColumn.name + "" : null
       linkEditDisabled = originalName != null
-      isCreating = originalName == null
       primaryDisplay =
         $tables.selected.primaryDisplay == null ||
         $tables.selected.primaryDisplay === editableColumn.name
@@ -584,6 +584,7 @@
               { label: "Dynamic", value: "dynamic" },
               { label: "Static", value: "static" },
             ]}
+            disabled={!isCreating}
             getOptionLabel={option => option.label}
             getOptionValue={option => option.value}
             tooltip="Dynamic formula are calculated when retrieved, but cannot be filtered or sorted by,

From ab5753273ddebb9f7f68b538e517162f26bb88ef Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Thu, 7 Sep 2023 18:50:07 +0100
Subject: [PATCH 10/17] fix for legacy custom roles

---
 packages/server/src/sdk/app/permissions/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/sdk/app/permissions/index.ts b/packages/server/src/sdk/app/permissions/index.ts
index b79bfeeb31..b2661b0f7e 100644
--- a/packages/server/src/sdk/app/permissions/index.ts
+++ b/packages/server/src/sdk/app/permissions/index.ts
@@ -92,7 +92,7 @@ export async function getResourcePerms(
     // update the various roleIds in the resource permissions
     for (let role of rolesList) {
       const rolePerms = allowsExplicitPerm
-        ? roles.checkForRoleResourceArray(role.permissions, resourceId)
+        ? roles.checkForRoleResourceArray(role.permissions || {}, resourceId)
         : {}
       if (rolePerms[resourceId]?.indexOf(level) > -1) {
         permissions[level] = {

From b74814906851bed6853ccccf438a0c5e65bb91e1 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Thu, 7 Sep 2023 19:06:58 +0100
Subject: [PATCH 11/17] fix for app backups not being shown

---
 packages/builder/src/stores/portal/licensing.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js
index 795616add1..3197822e53 100644
--- a/packages/builder/src/stores/portal/licensing.js
+++ b/packages/builder/src/stores/portal/licensing.js
@@ -107,7 +107,7 @@ export const createLicensingStore = () => {
         Constants.Features.USER_GROUPS
       )
       const backupsEnabled = license.features.includes(
-        Constants.Features.BACKUPS
+        Constants.Features.APP_BACKUPS
       )
       const scimEnabled = license.features.includes(Constants.Features.SCIM)
       const environmentVariablesEnabled = license.features.includes(

From 3cec62b0c7672392a00f1ef4a014329cf03dad4f Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 7 Sep 2023 18:21:05 +0000
Subject: [PATCH 12/17] Bump version to 2.10.1

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

diff --git a/lerna.json b/lerna.json
index fd2bdb2f65..a346d18213 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.10.0",
+  "version": "2.10.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From a780f85cacab6ef2dfd0612dd298093b5b431b90 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 8 Sep 2023 12:37:28 +0000
Subject: [PATCH 13/17] Bump version to 2.9.40-alpha.8

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

diff --git a/lerna.json b/lerna.json
index 1725c59154..96ada475a3 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.9.40-alpha.7",
+  "version": "2.9.40-alpha.8",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From fd023cf291e1dba7abb5643c15de5b52d318f150 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 8 Sep 2023 15:56:31 +0200
Subject: [PATCH 14/17] Add dist/plugins.js back

---
 packages/backend-core/scripts/build.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/backend-core/scripts/build.js b/packages/backend-core/scripts/build.js
index 9cc33d7b75..f84f22bf8d 100644
--- a/packages/backend-core/scripts/build.js
+++ b/packages/backend-core/scripts/build.js
@@ -1,4 +1,5 @@
 #!/usr/bin/node
 const coreBuild = require("../../../scripts/build")
 
+coreBuild("./src/plugin/index.ts", "./dist/plugins.js")
 coreBuild("./src/index.ts", "./dist/index.js")

From b4e82289691ec92cb36df9a428bfdf89352d58e0 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 8 Sep 2023 14:26:28 +0000
Subject: [PATCH 15/17] Bump version to 2.9.40-alpha.9

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

diff --git a/lerna.json b/lerna.json
index 96ada475a3..65d0082142 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.9.40-alpha.8",
+  "version": "2.9.40-alpha.9",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From d1d3dd3c378e055f180517b851c1bfd72f1b701b Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 8 Sep 2023 14:51:34 +0000
Subject: [PATCH 16/17] Bump version to 2.10.2

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

diff --git a/lerna.json b/lerna.json
index a346d18213..34dca0cd41 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.10.1",
+  "version": "2.10.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From 8ecc9c2d53e9f62e44c66ef218bd2f0090778937 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 11 Sep 2023 10:57:39 +0000
Subject: [PATCH 17/17] Bump version to 2.10.3-alpha.0

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

diff --git a/lerna.json b/lerna.json
index 34dca0cd41..1669e15246 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.10.2",
+  "version": "2.10.3-alpha.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"