@saltcorn/data 1.6.0-alpha.7 → 1.6.0-alpha.9

package/dist/base-plugin/viewtemplates/filter.js

@@ -1,21 +1,24 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 /**
  * @category saltcorn-data
  * @module base-plugin/viewtemplates/filter
  * @subcategory base-plugin
  */
-const User = require("../../models/user");
-const Page = require("../../models/page");
-const View = require("../../models/view");
-const Table = require("../../models/table");
-const Field = require("../../models/field");
-const Workflow = require("../../models/workflow");
-const Trigger = require("../../models/trigger");
-const Crash = require("../../models/crash");
-const { div, text, span, i, option, select, button, text_attr, domReady, script, a, } = require("@saltcorn/markup/tags");
+const table_1 = __importDefault(require("../../models/table"));
+const view_1 = __importDefault(require("../../models/view"));
+const field_1 = __importDefault(require("../../models/field"));
+const workflow_1 = __importDefault(require("../../models/workflow"));
+const trigger_1 = __importDefault(require("../../models/trigger"));
+const user_1 = __importDefault(require("../../models/user"));
+const page_1 = __importDefault(require("../../models/page"));
+const crash_1 = __importDefault(require("../../models/crash"));
+const tags_1 = require("@saltcorn/markup/tags");
 const renderLayout = require("@saltcorn/markup/layout");
-const { readState, calcfldViewOptions, calcfldViewConfig, run_action_column, stateFieldsToWhere, getActionConfigFields, picked_fields_to_query, stateFieldsToQuery, stateToQueryString, } = require("../../plugin-helper");
-const { action_link } = require("../../viewable_fields");
+const plugin_helper_1 = require("../../plugin-helper");
+const viewable_fields_1 = require("../../viewable_fields");
 const { search_bar } = require("@saltcorn/markup/helpers");
 const { eachView, translateLayout, getStringsForI18n, traverse, } = require("../../models/layout");
 const { InvalidConfiguration, objectToQueryString, removeEmptyStrings, asyncMap, getSessionId, mergeIntoWhere, isWeb, renderServerSide, } = require("../../utils");
@@ -27,12 +30,12 @@ const db = require("../../db/index");
 /**
  * @returns {Workflow}
  */
