@saltcorn/data 0.8.0-beta.4 → 0.8.1-beta.0

package/dist/models/view.js

@@ -77,6 +77,7 @@ class View {
         this.default_render_page = o.default_render_page;
         this.table = o.table;
         this.slug = stringToJSON(o.slug);
+        this.attributes = stringToJSON(o.attributes);
     }
     /**
      * @param {object} where
@@ -394,6 +395,10 @@ class View {
         }
         const state = view.combine_state_and_default_state(query);
         const resp = await view.run(state, { res, req }, remote);
+        //console.log(req.headers);
+        const isModal = req.headers?.saltcornmodalrequest;
+        if (isModal) {
+        }
         // return contents
         return div(resp);
     }
@@ -539,18 +544,21 @@ class View {
         }
     }
     async connected_objects() {
+        const Table = (await Promise.resolve().then(() => __importStar(require("./table")))).default;
+        const viewTbl = this.table_id
+            ? Table.findOne({ id: this.table_id })
+            : undefined;
         if (!this.viewtemplateObj?.connectedObjects)
-            return {};
+            return viewTbl ? { tables: [viewTbl] } : {};
         else {
             const result = await this.viewtemplateObj.connectedObjects(this.configuration);
-            if (this.table_id) {
-                const Table = (await Promise.resolve().then(() => __importStar(require("./table")))).default;
-                const table = Table.findOne({ id: this.table_id });
-                if (table)
-                    if (result.tables)
-                        result.tables.push(table);
-                    else
-                        result.tables = [table];
+            if (viewTbl) {
+                if (!result)
+                    return { tables: [viewTbl] };
+                else if (result.tables)
+                    result.tables.push(viewTbl);
+                else
+                    result.tables = [viewTbl];
             }
             return result;
         }

package/dist/models/view.js.map

@@ -1 +1 @@
-{"version":3,"file":"view.js","sourceRoot":"","sources":["../../models/view.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"view.js","sourceRoot":"","sources":["../../models/view.ts"],"names":[],"mappings":"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"}

package/dist/package.json

@@ -1,120 +1,120 @@
 {
-    "name": "@saltcorn/data",
-    "version": "0.7.2-beta.0",
-    "description": "Data models for Saltcorn, open-source no-code platform",
-    "homepage": "https://saltcorn.com",
-    "scripts": {
-        "test": "jest tests --runInBand",
-        "tsc": "echo \"Error: no TypeScript support yet\"",
-        "clean": "echo \"Error: no TypeScript support yet\"",
-        "build": "webpack --mode development"
-    },
-    "author": "Tom Nielsen",
-    "license": "MIT",
-    "main": "dist/index.js",
-    "exports": {
-        ".": "./dist/index.js",
-        "./*": "./dist/*.js",
-        "./base-plugin/*": "./dist/base-plugin/*.js",
-        "./base-plugin": "./dist/base-plugin/index.js",
-        "./base-plugin/viewtemplate/*": "./dist/base-plugin/viewtemplate/*.js",
-        "./db/": "./dist/db/index.js",
-        "./db": "./dist/db/index.js",
-        "./db/*": "./dist/db/*.js",
-        "./models/*": "./dist/models/*.js"
-    },
-    "typesVersions": {
-        "*": {
-            "*": [
-                "dist/*",
-                "dist/db/*"
-            ]
-        }
-    },
-    "files": [
-        "dist/**/*"
+  "name": "@saltcorn/data",
+  "version": "0.7.2-beta.0",
+  "description": "Data models for Saltcorn, open-source no-code platform",
+  "homepage": "https://saltcorn.com",
+  "scripts": {
+    "test": "jest tests --runInBand",
+    "tsc": "echo \"Error: no TypeScript support yet\"",
+    "clean": "echo \"Error: no TypeScript support yet\"",
+    "build": "webpack --mode development"
+  },
+  "author": "Tom Nielsen",
+  "license": "MIT",
+  "main": "dist/index.js",
+  "exports": {
+    ".": "./dist/index.js",
+    "./*": "./dist/*.js",
+    "./base-plugin/*": "./dist/base-plugin/*.js",
+    "./base-plugin": "./dist/base-plugin/index.js",
+    "./base-plugin/viewtemplate/*": "./dist/base-plugin/viewtemplate/*.js",
+    "./db/": "./dist/db/index.js",
+    "./db": "./dist/db/index.js",
+    "./db/*": "./dist/db/*.js",
+    "./models/*": "./dist/models/*.js"
+  },
+  "typesVersions": {
+    "*": {
+      "*": [
+        "dist/*",
+        "dist/db/*"
+      ]
+    }
+  },
+  "files": [
+    "dist/**/*"
+  ],
+  "optionalDependencies": {
+    "@saltcorn/postgres": "0.7.2-beta.0",
+    "@saltcorn/sqlite": "0.7.2-beta.0"
+  },
+  "dependencies": {
+    "@saltcorn/types": "0.7.2-beta.0",
+    "@saltcorn/markup": "0.7.2-beta.0",
+    "@saltcorn/db-common": "0.7.2-beta.0",
+    "@saltcorn/sqlite-mobile": "0.7.2-beta.0",
+    "acorn": "^8.0.3",
+    "astring": "^1.4.3",
+    "axios": "^0.26.1",
+    "bcryptjs": "^2.4.3",
+    "blockly": "^6.20210701.0",
+    "contractis": "^0.1.0",
+    "csvtojson": "^2.0.10",
+    "dateformat": "^3.0.3",
+    "dumb-passwords": "^0.2.1",
+    "email-validator": "^2.0.4",
+    "env-paths": "^2.2.0",
+    "estraverse": "^5.2.0",
+    "i18n": "^0.14.0",
+    "latest-version": "^5.1.0",
+    "moment": "^2.27.0",
+    "moment-timezone": "^0.5.33",
+    "node-fetch": "2.6.2",
+    "pluralize": "^8.0.0",
+    "tmp-promise": "^3.0.2",
+    "uuid": "^8.2.0",
+    "vm-browserify": "^1.1.2",
+    "buffer": "6.0.3",
+    "url": "0.11.0",
+    "util": "0.12.4",
+    "os-browserify": "0.3.0",
+    "path-browserify": "1.0.1",
+    "stream-browserify": "3.0.0",
+    "stream-http": "3.2.0",
+    "cordova-sqlite-storage": "^6.0.0",
+    "crypto-browserify": "3.12.0",
+    "https-browserify": "1.0.0",
+    "browserify-zlib": "0.2.0",
+    "nodemailer": "^6.4.17",
+    "mjml": "4.12.0"
+  },
+  "repository": "github:saltcorn/saltcorn",
+  "devDependencies": {
+    "@types/i18n": "^0.13.2",
+    "@types/bcryptjs": "^2.4.2",
+    "@types/csvtojson": "^2.0.0",
+    "@types/dateformat": "^5.0.0",
+    "@types/dumb-passwords": "^0.2.1",
+    "@types/estraverse": "^5.1.1",
+    "@types/jest": "^27.0.3",
+    "@types/mjml": "4.7.0",
+    "@types/node": "^16.11.12",
+    "@types/node-fetch": "2.5.12",
+    "@types/nodemailer": "^6.4.4",
+    "@types/uuid": "^8.3.3",
+    "chaos-guinea-pig": "^0.1.0",
+    "jest": "^27.1.0",
+    "ts-jest": "^27.1.0",
+    "typescript": "^4.4.4",
+    "webpack": "5.68.0",
+    "webpack-cli": "4.9.2"
+  },
+  "jest": {
+    "preset": "ts-jest",
+    "testEnvironment": "node",
+    "modulePathIgnorePatterns": [
+      ".*\\.js$"
     ],
-    "optionalDependencies": {
-        "@saltcorn/postgres": "0.7.2-beta.0",
-        "@saltcorn/sqlite": "0.7.2-beta.0"
-    },
-    "dependencies": {
-        "@saltcorn/types": "0.7.2-beta.0",
-        "@saltcorn/markup": "0.7.2-beta.0",
-        "@saltcorn/db-common": "0.7.2-beta.0",
-        "@saltcorn/sqlite-mobile": "0.7.2-beta.0",
-        "acorn": "^8.0.3",
-        "astring": "^1.4.3",
-        "axios": "^0.26.1",
-        "bcryptjs": "^2.4.3",
-        "blockly": "^6.20210701.0",
-        "contractis": "^0.1.0",
-        "csvtojson": "^2.0.10",
-        "dateformat": "^3.0.3",
-        "dumb-passwords": "^0.2.1",
-        "email-validator": "^2.0.4",
-        "env-paths": "^2.2.0",
-        "estraverse": "^5.2.0",
-        "i18n": "^0.14.0",
-        "latest-version": "^5.1.0",
-        "moment": "^2.27.0",
-        "moment-timezone": "^0.5.33",
-        "node-fetch": "2.6.2",
-        "pluralize": "^8.0.0",
-        "tmp-promise": "^3.0.2",
-        "uuid": "^8.2.0",
-        "vm-browserify": "^1.1.2",
-        "buffer": "6.0.3",
-        "url": "0.11.0",
-        "util": "0.12.4",
-        "os-browserify": "0.3.0",
-        "path-browserify": "1.0.1",
-        "stream-browserify": "3.0.0",
-        "stream-http": "3.2.0",
-        "cordova-sqlite-storage": "^6.0.0",
-        "crypto-browserify": "3.12.0",
-        "https-browserify": "1.0.0",
-        "browserify-zlib": "0.2.0",
-        "nodemailer": "^6.4.17",
-        "mjml": "4.12.0"
-    },
-    "repository": "github:saltcorn/saltcorn",
-    "devDependencies": {
-        "@types/i18n": "^0.13.2",
-        "@types/bcryptjs": "^2.4.2",
-        "@types/csvtojson": "^2.0.0",
-        "@types/dateformat": "^5.0.0",
-        "@types/dumb-passwords": "^0.2.1",
-        "@types/estraverse": "^5.1.1",
-        "@types/jest": "^27.0.3",
-        "@types/mjml": "4.7.0",
-        "@types/node": "^16.11.12",
-        "@types/node-fetch": "2.5.12",
-        "@types/nodemailer": "^6.4.4",
-        "@types/uuid": "^8.3.3",
-        "chaos-guinea-pig": "^0.1.0",
-        "jest": "^27.1.0",
-        "ts-jest": "^27.1.0",
-        "typescript": "^4.4.4",
-        "webpack": "5.68.0",
-        "webpack-cli": "4.9.2"
-    },
-    "jest": {
-        "preset": "ts-jest",
-        "testEnvironment": "node",
-        "modulePathIgnorePatterns": [
-            ".*\\.js$"
-        ],
-        "moduleNameMapper": {
-            "@saltcorn/sqlite/(.*)": "@saltcorn/sqlite/dist/$1",
-            "@saltcorn/db-common/(.*)": "@saltcorn/db-common/dist/$1",
-            "@saltcorn/data/(.*)": "@saltcorn/data/dist/$1",
-            "@saltcorn/types/(.*)": "@saltcorn/types/dist/$1",
-            "@saltcorn/markup$": "@saltcorn/markup/dist",
-            "@saltcorn/markup/(.*)": "@saltcorn/markup/dist/$1"
-        }
-    },
-    "publishConfig": {
-        "access": "public"
+    "moduleNameMapper": {
+      "@saltcorn/sqlite/(.*)": "@saltcorn/sqlite/dist/$1",
+      "@saltcorn/db-common/(.*)": "@saltcorn/db-common/dist/$1",
+      "@saltcorn/data/(.*)": "@saltcorn/data/dist/$1",
+      "@saltcorn/types/(.*)": "@saltcorn/types/dist/$1",
+      "@saltcorn/markup$": "@saltcorn/markup/dist",
+      "@saltcorn/markup/(.*)": "@saltcorn/markup/dist/$1"
     }
+  },
+  "publishConfig": {
+    "access": "public"
+  }
 }

