Merge branch 'develop' into BUDI-7367/ds_plus_row_unittest

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.9.40-alpha.7",
+  "version": "2.10.3-alpha.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

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")

packages/builder/src/builderStore/dataBinding.js

@@ -504,22 +504,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
 }

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,

packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte

@@ -21,6 +21,7 @@
     $selectedScreen,
     $store.selectedComponentId
   )
+
   $: componentBindings = getComponentBindableProperties(
     $selectedScreen,
     $store.selectedComponentId

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(

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,14 @@
     }
   })
 
+  $: theme = $themeStore.theme
+
   $: data = {
     mobile: width && width < tabletBreakpoint,
     tablet: width && width >= tabletBreakpoint && width < desktopBreakpoint,
     width,
     height,
+    theme,
   }
 
   onMount(() => {

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] = {