@saltcorn/data 0.7.1-beta.3 → 0.7.2-beta.10

package/dist/plugin-helper.d.ts

@@ -5,7 +5,7 @@
  * @param {object} req
  * @returns {Promise<object[]>}
  */
-export const field_picker_fields: any;
+export function field_picker_fields({ table, viewname, req }: Table | object): Promise<object[]>;
 /**
  * picked_fields_to_query Contract
  * @function
@@ -14,7 +14,7 @@ export const field_picker_fields: any;
  * @throws {InvalidConfiguration}
  * @returns {object}
  */
-export const picked_fields_to_query: any;
+export function picked_fields_to_query(columns: object[], fields: Field[], layout: any): object;
 /**
  * get_child_views Contract
  * @function
@@ -22,7 +22,7 @@ export const picked_fields_to_query: any;
  * @param {string} viewname
  * @returns {Promise<object[]>}
  */
-export const get_child_views: any;
+export function get_child_views(table: Table | object, viewname: string, nrecurse?: number): Promise<object[]>;
 /**
  * get_parent_views Contract
  * @function
@@ -30,7 +30,7 @@ export const get_child_views: any;
  * @param {string} viewname
  * @returns {Promise<object[]>}
  */
-export const get_parent_views: any;
+export function get_parent_views(table: Table | object, viewname: string): Promise<object[]>;
 /**
  * @function
  * @param {object} opts
@@ -39,7 +39,11 @@ export const get_parent_views: any;
  * @param {boolean} [opts.approximate = true]
  * @returns {object}
  */
-export const stateFieldsToWhere: any;
+export function stateFieldsToWhere({ fields, state, approximate }: {
+    fields: Field[];
+    state: object;
+    approximate?: boolean | undefined;
+}): object;
 /**
  * @function
  * @param {object}
@@ -47,21 +51,21 @@ export const stateFieldsToWhere: any;
  * @param {string} - missing in contract
  * @returns {object}
  */
-export const stateFieldsToQuery: any;
+export function stateFieldsToQuery({ state, fields, prefix }: object): object;
 /**
  * initial_config_all_fields Contract
  * @function
  * @param {boolean}
  * @returns {function}
  */
-export const initial_config_all_fields: any;
+export function initial_config_all_fields(isEdit: any): Function;
 /**
  * @function
  * @param {Field[]} fields
  * @param {boolean}
  * @returns {object}
  */
-export const calcfldViewOptions: any;
+export function calcfldViewOptions(fields: Field[], mode: any): object;
 /**
  * @function
  * @param {Table|object} table
@@ -69,8 +73,7 @@ export const calcfldViewOptions: any;
  * @param {boolean}
  * @returns {Promise<object[]>}
  */
-export const get_link_view_opts: any;
-import { is_column } from "./contracts";
+export function get_link_view_opts(table: Table | object, viewname: string): Promise<object[]>;
 /**
  *
  * @param {object} state
@@ -90,7 +93,7 @@ export function readStateStrict(state: object, fields: object[]): boolean | any;
  * @param {object} [state]
  * @returns {string}
  */
-export const stateToQueryString: any;
+export function stateToQueryString(state?: object | undefined): string;
 /**
  *
  * @param {string} url
@@ -105,7 +108,7 @@ export const stateToQueryString: any;
  * @param {string} [link_textcol]
  * @returns {button|a}
  */
-export function link_view(url0: any, label: string, popup?: boolean | undefined, link_style?: string | undefined, link_size?: string | undefined, link_icon?: string | undefined, textStyle?: string | undefined, link_bgcol?: string | undefined, link_bordercol?: string | undefined, link_textcol?: string | undefined, extraClass: any, extraState: any): button | a;
+export function link_view(url0: any, label: string, popup?: boolean | undefined, link_style?: string | undefined, link_size?: string | undefined, link_icon?: string | undefined, textStyle?: string | undefined, link_bgcol?: string | undefined, link_bordercol?: string | undefined, link_textcol?: string | undefined, extraClass: any, extraState: any, link_target_blank: any): button | a;
 /**
  * Get Action configuration fields
  * @param {object} action
@@ -119,7 +122,7 @@ export function getActionConfigFields(action: object, table: object): Promise<ob
  * @param {boolean}
  * @returns {Promise<object>}
  */