package/dist/plugin-helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-helper.d.ts","sourceRoot":"","sources":["../plugin-helper.js"],"names":[],"mappings":"AA+WA;;;;;;GAMG;AACH,8DALW,KAAK,GAAC,MAAM,GAGV,QAAQ,MAAM,EAAE,CAAC,CAgf7B;AA+FD;;;;;;;;GAQG;AACH,gDANW,MAAM,EAAE,UACR,KAAK,EAAE,gBAGL,MAAM,CA4IlB;AAhPD;;;;;;;GAOG;AACH,uCALW,KAAK,GAAC,MAAM,YACZ,MAAM,sBAEJ,QAAQ,MAAM,EAAE,CAAC,CAiC7B;AAED;;;;;;GAMG;AACH,wCAJW,KAAK,GAAC,MAAM,YACZ,MAAM,GACJ,QAAQ,MAAM,EAAE,CAAC,CAoB7B;AAgRD;;;;;;;;GAQG;AACH;IANyB,MAAM,EAApB,KAAK,EAAE;IACM,KAAK,EAAlB,MAAM;IACS,WAAW;IACd,KAAK,EAAjB,KAAK;IACH,MAAM,CAkJlB;AAhND;;;;;GAKG;AACH,yEAHW,MAAM,GACJ,MAAM,CAoClB;AA0KD;;;;;GAKG;AACH,iEAyGK;AA90CL;;;;;GAKG;AACH,2CAJW,KAAK,EAAE,cAEL,MAAM,CA6FlB;AA2CD;;;;;GAKG;AACH,0CAJW,KAAK,GAAC,MAAM,YACZ,MAAM;oBACqB,MAAM,EAAE;GA8F7C;AA6mCD;;;;;;GAMG;AACH,iCALW,MAAM,UACN,MAAM,EAAE,aAEN,MAAM,CA0BlB;AAED;;;;;GAKG;AACH,uCAJW,MAAM,UACN,MAAM,EAAE,GACN,OAAO,MAAE,CA4BrB;AA/6CD;;;;GAIG;AACH,gEAFa,MAAM,CAclB;AAjGD;;;;;;;;;;;;;;;;GAgBG;AACH,gCAfW,MAAM,SACN,MAAM,oUAYJ,UAAQ,CA+DpB;AAqQD;;;;;GAKG;AACH,8CAJW,MAAM,SACN,MAAM,GACJ,QAAQ,MAAM,EAAE,CAAC,CAKC;AAtJ/B;;;;;;GAMG;AACH,0CALW,KAAK,EAAE,mCAGL,QAAQ,MAAM,CAAC,CAkC3B;AAssCD;;;;GAIG;AAEH,kCAJW,MAAM,GACJ,MAAM,GAAC,SAAS,CAM5B;AAwJD;;;;;;GAMG;AACH,yDALW,MAAM,GAGJ,YAAU,CAiBtB;AA1GD;;;;;;GAMG;AACH,8EAHW,MAAM,EAAE,GACN,MAAM,CA6ElB;AA5gBD;;;;;GAKG;AACH,oGAkCC"}
+{"version":3,"file":"plugin-helper.d.ts","sourceRoot":"","sources":["../plugin-helper.js"],"names":[],"mappings":"AAuXA;;;;;;GAMG;AACH,8DALW,KAAK,GAAC,MAAM,GAGV,QAAQ,MAAM,EAAE,CAAC,CAsgB7B;AA+FD;;;;;;;;GAQG;AACH,gDANW,MAAM,EAAE,UACR,KAAK,EAAE,gBAGL,MAAM,CA+IlB;AAnPD;;;;;;;GAOG;AACH,uCALW,KAAK,GAAC,MAAM,YACZ,MAAM,sBAEJ,QAAQ,MAAM,EAAE,CAAC,CAiC7B;AAED;;;;;;GAMG;AACH,wCAJW,KAAK,GAAC,MAAM,YACZ,MAAM,GACJ,QAAQ,MAAM,EAAE,CAAC,CAoB7B;AAqRD;;;;;;;;GAQG;AACH;IANyB,MAAM,EAApB,KAAK,EAAE;IACM,KAAK,EAAlB,MAAM;IACS,WAAW;IACd,KAAK,EAAjB,KAAK;IACH,MAAM,CAkJlB;AAlND;;;;;GAKG;AACH,yEAHW,MAAM,GACJ,MAAM,CAsClB;AA0KD;;;;;GAKG;AACH,iEAyGG;AA32CH;;;;;GAKG;AACH,2CAJW,KAAK,EAAE,cAEL,MAAM,CA6FlB;AA2CD;;;;;GAKG;AACH,0CAJW,KAAK,GAAC,MAAM,YACZ,MAAM;oBACqB,MAAM,EAAE;GAgG7C;AAwoCD;;;;;;GAMG;AACH,iCALW,MAAM,UACN,MAAM,EAAE,aAEN,MAAM,CAyBlB;AAED;;;;;GAKG;AACH,uCAJW,MAAM,UACN,MAAM,EAAE,GACN,OAAO,MAAE,CA4BrB;AA38CD;;;;GAIG;AACH,gEAFa,MAAM,CAclB;AAvGD;;;;;;;;;;;;;;;;GAgBG;AACH,gCAfW,MAAM,SACN,MAAM,oUAYJ,UAAQ,CAqEpB;AAuQD;;;;;GAKG;AACH,8CAJW,MAAM,SACN,MAAM,GACJ,QAAQ,MAAM,EAAE,CAAC,CAKC;AAxJ/B;;;;;;GAMG;AACH,0CALW,KAAK,EAAE,mCAGL,QAAQ,MAAM,CAAC,CAkC3B;AAmuCD;;;;GAIG;AAEH,kCAJW,MAAM,GACJ,MAAM,GAAC,SAAS,CAM5B;AAyJD;;;;;;GAMG;AACH,yDALW,MAAM,GAGJ,YAAU,CAiBtB;AA5GD;;;;;;GAMG;AACH,8EAHW,MAAM,EAAE,GACN,MAAM,CA+ElB;AA/gBD;;;;;GAKG;AACH,oGAkCC"}