-const configuration_workflow = (req) => new Workflow({
+const configuration_workflow = (req) => new workflow_1.default({
     steps: [
         {
             name: "Layout",
             builder: async (context) => {
-                const table = Table.findOne(context.table_id || context.exttable_name);
+                const table = table_1.default.findOne(context.table_id || context.exttable_name);
                 const fields = [...table.getFields()];
                 const { child_field_list, child_relations } = await table.get_child_relations();
                 const { parent_field_list } = await table.get_parent_relations(true);
@@ -50,7 +53,7 @@ const configuration_workflow = (req) => new Workflow({
                         const jfld = fields.find((f) => f.name === jFieldNm);
                         if (!jfld)
                             return;
-                        const throughTable = Table.findOne({
+                        const throughTable = table_1.default.findOne({
                             name: jfld.reftable_name,
                         });
                         const throughFld = throughTable.fields.find((f) => f.name === throughField);
@@ -58,12 +61,12 @@ const configuration_workflow = (req) => new Workflow({
                     }
                 })
                     .filter((f) => f);
-                const roles = await User.get_roles();
+                const roles = await user_1.default.get_roles();
                 for (const cr of child_relations) {
                     const cfields = await cr.table.getFields();
                     cfields.forEach((cf) => {
                         if (cf.name !== cr.key_field.name)
-                            fields.push(new Field({
+                            fields.push(new field_1.default({
                                 ...cf,
                                 label: `${cr.table.name}.${cr.key_field.name}→${cf.name}`,
                                 name: `${cr.table.name}.${cr.key_field.name}.${cf.name}`,
@@ -72,14 +75,14 @@ const configuration_workflow = (req) => new Workflow({
                 }
                 const stateActions = Object.entries(getState().actions).filter(([k, v]) => !v.disableInBuilder && !v.disableIf?.());
                 const actions1 = ["Clear", ...stateActions.map(([k, v]) => k)];
-                const actions = Trigger.action_options({
+                const actions = trigger_1.default.action_options({
                     tableTriggers: table.id,
                     apiNeverTriggers: true,
                     forBuilder: true,
                     builtInLabel: "Filter Actions",
                     builtIns: ["Clear"],
                 });
-                const triggerActions = Trigger.trigger_actions({
+                const triggerActions = trigger_1.default.trigger_actions({
                     tableTriggers: table.id,
                     apiNeverTriggers: true,
                 });
@@ -101,10 +104,10 @@ const configuration_workflow = (req) => new Workflow({
                 };
                 for (const [name, action] of stateActions) {
                     if (action.configFields) {
-                        actionConfigForms[name] = await getActionConfigFields(action, table, { mode: "filter", req });
+                        actionConfigForms[name] = await (0, plugin_helper_1.getActionConfigFields)(action, table, { mode: "filter", req });
                     }
                 }
-                const workflowActions = Trigger.trigger_actions({
+                const workflowActions = trigger_1.default.trigger_actions({
                     tableTriggers: table.id,
                     apiNeverTriggers: true,
                     onlyWorkflows: true,
@@ -119,7 +122,7 @@ const configuration_workflow = (req) => new Workflow({
                         },
                     ];
                 }
-                const own_link_views = await View.find_table_views_where(context.table_id || context.exttable_name, ({ viewrow }) => viewrow.name !== context.viewname);
+                const own_link_views = await view_1.default.find_table_views_where(context.table_id || context.exttable_name, ({ viewrow }) => viewrow.name !== context.viewname);
                 const own_view_names = new Set();
                 const views = own_link_views.map((v) => {
                     own_view_names.add(v.name);
@@ -129,7 +132,7 @@ const configuration_workflow = (req) => new Workflow({
                         viewtemplate: v.viewtemplate,
                     };
                 });
-                const all_views = await View.find({}, { cached: true });
+                const all_views = await view_1.default.find({}, { cached: true });
                 for (const v of all_views) {
                     if (!own_view_names.has(v.name)) {
                         views.push({
@@ -145,15 +148,15 @@ const configuration_workflow = (req) => new Workflow({
                 }
                 const library = (await Library.find({})).filter((l) => l.suitableFor("filter"));
                 //const fieldViewConfigForms = await calcfldViewConfig(fields, false);
-                const { field_view_options, handlesTextStyle } = calcfldViewOptions(fields, "filter");
-                const pages = await Page.find();
+                const { field_view_options, handlesTextStyle } = (0, plugin_helper_1.calcfldViewOptions)(fields, "filter");
+                const pages = await page_1.default.find();
                 var agg_field_opts = {};
                 agg_field_opts[table.name] = table.fields
                     .filter((f) => !f.calculated || f.stored)
                     .map((f) => ({
                     name: f.name,
                     label: f.label,
-                    ftype: f.type.name || f.type,
+                    ftype: f.type?.name || f.type,
                     table_name: table.name,
                     table_id: table.id,
                 }));
@@ -214,9 +217,9 @@ const run = async (table_id, viewname, { columns, layout }, state, extra, { dist
     //console.log(layout);
     if (!columns || !layout)
         return "View not yet built";
-    const table = Table.findOne(table_id);
+    const table = table_1.default.findOne(table_id);
     const fields = table.getFields();
-    readState(state, fields);
+    (0, plugin_helper_1.readState)(state, fields);
     const formFieldNames = (columns || [])
         .map((c) => c.field_name)
         .filter((n) => n);
@@ -233,8 +236,8 @@ const run = async (table_id, viewname, { columns, layout }, state, extra, { dist
                     showv = realv.label;
             }
             badges.push({
-                text: `${text_attr(k)}:${text_attr(showv)}`,
-                onclick: `unset_state_field('${text_attr(k)}', this)`,
+                text: `${(0, tags_1.text_attr)(k)}:${(0, tags_1.text_attr)(showv)}`,
+                onclick: `unset_state_field('${(0, tags_1.text_attr)(k)}', this)`,
             });
         }
     });
@@ -248,7 +251,7 @@ const run = async (table_id, viewname, { columns, layout }, state, extra, { dist
     await traverse(layout, {
         aggregation: async (segment) => {
             const { stat, agg_field, agg_fieldview, aggwhere } = segment;
-            const where = stateFieldsToWhere({ fields, state, table, prefix: "a." });
+            const where = (0, plugin_helper_1.stateFieldsToWhere)({ fields, state, table, prefix: "a." });
             if (aggwhere) {
                 const ctx = {
                     ...state,
@@ -271,7 +274,7 @@ const run = async (table_id, viewname, { columns, layout }, state, extra, { dist
             const fld = table.getField(agg_field);
             segment.type = "blank";
             if (stat.toLowerCase() === "array_agg" && Array.isArray(val))
-                segment.contents = val.map((v) => text(v.toString())).join(", ");
+                segment.contents = val.map((v) => (0, tags_1.text)(v.toString())).join(", ");
             else if (agg_fieldview) {
                 const outcomeType = stat === "Percent true" || stat === "Percent false"
                     ? "Float"
@@ -285,7 +288,7 @@ const run = async (table_id, viewname, { columns, layout }, state, extra, { dist
                 }
             }
             else
-                segment.contents = text(val);
+                segment.contents = (0, tags_1.text)(val);
         },
         field: async (segment) => {
             const { field_name, fieldview, configuration } = segment;
@@ -295,7 +298,7 @@ const run = async (table_id, viewname, { columns, layout }, state, extra, { dist
                     const kpath = field_name.split(".");
                     if (kpath.length === 3) {
                         const [jtNm, jFieldNm, lblField] = kpath;
-                        const jtable = Table.findOne({ name: jtNm });
+                        const jtable = table_1.default.findOne({ name: jtNm });
                         if (!jtable)
                             throw new InvalidConfiguration(`View ${viewname} incorrectly configured: cannot find join table ${jtNm}`);
                         const jfields = jtable.fields;
@@ -362,7 +365,7 @@ const run = async (table_id, viewname, { columns, layout }, state, extra, { dist
                 if (extra?.isPreview)
                     return;
                 try {
-                    const actionResult = await run_action_column({
+                    const actionResult = await (0, plugin_helper_1.run_action_column)({
                         col: { ...segment },
                         referrer: extra.req?.get?.("Referrer"),
                         req: extra.req,
@@ -376,19 +379,19 @@ const run = async (table_id, viewname, { columns, layout }, state, extra, { dist
                         });
                     }
                     if (actionResult)
-                        segment.contents = script(domReady(`common_done(${JSON.stringify(actionResult)}, "${viewname}")`));
+                        segment.contents = (0, tags_1.script)((0, tags_1.domReady)(`common_done(${JSON.stringify(actionResult)}, "${viewname}")`));
                     else
                         segment.contents = "";
                 }
                 catch (e) {
                     segment.contents = "";
-                    Crash.create(e, extra.req);
+                    crash_1.default.create(e, extra.req);
                 }
             }
         },
     });
     await eachView(layout, async (segment, inLazy) => {
-        const view = await View.findOne({ name: segment.view });
+        const view = await view_1.default.findOne({ name: segment.view });
         if (!view)
             throw new InvalidConfiguration(`View ${viewname} incorrectly configured: cannot find view ${segment.view}`);
         const extra_state = segment.extra_state_fml
@@ -396,8 +399,8 @@ const run = async (table_id, viewname, { columns, layout }, state, extra, { dist
             : {};
         if (segment.state === "local") {
             const state1 = { ...extra_state };
-            const qs = stateToQueryString(state1, true);
-            segment.contents = div({
+            const qs = (0, plugin_helper_1.stateToQueryString)(state1, true);
+            segment.contents = (0, tags_1.div)({
                 class: "d-inline",
                 "data-sc-embed-viewname": view.name,
                 "data-sc-local-state": `/view/${view.name}${qs}`,
@@ -410,8 +413,8 @@ const run = async (table_id, viewname, { columns, layout }, state, extra, { dist
         }
         else {
             const state1 = { ...state, ...extra_state };
-            const qs = stateToQueryString(state1, true);
-            segment.contents = div({
+            const qs = (0, plugin_helper_1.stateToQueryString)(state1, true);
+            segment.contents = (0, tags_1.div)({
                 class: "d-inline",
                 "data-sc-embed-viewname": view.name,
                 "data-sc-view-source": `/view/${view.name}${qs}`,
@@ -422,7 +425,7 @@ const run = async (table_id, viewname, { columns, layout }, state, extra, { dist
                     : await renderServerSide(view.name, state1));
         }
     }, state);
-    await Page.renderEachEmbeddedPageInLayout(layout, state, extra);
+    await page_1.default.renderEachEmbeddedPageInLayout(layout, state, extra);
     translateLayout(layout, extra.req.getLocale());
     const blockDispatch = {
         field(segment) {
@@ -475,7 +478,7 @@ const run = async (table_id, viewname, { columns, layout }, state, extra, { dist
                 (b.label?.toLowerCase?.() || b.label)
                 ? 1
                 : -1);
-            const options = dvs.map(({ label, value, jsvalue }, ix) => option({
+            const options = dvs.map(({ label, value, jsvalue }, ix) => (0, tags_1.option)({
                 value,
                 selected: `${state[field_name]}` === `${or_if_undef(jsvalue, value)}` ||
                     (!value && !state[field_name]) ||
@@ -487,7 +490,7 @@ const run = async (table_id, viewname, { columns, layout }, state, extra, { dist
                 : label_formula
                     ? eval_expression(label_formula, { [field_name]: value }, extra.req.user || { role_id: 100 }, "Dropdown label formula")
                     : label));
-            return (select({
+            return ((0, tags_1.select)({
                 name: `ddfilter${field_name}`,
                 class: "form-control form-select d-inline-maybe scfilter selectizable",
                 style: full_width ? undefined : "width: unset;",
@@ -495,7 +498,7 @@ const run = async (table_id, viewname, { columns, layout }, state, extra, { dist
                 onchange: `this.value=='' ? unset_state_field('${encodeURIComponent(field_name)}', this): set_state_field('${encodeURIComponent(field_name)}', this.value, this)`,
             }, options) +
                 (apply_select2
-                    ? script(domReady(`$('select[name=ddfilter${field_name}]').select2();`))
+                    ? (0, tags_1.script)((0, tags_1.domReady)(`$('select[name=ddfilter${field_name}]').select2();`))
                     : ""));
         },
         action(segment) {
@@ -508,18 +511,18 @@ const run = async (table_id, viewname, { columns, layout }, state, extra, { dist
                 : "";
             if (action_name === "Clear") {
                 if (action_style === "btn-link")
-                    return a({
+                    return (0, tags_1.a)({
                         onclick: `${confirmStr}clear_state('${configuration?.omit_fields || ""}', this)`,
                         href: "javascript:void(0)",
                     }, action_icon
-                        ? i({ class: action_icon }) + (label ? " " : "")
+                        ? (0, tags_1.i)({ class: action_icon }) + (label ? " " : "")
                         : false, label);
                 else
-                    return button({
+                    return (0, tags_1.button)({
                         onClick: `${confirmStr}clear_state('${configuration?.omit_fields || ""}', this)`,
                         class: `btn ${action_style || "btn-primary"} ${action_size || ""}`,
                     }, action_icon
-                        ? i({ class: action_icon }) + (label ? " " : "")
+                        ? (0, tags_1.i)({ class: action_icon }) + (label ? " " : "")
                         : false, label);
             }
             else {
@@ -529,13 +532,13 @@ const run = async (table_id, viewname, { columns, layout }, state, extra, { dist
                     javascript: `${confirmStr}view_post('${viewname}', 'run_action', {rndid:'${segment.rndid}'}, ` +
                         `null, ${withState});`,
                 };
-                return action_link(url, extra.req, segment);
+                return (0, viewable_fields_1.action_link)(url, extra.req, segment);
             }
         },
         toggle_filter({ field_name, value, preset_value, label, size, style }) {
             const field = fields.find((f) => f.name === field_name);
             const isBool = field && field.type.name === "Bool";
-            const use_value = preset_value && field.presets
+            const use_value = preset_value && field?.presets
                 ? field.presets[preset_value]({
                     user: extra.req.user,
                     req: extra.req,
@@ -549,7 +552,7 @@ const run = async (table_id, viewname, { columns, layout }, state, extra, { dist
                     "?": state[field_name] === null,
                 }[use_value]
                 : eq_string(state[field_name], use_value);
-            return button({
+            return (0, tags_1.button)({
                 class: [
                     "btn",
                     active
@@ -563,7 +566,7 @@ const run = async (table_id, viewname, { columns, layout }, state, extra, { dist
             }, label || value || preset_value);
         },
     };
-    return div({ class: "form-namespace" }, renderLayout({
+    return (0, tags_1.div)({ class: "form-namespace" }, renderLayout({
         blockDispatch,
         layout,
         role,
@@ -584,16 +587,16 @@ const or_if_undef = (x, y) => (typeof x === "undefined" ? y : x);
  */
 const eq_string = (x, y) => `${x}` === `${y}`;
 const run_action = async (table_id, viewname, config, body, { req, res }, { actionQuery }) => {
-    const table = Table.findOne(table_id);
+    const table = table_1.default.findOne(table_id);
     if (!table)
         throw new InvalidConfiguration(`View '${viewname}:run_action' incorrectly configured: ` +
             `Unable to find table with id '${table_id}'`);
     const state = req?.query
-        ? readState(removeEmptyStrings(req.query), table.getFields(), req)
+        ? (0, plugin_helper_1.readState)(removeEmptyStrings(req.query), table.getFields(), req)
         : {};
     const result = await actionQuery(state, body?.rndid);
     if (result.json.error) {
-        Crash.create({ message: result.json.error, stack: "" }, req);
+        crash_1.default.create({ message: result.json.error, stack: "" }, req);
     }
     return result;
 };
@@ -619,41 +622,41 @@ const combineResults = (results) => {
         if (typeof result[memberName] === "undefined")
             result.json[memberName] = newElement;
     };
-    for (const result of results) {
-        if (!result)
+    for (const r of results) {
+        if (!r)
             continue;
-        if (result.reload_page)
-            initOnce(result.reload_page, "reload_page");
-        if (result.goto)
-            initOnce(result.goto, "goto");
-        if (result.popup)
-            initOnce(result.popup, "popup");
-        if (result.notify) {
+        if (r.reload_page)
+            initOnce(r.reload_page, "reload_page");
+        if (r.goto)
+            initOnce(r.goto, "goto");
+        if (r.popup)
+            initOnce(r.popup, "popup");
+        if (r.notify) {
             if (numMsgs < messageLimit) {
-                initOrPush(result.notify, "notify");
+                initOrPush(r.notify, "notify");
                 ++numMsgs;
             }
             else
                 ++suppressedMsgs;
         }
-        if (result.error) {
+        if (r.error) {
             if (numMsgs < messageLimit) {
-                initOrPush(result.error, "error");
+                initOrPush(r.error, "error");
                 ++numMsgs;
             }
             else
                 ++suppressedErrors;
         }
-        if (result.download) {
+        if (r.download) {
             if (numDownloads < downloadLimit) {
-                initOrPush(result.download, "download");
+                initOrPush(r.download, "download");
                 ++numDownloads;
             }
             else
                 suppressedDownloads++;
         }
-        if (result.eval_js)
-            initOrPush(result.eval_js, "eval_js");
+        if (r.eval_js)
+            initOrPush(r.eval_js, "eval_js");
     }
     let suppressedMsg = "";
     if (suppressedMsgs > 0)
@@ -684,24 +687,25 @@ module.exports = {
     routes: { run_action },
     queries: ({ table_id, viewname, configuration: { columns }, req, res, exttable_name, }) => ({
         async optionsQuery(reftable_name, type, attributes, whereWithExisting, user) {
-            return await Field.select_options_query(reftable_name, type === "File" ? attributes.select_file_where : whereWithExisting, attributes, undefined, user);
+            return await field_1.default.select_options_query(reftable_name, type === "File" ? attributes.select_file_where : whereWithExisting, attributes, undefined, user);
         },
         async actionQuery(state, rndid) {
             const col = columns.find((c) => c.type === "Action" && c.rndid === rndid && rndid);
-            const table = Table.findOne(table_id);
+            const table = table_1.default.findOne(table_id);
             try {
                 return await db.withTransaction(async () => {
                     if (col.action_row_variable === "each_matching_row") {
                         const fields = table.getFields();
-                        const { joinFields, aggregations } = picked_fields_to_query(columns, fields, undefined, req, table);
-                        const where = stateFieldsToWhere({
+                        const { joinFields, aggregations } = (0, plugin_helper_1.picked_fields_to_query)(columns, fields, undefined, req, table);
+                        const where = (0, plugin_helper_1.stateFieldsToWhere)({
                             fields,
                             state,
                             table,
                             prefix: "a.",
                         });
-                        const q = stateFieldsToQuery({
+                        const q = (0, plugin_helper_1.stateFieldsToQuery)({
                             state,
+                            fields,
                             prefix: "a.",
                             noSortAndPaging: true,
                         });
@@ -717,7 +721,7 @@ module.exports = {
                         });
                         const referrer = req?.get?.("Referrer");
                         return combineResults(await asyncMap(rows, async (row) => {
-                            return await run_action_column({
+                            return await (0, plugin_helper_1.run_action_column)({
                                 col,
                                 req,
                                 table,
@@ -729,7 +733,7 @@ module.exports = {
                     }
                     else {
                         const row = col.action_row_variable === "state" ? { ...state } : null;
-                        const result = await run_action_column({
+                        const result = await (0, plugin_helper_1.run_action_column)({
                             col,
                             req,
                             table,
@@ -747,7 +751,7 @@ module.exports = {
             }
         },
         async distinctValuesQuery(state) {
-            const table = Table.findOne(table_id || exttable_name);
+            const table = table_1.default.findOne(table_id || exttable_name);
             const fields = table.getFields();
             let distinct_values = {};
             const role = req.user ? req.user.role_id : 100;
@@ -779,7 +783,7 @@ module.exports = {
                     else if (col.field_name.includes("->")) {
                         const [jFieldNm, krest] = col.field_name.split(".");
                         const [jtNm, lblField] = krest.split("->");
-                        const jtable = Table.findOne({ name: jtNm });
+                        const jtable = table_1.default.findOne({ name: jtNm });
                         if (!jtable)
                             throw new InvalidConfiguration(`View ${viewname} incorrectly configured: cannot find join table ${jtNm}`);
                         const jfields = await jtable.getFields();
@@ -791,7 +795,7 @@ module.exports = {
                         const kpath = col.field_name.split(".");
                         if (kpath.length === 3) {
                             const [jtNm, jFieldNm, lblField] = kpath;
-                            const jtable = Table.findOne({ name: jtNm });
+                            const jtable = table_1.default.findOne({ name: jtNm });
                             if (!jtable)
                                 throw new InvalidConfiguration(`View ${viewname} incorrectly configured: cannot find join table ${jtNm}`);
                             const jfields = jtable.fields;