-export const calcfldViewConfig: any;
+export function calcfldViewConfig(fields: Field[], isEdit: any, nrecurse?: number): Promise<object>;
 /**
  *
  * @param {string} x
@@ -141,5 +144,7 @@ export function run_action_column({ col, req, ...rest }: object): Promise<any>;
  * @returns {object}
  */
 export function json_list_to_external_table(get_json_list: Function, fields0: object[]): object;
-export { is_column };
+export function add_free_variables_to_joinfields(freeVars: any, joinFields: any, fields: any): void;
+import Table = require("./models/table");
+import Field = require("./models/field");
 //# sourceMappingURL=plugin-helper.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"plugin-helper.d.ts","sourceRoot":"","sources":["../plugin-helper.js"],"names":[],"mappings":"AA2VA;;;;;;GAMG;AACH,sCAqbE;AA0IF;;;;;;;GAOG;AACH,yCAqIE;AArRF;;;;;;GAMG;AACH,kCA6CE;AAEF;;;;;;GAMG;AACH,mCAiCE;AAyOF;;;;;;;GAOG;AACH,qCAsEE;AA9HF;;;;;;GAMG;AACH,qCA2BE;AA8FF;;;;;GAKG;AACH,4CA6GE;AAhrCF;;;;;GAKG;AACH,qCAwFE;AA8CF;;;;;;GAMG;AACH,qCAwEE;;AAi+BF;;;;;GAKG;AACH,iCAJW,MAAM,UACN,MAAM,EAAE,aACN,MAAM,CAwBlB;AAED;;;;;GAKG;AACH,uCAJW,MAAM,UACN,MAAM,EAAE,GACN,OAAO,MAAE,CA4BrB;AAlxCD;;;;GAIG;AACH,qCAiBE;AA1FF;;;;;;;;;;;;;GAaG;AACH,4CAXW,MAAM,4SASJ,UAAQ,CAsDpB;AAuPD;;;;;GAKG;AACH,8CAJW,MAAM,SACN,MAAM,GACJ,QAAQ,MAAM,EAAE,CAAC,CAKC;AAtI/B;;;;;GAKG;AACH,oCAoCE;AAwiCF;;;;GAIG;AACH,kCAHW,MAAM,GACJ,MAAM,GAAC,SAAS,CAK5B;AA0ID;;;;;;GAMG;AACH,yDALW,MAAM,GAGJ,YAAU,CAiBtB;AA/FD;;;;;GAKG;AACH,8EAHW,MAAM,EAAE,GACN,MAAM,CAmElB"}
+{"version":3,"file":"plugin-helper.d.ts","sourceRoot":"","sources":["../plugin-helper.js"],"names":[],"mappings":"AAiUA;;;;;;GAMG;AACH,8DALW,KAAK,GAAC,MAAM,GAGV,QAAQ,MAAM,EAAE,CAAC,CAib7B;AA8FD;;;;;;;GAOG;AACH,gDALW,MAAM,EAAE,UACR,KAAK,EAAE,gBAEL,MAAM,CA+GlB;AAjND;;;;;;GAMG;AACH,uCAJW,KAAK,GAAC,MAAM,YACZ,MAAM,sBACJ,QAAQ,MAAM,EAAE,CAAC,CAiC7B;AAED;;;;;;GAMG;AACH,wCAJW,KAAK,GAAC,MAAM,YACZ,MAAM,GACJ,QAAQ,MAAM,EAAE,CAAC,CAoB7B;AAkOD;;;;;;;GAOG;AACH;IALyB,MAAM,EAApB,KAAK,EAAE;IACM,KAAK,EAAlB,MAAM;IACS,WAAW;IACxB,MAAM,CAiJlB;AAnMD;;;;;;GAMG;AACH,8DALW,MAAM,GAGJ,MAAM,CAyBlB;AAuKD;;;;;GAKG;AACH,iEAqGG;AArrCH;;;;;GAKG;AACH,2CAJW,KAAK,EAAE,cAEL,MAAM,CAuFlB;AAwCD;;;;;;GAMG;AACH,0CALW,KAAK,GAAC,MAAM,YACZ,MAAM,GAEJ,QAAQ,MAAM,EAAE,CAAC,CAiE7B;AAw/BD;;;;;GAKG;AACH,iCAJW,MAAM,UACN,MAAM,EAAE,aACN,MAAM,CAwBlB;AAED;;;;;GAKG;AACH,uCAJW,MAAM,UACN,MAAM,EAAE,GACN,OAAO,MAAE,CA4BrB;AAlxCD;;;;GAIG;AACH,gEAFa,MAAM,CAclB;AAvFD;;;;;;;;;;;;;GAaG;AACH,4CAXW,MAAM,oUASJ,UAAQ,CAwDpB;AAgOD;;;;;GAKG;AACH,8CAJW,MAAM,SACN,MAAM,GACJ,QAAQ,MAAM,EAAE,CAAC,CAKC;AAvH/B;;;;;GAKG;AACH,0CAJW,KAAK,EAAE,mCAEL,QAAQ,MAAM,CAAC,CAgC3B;AAsjCD;;;;GAIG;AACH,kCAHW,MAAM,GACJ,MAAM,GAAC,SAAS,CAK5B;AA0ID;;;;;;GAMG;AACH,yDALW,MAAM,GAGJ,YAAU,CAiBtB;AA/FD;;;;;GAKG;AACH,8EAHW,MAAM,EAAE,GACN,MAAM,CAmElB;AAteD,oGAkCC"}