package/dist/plugin-helper.js

@@ -13,7 +13,7 @@ const db = require("./db");
 const { button, a, text, i } = require("@saltcorn/markup/tags");
 const { applyAsync, InvalidConfiguration } = require("./utils");
 const { jsexprToWhere, freeVariables } = require("./models/expression");
-const { traverse } = require("./models/layout");
+const { traverseSync } = require("./models/layout");
 const { isNode } = require("./utils");
 /**
  *
@@ -228,10 +228,12 @@ const get_link_view_opts = async (table, viewname) => {
     const all_views = await View.find({});
     const all_tables = await Table.find({});
     const table_id_to_name = {};
-    all_tables.forEach(t => { table_id_to_name[t.id] = t.name; });
-    const view_name_opts = all_views.map(v => ({
+    all_tables.forEach((t) => {
+        table_id_to_name[t.id] = t.name;
+    });
+    const view_name_opts = all_views.map((v) => ({
         label: `${v.name} [${v.viewtemplate} ${table_id_to_name[v.table_id] || ""}]`,
-        name: v.name
+        name: v.name,
     }));
     const view_relation_opts = {};
     const link_view_opts = [];
@@ -241,14 +243,12 @@ const get_link_view_opts = async (table, viewname) => {
             view_relation_opts[view] = [];
         view_relation_opts[view].push({ value: name, label: relation });
     };
-    own_link_views
-        .filter((v) => v.name !== viewname)
-        .forEach((v) => {
+    own_link_views.forEach((v) => {
         push_view_option({
             view: v.name,
             label: `${v.name} [${v.viewtemplate} ${table.name}]`,
             name: `Own:${v.name}`,
-            relation: table.name
+            relation: table.name,
         });
     });
     const link_view_opts_push = (o) => {
@@ -263,7 +263,7 @@ const get_link_view_opts = async (table, viewname) => {
                     view: view.name,
                     name: `ChildList:${view.name}.${throughTable.name}.${through.name}.${related_table.name}.${relation.name}`,
                     label: `${view.name} [${view.viewtemplate} ${related_table.name}.${relation.name}.${through.name}]`,
-                    relation: `${related_table.name}.${relation.name}.${through.name}`
+                    relation: `${related_table.name}.${relation.name}.${through.name}`,
                 });
             }
             else {
@@ -271,7 +271,7 @@ const get_link_view_opts = async (table, viewname) => {
                     view: view.name,
                     name: `ChildList:${view.name}.${related_table.name}.${relation.name}`,
                     label: `${view.name} [${view.viewtemplate} ${related_table.name}.${relation.name}]`,
-                    relation: `${related_table.name}.${relation.name}`
+                    relation: `${related_table.name}.${relation.name}`,
                 });
             }
         }
@@ -283,7 +283,7 @@ const get_link_view_opts = async (table, viewname) => {
                 view: view.name,
                 name: `ParentShow:${view.name}.${related_table.name}.${relation.name}`,
                 label: `${view.name} [${view.viewtemplate} ${relation.name}.${related_table.name}]`,
-                relation: `${relation.name}.${related_table.name}`
+                relation: `${relation.name}.${related_table.name}`,
             });
         }
     }
@@ -294,7 +294,7 @@ const get_link_view_opts = async (table, viewname) => {
                 view: view.name,
                 name: `OneToOneShow:${view.name}.${related_table.name}.${relation.name}`,
                 label: `${view.name} [${view.viewtemplate} ${related_table.name}.${relation.label}]`,
-                relation: `${related_table.name}.${relation.label}`
+                relation: `${related_table.name}.${relation.label}`,
             });
         }
     }
@@ -304,7 +304,7 @@ const get_link_view_opts = async (table, viewname) => {
             view: view.name,
             label: `${view.name} [${view.viewtemplate}]`,
             name: `Independent:${view.name}`,
-            relation: "None"
+            relation: "None",
         });
     });
     return { link_view_opts, view_name_opts, view_relation_opts };
@@ -403,7 +403,7 @@ const field_picker_fields = async ({ table, viewname, req }) => {
     const { child_field_list, child_relations } = await table.get_child_relations(true);
     const aggStatOptions = {};
     const agg_fieldviews = [];
-    Object.values(getState().types).forEach(t => {
+    Object.values(getState().types).forEach((t) => {
         const fvnames = Object.entries(t.fieldviews)
             .filter(([k, v]) => !v.isEdit && !v.isFilter)
             .map(([k, v]) => k);
@@ -412,7 +412,7 @@ const field_picker_fields = async ({ table, viewname, req }) => {
             label: __("Field view"),
             type: "String",
             attributes: {
-                options: fvnames
+                options: fvnames,
             },
             showIf: {
                 "agg_field|_@_1": t.name,
@@ -429,12 +429,13 @@ const field_picker_fields = async ({ table, viewname, req }) => {
             showIf: {
                 type: "Aggregation",
                 "agg_field|_@_1": "Date",
-                agg_fieldview: "format"
-            }
+                agg_fieldview: "format",
+            },
         },
     ];
     const agg_field_opts = child_relations.map(({ table, key_field, through }) => {
-        const aggKey = (through ? `${through.name}->` : '') + `${table.name}.${key_field.name}`;
+        const aggKey = (through ? `${through.name}->` : "") +
+            `${table.name}.${key_field.name}`;
         aggStatOptions[aggKey] = [
             "Count",
             "Avg",
@@ -540,7 +541,28 @@ const field_picker_fields = async ({ table, viewname, req }) => {
             },
             showIf: { type: "JoinField" },
         },
-        ...fvConfigFields,
+        ...(req.staticFieldViewConfig
+            ? fvConfigFields
+            : [
+                {
+                    name: "fvcfg",
+                    input_type: "dynamic_fields",
+                    attributes: {
+                        //getFields: `({type, field, join_field, fieldview, join_fieldview})=>'/field/fieldviewcfgform/${table.name}/'+(type==='Field'?field:join_field)+'/'+(type==='Field'?fieldview:join_fieldview)`,
+                        getFields: `/field/fieldviewcfgform/${table.name}`,
+                        relevantFields: [
+                            "field_name",
+                            "fieldview",
+                            "type",
+                            "join_field",
+                            "join_fieldview",
+                            "_columndef",
+                        ],
+                    },
+                    //showIf: { type: ["Field", "JoinField"] },
+                },
+                { name: "_columndef", input_type: "hidden" },
+            ]),
         {
             name: "action_name",
             label: __("Action"),
@@ -618,7 +640,7 @@ const field_picker_fields = async ({ table, viewname, req }) => {
             required: true,
             attributes: {
                 options: view_name_opts,
-                asideNext: true
+                asideNext: true,
             },
             showIf: { type: "ViewLink" },
         },
@@ -628,8 +650,8 @@ const field_picker_fields = async ({ table, viewname, req }) => {
             type: "String",
             required: true,
             attributes: {
-                //options: link_view_opts,        
-                calcOptions: ["view_name", view_relation_opts]
+                //options: link_view_opts,
+                calcOptions: ["view_name", view_relation_opts],
             },
             showIf: { type: "ViewLink" },
         },
@@ -790,7 +812,7 @@ const field_picker_fields = async ({ table, viewname, req }) => {
             name: "col_width",
             label: __("Column width"),
             type: "Integer",
-            attributes: { asideNext: true }
+            attributes: { asideNext: true },
         },
         {
             name: "col_width_units",
@@ -936,10 +958,7 @@ const picked_fields_to_query = (columns, fields, layout) => {
             }
         }
         else if (column.type === "FormulaValue") {
-            freeVars = new Set([
-                ...freeVars,
-                ...freeVariables(column.formula),
-            ]);
+            freeVars = new Set([...freeVars, ...freeVariables(column.formula)]);
         }
         else if (column.type === "ViewLink") {
             if (column.view_label_formula)
@@ -987,7 +1006,7 @@ const picked_fields_to_query = (columns, fields, layout) => {
                     where: column.aggwhere ? jsexprToWhere(column.aggwhere) : undefined,
                     field,
                     aggregate: column.stat,
-                    through
+                    through,
                 };
             }
         }
@@ -1002,7 +1021,7 @@ const picked_fields_to_query = (columns, fields, layout) => {
         }
     });
     if (layout) {
-        traverse(layout, {
+        traverseSync(layout, {
             view(v) {
                 if (v.extra_state_fml)
                     freeVars = new Set([
@@ -1017,13 +1036,20 @@ const picked_fields_to_query = (columns, fields, layout) => {
                         ...freeVariables(v.extra_state_fml),
                     ]);
             },
+            blank(v) {
+                if (v?.isFormula?.text && typeof v.contents === "string")
+                    freeVars = new Set([...freeVars, ...freeVariables(v.contents)]);
+            },
             container(v) {
                 if (v.showIfFormula)
-                    freeVars = new Set([
-                        ...freeVars,
-                        ...freeVariables(v.showIfFormula),
-                    ]);
-            }
+                    freeVars = new Set([...freeVars, ...freeVariables(v.showIfFormula)]);
+                if (v.isFormula?.bgColor)
+                    freeVars = new Set([...freeVars, ...freeVariables(v.bgColor)]);
+                if (v.isFormula?.url)
+                    freeVars = new Set([...freeVars, ...freeVariables(v.url)]);
+                if (v.isFormula?.customClass)
+                    freeVars = new Set([...freeVars, ...freeVariables(v.customClass)]);
+            },
         });
     }
     add_free_variables_to_joinfields(freeVars, joinFields, fields);
@@ -1482,13 +1508,13 @@ const json_list_to_external_table = (get_json_list, fields0) => {
     const getRows = async (where = {}, selopts = {}) => {
         let data_in = await get_json_list({ where, ...selopts });
         const restricts = Object.entries(where);
-        const sat = x => ([k, v]) => {
+        const sat = (x) => ([k, v]) => {
             if (Array.isArray(v))
-                return v.every(v1 => sat(x)([k, v1]));
+                return v.every((v1) => sat(x)([k, v1]));
             else if (v?.lt)
-                return x[k] < +(v.lt);
+                return x[k] < +v.lt;
             else if (v?.gt)
-                return x[k] > +(v.gt);
+                return x[k] > +v.gt;
             else if (v?.ilike)
                 return (x[k] || "").includes(v.ilike);
             else
@@ -1512,6 +1538,9 @@ const json_list_to_external_table = (get_json_list, fields0) => {
         getFields() {
             return fields;
         },
+        getField(fnm) {
+            return fields.find((f) => f.name === fnm);
+        },
         fields,
         getRows,
         get min_role_read() {