@saltcorn/data 1.4.2 → 1.4.3

package/dist/viewable_fields.js

@@ -1,21 +1,27 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateViewSelect = exports.transformForm = exports.setDateLocales = exports.standardLayoutRowVisitor = exports.standardBlockDispatch = exports.edit_build_in_actions = exports.make_link = exports.get_view_link_query = exports.fill_presets = exports.getForm = exports.splitUniques = exports.parse_view_select = exports.view_linker = exports.action_link = exports.objToQueryString = exports.action_url = exports.get_viewable_fields_from_layout = exports.get_viewable_fields = void 0;
 /**
  * @category saltcorn-data
  * @module base-plugin/viewtemplates/viewable_fields
  * @subcategory base-plugin
  */
+const table_1 = __importDefault(require("./models/table"));
+const field_1 = __importDefault(require("./models/field"));
+const view_1 = __importDefault(require("./models/view"));
 const { post_btn } = require("@saltcorn/markup");
 const { text, a, i, div, button, span, script, domReady, input, } = require("@saltcorn/markup/tags");
 const { getState, getReq__ } = require("./db/state");
-const { link_view, displayType, run_action_column, } = require("./plugin-helper");
+const plugin_helper_1 = require("./plugin-helper");
 const { eval_expression, freeVariables, get_expression_function, } = require("./models/expression");
-const Field = require("./models/field");
+const FieldRepeat = require("./models/fieldrepeat");
 const Form = require("./models/form");
-const { traverseSync } = require("./models/layout");
-const { structuredClone, isWeb, isOfflineMode, getSessionId, interpolate, objectToQueryString, validSqlId, } = require("./utils");
+const { traverseSync, traverse, translateLayout } = require("./models/layout");
+const { structuredClone, isWeb, isOfflineMode, getSessionId, interpolate, objectToQueryString, validSqlId, InvalidConfiguration, renderServerSide, } = require("./utils");
 const db = require("./db");
-const View = require("./models/view");
-const Table = require("./models/table");
 const { isNode, dollarizeObject, getSafeBaseUrl } = require("./utils");
 const { bool, date } = require("./base-plugin/types");
 const _ = require("underscore");
@@ -63,6 +69,7 @@ const action_url = (viewname, table, action_name, r, colId, colIdNm, confirm, co
         javascript: `${confirmStr}view_post('${viewname}', 'run_action', {${colIdNm}:'${colId}'${r ? `, ${pk_name}:'${r?.[pk_name]}'` : ""}${columnIndex(colIndex)}}${runAsync ? `,{runAsync:true}` : ""});`,
     };
 };
