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

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

@@ -16,12 +16,13 @@ const { text, text_attr } = require("@saltcorn/markup/tags");
 const { renderForm } = require("@saltcorn/markup");
 const FieldRepeat = require("../../models/fieldrepeat");
 const { get_expression_function, expressionChecker, } = require("../../models/expression");
-const { InvalidConfiguration } = require("../../utils");
+const { InvalidConfiguration, isNode } = require("../../utils");
 const Library = require("../../models/library");
+const { check_view_columns } = require("../../plugin-testing");
 const { initial_config_all_fields, calcfldViewOptions, calcfldViewConfig, get_parent_views, get_link_view_opts, picked_fields_to_query, stateFieldsToWhere, stateFieldsToQuery, strictParseInt, } = require("../../plugin-helper");
 const { splitUniques, getForm, fill_presets, parse_view_select, get_view_link_query, objToQueryString, } = require("./viewable_fields");
-const { traverse, getStringsForI18n, translateLayout, } = require("../../models/layout");
-const { asyncMap } = require("../../utils");
+const { traverse, getStringsForI18n, translateLayout, traverseSync, } = require("../../models/layout");
+const { asyncMap, isWeb } = require("../../utils");
 /**
  * @param {object} req
  * @returns {Workflow}
@@ -42,7 +43,7 @@ const configuration_workflow = (req) => new Workflow({
                             await field.reftable.getFields();
                     }
                 }
-                const { field_view_options, handlesTextStyle } = calcfldViewOptions(fields, "edit");
+                const { field_view_options, handlesTextStyle, blockDisplay } = calcfldViewOptions(fields, "edit");
                 const fieldViewConfigForms = await calcfldViewConfig(fields, true);
                 const roles = await User.get_roles();
                 const images = await File.find({ mime_super: "image" });
@@ -115,6 +116,7 @@ const configuration_workflow = (req) => new Workflow({
                     field_view_options,
                     parent_field_list,
                     handlesTextStyle,
+                    blockDisplay,
                     roles,
                     actions,
                     fieldViewConfigForms,
@@ -185,7 +187,6 @@ const configuration_workflow = (req) => new Workflow({
                     done_view_opts.push(`${v.name}.${relation.name}`);
                 }));
                 return new Form({
-                    blurb: req.__("The view you choose here can be ignored depending on the context of the form, for instance if it appears in a pop-up the redirect will not take place."),
                     fields: [
                         {
                             name: "auto_save",
@@ -194,24 +195,36 @@ const configuration_workflow = (req) => new Workflow({
                             type: "Bool",
                         },
                         {
-                            name: "view_when_done",
-                            label: req.__("Default view when done"),
-                            sublabel: req.__("This is the view to which the user will be sent when the form is submitted, unless a formula below is true."),
+                            name: "destination_type",
+                            label: "Destination type",
                             type: "String",
                             required: true,
+                            sublabel: req.__("This is the view to which the user will be sent when the form is submitted. The view you specify here can be ignored depending on the context of the form, for instance if it appears in a pop-up the redirect will not take place."),
+                            //fieldview: "radio_group",
                             attributes: {
-                                options: done_view_opts,
+                                options: ["View", "Formula", "Back to referer"],
                             },
                         },
                         {
-                            label: req.__("Alternative destinations if formula evaluates to true"),
-                            sublabel: req.__("You can send the user to an different view depending on the day the user has submitted. Ignore this option if you always want to send the user to the same destination"),
-                            input_type: "section_header",
+                            name: "view_when_done",
+                            label: req.__("Destination view"),
+                            type: "String",
+                            required: true,
+                            attributes: {
+                                options: done_view_opts,
+                            },
+                            showIf: { destination_type: "View" },
                         },
                         new FieldRepeat({
                             name: "formula_destinations",
+                            showIf: { destination_type: "Formula" },
                             fields: [
-                                { type: "String", name: "expression", label: "Formula" },
+                                {
+                                    type: "String",
+                                    name: "expression",
+                                    label: "Formula",
+                                    sublabel: "if this formula evaluates to true, use the following view",
+                                },
                                 {
                                     name: "view",
                                     label: req.__("View"),
@@ -268,26 +281,8 @@ const initial_config = initial_config_all_fields(true);
  * @param {object} optsTwo.res
  * @returns {Promise<Form>}
  */
