@saltcorn/data 0.9.4-beta.2 → 0.9.4-beta.21

package/dist/plugin-helper.js

@@ -12,8 +12,9 @@ const Tag = require("./models/tag");
 const { getState } = require("./db/state");
 const db = require("./db");
 const { button, a, text, i } = require("@saltcorn/markup/tags");
-const { applyAsync, InvalidConfiguration, parseRelationPath, buildRelationPath, mergeActionResults, } = require("./utils");
-const { jsexprToWhere, freeVariables, add_free_variables_to_joinfields, eval_expression, } = require("./models/expression");
+const { Relation, RelationType, ViewDisplayType, parseRelationPath, buildRelationPath, } = require("@saltcorn/common-code");
+const { applyAsync, InvalidConfiguration, mergeActionResults, } = require("./utils");
+const { jsexprToWhere, freeVariables, add_free_variables_to_joinfields, eval_expression, freeVariablesInInterpolation, } = require("./models/expression");
 const { traverseSync } = require("./models/layout");
 const { isNode } = require("./utils");
 /**
@@ -635,6 +636,7 @@ const field_picker_fields = async ({ table, viewname, req, has_click_to_edit, ha
     ];
     const triggers = Trigger.find({
         when_trigger: { or: ["API call", "Never"] },
+        table_id: null,
     });
     triggers.forEach((tr) => {
         actions.push(tr.name);
@@ -1288,7 +1290,7 @@ const get_onetoone_views = async (table, viewname) => {
  * @throws {InvalidConfiguration}
  * @returns {object}
  */