package/dist/plugin-helper.js

@@ -10,12 +10,12 @@ const Table = require("./models/table");
 const Trigger = require("./models/trigger");
 const { getState } = require("./db/state");
 const db = require("./db");
-const { contract, is } = require("contractis");
-const { fieldlike, is_table_query, is_column, is_tablely, } = require("./contracts");
 const { link } = require("@saltcorn/markup");
 const { button, a, label, text, i } = require("@saltcorn/markup/tags");
 const { applyAsync, InvalidConfiguration } = require("./utils");
 const { jsexprToWhere, freeVariables } = require("./models/expression");
+const { traverse } = require("./models/layout");
+const { isNode } = require("./utils");
 /**
  *
  * @param {string} url
@@ -30,7 +30,7 @@ const { jsexprToWhere, freeVariables } = require("./models/expression");
  * @param {string} [link_textcol]
  * @returns {button|a}
  */
-const link_view = (url0, label, popup, link_style = "", link_size = "", link_icon = "", textStyle = "", link_bgcol, link_bordercol, link_textcol, extraClass, extraState) => {
+const link_view = (url0, label, popup, link_style = "", link_size = "", link_icon = "", textStyle = "", link_bgcol, link_bordercol, link_textcol, extraClass, extraState, link_target_blank) => {
     let style = link_style === "btn btn-custom-color"
         ? `background-color: ${link_bgcol || "#000000"};border-color: ${link_bordercol || "#000000"}; color: ${link_textcol || "#000000"}`
         : null;
@@ -51,7 +51,7 @@ const link_view = (url0, label, popup, link_style = "", link_size = "", link_ico
                 extraClass,
             ],
             type: "button",
-            onClick: `ajax_modal('${url}')`,
+            onClick: isNode() ? `ajax_modal('${url}')` : `mobile_modal('${url}')`,
             style,
         }, link_icon ? i({ class: link_icon }) + " " : "", label);
     }
@@ -60,6 +60,7 @@ const link_view = (url0, label, popup, link_style = "", link_size = "", link_ico
             href: url,
             class: [textStyle, link_style, link_size, extraClass],
             style,
+            target: link_target_blank ? "_blank" : undefined,
         }, link_icon ? i({ class: link_icon }) + " " : "", text(label));
 };
 /**
@@ -67,30 +68,30 @@ const link_view = (url0, label, popup, link_style = "", link_size = "", link_ico
  * @param {object} [state]
  * @returns {string}
  */
