Merge branch 'master' into budi-7589/user-column-multi-user-filtering-support

lerna.json

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

packages/builder/src/builderStore/dataBinding.js

@@ -948,12 +948,15 @@ export const buildFormSchema = (component, asset) => {
 
   if (component._component.endsWith("formblock")) {
     let schema = {}
-
     const datasource = getDatasourceForProvider(asset, component)
     const info = getSchemaForDatasource(component, datasource)
 
+    if (!info?.schema) {
+      return schema
+    }
+
     if (!component.fields) {
-      Object.values(info?.schema)
+      Object.values(info.schema)
         .filter(
           ({ autocolumn, name }) =>
             !autocolumn && !["_rev", "_id"].includes(name)

packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte

@@ -37,7 +37,7 @@
   }
 
   $: datasource = getDatasourceForProvider($currentAsset, componentInstance)
-  $: resourceId = datasource.resourceId || datasource.tableId
+  $: resourceId = datasource?.resourceId || datasource?.tableId
 
   $: if (!isEqual(value, cachedValue)) {
     cachedValue = cloneDeep(value)