-const picked_fields_to_query = (columns, fields, layout) => {
+const picked_fields_to_query = (columns, fields, layout, req) => {
     let joinFields = {};
     let aggregations = {};
     let freeVars = new Set(); // for join fields
@@ -1339,8 +1341,11 @@ const picked_fields_to_query = (columns, fields, layout) => {
             freeVars = new Set([...freeVars, ...freeVariables(column.formula)]);
         }
         else if (column.type === "ViewLink") {
-            if (column.view_label_formula)
-                freeVars = new Set([...freeVars, ...freeVariables(column.view_label)]);
+            if (column.view_label_formula || column.isFormula?.label)
+                freeVars = new Set([
+                    ...freeVars,
+                    ...freeVariables(column.view_label || column.label),
+                ]);
             if (column.extra_state_fml)
                 freeVars = new Set([
                     ...freeVars,
@@ -1392,7 +1397,9 @@ const picked_fields_to_query = (columns, fields, layout) => {
                 aggregations[targetNm] = {
                     table,
                     ref: fld,
-                    where: column.aggwhere ? jsexprToWhere(column.aggwhere) : undefined,
+                    where: column.aggwhere
+                        ? jsexprToWhere(column.aggwhere, req ? { user: req.user } : {})
+                        : undefined,
                     field,
                     aggregate: column.stat,
                     through,
@@ -1408,6 +1415,8 @@ const picked_fields_to_query = (columns, fields, layout) => {
         else if (column.type === "Action" && column.action_label_formula) {
             freeVars = new Set([...freeVars, ...freeVariables(column.action_label)]);
         }
+        if (column.showif)
+            freeVars = new Set([...freeVars, ...freeVariables(column.showif)]);
     });
     if (layout) {
         traverseSync(layout, {
@@ -1443,14 +1452,26 @@ const picked_fields_to_query = (columns, fields, layout) => {
                 if (v?.isFormula?.url && typeof v.url === "string")
                     freeVars = new Set([...freeVars, ...freeVariables(v.url)]);
             },
+            tabs(v) {
+                (v.titles || []).forEach((t) => {
+                    if (typeof t === "string")
+                        freeVars = new Set([
+                            ...freeVars,
+                            ...freeVariablesInInterpolation(t),
+                        ]);
+                });
+                (v.showif || []).forEach((t) => {
+                    freeVars = new Set([...freeVars, ...freeVariablesInInterpolation(t)]);
+                });
+            },
             blank(v) {
                 if (v?.isFormula?.text && typeof v.contents === "string")
                     freeVars = new Set([...freeVars, ...freeVariables(v.contents)]);
                 if (v.isHTML)
-                    ((v.contents || "").match(/\{\{([^#].+?)\}\}/g) || []).forEach((s) => {
-                        const s1 = s.replace("{{", "").replace("}}", "").trim();
-                        freeVars = new Set([...freeVars, ...freeVariables(s1)]);
-                    });
+                    freeVars = new Set([
+                        ...freeVars,
+                        ...freeVariablesInInterpolation(v.contents),
+                    ]);
             },
             container(v) {
                 if (v.showIfFormula)
@@ -1464,6 +1485,12 @@ const picked_fields_to_query = (columns, fields, layout) => {
             },
         });
     }
+    if (layout?.besides && layout?.list_columns) {
+        layout?.besides.forEach((s) => {
+            if (s.showif)
+                freeVars = new Set([...freeVars, ...freeVariables(s.showif)]);
+        });
+    }
     add_free_variables_to_joinfields(freeVars, joinFields, fields);
     return { joinFields, aggregations };
 };
@@ -1977,7 +2004,7 @@ const readState = (state, fields, req) => {
             else if (typeof current === "object") {
                 //ignore
             }
-            else if (f.type.read)
+            else if (f.type?.read)
                 state[f.name] = f.type.read(current);
             else if (typeof current === "string" && current.startsWith("Preset:")) {
                 const pname = current.replace("Preset:", "");
@@ -2048,7 +2075,7 @@ const readStateStrict = (state, fields) => {
 const json_list_to_external_table = (get_json_list, fields0) => {
     const fields = fields0.map((f) => f.constructor.name === Object.name ? new Field(f) : f);
     const getRows = async (where = {}, selopts = {}) => {
-        let data_in = await get_json_list({ where, ...selopts });
+        let data_in = await get_json_list(where, selopts);
         const restricts = Object.entries(where);
         const sat = (x) => ([k, v]) => {
             if (Array.isArray(v))
@@ -2060,7 +2087,7 @@ const json_list_to_external_table = (get_json_list, fields0) => {
             else if (v?.ilike)
                 return (x[k] || "").includes(v.ilike);
             else
-                return x[k] === v;
+                return x[k] == v;
         };
         const data_filtered = restricts.length === 0
             ? data_in
@@ -2077,6 +2104,7 @@ const json_list_to_external_table = (get_json_list, fields0) => {
             return data_filtered;
     };
     const tbl = {
+        pk_name: fields.find((f) => f.primary_key)?.name,
         getFields() {
             return fields;
         },
@@ -2100,8 +2128,13 @@ const json_list_to_external_table = (get_json_list, fields0) => {
             const { where, ...rest } = opts;
             return getRows(where || {}, rest || {});
         },
+        async getJoinedRow(opts = {}) {
+            const { where, ...rest } = opts;
+            const rows = await getRows(where || {}, rest || {});
+            return rows.length > 0 ? rows[0] : null;
+        },
         async countRows(where, opts) {
-            let data_in = await get_json_list({ ...where, ...opts });
+            let data_in = await get_json_list(where, opts);
             return data_in.length;
         },
         get_child_relations() {
@@ -2122,6 +2155,7 @@ const json_list_to_external_table = (get_json_list, fields0) => {
         slug_options() {
             return [];
         },
+        enable_fkey_constraints() { },
         ownership_options() {
             return [];
         },
@@ -2157,44 +2191,69 @@ const run_action_column = async ({ col, req, ...rest }) => {
     const run_action_step = async (action_name, colcfg) => {
         let state_action = getState().actions[action_name];
         let configuration;
-        if (state_action)
+        let goRun;
+        if (state_action) {
             configuration = colcfg;
+            goRun = () => state_action.run({
+                configuration,
+                user: req.user,
+                req,
+                ...rest,
+            });
+        }
         else {
             const trigger = await Trigger.findOne({ name: action_name });
-            if (trigger) {
+            if (trigger?.action === "Multi-step action") {
+                goRun = () => trigger.runWithoutRow({ req, ...rest });
+            }
+            else if (trigger) {
                 state_action = getState().actions[trigger.action];
-                configuration = trigger.configuration;
+                goRun = () => state_action.run({
+                    configuration: trigger.configuration,
+                    user: req.user,
+                    req,
+                    ...rest,
+                });
             }
         }
-        if (!state_action)
+        if (!goRun)
             throw new Error("Runnable action not found: " + text(action_name));
-        return await state_action.run({
-            configuration,
-            user: req.user,
-            req,
-            ...rest,
-        });
+        return await goRun();
     };
     if (col.action_name === "Multi-step action") {
-        const result = {};
-        for (let i = 0; i < col.step_action_names.length; i++) {
+        let result = {};
+        let step_count = 0;
+        let MAX_STEPS = 200;
+        for (let i = 0; i < col.step_action_names.length && step_count < MAX_STEPS; i++) {
+            step_count += 1;
             const action_name = col.step_action_names?.[i];
             if (!action_name)
                 continue;
             const only_if = col.step_only_ifs?.[i];
             const config = col.configuration.steps?.[i] || {};
             if (only_if && rest.row) {
-                if (!eval_expression(only_if, rest.row, rest.req?.user))
+                if (!eval_expression(only_if, rest.row, req?.user))
                     continue;
             }
             const stepres = await run_action_step(action_name, config);
+            if (stepres?.goto_step) {
+                i = +stepres.goto_step - 2;
+                delete stepres.goto_step;
+            }
+            if (stepres?.clear_return_values)
+                result = {};
+            if (stepres?.set_fields && rest?.row) {
+                Object.entries(stepres?.set_fields).forEach(([k, v]) => {
+                    rest.row[k] = v;
+                });
+            }
             try {
                 mergeActionResults(result, stepres);
             }
             catch (error) {
                 console.error(error);
             }
-            if (result.error)
+            if (result.error || result.halt_steps)
                 break;
         }
         return result;
@@ -2202,11 +2261,6 @@ const run_action_column = async ({ col, req, ...rest }) => {
     else
         return await run_action_step(col.action_name, col.configuration);
 };
-const ViewDisplayType = {
-    ROW_REQUIRED: "ROW_REQUIRED",
-    NO_ROW_LIMIT: "NO_ROW_LIMIT",
-    INVALID: "INVALID",
-};
 const displayType = (stateFields) => stateFields.every((sf) => !sf.required)
     ? ViewDisplayType.NO_ROW_LIMIT
     : stateFields.some((sf) => sf.name === "id")
@@ -2240,54 +2294,32 @@ const build_schema_data = async () => {
     return { views, tables };
 };
 /**
- * tries to match a type to a relation
- * if it's not ChildList, ParentShow, Own, or Independent then RelationPath is returned
- * @param {View} subView
- * @param {string[]} path
- * @param {Table} srcTable
- * @returns ChildList, ParentShow, Own, Independent or RelationPath
- */
-const relationTypeFromPath = (subview, path, srcTable) => {
-    if (path.length === 1 && path[0].inboundKey)
-        return "ChildList"; // works for OneToOneShow as well
-    else if (path.length === 2 && path.every((p) => p.inboundKey))
-        return "ChildList";
-    else if (path.length === 1 && path[0].fkey)
-        return "ParentShow";
-    else if (path.length === 0)
-        return subview.table_id === srcTable.id ? "Own" : "Independent";
-    else
-        return "RelationPath";
-};
-/**
- * creates a state object from a relation path
- * @param {View} subview
- * @param {string} relation
- * @param {string[]} pathArr
- * @param {Function} getRowVal
- * @param {Table} srcTbl
+ *
+ * @param {Relation} relation
+ * @param {function} getRowVal
  */
-const pathToState = (subview, relation, pathArr, getRowVal, srcTbl) => {
-    const subTbl = Table.findOne({ id: subview.table_id });
-    const pkName = subTbl.pk_name;
-    switch (relationTypeFromPath(subview, pathArr, srcTbl)) {
-        case "ChildList":
-            return pathArr.length === 1
-                ? {
-                    [pathArr[0].inboundKey]: getRowVal(pkName), // works for OneToOneShow as well
-                }
+const pathToState = (relation, getRowVal) => {
+    const targetTbl = Table.findOne({ name: relation.targetTblName });
+    const pkName = targetTbl.pk_name;
+    const path = relation.path;
+    switch (relation.type) {
+        case RelationType.CHILD_LIST:
+        case RelationType.ONE_TO_ONE_SHOW:
+            return path.length === 1
+                ? { [path[0].inboundKey]: getRowVal(pkName) }
                 : {
-                    [`${pathArr[1].table}.${pathArr[1].inboundKey}.${pathArr[0].table}.${pathArr[0].inboundKey}`]: getRowVal(pkName),
+                    [`${path[1].table}.${path[1].inboundKey}.${path[0].table}.${path[0].inboundKey}`]: getRowVal(pkName),
                 };
-        case "ParentShow":
-            return { id: getRowVal(pathArr[0].fkey) };
-        case "Own":
+        case RelationType.PARENT_SHOW:
+            return { id: getRowVal(path[0].fkey) };
+        case RelationType.OWN:
             return { [pkName]: getRowVal(pkName) };
-        case "Independent":
+        case RelationType.INDEPENDENT:
+        case RelationType.NONE:
             return {};
-        case "RelationPath":
+        case RelationType.RELATION_PATH:
             return {
-                [relation]: getRowVal(pathArr[0].fkey ? pathArr[0].fkey : pkName) || "NULL",
+                [relation.relationString]: getRowVal(path[0].fkey ? path[0].fkey : pkName) || "NULL",
             };
     }
 };
@@ -2316,7 +2348,7 @@ module.exports = {
     get_inbound_self_relation_opts,
     get_many_to_many_relation_opts,
     build_schema_data,
-    relationTypeFromPath,
     pathToState,
+    displayType,
 };
 //# sourceMappingURL=plugin-helper.js.map