-const stateToQueryString = contract(is.fun(is.maybe(is.obj()), is.str), (state) => {
+const stateToQueryString = (state) => {
     if (!state || Object.keys(state).length === 0)
         return "";
     return ("?" +
         Object.entries(state)
-            .map(([k, v]) => k === "id"
-            ? null
-            : `${encodeURIComponent(k)}=${encodeURIComponent(v)}`)
+            .map(([k, v]) => k === "id" ? null : `${encodeURIComponent(k)}=${encodeURIComponent(v)}`)
             .filter((s) => !!s)
             .join("&"));
-});
+};
 /**
  * @function
  * @param {Field[]} fields
  * @param {boolean}
  * @returns {object}
  */
-const calcfldViewOptions = contract(is.fun([is.array(is.class("Field")), is.str], is.obj({ field_view_options: is.objVals(is.array(is.str)) })), (fields, mode) => {
+const calcfldViewOptions = (fields, mode) => {
     const isEdit = mode === "edit";
     const isFilter = mode === "filter";
     let fvs = {};
     const handlesTextStyle = {};
+    const blockDisplay = {};
     fields.forEach((f) => {
         handlesTextStyle[f.name] = [];
+        blockDisplay[f.name] = [];
         if (f.type === "File") {
             if (!isEdit && !isFilter)
                 fvs[f.name] = Object.keys(getState().fileviews);
@@ -135,6 +136,8 @@ const calcfldViewOptions = contract(is.fun([is.array(is.class("Field")), is.str]
             Object.entries(getState().keyFieldviews).forEach(([k, v]) => {
                 if (v && v.handlesTextStyle)
                     handlesTextStyle[f.name].push(k);
+                if (v && v.blockDisplay)
+                    blockDisplay[f.name].push(k);
             });
         }
         else if (f.type && f.type.fieldviews) {
@@ -158,19 +161,21 @@ const calcfldViewOptions = contract(is.fun([is.array(is.class("Field")), is.str]
             fvs[f.name] = tfvs_ordered.map(([k, fv]) => {
                 if (fv && fv.handlesTextStyle)
                     handlesTextStyle[f.name].push(k);
+                if (fv && fv.blockDisplay)
+                    blockDisplay[f.name].push(k);
                 return k;
             });
         }
     });
-    return { field_view_options: fvs, handlesTextStyle };
-});
+    return { field_view_options: fvs, handlesTextStyle, blockDisplay };
+};
 /**
  * @function
  * @param {Field[]} fields
  * @param {boolean}
  * @returns {Promise<object>}
  */
-const calcfldViewConfig = contract(is.fun([is.array(is.class("Field")), is.bool], is.promise(is.obj())), async (fields, isEdit, nrecurse = 2) => {
+const calcfldViewConfig = async (fields, isEdit, nrecurse = 2) => {
     const fieldViewConfigForms = {};
     for (const f of fields) {
         f.fill_table();
@@ -195,7 +200,7 @@ const calcfldViewConfig = contract(is.fun([is.array(is.class("Field")), is.bool]
         }
     }
     return fieldViewConfigForms;
-});
+};
 /**
  * @function
  * @param {Table|object} table
@@ -203,7 +208,7 @@ const calcfldViewConfig = contract(is.fun([is.array(is.class("Field")), is.bool]
  * @param {boolean}
  * @returns {Promise<object[]>}
  */
-const get_link_view_opts = contract(is.fun([is_tablely, is.str], is.promise(is.array(is.obj({ label: is.str, name: is.str })))), async (table, viewname) => {
+const get_link_view_opts = async (table, viewname) => {
     const own_link_views = await View.find_possible_links_to_table(table);
     const link_view_opts = own_link_views
         .filter((v) => v.name !== viewname)
@@ -211,22 +216,21 @@ const get_link_view_opts = contract(is.fun([is_tablely, is.str], is.promise(is.a
         label: `${v.name} [${v.viewtemplate} ${table.name}]`,
         name: `Own:${v.name}`,
     }));
-    const link_view_names = new Set();
+    const link_view_opts_push = (o) => {
+        if (!link_view_opts.map((v) => v.name).includes(o.name))
+            link_view_opts.push(o);
+    };
     const child_views = await get_child_views(table, viewname);
     for (const { relation, related_table, through, throughTable, views, } of child_views) {
         for (const view of views) {
             if (through && throughTable) {
-                const name = `${view.name}.${related_table.name}.${relation.name}.${throughTable.name}.${through.name}`;
-                link_view_names.add(name);
-                link_view_opts.push({
-                    name: `ChildList:${view.name}.${related_table.name}.${relation.name}.${throughTable.name}.${through.name}`,
+                link_view_opts_push({
+                    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}]`,
                 });
             }
             else {
-                const name = `${view.name}.${related_table.name}.${relation.name}`;
-                link_view_names.add(name);
-                link_view_opts.push({
+                link_view_opts_push({
                     name: `ChildList:${view.name}.${related_table.name}.${relation.name}`,
                     label: `${view.name} [${view.viewtemplate} ${related_table.name}.${relation.name}]`,
                 });
@@ -236,7 +240,7 @@ const get_link_view_opts = contract(is.fun([is_tablely, is.str], is.promise(is.a
     const parent_views = await get_parent_views(table, viewname);
     for (const { relation, related_table, views } of parent_views) {
         for (const view of views) {
-            link_view_opts.push({
+            link_view_opts_push({
                 name: `ParentShow:${view.name}.${related_table.name}.${relation.name}`,
                 label: `${view.name} [${view.viewtemplate} ${relation.name}.${related_table.name}]`,
             });
@@ -245,23 +249,21 @@ const get_link_view_opts = contract(is.fun([is_tablely, is.str], is.promise(is.a
     const onetoone_views = await get_onetoone_views(table, viewname);
     for (const { relation, related_table, views } of onetoone_views) {
         for (const view of views) {
-            const name = `${view.name}.${related_table.name}.${relation.name}`;
-            if (!link_view_names.has(name))
-                link_view_opts.push({
-                    name: `OneToOneShow:${view.name}.${related_table.name}.${relation.name}`,
-                    label: `${view.name} [${view.viewtemplate} ${related_table.name}.${relation.label}]`,
-                });
+            link_view_opts_push({
+                name: `OneToOneShow:${view.name}.${related_table.name}.${relation.name}`,
+                label: `${view.name} [${view.viewtemplate} ${related_table.name}.${relation.label}]`,
+            });
         }
     }
     const independent_views = await View.find_all_views_where(({ state_fields }) => !state_fields.some((sf) => sf.required));
     independent_views.forEach((view) => {
-        link_view_opts.push({
+        link_view_opts_push({
             label: `${view.name} [${view.viewtemplate}]`,
             name: `Independent:${view.name}`,
         });
     });
     return link_view_opts;
-});
+};
 /**
  * Get Action configuration fields
  * @param {object} action
@@ -278,7 +280,7 @@ const getActionConfigFields = async (action, table) => typeof action.configField
  * @param {object} req
  * @returns {Promise<object[]>}
  */
-const field_picker_fields = contract(is.fun(is.obj({ table: is_tablely, viewname: is.str }), is.promise(is.array(fieldlike))), async ({ table, viewname, req }) => {
+const field_picker_fields = async ({ table, viewname, req }) => {
     const __ = (...s) => (req ? req.__(...s) : s.join(""));
     const fields = await table.getFields();
     for (const field of fields) {
@@ -625,7 +627,7 @@ const field_picker_fields = contract(is.fun(is.obj({ table: is_tablely, viewname
             label: __("Open in new tab"),
             type: "Bool",
             required: false,
-            showIf: { type: "Link" },
+            showIf: { type: ["ViewLink", "Link"] },
         },
         {
             name: "in_modal",
@@ -697,7 +699,7 @@ const field_picker_fields = contract(is.fun(is.obj({ table: is_tablely, viewname
             },
         },
     ];
-});
+};
 /**
  * get_child_views Contract
  * @function
@@ -705,11 +707,7 @@ const field_picker_fields = contract(is.fun(is.obj({ table: is_tablely, viewname
  * @param {string} viewname
  * @returns {Promise<object[]>}
  */
-const get_child_views = contract(is.fun([is_tablely, is.maybe(is.str)], is.promise(is.array(is.obj({
-    relation: is.class("Field"),
-    related_table: is.class("Table"),
-    views: is.array(is.class("View")),
-})))), async (table, viewname, nrecurse = 2) => {
+const get_child_views = async (table, viewname, nrecurse = 2) => {
     const rels = await Field.find({ reftable_name: table.name });
     const possibleThroughTables = new Set();
     var child_views = [];
@@ -736,7 +734,7 @@ const get_child_views = contract(is.fun([is_tablely, is.maybe(is.str)], is.promi
                 });
         }
     return child_views;
-});
+};
 /**
  * get_parent_views Contract
  * @function
@@ -744,35 +742,26 @@ const get_child_views = contract(is.fun([is_tablely, is.maybe(is.str)], is.promi
  * @param {string} viewname
  * @returns {Promise<object[]>}
  */
-const get_parent_views = contract(is.fun([is_tablely, is.str], is.promise(is.array(is.obj({
-    relation: is.class("Field"),
-    related_table: is.class("Table"),
-    views: is.array(is.class("View")),
-})))), async (table, viewname) => {
+const get_parent_views = async (table, viewname) => {
     var parent_views = [];
     const parentrels = (await table.getFields()).filter((f) => f.is_fkey && f.type !== "File");
     for (const relation of parentrels) {
         const related_table = await Table.findOne({
             name: relation.reftable_name,
         });
-        const views = await View.find_table_views_where(related_table, ({ state_fields, viewrow }) => viewrow.name !== viewname &&
-            state_fields.some((sf) => sf.name === "id"));
+        const views = await View.find_table_views_where(related_table, ({ state_fields, viewrow }) => viewrow.name !== viewname && state_fields.some((sf) => sf.name === "id"));
         parent_views.push({ relation, related_table, views });
     }
     return parent_views;
-});
+};
 /**
  * get_onetoone_views Contract
  * @function
- * @param {Table|is_tablely} table
+ * @param {Table} table
  * @param {string} viewname
  * @returns {Promise<object[]>}
  */
-const get_onetoone_views = contract(is.fun([is_tablely, is.str], is.promise(is.array(is.obj({
-    relation: is.class("Field"),
-    related_table: is.class("Table"),
-    views: is.array(is.class("View")),
-})))), async (table, viewname) => {
+const get_onetoone_views = async (table, viewname) => {
     const rels = await Field.find({
         reftable_name: table.name,
         is_unique: true,
@@ -780,12 +769,11 @@ const get_onetoone_views = contract(is.fun([is_tablely, is.str], is.promise(is.a
     var child_views = [];
     for (const relation of rels) {
         const related_table = await Table.findOne({ id: relation.table_id });
-        const views = await View.find_table_views_where(related_table.id, ({ state_fields, viewrow }) => viewrow.name !== viewname &&
-            state_fields.some((sf) => sf.name === "id"));
+        const views = await View.find_table_views_where(related_table.id, ({ state_fields, viewrow }) => viewrow.name !== viewname && state_fields.some((sf) => sf.name === "id"));
         child_views.push({ relation, related_table, views });
     }
     return child_views;
-});
+};
 /**
  * picked_fields_to_query Contract
  * @function
@@ -794,11 +782,10 @@ const get_onetoone_views = contract(is.fun([is_tablely, is.str], is.promise(is.a
  * @throws {InvalidConfiguration}
  * @returns {object}
  */
-const picked_fields_to_query = contract(is.fun([is.array(is_column), is.array(is.class("Field"))], is_table_query), (columns, fields) => {
+const picked_fields_to_query = (columns, fields, layout) => {
     var joinFields = {};
     var aggregations = {};
     let freeVars = new Set(); // for join fields
-    const joinFieldNames = new Set(fields.filter((f) => f.is_fkey).map((f) => f.name));
     (columns || []).forEach((column) => {
         if (column.type === "JoinField") {
             if (column.join_field && column.join_field.split) {
@@ -844,9 +831,11 @@ const picked_fields_to_query = contract(is.fun([is.array(is_column), is.array(is
         }
         else if (column.type === "ViewLink") {
             if (column.view_label_formula)
+                freeVars = new Set([...freeVars, ...freeVariables(column.view_label)]);
+            if (column.extra_state_fml)
                 freeVars = new Set([
                     ...freeVars,
-                    ...freeVariables(column.view_label),
+                    ...freeVariables(column.extra_state_fml),
                 ]);
             if (column.view && column.view.split) {
                 const [vtype, vrest] = column.view.split(":");
@@ -888,15 +877,28 @@ const picked_fields_to_query = contract(is.fun([is.array(is_column), is.array(is
                 freeVars = new Set([...freeVars, ...freeVariables(column.link_url)]);
         }
         else if (column.type === "Action" && column.action_label_formula) {
-            freeVars = new Set([
-                ...freeVars,
-                ...freeVariables(column.action_label),
-            ]);
+            freeVars = new Set([...freeVars, ...freeVariables(column.action_label)]);
         }
     });
+    if (layout) {
+        traverse(layout, {
+            view(v) {
+                if (v.extra_state_fml)
+                    freeVars = new Set([
+                        ...freeVars,
+                        ...freeVariables(v.extra_state_fml),
+                    ]);
+            },
+        });
+    }
+    add_free_variables_to_joinfields(freeVars, joinFields, fields);
+    return { joinFields, aggregations };
+};
+const add_free_variables_to_joinfields = (freeVars, joinFields, fields) => {
+    const joinFieldNames = new Set(fields.filter((f) => f.is_fkey).map((f) => f.name));
     [...freeVars]
         .filter((v) => v.includes("."))
-        .map((v) => {
+        .forEach((v) => {
         const kpath = v.split(".");
         if (joinFieldNames.has(kpath[0]))
             if (kpath.length === 2) {
@@ -926,8 +928,7 @@ const picked_fields_to_query = contract(is.fun([is.array(is_column), is.array(is
                 };
             }
     });
-    return { joinFields, aggregations };
-});
+};
 /**
  * @function
  * @param {object}
@@ -935,7 +936,7 @@ const picked_fields_to_query = contract(is.fun([is.array(is_column), is.array(is
  * @param {string} - missing in contract
  * @returns {object}
  */
-const stateFieldsToQuery = contract(is.fun(is.obj(), is.obj()), ({ state, fields, prefix = "" }) => {
+const stateFieldsToQuery = ({ state, fields, prefix = "" }) => {
     let q = {};
     const stateKeys = Object.keys(state);
     if (state._sortby) {
@@ -960,7 +961,7 @@ const stateFieldsToQuery = contract(is.fun(is.obj(), is.obj()), ({ state, fields
         q.orderBy = { distance: { lat, long, latField, longField } };
     }
     return q;
-});
+};
 /**
  *
  * @param {object} container
@@ -982,14 +983,15 @@ const addOrCreateList = (container, key, x) => {
  * @param {boolean} [opts.approximate = true]
  * @returns {object}
  */
-const stateFieldsToWhere = contract(is.fun(is.obj({
-    fields: is.array(is.class("Field")),
-    approximate: is.maybe(is.bool),
-}), is.obj()), ({ fields, state, approximate = true }) => {
+const stateFieldsToWhere = ({ fields, state, approximate = true }) => {
     var qstate = {};
-    Object.entries(state).forEach(([k, v]) => {
+    Object.entries(state || {}).forEach(([k, v]) => {
         if (k === "_fts") {
-            qstate[k] = { searchTerm: v.replace(/\0/g, ""), fields };
+            qstate[k] = {
+                searchTerm: v.replace(/\0/g, ""),
+                fields,
+                schema: db.getTenantSchema(),
+            };
             return;
         }
         const field = fields.find((fld) => fld.name == k);
@@ -1029,12 +1031,72 @@ const stateFieldsToWhere = contract(is.fun(is.obj({
         else if (field && field.type.name === "Bool" && state[k] === "?") {
             // omit
         }
+        else if (typeof v === "object" && v && field?.type?.name === "JSON") {
+            let json = {};
+            if (Object.values(v).length === 1 && Object.values(v)[0] === "")
+                return;
+            Object.entries(v).forEach(([kj, vj]) => {
+                if (vj === "")
+                    return;
+                if (kj.endsWith("__lte")) {
+                    json[kj.replace("__lte", "")] = {
+                        lte: +vj,
+                        ...(json[kj.replace("__lte", "")] || {}),
+                    };
+                }
+                else if (kj.endsWith("__gte")) {
+                    json[kj.replace("__gte", "")] = {
+                        gte: +vj,
+                        ...(json[kj.replace("__gte", "")] || {}),
+                    };
+                }
+                else {
+                    json[kj] = vj;
+                    if (field.attributes?.hasSchema) {
+                        const s = field.attributes.schema.find((f) => f.key === Object.keys(v)[0]);
+                        if (s?.type === "String") {
+                            json[kj] = { ilike: vj };
+                        }
+                    }
+                }
+            });
+            qstate[k] = [
+                ...(qstate[k] ? [qstate[k]] : []),
+                {
+                    json,
+                },
+            ];
+        }
         else if (field && field.type && field.type.read)
             qstate[k] = Array.isArray(v)
                 ? { or: v.map(field.type.read) }
                 : field.type.read(v);
         else if (field)
             qstate[k] = v;
+        else if (k.includes("->")) {
+            // jFieldNm.jtnm->lblField
+            // where jFieldNm in (select id from jtnm where lblField=v)
+            const [jFieldNm, krest] = k.split(".");
+            const [jtNm, lblField] = krest.split("->");
+            let where = { [db.sqlsanitize(lblField)]: v };
+            const jTable = Table.findOne({ name: jtNm });
+            const lblFld = (jTable.fields || []).find((f) => f.name === lblField);
+            if (lblFld &&
+                lblFld.type?.name === "String" &&
+                !lblFld.attributes?.options)
+                where = { [db.sqlsanitize(lblField)]: { ilike: v } };
+            qstate[jFieldNm] = [
+                ...(qstate[jFieldNm] ? [qstate[jFieldNm]] : []),
+                {
+                    // where jFieldNm in (select id from jtnm where lblField=v)
+                    inSelect: {
+                        table: `${db.getTenantSchemaPrefix()}"${db.sqlsanitize(jtNm)}"`,
+                        field: "id",
+                        where,
+                    },
+                },
+            ];
+        }
         else if (k.includes(".")) {
             const kpath = k.split(".");
             if (kpath.length === 3) {
@@ -1051,17 +1113,33 @@ const stateFieldsToWhere = contract(is.fun(is.obj({
                     },
                 ];
             }
+            else if (kpath.length === 4) {
+                const [jtNm, jFieldNm, tblName, lblField] = kpath;
+                qstate.id = [
+                    ...(qstate.id ? [qstate.id] : []),
+                    {
+                        // where id in (select jFieldNm from jtnm where lblField=v)
+                        inSelect: {
+                            table: `${db.getTenantSchemaPrefix()}"${db.sqlsanitize(jtNm)}"`,
+                            field: db.sqlsanitize(jFieldNm),
+                            valField: "id",
+                            through: `${db.getTenantSchemaPrefix()}"${db.sqlsanitize(tblName)}"`,
+                            where: { [db.sqlsanitize(lblField)]: v },
+                        },
+                    },
+                ];
+            }
         }
     });
     return qstate;
-});
+};
 /**
  * initial_config_all_fields Contract
  * @function
  * @param {boolean}
  * @returns {function}
  */
-const initial_config_all_fields = contract(is.fun(is.bool, is.fun(is.obj({ table_id: is.posint }), is.promise(is.obj({ columns: is.array(is.obj()), layout: is.obj() })))), (isEdit) => async ({ table_id, exttable_name }) => {
+const initial_config_all_fields = (isEdit) => async ({ table_id, exttable_name }) => {
     const table = await Table.findOne(table_id ? { id: table_id } : { name: exttable_name });
     const fields = (await table.getFields()).filter((f) => !f.primary_key && (!isEdit || !f.calculated));
     var cfg = { columns: [] };
@@ -1153,7 +1231,7 @@ const initial_config_all_fields = contract(is.fun(is.bool, is.fun(is.obj({ table
         });
     cfg.layout = { above: aboves };
     return cfg;
-});
+};
 /**
  *
  * @param {string} x
@@ -1328,7 +1406,6 @@ module.exports = {
     initial_config_all_fields,
     calcfldViewOptions,
     get_link_view_opts,
-    is_column,
     readState,
     readStateStrict,
     stateToQueryString,
@@ -1338,5 +1415,6 @@ module.exports = {
     strictParseInt,
     run_action_column,
     json_list_to_external_table,
+    add_free_variables_to_joinfields,
 };
 //# sourceMappingURL=plugin-helper.js.map