-const run = async (table_id, viewname, { columns, layout, auto_save }, state, { res, req }) => {
-    const table = await Table.findOne({ id: table_id });
-    const fields = await table.getFields();
-    const { uniques, nonUniques } = splitUniques(fields, state);
-    let row = null;
-    if (Object.keys(uniques).length > 0) {
-        row = await table.getRow(uniques);
-    }
-    return await render({
-        table,
-        fields,
-        viewname,
-        columns,
-        layout,
-        row,
-        req,
-        res,
-        state,
-        auto_save,
-    });
+const run = async (table_id, viewname, {}, state, { res, req }, { editQuery }) => {
+    return await editQuery(state);
 };
 /**
  * @param {number} table_id
@@ -299,22 +294,8 @@ const run = async (table_id, viewname, { columns, layout, auto_save }, state, {
  * @param {object} extra
  * @returns {Promise<Form[]>}
  */
-const runMany = async (table_id, viewname, { columns, layout, auto_save }, state, extra) => {
-    const table = await Table.findOne({ id: table_id });
-    const fields = await table.getFields();
-    const { joinFields, aggregations } = picked_fields_to_query(columns, fields);
-    const qstate = await stateFieldsToWhere({ fields, state });
-    const q = await stateFieldsToQuery({ state, fields });
-    const rows = await table.getJoinedRows({
-        where: qstate,
-        joinFields,
-        aggregations,
-        ...(extra && extra.limit && { limit: extra.limit }),
-        ...(extra && extra.offset && { offset: extra.offset }),
-        ...(extra && extra.orderBy && { orderBy: extra.orderBy }),
-        ...(extra && extra.orderDesc && { orderDesc: extra.orderDesc }),
-        ...q,
-    });
+const runMany = async (table_id, viewname, { columns, layout, auto_save }, state, extra, { editManyQuery, getRowQuery }) => {
+    const { table, fields, rows } = editManyQuery();
     return await asyncMap(rows, async (row) => {
         const html = await render({
             table,
@@ -327,6 +308,7 @@ const runMany = async (table_id, viewname, { columns, layout, auto_save }, state
             res: extra.res,
             state,
             auto_save,
+            getRowQuery,
         });
         return { html, row };
     });
@@ -341,7 +323,7 @@ const runMany = async (table_id, viewname, { columns, layout, auto_save }, state
  * @throws {InvalidConfiguration}
  * @returns {Promise<void>}
  */
-const transformForm = async ({ form, table, req, row, res }) => {
+const transformForm = async ({ form, table, req, row, res, getRowQuery }) => {
     await traverse(form.layout, {
         action(segment) {
             if (segment.action_name === "Delete") {
@@ -359,13 +341,53 @@ const transformForm = async ({ form, table, req, row, res }) => {
             segment.sourceURL = `/field/show-calculated/${table.name}/${segment.join_field}/${segment.fieldview}?${qs}`;
         },
         async view(segment) {
+            //console.log(segment);
+            const view_select = parse_view_select(segment.view);
+            //console.log({ view_select });
+            const view = await View.findOne({ name: view_select.viewname });
+            if (!view)
+                throw new InvalidConfiguration(`Cannot find embedded view: ${view_select.viewname}`);
+            if (view.viewtemplate === "Edit" && view_select.type === "ChildList") {
+                const childTable = Table.findOne({ id: view.table_id });
+                const childForm = await getForm(childTable, view.name, view.configuration.columns, view.configuration.layout, row?.id, req);
+                traverseSync(childForm.layout, {
+                    field(segment) {
+                        segment.field_name = `${view_select.field_name}.${segment.field_name}`;
+                    },
+                });
+                const fr = new FieldRepeat({
+                    name: view_select.field_name,
+                    label: view_select.field_name,
+                    fields: childForm.fields,
+                    layout: childForm.layout,
+                    metadata: {
+                        table_id: childTable.id,
+                        relation: view_select.field_name,
+                    },
+                });
+                if (row?.id) {
+                    const childRows = getRowQuery
+                        ? await getRowQuery(view.table_id, view_select, row.id)
+                        : await childTable.getRows({
+                            [view_select.field_name]: row.id,
+                        });
+                    fr.metadata.rows = childRows;
+                    if (!fr.fields.map((f) => f.name).includes(childTable.pk_name))
+                        fr.fields.push({
+                            name: childTable.pk_name,
+                            input_type: "hidden",
+                        });
+                }
+                form.fields.push(fr);
+                segment.type = "field_repeat";
+                segment.field_repeat = fr;
+                return;
+            }
             if (!row) {
                 segment.type = "blank";
                 segment.contents = "";
                 return;
             }
-            const view_select = parse_view_select(segment.view);
-            const view = await View.findOne({ name: view_select.viewname });
             if (!view)
                 throw new InvalidConfiguration(`Edit view incorrectly configured: cannot find embedded view ${view_select.viewname}`);
             let state;
@@ -405,10 +427,10 @@ const transformForm = async ({ form, table, req, row, res }) => {
  * @param {object} opts.res
  * @returns {Promise<Form>}
  */
-const render = async ({ table, fields, viewname, columns, layout, row, req, state, res, auto_save, }) => {
-    const form = await getForm(table, viewname, columns, layout, state.id, req);
+const render = async ({ table, fields, viewname, columns, layout, row, req, state, res, auto_save, destination_type, isRemote, getRowQuery, }) => {
+    const form = await getForm(table, viewname, columns, layout, state.id, req, isRemote);
     if (auto_save)
-        form.onChange = `saveAndContinue(this)`;
+        form.onChange = `saveAndContinue(this, ${!isWeb(req) ? `'${form.action}'` : undefined})`;
     if (row) {
         form.values = row;
         const file_fields = form.fields.filter((f) => f.type === "File");
@@ -420,6 +442,10 @@ const render = async ({ table, fields, viewname, columns, layout, row, req, stat
         }
         form.hidden(table.pk_name);
     }
+    if (destination_type === "Back to referer") {
+        form.hidden("_referer");
+        form.values._referer = req.headers?.referer;
+    }
     Object.entries(state).forEach(([k, v]) => {
         const field = form.fields.find((f) => f.name === k);
         if (field && ((field.type && field.type.read) || field.is_fkey)) {
@@ -434,8 +460,8 @@ const render = async ({ table, fields, viewname, columns, layout, row, req, stat
         }
     });
     await form.fill_fkey_options();
-    await transformForm({ form, table, req, row, res });
-    return renderForm(form, req.csrfToken());
+    await transformForm({ form, table, req, row, res, getRowQuery });
+    return renderForm(form, !isRemote ? req.csrfToken() : false);
 };
 /**
  * @param {number} table_id
@@ -454,12 +480,12 @@ const render = async ({ table, fields, viewname, columns, layout, row, req, stat
  * @param {string} optsTwo.redirect
  * @returns {Promise<void>}
  */
-const runPost = async (table_id, viewname, { columns, layout, fixed, view_when_done, formula_destinations, auto_save }, state, body, { res, req, redirect }) => {
+const runPost = async (table_id, viewname, { columns, layout, fixed, view_when_done, formula_destinations, auto_save, destination_type, }, state, body, { res, req, redirect }, { tryInsertQuery, tryUpdateQuery, getRowQuery }) => {
     const table = await Table.findOne({ id: table_id });
     const fields = await table.getFields();
     const form = await getForm(table, viewname, columns, layout, body.id, req);
     if (auto_save)
-        form.onChange = `saveAndContinue(this)`;
+        form.onChange = `saveAndContinue(this, ${!isWeb(req) ? `'${form.action}'` : undefined})`;
     Object.entries(body).forEach(([k, v]) => {
         const form_field = form.fields.find((f) => f.name === k);
         const tbl_field = fields.find((f) => f.name === k);
@@ -468,13 +494,21 @@ const runPost = async (table_id, viewname, { columns, layout, fixed, view_when_d
         }
     });
     setDateLocales(form, req.getLocale());
+    await transformForm({
+        form,
+        table,
+        req,
+        row: body[table.pk_name]
+            ? { [table.pk_name]: body[table.pk_name] }
+            : undefined,
+        getRowQuery,
+    });
     form.validate(body);
     if (form.hasErrors) {
         if (req.xhr)
             res.status(422);
         await form.fill_fkey_options();
-        await transformForm({ form, table, req });
-        res.sendWrap(viewname, renderForm(form, req.csrfToken()));
+        res.sendWrap(viewname, renderForm(form, req.csrfToken ? req.csrfToken() : false));
     }
     else {
         let row;
@@ -485,7 +519,10 @@ const runPost = async (table_id, viewname, { columns, layout, fixed, view_when_d
             row = { ...use_fixed, ...form.values };
         }
         else {
-            row = form.values;
+            row = { ...form.values };
+        }
+        for (const field of form.fields.filter((f) => f.isRepeat)) {
+            delete row[field.name];
         }
         const file_fields = form.fields.filter((f) => f.type === "File");
         for (const field of file_fields) {
@@ -499,77 +536,102 @@ const runPost = async (table_id, viewname, { columns, layout, fixed, view_when_d
         }
         const originalID = id;
         if (typeof id === "undefined") {
-            const ins_res = await table.tryInsertRow(row, req.user ? +req.user.id : undefined);
+            const ins_res = await tryInsertQuery(row);
             if (ins_res.success) {
                 id = ins_res.success;
                 row[pk.name] = id;
             }
             else {
                 req.flash("error", text_attr(ins_res.error));
-                res.sendWrap(viewname, renderForm(form, req.csrfToken()));
+                res.sendWrap(viewname, renderForm(form, req.csrfToken ? req.csrfToken() : false));
                 return;
             }
         }
         else {
-            const upd_res = await table.tryUpdateRow(row, id, req.user ? +req.user.id : undefined);
+            const upd_res = await tryUpdateQuery(row, id);
             if (upd_res.error) {
                 req.flash("error", text_attr(upd_res.error));
                 res.sendWrap(viewname, renderForm(form, req.csrfToken()));
                 return;
             }
         }
-        if (req.xhr && !originalID) {
-            res.json({ id });
+        for (const field of form.fields.filter((f) => f.isRepeat)) {
+            const childTable = Table.findOne({ id: field.metadata?.table_id });
+            for (const childRow of form.values[field.name]) {
+                childRow[field.metadata?.relation] = id;
+                if (childRow[childTable.pk_name]) {
+                    const upd_res = await childTable.tryUpdateRow(childRow, childRow[childTable.pk_name]);
+                    if (upd_res.error) {
+                        req.flash("error", text_attr(upd_res.error));
+                        res.sendWrap(viewname, renderForm(form, req.csrfToken()));
+                        return;
+                    }
+                }
+                else {
+                    const ins_res = await childTable.tryInsertRow(childRow, req.user ? +req.user.id : undefined);
+                    if (ins_res.error) {
+                        req.flash("error", text_attr(ins_res.error));
+                        res.sendWrap(viewname, renderForm(form, req.csrfToken()));
+                        return;
+                    }
+                }
+            }
+        }
+        if (req.xhr && !originalID && !req.smr) {
+            res.json({ id, view_when_done });
             return;
         }
         if (redirect) {
             res.redirect(redirect);
             return;
         }
-        if (!view_when_done) {
-            res.redirect(`/`);
+        let use_view_when_done = view_when_done;
+        if (destination_type === "Back to referer" && body._referer) {
+            res.redirect(body._referer);
             return;
         }
-        let use_view_when_done = view_when_done;
-        for (const { view, expression } of formula_destinations || []) {
-            if (expression) {
-                const f = get_expression_function(expression, fields);
-                if (f(row)) {
-                    use_view_when_done = view;
-                    continue;
+        else if (destination_type !== "View")
+            for (const { view, expression } of formula_destinations || []) {
+                if (expression) {
+                    const f = get_expression_function(expression, fields);
+                    if (f(row)) {
+                        use_view_when_done = view;
+                        continue;
+                    }
                 }
             }
+        if (!use_view_when_done) {
+            res.redirect(`/`);
+            return;
         }
         const [viewname_when_done, relation] = use_view_when_done.split(".");
         const nxview = await View.findOne({ name: viewname_when_done });
-        //console.log()
         if (!nxview) {
             req.flash("warning", `View "${use_view_when_done}" not found - change "View when done" in "${viewname}" view`);
             res.redirect(`/`);
         }
         else {
             const state_fields = await nxview.get_state_fields();
+            let target = `/view/${text(viewname_when_done)}`;
+            let query = "";
             if ((nxview.table_id === table_id || relation) &&
                 state_fields.some((sf) => sf.name === pk.name)) {
                 const get_query = get_view_link_query(fields);
-                const query = relation
+                query = relation
                     ? `?${pk.name}=${text(row[relation])}`
                     : get_query(row);
-                res.redirect(`/view/${text(viewname_when_done)}${query}`);
             }
-            else
-                res.redirect(`/view/${text(viewname_when_done)}`);
+            const redirectPath = `${target}${query}`;
+            if (!isWeb(req)) {
+                res.json({ redirect: `get${redirectPath}` });
+            }
+            else {
+                res.redirect(redirectPath);
+            }
         }
     }
 };
-/**
- * @param {object} opts
- * @param {object} opts.body
- * @param {string} opts.table_id
- * @param {object} opts.req
- * @returns {Promise<boolean>}
- */
-const authorise_post = async ({ body, table_id, req }) => {
+const doAuthPost = async ({ body, table_id, req }) => {
     const table = await Table.findOne({ id: table_id });
     const user_id = req.user ? req.user.id : null;
     if (table.ownership_field_id && user_id) {
@@ -592,6 +654,16 @@ const authorise_post = async ({ body, table_id, req }) => {
         return true;
     return false;
 };
+/**
+ * @param {object} opts
+ * @param {object} opts.body
+ * @param {string} opts.table_id
+ * @param {object} opts.req
+ * @returns {Promise<boolean>}
+ */
+const authorise_post = async ({ body, table_id, req }, { authorizePostQuery }) => {
+    return await authorizePostQuery(body, table_id);
+};
 module.exports = {
     /** @type {string} */
     name: "Edit",
@@ -612,20 +684,8 @@ module.exports = {
      * @param {...*} opts.rest
      * @returns {Promise<boolean>}
      */
-    authorise_get: async ({ query, table_id, req }) => {
-        let body = query || {};
-        if (Object.keys(body).length == 1) {
-            const table = await Table.findOne({ id: table_id });
-            if (table.ownership_field_id || table.ownership_formula) {
-                const fields = await table.getFields();
-                const { uniques } = splitUniques(fields, body);
-                if (Object.keys(uniques).length > 0) {
-                    body = await table.getRow(uniques);
-                    return table.is_owner(req.user, body);
-                }
-            }
-        }
-        return authorise_post({ body, table_id, req });
+    authorise_get: async ({ query, table_id, req }, { authorizeGetQuery }) => {
+        return await authorizeGetQuery(query, table_id);
     },
     /**
      * @param {object} opts
@@ -635,17 +695,103 @@ module.exports = {
     getStringsForI18n({ layout }) {
         return getStringsForI18n(layout);
     },
-    configCheck: async ({ name, configuration: { view_when_done, formula_destinations }, }) => {
+    queries: ({ table_id, name, configuration: { columns, default_state, layout, auto_save, destination_type, }, req, res, }) => ({
+        async editQuery(state) {
+            const table = await Table.findOne({ id: table_id });
+            const fields = await table.getFields();
+            const { uniques } = splitUniques(fields, state);
+            let row = null;
+            if (Object.keys(uniques).length > 0) {
+                row = await table.getRow(uniques);
+            }
+            const isRemote = !isWeb(req);
+            return await render({
+                table,
+                fields,
+                viewname: name,
+                columns,
+                layout,
+                row,
+                req,
+                res,
+                state,
+                auto_save,
+                destination_type,
+                isRemote,
+            });
+        },
+        async editManyQuery(state) {
+            const table = await Table.findOne({ id: table_id });
+            const fields = await table.getFields();
+            const { joinFields, aggregations } = picked_fields_to_query(columns, fields);
+            const qstate = await stateFieldsToWhere({ fields, state });
+            const q = await stateFieldsToQuery({ state, fields });
+            const rows = await table.getJoinedRows({
+                where: qstate,
+                joinFields,
+                aggregations,
+                ...(extra && extra.limit && { limit: extra.limit }),
+                ...(extra && extra.offset && { offset: extra.offset }),
+                ...(extra && extra.orderBy && { orderBy: extra.orderBy }),
+                ...(extra && extra.orderDesc && { orderDesc: extra.orderDesc }),
+                ...q,
+            });
+            return {
+                table,
+                fields,
+                rows,
+            };
+        },
+        async tryInsertQuery(row) {
+            const table = await Table.findOne({ id: table_id });
+            const ins_res = await table.tryInsertRow(row, req.user ? +req.user.id : undefined);
+            return ins_res;
+        },
+        async tryUpdateQuery(row, id) {
+            const table = await Table.findOne({ id: table_id });
+            const upd_res = await table.tryUpdateRow(row, id, req.user ? +req.user.id : undefined);
+            return upd_res;
+        },
+        async authorizePostQuery(body, table_id /*overwrites*/) {
+            return await doAuthPost({ body, table_id, req });
+        },
+        async authorizeGetQuery(query, table_id) {
+            let body = query || {};
+            if (Object.keys(body).length == 1) {
+                const table = await Table.findOne({ id: table_id });
+                if (table.ownership_field_id || table.ownership_formula) {
+                    const fields = await table.getFields();
+                    const { uniques } = splitUniques(fields, body);
+                    if (Object.keys(uniques).length > 0) {
+                        body = await table.getRow(uniques);
+                        return table.is_owner(req.user, body);
+                    }
+                }
+            }
+            return doAuthPost({ body, table_id, req });
+        },
+        async getRowQuery(table_id, view_select, row_id) {
+            const childTable = Table.findOne({ id: table_id });
+            return await childTable.getRows({
+                [view_select.field_name]: row_id,
+            });
+        },
+    }),
+    configCheck: async (view) => {
+        const { name, configuration: { view_when_done, destination_type, formula_destinations }, } = view;
         const errs = [];
-        const vwd = await View.findOne({
-            name: (view_when_done || "").split(".")[0],
-        });
-        if (!vwd)
-            errs.push(`In View ${name}, view when done ${view_when_done} not found`);
-        for (const { expression } of formula_destinations || []) {
-            if (expression)
-                expressionChecker(expression, `In View ${name}, destination formula ${expression} error: `, errs);
+        if (destination_type !== "Back to referer") {
+            const vwd = await View.findOne({
+                name: (view_when_done || "").split(".")[0],
+            });
+            if (!vwd)
+                errs.push(`In View ${name}, view when done ${view_when_done} not found`);
+            for (const { expression } of formula_destinations || []) {
+                if (expression)
+                    expressionChecker(expression, `In View ${name}, destination formula ${expression} error: `, errs);
+            }
         }
+        errs.push(...(await check_view_columns(view, view.configuration.columns)));
         return errs;
     },
 };