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

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
@@ -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);
     }
@@ -67,30 +67,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 +135,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 +160,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 +199,7 @@ const calcfldViewConfig = contract(is.fun([is.array(is.class("Field")), is.bool]
         }
     }
     return fieldViewConfigForms;
-});
+};
 /**
  * @function
  * @param {Table|object} table
@@ -203,7 +207,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 +215,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 +239,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 +248,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 +279,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) {
@@ -697,7 +698,7 @@ const field_picker_fields = contract(is.fun(is.obj({ table: is_tablely, viewname
             },
         },
     ];
-});
+};
 /**
  * get_child_views Contract
  * @function
@@ -705,11 +706,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 +733,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 +741,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 +768,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,7 +781,7 @@ 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
@@ -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,12 +877,20 @@ 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),
+                    ]);
+            },
+        });
+    }
     [...freeVars]
         .filter((v) => v.includes("."))
         .map((v) => {
@@ -927,7 +924,7 @@ const picked_fields_to_query = contract(is.fun([is.array(is_column), is.array(is
             }
     });
     return { joinFields, aggregations };
-});
+};
 /**
  * @function
  * @param {object}
@@ -935,7 +932,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 +957,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 +979,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]) => {
         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 +1027,47 @@ const stateFieldsToWhere = contract(is.fun(is.obj({
         else if (field && field.type.name === "Bool" && state[k] === "?") {
             // omit
         }
+        else if (typeof v === "object" &&
+            Object.keys(v).length === 1 &&
+            field?.type?.name === "JSON") {
+            qstate[k] = [
+                ...(qstate[k] ? [qstate[k]] : []),
+                {
+                    // where jFieldNm in (select id from jtnm where lblField=v)
+                    json: [Object.keys(v)[0], Object.values(v)[0]],
+                },
+            ];
+        }
         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 +1084,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 +1202,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 +1377,6 @@ module.exports = {
     initial_config_all_fields,
     calcfldViewOptions,
     get_link_view_opts,
-    is_column,
     readState,
     readStateStrict,
     stateToQueryString,