@saltcorn/data 0.9.4-beta.8 → 0.9.4

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

@@ -20,10 +20,10 @@ const { text, text_attr, script, domReady, div, button, i, pre, } = require("@sa
 const { renderForm } = require("@saltcorn/markup");
 const FieldRepeat = require("../../models/fieldrepeat");
 const { get_expression_function, expressionChecker, eval_expression, freeVariables, freeVariablesInInterpolation, } = require("../../models/expression");
-const { InvalidConfiguration, isNode, isOfflineMode, mergeIntoWhere, dollarizeObject, getSessionId, } = require("../../utils");
+const { InvalidConfiguration, isNode, isOfflineMode, mergeIntoWhere, dollarizeObject, getSessionId, interpolate, } = require("../../utils");
 const Library = require("../../models/library");
 const { check_view_columns } = require("../../plugin-testing");
-const { initial_config_all_fields, calcfldViewOptions, calcfldViewConfig, get_parent_views, picked_fields_to_query, stateFieldsToWhere, stateFieldsToQuery, getActionConfigFields, run_action_column, add_free_variables_to_joinfields, readState, stateToQueryString, pathToState, relationTypeFromPath, } = require("../../plugin-helper");
+const { initial_config_all_fields, calcfldViewOptions, calcfldViewConfig, get_parent_views, picked_fields_to_query, stateFieldsToWhere, stateFieldsToQuery, getActionConfigFields, run_action_column, add_free_variables_to_joinfields, readState, stateToQueryString, pathToState, displayType, } = require("../../plugin-helper");
 const { splitUniques, getForm, fill_presets, parse_view_select, get_view_link_query, objToQueryString, action_url, action_link, view_linker, } = require("./viewable_fields");
 const { traverse, getStringsForI18n, translateLayout, traverseSync, } = require("../../models/layout");
 const { asyncMap, isWeb, removeEmptyStrings } = require("../../utils");
@@ -31,6 +31,7 @@ const { extractFromLayout } = require("../../diagram/node_extract_utils");
 const db = require("../../db");
 const { prepare_update_row } = require("../../web-mobile-commons");
 const _ = require("underscore");
+const { Relation, RelationType } = require("@saltcorn/common-code");
 const builtInActions = [
     "Save",
     "SaveAndContinue",
@@ -73,6 +74,7 @@ const configuration_workflow = (req) => new Workflow({
                 const triggerActions = [];
                 (await Trigger.find({
                     when_trigger: { or: ["API call", "Never"] },
+                    table_id: null,
                 })).forEach((tr) => {
                     actions.push(tr.name);
                     triggerActions.push(tr.name);
@@ -141,7 +143,7 @@ const configuration_workflow = (req) => new Workflow({
                     field_view_options.remember = ["edit"];
                 }
                 const library = (await Library.find({})).filter((l) => l.suitableFor("edit"));
-                const myviewrow = await View.findOne({ name: context.viewname });
+                const myviewrow = View.findOne({ name: context.viewname });
                 const { parent_field_list } = await table.get_parent_relations(true, true);
                 const pages = await Page.find();
                 const groups = (await PageGroup.find()).map((g) => ({
@@ -376,12 +378,6 @@ const setDateLocales = (form, locale) => {
         }
     });
 };
-/**
- * check if a relation path has a CHildList structure
- */
-const isChildListPath = (viewSelect, subView) => viewSelect.type === "RelationPath" &&
-    relationTypeFromPath(subView, viewSelect.path, viewSelect.sourcetable) ===
-        "ChildList";
 /**
  * update viewSelect so that it looks like a normal ChildList
  */
@@ -469,7 +465,18 @@ const runMany = async (table_id, viewname, { columns, layout, auto_save, split_p
  * @returns {Promise<void>}
  */
 const transformForm = async ({ form, table, req, row, res, getRowQuery, viewname, optionsQuery, }) => {
+    let pseudo_row = {};
+    if (!row) {
+        table.fields.forEach((f) => {
+            pseudo_row[f.name] = undefined;
+        });
+    }
     await traverse(form.layout, {
+        container(segment) {
+            if (segment.click_action) {
+                segment.url = `javascript:view_post('${viewname}', 'run_action', {click_action: '${segment.click_action}', ...get_form_record({viewname: '${viewname}'}) })`;
+            }
+        },
         async action(segment) {
             if (segment.action_style === "on_page_load") {
                 //TODO check segment.min_role
@@ -481,11 +488,11 @@ const transformForm = async ({ form, table, req, row, res, getRowQuery, viewname
                 try {
                     const actionResult = await run_action_column({
                         col: { ...segment },
-                        referrer: req.get("Referrer"),
+                        referrer: req?.get?.("Referrer"),
                         req,
                         res,
                         table,
-                        row,
+                        row: row || pseudo_row,
                     });
                     segment.type = "blank";
                     segment.style = {};
@@ -527,25 +534,19 @@ const transformForm = async ({ form, table, req, row, res, getRowQuery, viewname
             segment.sourceURL = `/field/show-calculated/${table.name}/${segment.join_field}/${segment.fieldview}?${qs}`;
         },
         tabs(segment) {
+            const to_delete = new Set();
             (segment.showif || []).forEach((sif, ix) => {
                 if (sif) {
-                    const showit = eval_expression(sif, row || {}, req.user);
-                    if (!showit) {
-                        segment.titles.splice(ix, 1);
-                        segment.contents.splice(ix, 1);
-                    }
+                    const showit = eval_expression(sif, row || pseudo_row, req.user);
+                    if (!showit)
+                        to_delete.add(ix);
                 }
             });
+            segment.titles = segment.titles.filter((v, ix) => !to_delete.has(ix));
+            segment.contents = segment.contents.filter((v, ix) => !to_delete.has(ix));
             (segment.titles || []).forEach((t, ix) => {
                 if (typeof t === "string" && t.includes("{{")) {
-                    const template = _.template(t, {
-                        interpolate: /\{\{([^#].+?)\}\}/g,
-                    });
-                    segment.titles[ix] = template({
-                        user: req.user,
-                        row,
-                        ...(row || {}),
-                    });
+                    segment.titles[ix] = interpolate(t, row, req.user);
                 }
             });
         },
@@ -568,11 +569,17 @@ const transformForm = async ({ form, table, req, row, res, getRowQuery, viewname
             const view = View.findOne({ name: view_select.viewname });
             if (!view)
                 throw new InvalidConfiguration(`Cannot find embedded view: ${view_select.viewname}`);
-            const childListPath = isChildListPath(view_select, view);
+            // check if the relation path matches a ChildList relations
+            let childListRelPath = false;
+            if (segment.relation && view.table_id) {
+                const targetTbl = Table.findOne({ id: view.table_id });
+                const relation = new Relation(segment.relation, targetTbl.name, displayType(await view.get_state_fields()));
+                childListRelPath = relation.type === RelationType.CHILD_LIST;
+            }
             // Edit-in-edit
             if (view.viewtemplate === "Edit" &&
-                (view_select.type === "ChildList" || childListPath)) {
-                if (childListPath)
+                (view_select.type === "ChildList" || childListRelPath)) {
+                if (childListRelPath)
                     updateViewSelect(view_select);
                 const childTable = Table.findOne({ id: view.table_id });
                 const childForm = await getForm(childTable, view.name, view.configuration.columns, view.configuration.layout, row?.id, req, !isWeb(req));
@@ -619,42 +626,51 @@ const transformForm = async ({ form, table, req, row, res, getRowQuery, viewname
                 segment.field_repeat = fr;
                 return;
             }
-            const isIndependent = view_select.type === "Independent" ||
-                (view_select.type === "RelationPath" &&
-                    relationTypeFromPath(view, view_select.path, table) ===
-                        "Independent");
-            if (!row && !isIndependent) {
-                segment.type = "blank";
-                segment.contents = "";
-                return;
+            let state = {};
+            if (view_select.type === "RelationPath" && view.table_id) {
+                const targetTbl = Table.findOne({ id: view.table_id });
+                if (targetTbl) {
+                    const relation = new Relation(segment.relation, targetTbl.name, displayType(await view.get_state_fields()));
+                    const type = relation.type;
+                    if (!row && type !== RelationType.INDEPENDENT) {
+                        segment.type = "blank";
+                        segment.contents = "";
+                        return;
+                    }
+                    state = pathToState(relation, (k) => row[k]);
+                }
             }
-            if (!view)
-                throw new InvalidConfiguration(`Edit view incorrectly configured: cannot find embedded view ${view_select.viewname}`);
-            let state;
-            switch (view_select.type) {
-                case "RelationPath": {
-                    state = pathToState(view, segment.relation, view_select.path, (k) => row[k], table);
-                    break;
+            else {
+                const isIndependent = view_select.type === "Independent";
+                // legacy none check ?
+                if (!row && !isIndependent) {
+                    segment.type = "blank";
+                    segment.contents = "";
+                    return;
+                }
+                if (!view)
+                    throw new InvalidConfiguration(`Edit view incorrectly configured: cannot find embedded view ${view_select.viewname}`);
+                switch (view_select.type) {
+                    case "Own":
+                        state = { id: row.id };
+                        break;
+                    case "Independent":
+                        state = {};
+                        break;
+                    case "ChildList":
+                    case "OneToOneShow":
+                        state = { [view_select.field_name]: row.id };
+                        break;
+                    case "ParentShow":
+                        state = { id: row[view_select.field_name] };
+                        break;
                 }
-                case "Own":
-                    state = { id: row.id };
-                    break;
-                case "Independent":
-                    state = {};
-                    break;
-                case "ChildList":
-                case "OneToOneShow":
-                    state = { [view_select.field_name]: row.id };
-                    break;
-                case "ParentShow":
-                    state = { id: row[view_select.field_name] };
-                    break;
             }
             const extra_state = segment.extra_state_fml
                 ? eval_expression(segment.extra_state_fml, {
                     ...dollarizeObject(req.query),
                     session_id: getSessionId(req),
-                    ...(row || {}),
+                    ...(row || pseudo_row),
                 }, req.user)
                 : {};
             const qs = stateToQueryString({ ...state, ...extra_state });
@@ -818,6 +834,8 @@ const runPost = async (table_id, viewname, { columns, layout, fixed, view_when_d
         fixed,
         auto_save,
     }, { req, res }, body, { getRowQuery, saveFileQuery, optionsQuery, getRowByIdQuery }, remote);
+    const view = View.findOne({ name: viewname });
+    const pagetitle = { title: viewname, no_menu: view?.attributes?.no_menu };
     if (prepResult) {
         let { form, row, pk, id } = prepResult;
         const cancel = body._cancel;
@@ -850,7 +868,7 @@ const runPost = async (table_id, viewname, { columns, layout, fixed, view_when_d
                 }
                 else {
                     req.flash("error", text_attr(ins_upd_error));
-                    res.sendWrap(viewname, renderForm(form, req.csrfToken()));
+                    res.sendWrap(pagetitle, renderForm(form, req.csrfToken()));
                 }
                 return;
             }
@@ -858,8 +876,15 @@ const runPost = async (table_id, viewname, { columns, layout, fixed, view_when_d
             for (const field of form.fields.filter((f) => f.isRepeat)) {
                 const view_select = parse_view_select(field.metadata.view, field.metadata.relation_path);
                 const childView = View.findOne({ name: view_select.viewname });
-                if (isChildListPath(view_select, childView))
-                    updateViewSelect(view_select);
+                if (!childView)
+                    throw new InvalidConfiguration(`Cannot find embedded view: ${view_select.viewname}`);
+                if (field.metadata.relation_path &&
+                    view_select.type === "RelationPath") {
+                    const targetTbl = Table.findOne({ id: childView.table_id });
+                    const relation = new Relation(field.metadata.relation_path, targetTbl.name, displayType(await childView.get_state_fields()));
+                    if (relation.type === RelationType.CHILD_LIST)
+                        updateViewSelect(view_select);
+                }
                 const childTable = Table.findOne({ id: field.metadata?.table_id });
                 const submitted_row_ids = new Set((form.values[field.name] || []).map((srow) => `${srow[childTable.pk_name]}`));
                 const childFields = new Set(childTable.fields.map((f) => f.name));
@@ -876,7 +901,7 @@ const runPost = async (table_id, viewname, { columns, layout, fixed, view_when_d
                         const upd_res = await childTable.tryUpdateRow(childRow, childRow[childTable.pk_name], req.user || { role_id: 100 });
                         if (upd_res.error) {
                             req.flash("error", text_attr(upd_res.error));
-                            res.sendWrap(viewname, renderForm(form, req.csrfToken()));
+                            res.sendWrap(pagetitle, renderForm(form, req.csrfToken()));
                             return;
                         }
                     }
@@ -884,7 +909,7 @@ const runPost = async (table_id, viewname, { columns, layout, fixed, view_when_d
                         const ins_res = await childTable.tryInsertRow(childRow, req.user || { role_id: 100 });
                         if (ins_res.error) {
                             req.flash("error", text_attr(ins_res.error));
-                            res.sendWrap(viewname, renderForm(form, req.csrfToken()));
+                            res.sendWrap(pagetitle, renderForm(form, req.csrfToken()));
                             return;
                         }
                         else if (ins_res.success) {
@@ -1025,6 +1050,56 @@ const doAuthPost = async ({ body, table_id, req }) => {
 const authorise_post = async ({ body, table_id, req }, { authorizePostQuery }) => {
     return await authorizePostQuery(body, table_id);
 };
+const openDataStream = async (tableId, viewName, id, fieldName, fieldView, user, configuration, targetOpts) => {
+    const table = Table.findOne({ id: tableId });
+    const field = table.getField(fieldName);
+    if (!field)
+        throw new InvalidConfiguration(`Field ${fieldName} not found`);
+    if (field.type === "File") {
+        const cfgCol = configuration.columns.find((col) => col.fieldview === fieldView && col.field_name === fieldName);
+        const fileView = getState().fileviews[fieldView];
+        if (!fileView)
+            throw new InvalidConfiguration(`File view ${fieldView} not found`);
+        return await fileView.openDataStream(tableId, id, fieldName, user, cfgCol.configuration, targetOpts);
+    }
+};
+// TODO is owner check
+const authorizeDataStream = async (view, id, fieldName, user, targetOpts) => {
+    if (!user || user.role_id > view.min_role)
+        return false;
+    else {
+        const table = Table.findOne({ id: view.table_id });
+        if (!table || user.role_id > table.min_role_write)
+            return false;
+        else {
+            const field = table.getField(fieldName);
+            if (field.type === "File") {
+                if (targetOpts?.oldTarget) {
+                    // continue old file ?
+                    const file = await File.findOne(targetOpts.oldTarget);
+                    if (file)
+                        return file.min_role_read >= user.role_id;
+                }
+                else if (id) {
+                    // continue file of existing row ?
+                    const row = await table.getRow({ [table.pk_name]: id });
+                    const fileCol = row[fieldName];
+                    if (fileCol) {
+                        const file = await File.findOne(row[fieldName]);
+                        if (file)
+                            return file.min_role_read >= user.role_id;
+                    }
+                }
+                // stream is new or the file does not exist
+                return true;
+            }
+            else {
+                // only files for now
+                return false;
+            }
+        }
+    }
+};
 /**
  * @param {number} table_id
  * @param {*} viewname
@@ -1135,7 +1210,8 @@ const prepare = async (viewname, table, fields, { columns, layout, fixed, auto_s
         if (req.xhr)
             res.status(422);
         await form.fill_fkey_options(false, optionsQuery, req.user);
-        res.sendWrap(viewname, renderForm(form, req.csrfToken ? req.csrfToken() : false));
+        const view = View.findOne({ name: viewname });
+        res.sendWrap({ title: viewname, no_menu: view?.attributes?.no_menu }, renderForm(form, req.csrfToken ? req.csrfToken() : false));
         return null;
     }
     let row;
@@ -1158,7 +1234,7 @@ const prepare = async (viewname, table, fields, { columns, layout, fixed, auto_s
     }
     const file_fields = form.fields.filter((f) => f.type === "File");
     for (const field of file_fields) {
-        if (!field.fieldviewObj?.isEdit)
+        if (!field.fieldviewObj?.isEdit || field.fieldviewObj?.isStream)
             continue;
         if (field.fieldviewObj?.setsFileId) {
             //do nothing
@@ -1327,6 +1403,8 @@ module.exports = {
     run,
     runMany,
     runPost,
+    openDataStream,
+    authorizeDataStream,
     get_state_fields,
     initial_config,
     /** @type {boolean} */
@@ -1349,7 +1427,7 @@ module.exports = {
     getStringsForI18n({ layout }) {
         return getStringsForI18n(layout);
     },
-    queries: ({ table_id, name, configuration: { columns, default_state, layout, auto_save, split_paste, destination_type, }, req, res, }) => ({
+    queries: ({ table_id, name, configuration: { columns, default_state, layout, auto_save, split_paste, destination_type, fixed, }, req, res, }) => ({
         async editQuery(state, mobileReferrer) {
             const table = Table.findOne({ id: table_id });
             const fields = table.getFields();
@@ -1497,17 +1575,46 @@ module.exports = {
             });
         },
         async actionQuery() {
-            const { rndid, _csrf, onchange_action, onchange_field, ...body } = req.body;
+            const { rndid, _csrf, onchange_action, onchange_field, click_action, ...body } = req.body;
             const table = Table.findOne({ id: table_id });
-            const dbrow = body.id
+            let row = body.id
                 ? await table.getRow({ id: body.id }, {
                     forPublic: !req.user,
                     forUser: req.user,
                 })
-                : undefined;
-            const row = { ...dbrow, ...body };
+                : {};
+            table.fields.forEach((f) => {
+                if (!f?.validate)
+                    return;
+                const valres = f.validate(body);
+                if ("success" in valres)
+                    row[f.name] = valres.success;
+            });
+            const use_fixed = await fill_presets(table, req, fixed);
+            row = { ...use_fixed, ...row };
             try {
-                if (onchange_action && !rndid) {
+                if (click_action) {
+                    let container;
+                    traverseSync(layout, {
+                        container(segment) {
+                            if (segment.click_action === click_action)
+                                container = segment;
+                        },
+                    });
+                    if (!container)
+                        return { json: { error: "Action not found" } };
+                    const trigger = Trigger.findOne({ name: click_action });
+                    const result = await trigger.runWithoutRow({
+                        table,
+                        Table,
+                        req,
+                        row,
+                        referrer: req?.get?.("Referrer"),
+                        user: req.user,
+                    });
+                    return { json: { success: "ok", ...(result || {}) } };
+                }
+                else if (onchange_action && !rndid) {
                     const fldCol = columns.find((c) => c.field_name === onchange_field &&
                         c.onchange_action === onchange_action);
                     if (!fldCol)
@@ -1518,6 +1625,7 @@ module.exports = {
                         Table,
                         req,
                         row,
+                        referrer: req?.get?.("Referrer"),
                         user: req.user,
                     });
                     return { json: { success: "ok", ...(result || {}) } };
@@ -1530,7 +1638,7 @@ module.exports = {
                         table,
                         row,
                         res,
-                        referrer: req.get("Referrer"),
+                        referrer: req?.get?.("Referrer"),
                     });
                     //console.log("result", result);
                     return { json: { success: "ok", ...(result || {}) } };
@@ -1601,18 +1709,10 @@ module.exports = {
                 where: { [tbl.pk_name]: state[tbl.pk_name] },
                 joinFields,
             });
-            const template = _.template(title, {
-                interpolate: /\{\{([^#].+?)\}\}/g,
-            });
-            let t = template({ row, ...row });
-            return t;
+            return interpolate(title, row);
         }
         else {
-            const template = _.template(title, {
-                interpolate: /\{\{([^#].+?)\}\}/g,
-            });
-            let t = template({ row: null });
-            return t;
+            return interpolate(title, null);
         }
     },
     configCheck: async (view) => {
@@ -1620,7 +1720,7 @@ module.exports = {
         const errs = [];
         const warnings = [];
         if (!destination_type || destination_type === "View") {
-            const vwd = await View.findOne({
+            const vwd = View.findOne({
                 name: (view_when_done || "").split(".")[0],
             });
             if (!vwd)