+exports.action_url = action_url;
 /**
  * @param {string} url
  * @param {object} req
@@ -81,11 +88,11 @@ const action_url = (viewname, table, action_name, r, colId, colIdNm, confirm, co
  * @returns {object}
  */
 const action_link = (url, req, { action_name, action_label, confirm, rndid, action_style, action_size, action_icon, action_bgcol, action_title, action_class, action_bordercol, action_textcol, spinner, block, }, __ = (s) => s) => {
-    const label = action_label === " " ? "" : __(action_label) || action_name;
+    const label = action_label === " " ? "" : __(action_label || "") || action_name;
     let style = action_style === "btn-custom-color"
         ? `background-color: ${action_bgcol || "#000000"};border-color: ${action_bordercol || "#000000"}; color: ${action_textcol || "#000000"}`
         : null;
-    if (url.javascript)
+    if (typeof url !== "string" && url.javascript)
         return a({
             href: "javascript:void(0)",
             onclick: `${spinner ? "spin_action_link(this);" : ""}${url.javascript}`,
@@ -111,6 +118,7 @@ const action_link = (url, req, { action_name, action_label, confirm, rndid, acti
             formClass: !block && "d-inline",
         });
 };
+exports.action_link = action_link;
 const slug_transform = (row) => (step) => step.transform === "slugify"
     ? `/${db.slugify(row[step.field])}`
     : `/${row[step.field]}`;
@@ -126,6 +134,7 @@ const get_view_link_query = (fields, view) => {
     const pk_name = fields.find((f) => f.primary_key).name;
     return (r) => `?${pk_name}=${r[pk_name]}`;
 };
+exports.get_view_link_query = get_view_link_query;
 /**
  * @function
  * @param {object} opts
@@ -137,7 +146,7 @@ const get_view_link_query = (fields, view) => {
  * @param {Field[]} fields
  * @returns {object}
  */
-const make_link = ({ link_text, link_text_formula, link_url, link_url_formula, link_target_blank, in_dropdown, in_modal, link_icon, icon, link_style, link_size, }, fields, __ = (s) => s, in_row_click) => {
+const make_link = ({ link_text, link_text_formula, link_url, link_url_formula, link_target_blank, in_dropdown, in_modal, link_icon, icon, link_style, link_size, link_title, }, fields, __ = (s) => s, in_row_click) => {
     return {
         label: "",
         key: (r) => {
@@ -164,6 +173,8 @@ const make_link = ({ link_text, link_text_formula, link_url, link_url_formula, l
                 attrs.class = [...(attrs.class || []), link_size];
             if (in_row_click)
                 attrs.onclick = "event.stopPropagation()";
+            if (link_title)
+                attrs.title = link_title;
             if (in_modal)
                 return a({
                     ...attrs,
@@ -176,6 +187,7 @@ const make_link = ({ link_text, link_text_formula, link_url, link_url_formula, l
         },
     };
 };
+exports.make_link = make_link;
 /**
  * @param {string} view name of the view or a legacy relation (type:telation)
  * @param {string} relation new relation path syntax
@@ -221,6 +233,7 @@ const parse_view_select = (view, relation) => {
         }
     }
 };
+exports.parse_view_select = parse_view_select;
 const pathToQuery = (relation, srcTable, subTable, row) => {
     const path = relation.path;
     switch (relation.type) {
@@ -251,6 +264,7 @@ const pathToQuery = (relation, srcTable, subTable, row) => {
                 : row[idName]?.id || row[idName];
             return `?${relation.relationString}=${srcId}`;
     }
+    return null;
 };
 //todo: use above to simplify code
 /**
@@ -297,10 +311,10 @@ in_row_click) => {
             .join("&");
     };
     if (relation) {
-        const topview = View.findOne({ name: srcViewName });
-        const srcTable = Table.findOne({ id: topview.table_id });
-        const subview = View.findOne({ name: view });
-        const subTable = Table.findOne({ id: subview.table_id });
+        const topview = view_1.default.findOne({ name: srcViewName });
+        const srcTable = table_1.default.findOne({ id: topview.table_id });
+        const subview = view_1.default.findOne({ name: view });
+        const subTable = table_1.default.findOne({ id: subview.table_id });
         const relObj = new Relation(relation, subTable ? subTable.name : "", ViewDisplayType.NO_ROW_LIMIT);
         relObj.subView = subview;
         const type = relObj.type;
@@ -319,7 +333,7 @@ in_row_click) => {
                     else
                         label = get_label(view, r);
                     const target = `${safePrefix}/view/${encodeURIComponent(view)}${query}`;
-                    return link_view(isWeb || in_modal ? target : `javascript:execLink('${target}')`, label, in_modal && srcViewName && { reload_view: srcViewName }, link_style, link_size, link_icon || icon, textStyle, link_bgcol, link_bordercol, link_textcol, in_dropdown && "dropdown-item", get_extra_state(r), link_target_blank, label_attr, link_title, link_class, req, in_row_click);
+                    return (0, plugin_helper_1.link_view)(isWeb || in_modal ? target : `javascript:execLink('${target}')`, label, in_modal && srcViewName && { reload_view: srcViewName }, link_style, link_size, link_icon || icon, textStyle, link_bgcol, link_bordercol, link_textcol, in_dropdown && "dropdown-item", get_extra_state(r), link_target_blank, label_attr, link_title, link_class, req, in_row_click);
                 }
             },
         };
@@ -330,13 +344,13 @@ in_row_click) => {
         switch (vtype) {
             case "Own":
                 const vnm = vrest;
-                const viewrow = View.findOne({ name: vnm });
+                const viewrow = view_1.default.findOne({ name: vnm });
                 const get_query = get_view_link_query(fields, viewrow || {});
                 return {
                     label: vnm,
                     key: (r) => {
                         const target = `${safePrefix}/view/${encodeURIComponent(vnm)}${get_query(r)}`;
-                        return link_view(isWeb || in_modal ? target : `javascript:execLink('${target}')`, get_label(vnm, r), in_modal && srcViewName && { reload_view: srcViewName }, link_style, link_size, link_icon || icon, textStyle, link_bgcol, link_bordercol, link_textcol, in_dropdown && "dropdown-item", get_extra_state(r), link_target_blank, label_attr, link_title, link_class, req, in_row_click);
+                        return (0, plugin_helper_1.link_view)(isWeb || in_modal ? target : `javascript:execLink('${target}')`, get_label(vnm, r), in_modal && srcViewName && { reload_view: srcViewName }, link_style, link_size, link_icon || icon, textStyle, link_bgcol, link_bordercol, link_textcol, in_dropdown && "dropdown-item", get_extra_state(r), link_target_blank, label_attr, link_title, link_class, req, in_row_click);
                     },
                 };
             case "Independent":
@@ -345,7 +359,7 @@ in_row_click) => {
                     label: ivnm,
                     key: (r) => {
                         const target = `${safePrefix}/view/${encodeURIComponent(ivnm)}`;
-                        return link_view(isWeb || in_modal ? target : `javascript:execLink('${target}')`, get_label(ivnm, r), in_modal && srcViewName && { reload_view: srcViewName }, link_style, link_size, link_icon || icon, textStyle, link_bgcol, link_bordercol, link_textcol, in_dropdown && "dropdown-item", get_extra_state(r), link_target_blank, label_attr, link_title, link_class, req, in_row_click);
+                        return (0, plugin_helper_1.link_view)(isWeb || in_modal ? target : `javascript:execLink('${target}')`, get_label(ivnm, r), in_modal && srcViewName && { reload_view: srcViewName }, link_style, link_size, link_icon || icon, textStyle, link_bgcol, link_bordercol, link_textcol, in_dropdown && "dropdown-item", get_extra_state(r), link_target_blank, label_attr, link_title, link_class, req, in_row_click);
                     },
                 };
             case "ChildList":
@@ -356,7 +370,7 @@ in_row_click) => {
                     label: viewnm,
                     key: (r) => {
                         const target = `${safePrefix}/view/${encodeURIComponent(viewnm)}?${varPath}=${r.id}`;
-                        return link_view(isWeb || in_modal ? target : `javascript:execLink('${target}')`, get_label(viewnm, r), in_modal && srcViewName && { reload_view: srcViewName }, link_style, link_size, link_icon || icon, textStyle, link_bgcol, link_bordercol, link_textcol, in_dropdown && "dropdown-item", get_extra_state(r), link_target_blank, label_attr, link_title, link_class, req, in_row_click);
+                        return (0, plugin_helper_1.link_view)(isWeb || in_modal ? target : `javascript:execLink('${target}')`, get_label(viewnm, r), in_modal && srcViewName && { reload_view: srcViewName }, link_style, link_size, link_icon || icon, textStyle, link_bgcol, link_bordercol, link_textcol, in_dropdown && "dropdown-item", get_extra_state(r), link_target_blank, label_attr, link_title, link_class, req, in_row_click);
                     },
                 };
             case "ParentShow":
@@ -369,7 +383,7 @@ in_row_click) => {
                         const summary_field = r[`summary_field_${ptbl.toLowerCase()}`];
                         if (r[pfld]) {
                             const target = `${safePrefix}/view/${encodeURIComponent(pviewnm)}?${reffield.refname}=${typeof r[pfld] === "object" ? r[pfld].id : r[pfld]}`;
-                            return link_view(isWeb || in_modal ? target : `javascript:execLink('${target}')`, get_label(typeof summary_field === "undefined"
+                            return (0, plugin_helper_1.link_view)(isWeb || in_modal ? target : `javascript:execLink('${target}')`, get_label(typeof summary_field === "undefined"
                                 ? pviewnm
                                 : summary_field, r), in_modal && srcViewName && { reload_view: srcViewName }, link_style, link_size, link_icon || icon, textStyle, link_bgcol, link_bordercol, link_textcol, in_dropdown && "dropdown-item", get_extra_state(r), link_target_blank, label_attr, link_title, link_class, req, in_row_click);
                         }
@@ -382,6 +396,7 @@ in_row_click) => {
         }
     }
 };
+exports.view_linker = view_linker;
 /**
  * @param {string} nm
  * @returns {boolean}
@@ -407,7 +422,7 @@ const flapMapish = (xs, f) => {
     }
     return res;
 };
-const get_viewable_fields_from_layout = (viewname, statehash, table, fields, columns, isShow, req, __, state = {}, srcViewName, layoutCols, viewResults, in_row_click) => {
+const get_viewable_fields_from_layout = (viewname, statehash, table, fields, columns, isShow, req, __, state = {}, srcViewName, layoutCols, viewResults, in_row_click, disable_join_agg_sort) => {
     const typeMap = {
         field: "Field",
         join_field: "JoinField",
@@ -422,7 +437,7 @@ const get_viewable_fields_from_layout = (viewname, statehash, table, fields, col
     };
     const toArray = (x) => !x ? [] : Array.isArray(x) ? x : x.above ? x.above : [x];
     //console.log("layout cols", layoutCols);
-    const newCols = layoutCols.map(({ contents, ...rest }) => {
+    const newCols = (layoutCols || []).map(({ contents, ...rest }) => {
         if (!contents)
             contents = rest;
         if (contents.above) {
@@ -463,8 +478,9 @@ const get_viewable_fields_from_layout = (viewname, statehash, table, fields, col
         return col;
     });
     //console.log("newCols", newCols);
-    return get_viewable_fields(viewname, statehash, table, fields, newCols, isShow, req, __, state, srcViewName, viewResults, in_row_click);
+    return get_viewable_fields(viewname, statehash, table, fields, newCols, isShow, req, __, state, srcViewName, viewResults, in_row_click, disable_join_agg_sort);
 };
+exports.get_viewable_fields_from_layout = get_viewable_fields_from_layout;
 /**
  * @function
  * @param {string} viewname
@@ -476,7 +492,7 @@ const get_viewable_fields_from_layout = (viewname, statehash, table, fields, col
  * @param {*} __
  * @returns {object[]}
  */
-const get_viewable_fields = (viewname, statehash, table, fields, columns, isShow, req, __, state = {}, srcViewName, viewResults, in_row_click) => {
+const get_viewable_fields = (viewname, statehash, table, fields, columns, isShow, req, __, state = {}, srcViewName, viewResults, in_row_click, disable_join_agg_sort) => {
     const dropdown_actions = [];
     const checkShowIf = (tFieldGenF) => (column, index) => {
         const tfield = tFieldGenF(column, index);
@@ -531,7 +547,7 @@ const get_viewable_fields = (viewname, statehash, table, fields, columns, isShow
                         blockDispatch: {
                             ...standardBlockDispatch(viewname, state, table, { req }, r),
                             view(column) {
-                                return viewResults[column.view + column.relation]?.(r);
+                                return viewResults?.[column.view + column.relation]?.(r);
                             },
                         },
                         layout,
@@ -595,7 +611,7 @@ const get_viewable_fields = (viewname, statehash, table, fields, columns, isShow
                         ? eval_expression(column.action_label, r, req.user, "Action label formula")
                         : __(column.action_label) || __(column.action_name);
                     const icon = column.action_icon || column.icon || undefined;
-                    if (url.javascript)
+                    if (typeof url !== "string" && url.javascript)
                         return a({
                             href: "javascript:void(0)",
                             class: [
@@ -638,7 +654,7 @@ const get_viewable_fields = (viewname, statehash, table, fields, columns, isShow
         else if (column.type === "View") {
             return {
                 label: column.header_label ? __(column.header_label) : "",
-                key: (r) => viewResults[column.view + column.relation]?.(r),
+                key: (r) => viewResults?.[column.view + column.relation]?.(r),
             };
         }
         else if (column.type === "ViewLink") {
@@ -710,7 +726,8 @@ const get_viewable_fields = (viewname, statehash, table, fields, columns, isShow
             else {
                 if (field && field.type === "File")
                     column.field_type = "File";
-                else if (field?.type.name && field?.type?.fieldviews[fieldview]) {
+                else if (field?.type?.name &&
+                    field?.type?.fieldviews?.[fieldview]) {
                     column.field_type = field.type.name;
                     type = getState().types[column.field_type];
                 }
@@ -725,7 +742,7 @@ const get_viewable_fields = (viewname, statehash, table, fields, columns, isShow
             let statekey;
             if (!column.join_field.includes("->") && keypath.length == 2) {
                 statekey = `${refNm}.${table.getField(refNm).reftable_name}->${targetNm}`;
-                header_filter = headerFilterForField(field, state, statekey);
+                header_filter = headerFilterForField(field || null, state, statekey);
             }
             let gofv = fieldview && type && type.fieldviews && type.fieldviews[fieldview]
                 ? (row) => type.fieldviews[fieldview].run(row[key], req, {
@@ -752,11 +769,15 @@ const get_viewable_fields = (viewname, statehash, table, fields, columns, isShow
                 statekey,
                 header_filter,
                 key: gofv ? gofv : (row) => text(row[key]),
-                sortlink: sortlinkForName(key, req, viewname, statehash),
+                sortlink: disable_join_agg_sort
+                    ? undefined
+                    : sortlinkForName(key, req, viewname, statehash),
             };
             if (column.click_to_edit) {
                 const reffield = fields.find((f) => f.name === refNm);
-                const oldkey = typeof fvrun.key === "function" ? fvrun.key : (r) => r[fvrun.key];
+                const oldkey = typeof fvrun.key === "function"
+                    ? fvrun.key
+                    : (r) => r[fvrun.key];
                 const newkey = (row) => div({
                     "data-inline-edit-fielddata": encodeURIComponent(JSON.stringify({
                         field_name: keypath[0],
@@ -813,7 +834,7 @@ const get_viewable_fields = (viewname, statehash, table, fields, columns, isShow
                     showValue = (x) => type.fieldviews[column.agg_fieldview].run(x, req, column);
             }
             else if (column.agg_fieldview) {
-                const aggField = Table.findOne(table)?.getField?.(column.agg_field);
+                const aggField = table_1.default.findOne(table)?.getField?.(column.agg_field);
                 const outcomeType = column.stat === "Percent true" || column.stat === "Percent false"
                     ? "Float"
                     : column.stat === "Count" || column.stat === "CountUnique"
@@ -840,7 +861,9 @@ const get_viewable_fields = (viewname, statehash, table, fields, columns, isShow
                     ? column.header_label
                     : column.stat + " " + table, targetNm, req, __, statehash),
                 key,
-                sortlink: sortlinkForName(targetNm, req, viewname, statehash),
+                sortlink: disable_join_agg_sort
+                    ? undefined
+                    : sortlinkForName(targetNm, req, viewname, statehash),
             };
         }
         else if (column.type === "Field") {
@@ -852,14 +875,15 @@ const get_viewable_fields = (viewname, statehash, table, fields, columns, isShow
                 const localized_fld_nm = f.attributes.localized_by[locale];
                 f_with_val = fields.find((fld) => fld.name === localized_fld_nm) || f;
             }
-            const isNum = f && f.type && f.type.name === "Integer";
+            const ftype = f?.type;
+            const isNum = f && ftype && ftype.name === "Integer";
             if (isNum && !setWidth.align)
                 setWidth.align = "right";
             let fvrun;
-            let header_filter = headerFilterForField(f, state);
+            let header_filter = headerFilterForField(f || null, state);
             if (column.fieldview &&
-                f?.type?.fieldviews?.[column.fieldview]?.expandColumns) {
-                fvrun = f.type.fieldviews[column.fieldview].expandColumns(f, {
+                ftype?.fieldviews?.[column.fieldview]?.expandColumns) {
+                fvrun = ftype.fieldviews[column.fieldview].expandColumns(f, {
                     ...f.attributes,
                     ...column.configuration,
                 }, column);
@@ -874,12 +898,12 @@ const get_viewable_fields = (viewname, statehash, table, fields, columns, isShow
                         ? (row) => row[f.name] &&
                             getState().fileviews[column.fieldview].run(row[f.name], row[`${f.name}__filename`], { row, ...column, ...(column?.configuration || {}) })
                         : column.fieldview &&
-                            f.type.fieldviews &&
-                            f.type.fieldviews[column.fieldview]
-                            ? (row) => f.type.fieldviews[column.fieldview].run(row[f_with_val.name], req, { row, ...f.attributes, ...column.configuration })
+                            ftype.fieldviews &&
+                            ftype.fieldviews[column.fieldview]
+                            ? (row) => ftype.fieldviews[column.fieldview].run(row[f_with_val.name], req, { row, ...f.attributes, ...column.configuration })
                             : isShow
-                                ? f.type.showAs
-                                    ? (row) => f.type.showAs(row[f_with_val.name])
+                                ? ftype.showAs
+                                    ? (row) => ftype.showAs(row[f_with_val.name])
                                     : (row) => text(row[f_with_val.name])
                                 : f.listKey,
                     header_filter,
@@ -945,8 +969,12 @@ const get_viewable_fields = (viewname, statehash, table, fields, columns, isShow
     }
     return tfields;
 };
+exports.get_viewable_fields = get_viewable_fields;
 const headerFilterForField = (f, state, path) => (id) => {
-    if (f?.type?.name === "Date") {
+    const ftype = f?.type;
+    if (!f)
+        return "";
+    if (ftype?.name === "Date") {
         const set_initial = state[`_fromdate_${f.name}`] && state[`_todate_${f.name}`]
             ? `defaultDate: ["${state[`_fromdate_${f.name}`]}", "${state[`_todate_${f.name}`]}"],`
             : "";
@@ -963,33 +991,33 @@ const headerFilterForField = (f, state, path) => (id) => {
             script(domReady(`ensure_script_loaded("/static_assets/${db.connectObj.version_tag}/flatpickr.min.js");
       ensure_css_loaded("/static_assets/${db.connectObj.version_tag}/flatpickr.min.css");
       $('#daterangefilter${f.name}').flatpickr({mode:'range',
-        dateFormat: "Y-m-d",${set_initial}    
+        dateFormat: "Y-m-d",${set_initial}
         onChange: function(selectedDates, dateStr, instance) {
             set_header_filter($(instance.element));
             if(selectedDates.length==2) {
-          
+
                set_state_fields({_fromdate_${f.name}: selectedDates[0].toLocaleDateString('en-CA'), _todate_${f.name}: selectedDates[1].toLocaleDateString('en-CA') }, false, ${id ? `document.getElementById('${id}')` : "this"})
-              
-                
-            }            
+
+
+            }
         },
     });`)));
     }
     let fieldviewObjs;
     /*if (f.is_fkey) {
-      fieldviewObjs = [getState().keyFieldviews.select];
-    } else */
+    fieldviewObjs = [getState().keyFieldviews.select];
+  } else */
     let extraAttrs = {};
-    if (f?.type?.name === "Bool") {
-        fieldviewObjs = [f.type.fieldviews.tristate];
+    if (ftype?.name === "Bool") {
+        fieldviewObjs = [ftype.fieldviews.tristate];
         extraAttrs.outline_buttons = true;
     }
-    else if (f?.type?.name === "String")
-        fieldviewObjs = [f.type.fieldviews.edit];
-    else if (f?.type?.name === "Integer" || f?.type?.name === "Float")
+    else if (ftype?.name === "String")
+        fieldviewObjs = [ftype.fieldviews.edit];
+    else if (ftype?.name === "Integer" || ftype?.name === "Float")
         fieldviewObjs = [
-            f.type.fieldviews.above_input,
-            f.type.fieldviews.below_input,
+            ftype.fieldviews.above_input,
+            ftype.fieldviews.below_input,
         ];
     if (!fieldviewObjs)
         return "";
@@ -1023,7 +1051,7 @@ const standardLayoutRowVisitor = (viewname, state, table, row, req) => {
     const locale = req.getLocale();
     const fields = table.fields;
     const evalMaybeExpr = (segment, key, fmlkey) => {
-        if (segment.isFormula && segment.isFormula[fmlkey || key]) {
+        if (segment.isFormula && segment.isFormula[fmlkey || key] && segment[key]) {
             segment[key] = eval_expression(segment[key], { session_id, locale, ...row }, req.user, `property ${key} in segment of type ${segment.type}`);
         }
     };
@@ -1057,8 +1085,8 @@ const standardLayoutRowVisitor = (viewname, state, table, row, req) => {
                 }
             });
             // TODO mutation here - potential issue with renderRows
-            segment.titles = segment.titles.filter((v, ix) => !to_delete.has(ix));
-            segment.contents = segment.contents.filter((v, ix) => !to_delete.has(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");
@@ -1080,9 +1108,10 @@ const standardLayoutRowVisitor = (viewname, state, table, row, req) => {
                 const field = fields.find((f) => f.name === segment.field);
                 if (!field)
                     return;
-                if (field.type.name === "String")
+                const ftype = field.type;
+                if (ftype?.name === "String")
                     segment.url = row[segment.field];
-                if (field.type === "File") {
+                if (ftype === "File") {
                     segment.url = `/files/serve/${row[segment.field]}`;
                     segment.fileid = row[segment.field];
                 }
@@ -1110,6 +1139,7 @@ const standardLayoutRowVisitor = (viewname, state, table, row, req) => {
         },
     };
 };
+exports.standardLayoutRowVisitor = standardLayoutRowVisitor;
 const standardBlockDispatch = (viewname, state, table, extra, row) => {
     const req = extra.req;
     const fields = table.fields;
@@ -1120,6 +1150,7 @@ const standardBlockDispatch = (viewname, state, table, extra, row) => {
             let field = fields.find((fld) => fld.name === field_name);
             if (!field)
                 return "";
+            const ftype = field.type;
             let val = row[field_name];
             let fvrun;
             if (field &&
@@ -1134,7 +1165,7 @@ const standardBlockDispatch = (viewname, state, table, extra, row) => {
                 ...field.attributes,
                 ...configuration,
             };
-            if (fieldview && field.type === "File") {
+            if (fieldview && ftype === "File") {
                 if (req.generate_email)
                     cfg.targetPrefix = getSafeBaseUrl();
                 fvrun = val
@@ -1142,10 +1173,10 @@ const standardBlockDispatch = (viewname, state, table, extra, row) => {
                     : "";
             }
             else if (fieldview &&
-                field.type &&
-                field.type.fieldviews &&
-                field.type.fieldviews[fieldview])
-                fvrun = field.type.fieldviews[fieldview].run(val, req, cfg);
+                ftype &&
+                ftype.fieldviews &&
+                ftype.fieldviews[fieldview])
+                fvrun = ftype.fieldviews[fieldview].run(val, req, cfg);
             else
                 fvrun = text(val);
             if (click_to_edit &&
@@ -1248,12 +1279,12 @@ const standardBlockDispatch = (viewname, state, table, extra, row) => {
             if (stat.toLowerCase() === "array_agg" && Array.isArray(val))
                 return val.map((v) => text(v?.toString?.())).join(", ");
             else if (column.agg_fieldview) {
-                const aggField = Table.findOne(table)?.getField?.(column.agg_field);
+                const aggField = table_1.default.findOne(table)?.getField?.(column.agg_field);
                 const outcomeType = stat === "Percent true" || stat === "Percent false"
                     ? "Float"
                     : stat === "Count" || stat === "CountUnique"
                         ? "Integer"
-                        : aggField.type?.name;
+                        : aggField?.type?.name;
                 const type = getState().types[outcomeType];
                 if (type?.fieldviews[column.agg_fieldview]) {
                     const readval = type.read(val);
@@ -1266,7 +1297,7 @@ const standardBlockDispatch = (viewname, state, table, extra, row) => {
             if (segment.action_style === "on_page_load") {
                 if (extra?.isPreview)
                     return "";
-                run_action_column({
+                (0, plugin_helper_1.run_action_column)({
                     col: { ...segment },
                     referrer: req?.get?.("Referrer"),
                     req: req,
@@ -1311,6 +1342,7 @@ const standardBlockDispatch = (viewname, state, table, extra, row) => {
         },
     };
 };
+exports.standardBlockDispatch = standardBlockDispatch;
 /**
  * @param {object} column
  * @param {object} f
@@ -1350,12 +1382,15 @@ const splitUniques = (fields, state, fuzzyStrings) => {
             field.type.name === "String")
             uniques[k] = { ilike: v };
         else if (field && (field.is_unique || field.primary_key))
-            uniques[k] = field.type.read ? field.type.read(v, field.attributes) : v;
+            uniques[k] = field.type.read
+                ? field.type.read(v, field.attributes)
+                : v;
         else
             nonUniques[k] = v;
     });
     return { uniques, nonUniques };
 };
+exports.splitUniques = splitUniques;
 /**
  * @param {object} table
  * @param {string} viewname
@@ -1374,7 +1409,7 @@ const getForm = async (table, viewname, columns, layout0, id, req, isRemote) =>
         if (column.type === "Field") {
             const f0 = fields.find((fld) => fld.name === column.field_name);
             if (f0) {
-                const f = new Field(f0);
+                const f = new field_1.default(f0);
                 f.fieldview = column.fieldview;
                 if (f.type === "Key") {
                     if (state.keyFieldviews[column.fieldview])
@@ -1404,7 +1439,7 @@ const getForm = async (table, viewname, columns, layout0, id, req, isRemote) =>
                 return f;
             }
             else if (table.name === "users" && column.field_name === "password") {
-                return new Field({
+                return new field_1.default({
                     name: "password",
                     fieldview: column.fieldview,
                     type: "String",
@@ -1412,14 +1447,14 @@ const getForm = async (table, viewname, columns, layout0, id, req, isRemote) =>
             }
             else if (table.name === "users" &&
                 column.field_name === "passwordRepeat") {
-                return new Field({
+                return new field_1.default({
                     name: "passwordRepeat",
                     fieldview: column.fieldview,
                     type: "String",
                 });
             }
             else if (table.name === "users" && column.field_name === "remember") {
-                return new Field({
+                return new field_1.default({
                     name: "remember",
                     fieldview: column.fieldview,
                     type: "Bool",
@@ -1451,6 +1486,7 @@ const getForm = async (table, viewname, columns, layout0, id, req, isRemote) =>
                             ref: ref.replace("?", ""),
                             target,
                             refTable: refField.reftable_name,
+                            refTablePK: table_1.default.findOne(refField.reftable_name).pk_name,
                         };
                     })
                         .filter(Boolean);
@@ -1490,6 +1526,345 @@ const getForm = async (table, viewname, columns, layout0, id, req, isRemote) =>
         form.hidden(form.pk_name);
     return form;
 };
+exports.getForm = getForm;
+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;
+        });
+    }
+    const appState = getState();
+    const __ = db.is_node && appState
+        ? (s) => appState.i18n.__({ phrase: s, locale: req.getLocale() }) || s
+        : (s) => {
+            return s;
+        };
+    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 (0, plugin_helper_1.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) {
+                    const err = e;
+                    appState.log(5, `Error in Edit ${viewname} on page load action: ${err.message}`);
+                    err.message = `Error in evaluating Run on Page Load action in view ${viewname}: ${err.message}`;
+                    throw err;
+                }
+            }
+            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 || pseudo_row, segment.rndid, "rndid", segment.confirm);
+                if (typeof url !== "string" && 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 || pseudo_row, segment.rndid, "rndid", segment.confirm, undefined, segment.run_async);
+                if (typeof url !== "string" && 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_1.default.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_1.default.findOne({ id: view.table_id });
+                const relation = new Relation(segment.relation, targetTbl.name, (0, plugin_helper_1.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_1.default.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 = (0, plugin_helper_1.pathToState)(relation, (k) => `row.` + k);
+                    return Object.entries(st)
+                        .map(([k, v]) => {
+                        needFields.add(v.split(".")[1]);
+                        return `${k}='+${v}+'`;
+                    })
+                        .join("&");
+                };
+                const targetTbl = table_1.default.findOne({ id: view.table_id });
+                if (targetTbl) {
+                    const relation = new Relation(segment.relation, targetTbl.name, (0, plugin_helper_1.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 = (0, plugin_helper_1.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 = (0, plugin_helper_1.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());
+};
+exports.transformForm = transformForm;
+const setDateLocales = (form, locale) => {
+    form.fields.forEach((f) => {
+        const ftype = f.type;
+        if (ftype && ftype.name === "Date") {
+            f.attributes.locale = locale;
+        }
+    });
+};
+exports.setDateLocales = setDateLocales;
+/**
+ * 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;
+    }
+};
+exports.updateViewSelect = updateViewSelect;
 /**
  * @param {object} table
  * @param {object} req
@@ -1528,9 +1903,11 @@ const fill_presets = async (table, req, fixed) => {
     });
     return fixed;
 };
+exports.fill_presets = fill_presets;
 const objToQueryString = (o) => Object.entries(o || {})
     .map(([k, v]) => `${encodeURIComponent(k)}=${encodeURIComponent(v)}`)
     .join("&");
+exports.objToQueryString = objToQueryString;
 // edit template build in actions
 const edit_build_in_actions = [
     "Save",
@@ -1542,21 +1919,5 @@ const edit_build_in_actions = [
     "Delete",
     "Cancel",
 ];
-module.exports = {
-    get_viewable_fields,
-    get_viewable_fields_from_layout,
-    action_url,
-    objToQueryString,
-    action_link,
-    view_linker,
-    parse_view_select,
-    splitUniques,
-    getForm,
-    fill_presets,
-    get_view_link_query,
-    make_link,
-    edit_build_in_actions,
-    standardBlockDispatch,
-    standardLayoutRowVisitor,
-};
+exports.edit_build_in_actions = edit_build_in_actions;
 //# sourceMappingURL=viewable_fields.js.map