@saltcorn/data 1.5.0-beta.9 → 1.5.0-rc.1

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

@@ -24,7 +24,7 @@ const { InvalidConfiguration, isNode, isWeb, isTest, mergeIntoWhere, dollarizeOb
 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, displayType, runCollabEvents, } = require("../../plugin-helper");
-const { splitUniques, getForm, fill_presets, parse_view_select, get_view_link_query, objToQueryString, action_url, action_link, view_linker, edit_build_in_actions, } = require("./viewable_fields");
+const { splitUniques, getForm, setDateLocales, transformForm, fill_presets, parse_view_select, get_view_link_query, objToQueryString, action_url, action_link, view_linker, edit_build_in_actions, updateViewSelect, } = require("./viewable_fields");
 const { traverse, getStringsForI18n, translateLayout, traverseSync, splitLayoutContainerFields, findLayoutBranchWith, } = require("../../models/layout");
 const { extractFromLayout } = require("../../diagram/node_extract_utils");
 const db = require("../../db");
@@ -398,28 +398,6 @@ const get_state_fields = async (table_id, viewname, { columns }) => [
  * @param {Form} form
  * @param {string} locale
  */
-const setDateLocales = (form, locale) => {
-    form.fields.forEach((f) => {
-        if (f.type && f.type.name === "Date") {
-            f.attributes.locale = locale;
-        }
-    });
-};
-/**
- * update viewSelect so that it looks like a normal ChildList
- */
-const updateViewSelect = (viewSelect) => {
-    if (viewSelect.path.length === 1) {
-        viewSelect.field_name = viewSelect.path[0].inboundKey;
-        viewSelect.table_name = viewSelect.path[0].table;
-    }
-    else if (viewSelect.path.length === 2) {
-        viewSelect.field_name = viewSelect.path[1].inboundKey;
-        viewSelect.table_name = viewSelect.path[1].table;
-        viewSelect.throughTable = viewSelect.path[0].inboundKey;
-        viewSelect.through = viewSelect.path[0].table;
-    }
-};
 /** @type {function} */
 const initial_config = initial_config_all_fields(true);
 /**
@@ -494,311 +472,6 @@ const runMany = async (table_id, viewname, { columns, layout, auto_save, split_p
  * @throws {InvalidConfiguration}
  * @returns {Promise<void>}
  */
-const transformForm = async ({ form, table, req, row, res, getRowQuery, viewname, optionsQuery, state, }) => {
-    let originalState = state;
-    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(this, 'run_action', {click_action: '${segment.click_action}', ...get_form_record(this) })`;
-            }
-        },
-        async action(segment) {
-            if (segment.action_style === "on_page_load") {
-                segment.type = "blank";
-                segment.style = {};
-                if (segment.minRole && segment.minRole != 100) {
-                    const minRole = +segment.minRole;
-                    const userRole = req?.user?.role_id || 100;
-                    if (minRole < userRole)
-                        return;
-                }
-                if (req.method === "POST")
-                    return;
-                //run action
-                try {
-                    const actionResult = await run_action_column({
-                        col: { ...segment },
-                        referrer: req?.get?.("Referrer"),
-                        req,
-                        res,
-                        table,
-                        row: row || pseudo_row,
-                    });
-                    if (actionResult)
-                        segment.contents = script(domReady(`common_done(${JSON.stringify(actionResult)}, "${viewname}")`));
-                }
-                catch (e) {
-                    getState().log(5, `Error in Edit ${viewname} on page load action: ${e.message}`);
-                    e.message = `Error in evaluating Run on Page Load action in view ${viewname}: ${e.message}`;
-                    throw e;
-                }
-            }
-            if (segment.action_name === "Delete") {
-                if (form.values && form.values[table.pk_name]) {
-                    segment.action_url = table.delete_url(form.values);
-                }
-                else {
-                    segment.type = "blank";
-                    segment.contents = "";
-                }
-            }
-            else if (segment.action_name === "form_action" &&
-                segment.configuration?.form_action === "Save" &&
-                table.fields.some((f) => f.type === "File")) {
-                let url = action_url(viewname, table, segment.action_name, row, segment.rndid, "rndid", segment.confirm);
-                if (url.javascript) {
-                    //redo to include dynamic row
-                    const confirmStr = segment.confirm
-                        ? `if(confirm('Are you sure?'))`
-                        : "";
-                    url.javascript = `${confirmStr}view_post(this, 'run_action', get_form_data(this, '${segment.rndid}') );`;
-                }
-                segment.action_link = action_link(url, req, segment);
-            }
-            else if (!["Sign up", ...edit_build_in_actions].includes(segment.action_name) &&
-                !segment.action_name.startsWith("Login")) {
-                let url = action_url(viewname, table, segment.action_name, row, segment.rndid, "rndid", segment.confirm, undefined, segment.run_async);
-                if (url.javascript) {
-                    //redo to include dynamic row
-                    const confirmStr = segment.confirm
-                        ? `if(confirm('Are you sure?'))`
-                        : "";
-                    // If this is a Multi-step action or the form/table contains File fields,
-                    // post multipart FormData so req.files is populated server-side.
-                    const hasFileFields = table.fields?.some((f) => f.type === "File");
-                    if (segment.action_name === "Multi-step action" || hasFileFields) {
-                        url.javascript = `${confirmStr}view_post(this, 'run_action', get_form_data(this, '${segment.rndid}') );`;
-                    }
-                    else {
-                        url.javascript = `${confirmStr}view_post(this, 'run_action', {rndid:'${segment.rndid}', ...get_form_record(this)});`;
-                    }
-                }
-                segment.action_link = action_link(url, req, segment);
-            }
-        },
-        join_field(segment) {
-            const qs = objToQueryString(segment.configuration);
-            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 || pseudo_row, req.user, "Tab show if formula");
-                    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("{{")) {
-                    segment.titles[ix] = interpolate(t, row, req.user, "Tab titles");
-                }
-            });
-        },
-        view_link(segment) {
-            segment.type = "blank";
-            const view_select = parse_view_select(segment.view);
-            if (!row && view_select.type !== "Independent") {
-                segment.contents = "";
-            }
-            else {
-                const prefix = req.generate_email && req.get_base_url ? req.get_base_url() : "";
-                const { key } = view_linker(segment, table.fields, (s) => s, isWeb(req), req.user, prefix, req.query, req, viewname);
-                segment.contents = key(row || {});
-            }
-        },
-        async view(segment) {
-            //console.log(segment);
-            const view_select = parse_view_select(segment.view, segment.relation);
-            //console.log({ view_select });
-            const view = View.findOne({ name: view_select.viewname });
-            if (!view)
-                throw new InvalidConfiguration(`Cannot find embedded view: ${view_select.viewname}`);
-            // 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" || 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));
-                traverseSync(childForm.layout, {
-                    field(segment) {
-                        segment.field_name = `${view_select.field_name}.${segment.field_name}`;
-                    },
-                });
-                for (const field of childForm.fields) {
-                    if (field.name === childTable.pk_name) {
-                        field.class = field.class
-                            ? `${field.class} omit-repeater-clone`
-                            : "omit-repeater-clone";
-                    }
-                }
-                await childForm.fill_fkey_options(false, optionsQuery, req.user);
-                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,
-                        view: segment.view,
-                        relation: view_select.field_name,
-                        relation_path: segment.relation,
-                        order_field: segment.order_field,
-                    },
-                });
-                if (row?.id) {
-                    const childRows = getRowQuery
-                        ? await getRowQuery(view.table_id, view_select, row.id, segment.order_field)
-                        : await childTable.getRows({
-                            [view_select.field_name]: row.id,
-                        }, segment.order_field ? { orderBy: segment.order_field } : {});
-                    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;
-            } // end edit in edit
-            const outerState = {};
-            Object.entries(originalState || {}).forEach(([k, v]) => {
-                if (k.startsWith("_"))
-                    outerState[k] = v;
-            });
-            let state = {};
-            let urlFormula;
-            let needFields = new Set();
-            if (view_select.type === "RelationPath" && view.table_id) {
-                const pathToUrlFormula = (relation) => {
-                    const st = pathToState(relation, (k) => `row.` + k);
-                    return Object.entries(st)
-                        .map(([k, v]) => {
-                        needFields.add(v.split(".")[1]);
-                        return `${k}='+${v}+'`;
-                    })
-                        .join("&");
-                };
-                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 relFmlQS = pathToUrlFormula(relation);
-                    const type = relation.type;
-                    if (!row && type == RelationType.OWN) {
-                        segment.type = "blank";
-                        urlFormula = `add_extra_state('/view/${view.name}/?${relFmlQS}', ${JSON.stringify(segment.extra_state_fml)}, row, ${JSON.stringify(outerState)})`;
-                        segment.contents = segment.contents = div({
-                            class: "d-inline",
-                            "data-sc-embed-viewname": view.name,
-                            "data-view-source-need-fields": [...needFields].join(","),
-                            "data-view-source": encodeURIComponent(urlFormula),
-                        });
-                        return;
-                    }
-                    else if (!row &&
-                        type !== RelationType.INDEPENDENT &&
-                        !relation.isFixedRelation()) {
-                        urlFormula = `add_extra_state('/view/${view.name}/?${relFmlQS}', ${JSON.stringify(segment.extra_state_fml)}, row, ${JSON.stringify(outerState)})`;
-                        segment.contents = segment.contents = div({
-                            class: "d-inline",
-                            "data-sc-embed-viewname": view.name,
-                            "data-view-source-need-fields": [...needFields].join(","),
-                            "data-view-source": encodeURIComponent(urlFormula),
-                        });
-                        return;
-                    }
-                    const userId = req?.user?.id;
-                    state = pathToState(relation, relation.isFixedRelation() ? () => userId : (k) => row[k]);
-                    urlFormula = `add_extra_state('/view/${view.name}?${relFmlQS}', ${JSON.stringify(segment.extra_state_fml)}, row, ${JSON.stringify(outerState)})`;
-                }
-            }
-            else {
-                const isIndependent = view_select.type === "Independent";
-                // legacy none check ?
-                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 };
-                        urlFormula = `add_extra_state('/view/${view.name}/?id='+row.id, ${JSON.stringify(segment.extra_state_fml)}, row, ${JSON.stringify(outerState)})`;
-                        needFields.add("id");
-                        break;
-                    case "Independent":
-                        state = {};
-                        urlFormula = `add_extra_state('/view/${view.name}/?id='+row.id, ${JSON.stringify(segment.extra_state_fml)}, row, ${JSON.stringify(outerState)})`;
-                        needFields.add("id");
-                        break;
-                    case "ChildList":
-                    case "OneToOneShow":
-                        state = { [view_select.field_name]: row?.id };
-                        urlFormula = `add_extra_state('/view/${view.name}/?${view_select.field_name}='+row.id, ${JSON.stringify(segment.extra_state_fml)}, row, ${JSON.stringify(outerState)})`;
-                        needFields.add("id");
-                        break;
-                    case "ParentShow":
-                        state = { id: row?.[view_select.field_name] };
-                        urlFormula = `add_extra_state('/view/${view.name}/?id='+row.${view_select.field_name}, ${JSON.stringify(segment.extra_state_fml)}, row, ${JSON.stringify(outerState)})`;
-                        needFields.add(view_select.field_name);
-                        break;
-                }
-                if (!row && !isIndependent) {
-                    segment.type = "blank";
-                    segment.contents = div({
-                        class: "d-inline",
-                        "data-sc-embed-viewname": view.name,
-                        "data-view-source-need-fields": [...needFields].join(","),
-                        "data-view-source": encodeURIComponent(urlFormula),
-                    });
-                    return;
-                }
-            }
-            const extra_state = segment.extra_state_fml
-                ? eval_expression(segment.extra_state_fml, {
-                    ...dollarizeObject(req.query),
-                    session_id: getSessionId(req),
-                    ...(row || pseudo_row),
-                }, req.user, `Extra state formula for embedding view ${view.name}`)
-                : {};
-            const qs = stateToQueryString({ ...state, ...outerState, ...extra_state }, true);
-            segment.contents = div({
-                class: "d-inline",
-                "data-sc-embed-viewname": view.name,
-                "data-sc-view-source": `/view/${view.name}${qs}`,
-                "data-view-source-current": `/view/${view.name}${qs}`,
-                "data-view-source-need-fields": [...needFields].join(","),
-                "data-view-source": encodeURIComponent(urlFormula),
-            }, view.renderLocally()
-                ? await view.run({ ...state, ...outerState, ...extra_state }, { req, res }, view.isRemoteTable())
-                : await renderServerSide(view.name, {
-                    ...state,
-                    ...outerState,
-                    ...extra_state,
-                }));
-        },
-    });
-    translateLayout(form.layout, req.getLocale());
-    if (req.headers?.saltcornmodalrequest)
-        form.xhrSubmit = true;
-    setDateLocales(form, req.getLocale());
-};
 const realTimeScript = (viewname, table_id, row, scriptId) => {
     const view = View.findOne({ name: viewname });
     const table = Table.findOne({ id: table_id });
@@ -1176,11 +849,12 @@ const runPost = async (table_id, viewname, { columns, layout, fixed, view_when_d
                             childRow[order_field] = row_ix;
                         for (const file_field of field.fields.filter((f) => f.type === "File")) {
                             const key = `${file_field.name}_${repeatIx}`;
-                            if (req.files?.[key]) {
+                            if (req.files?.[key] &&
+                                (!file_field.fieldviewObj || file_field.fieldviewObj.isEdit)) {
                                 const file = await File.from_req_files(req.files[key], req.user ? req.user.id : null, (file_field.attributes &&
                                     +file_field.attributes.min_role_read) ||
                                     1, file_field?.attributes?.folder);
-                                childRow[file_field.name] = file.path_to_serve;
+                                childRow[file_field.name] = file.field_value;
                             }
                         }
                         getState().log(6, `Edit POST ready to insert/update Child row into ${childTable.name} Row=${JSON.stringify(childRow)} ID=${childRow[childTable.pk_name]} Ajax=${!!req.xhr}`);
@@ -1559,16 +1233,18 @@ const prepare = async (viewname, table, fields, { columns, layout, fixed, auto_s
             if (body[field.name]) {
                 if (body[field.name].startsWith("data:")) {
                     const path_to_serve = await saveFileQuery(body[field.name], field.id, field.fieldview, row);
-                    row[field.name] = path_to_serve;
-                    form.values[field.name] = path_to_serve;
+                    const storedValue = File.fieldValueFromRelative(path_to_serve);
+                    row[field.name] = storedValue;
+                    form.values[field.name] = storedValue;
                 }
             }
         }
         else if (field.fieldviewObj?.editContent) {
             if (body[field.name]) {
                 const path_to_serve = await saveFileFromContentsQuery(body[`_content_${field.name}`], field.id, field.fieldview, row, body[field.name], "utf8");
-                row[field.name] = path_to_serve;
-                form.values[field.name] = path_to_serve;
+                const storedValue = File.fieldValueFromRelative(path_to_serve);
+                row[field.name] = storedValue;
+                form.values[field.name] = storedValue;
             }
         }
         else if (req.files && req.files[field.name]) {
@@ -1577,20 +1253,20 @@ const prepare = async (viewname, table, fields, { columns, layout, fixed, auto_s
             }
             if (isWeb(req)) {
                 const file = await File.from_req_files(req.files[field.name], req.user ? req.user.id : null, (field.attributes && +field.attributes.min_role_read) || 1, field?.attributes?.folder);
-                row[field.name] = file.path_to_serve;
-                form.values[field.name] = file.path_to_serve;
+                row[field.name] = file.field_value;
+                form.values[field.name] = file.field_value;
             }
             else {
                 const file = req.files[field.name];
                 if (file) {
                     const serverResp = await File.upload(req.files[field.name]);
                     if (serverResp?.location)
-                        row[field.name] = serverResp.location;
+                        row[field.name] = File.normalizeFieldValueInput(serverResp.location);
                 }
             }
         }
         else if (typeof body[`__exisiting_file_${field.name}`] === "string") {
-            row[field.name] = File.normalise(body[`__exisiting_file_${field.name}`]);
+            row[field.name] = File.normalizeFieldValueInput(body[`__exisiting_file_${field.name}`]);
             form.values[field.name] = row[field.name];
         }
         else {
@@ -2071,7 +1747,7 @@ module.exports = {
                 ...(column?.configuration || {}),
             });
             const file = await File.from_contents(filename, mimetype, buffer, req.user?.id, field.attributes.min_role_read || 1, folder);
-            return file.path_to_serve;
+            return File.fieldValueFromRelative(file.path_to_serve);
         },
         async saveFileFromContentsQuery(fieldVal, fieldId, fieldView, row, filename, encoding = "base64") {
             const field = await Field.findOne({ id: fieldId });
@@ -2095,13 +1771,13 @@ module.exports = {
             if (existing_file) {
                 if (existing_file.min_role_read >= (req.user?.role_id || 100)) {
                     await existing_file.overwrite_contents(buffer);
-                    return existing_file.path_to_serve;
+                    return File.fieldValueFromRelative(existing_file.path_to_serve);
                 }
                 else
                     throw new Error("Not authorized to write file");
             }
             const file = await File.from_contents(filename1, mimetype, buffer, req.user?.id, field.attributes.min_role_read || 1);
-            return file.path_to_serve;
+            return File.fieldValueFromRelative(file.path_to_serve);
         },
         async authorizePostQuery(body, table_id /*overwrites*/) {
             return await doAuthPost({ body, table_id, req });