@saltcorn/data 0.9.5-beta.9 → 0.9.6-beta.0

package/dist/base-plugin/actions.d.ts

@@ -337,6 +337,7 @@ export namespace recalculate_stored_fields {
         options: string[];
         type?: undefined;
         showIf?: undefined;
+        class?: undefined;
     } | {
         name: string;
         label: string;
@@ -349,9 +350,19 @@ export namespace recalculate_stored_fields {
         sublabel?: undefined;
         input_type?: undefined;
         options?: undefined;
+        class?: undefined;
+    } | {
+        name: string;
+        label: string;
+        sublabel: string;
+        type: string;
+        class: string;
+        input_type?: undefined;
+        options?: undefined;
+        showIf?: undefined;
     })[]>;
     export { configFields_7 as configFields };
-    export function run_6({ table, row, configuration }: {
+    export function run_6({ table, row, configuration, user }: {
         configuration: object;
     }): Promise<void>;
     export { run_6 as run };
@@ -606,6 +617,9 @@ export namespace toast {
 export namespace run_js_code {
     const description_14: string;
     export { description_14 as description };
+    export namespace configFormOptions {
+        const formStyle: string;
+    }
     export function configFields_14({ table }: {
         table: any;
     }): Promise<({
@@ -649,14 +663,46 @@ export namespace run_js_code {
     export { configFields_14 as configFields };
     export { run_code as run };
 }
-export namespace duplicate_row_prefill_edit {
+export namespace run_js_code_in_field {
+    const description_15: string;
+    export { description_15 as description };
     export function configFields_15({ table }: {
         table: any;
-    }): Promise<any[]>;
+    }): Promise<({
+        name: string;
+        label: string;
+        sublabel: string;
+        type: string;
+        required: boolean;
+        attributes: {
+            options: any;
+        };
+        input_type?: undefined;
+        options?: undefined;
+    } | {
+        name: string;
+        label: string;
+        input_type: string;
+        options: string[];
+        sublabel?: undefined;
+        type?: undefined;
+        required?: undefined;
+        attributes?: undefined;
+    })[]>;
     export { configFields_15 as configFields };
     const requireRow_5: boolean;
     export { requireRow_5 as requireRow };
-    export function run_13({ row, table, configuration: { viewname, ...flds }, user }: {
+    const run_13: base;
+    export { run_13 as run };
+}
+export namespace duplicate_row_prefill_edit {
+    export function configFields_16({ table }: {
+        table: any;
+    }): Promise<any[]>;
+    export { configFields_16 as configFields };
+    const requireRow_6: boolean;
+    export { requireRow_6 as requireRow };
+    export function run_14({ row, table, configuration: { viewname, ...flds }, user }: {
         row: any;
         table: any;
         configuration: {
@@ -667,12 +713,12 @@ export namespace duplicate_row_prefill_edit {
     }): Promise<{
         goto: string;
     }>;
-    export { run_13 as run };
+    export { run_14 as run };
 }
 export namespace set_user_language {
-    const description_15: string;
-    export { description_15 as description };
-    export function configFields_16({ table }: {
+    const description_16: string;
+    export { description_16 as description };
+    export function configFields_17({ table }: {
         table: any;
     }): Promise<{
         name: string;
@@ -685,8 +731,8 @@ export namespace set_user_language {
             }[];
         };
     }[]>;
-    export { configFields_16 as configFields };
-    export function run_14({ configuration: { language }, user, req, res }: {
+    export { configFields_17 as configFields };
+    export function run_15({ configuration: { language }, user, req, res }: {
         configuration: {
             language: any;
         };
@@ -696,12 +742,12 @@ export namespace set_user_language {
     }): Promise<{
         reload_page: boolean;
     }>;
-    export { run_14 as run };
+    export { run_15 as run };
 }
 export namespace sync_table_from_external {
-    const description_16: string;
-    export { description_16 as description };
-    export function configFields_17({ table }: {
+    const description_17: string;
+    export { description_17 as description };
+    export function configFields_18({ table }: {
         table: any;
     }): Promise<({
         name: string;
@@ -756,19 +802,19 @@ export namespace sync_table_from_external {
         attributes?: undefined;
         default?: undefined;
     })[]>;
-    export { configFields_17 as configFields };
-    export function run_15({ configuration: { row_expr, table_src, table_dest, pk_field, delete_rows, match_field_names, }, user, ...rest }: {
+    export { configFields_18 as configFields };
+    export function run_16({ configuration: { row_expr, table_src, table_dest, pk_field, delete_rows, match_field_names, }, user, ...rest }: {
         row: object;
         configuration: object;
         user: object;
         rest: any;
     }): Promise<boolean | object>;
-    export { run_15 as run };
+    export { run_16 as run };
 }
 export namespace reload_embedded_view {
-    const description_17: string;
-    export { description_17 as description };
-    export function configFields_18(): Promise<({
+    const description_18: string;
+    export { description_18 as description };
+    export function configFields_19(): Promise<({
         name: string;
         label: string;
         class: string;
@@ -785,8 +831,8 @@ export namespace reload_embedded_view {
         required?: undefined;
         attributes?: undefined;
     })[]>;
-    export { configFields_18 as configFields };
-    export function run_16({ row, user, configuration: { view, new_state_fml } }: {
+    export { configFields_19 as configFields };
+    export function run_17({ row, user, configuration: { view, new_state_fml } }: {
         row: any;
         user: any;
         configuration: {
@@ -796,31 +842,31 @@ export namespace reload_embedded_view {
     }): Promise<{
         eval_js: string;
     }>;
-    export { run_16 as run };
+    export { run_17 as run };
 }
 export namespace sleep {
-    const description_18: string;
-    export { description_18 as description };
-    const configFields_19: {
+    const description_19: string;
+    export { description_19 as description };
+    const configFields_20: {
         name: string;
         label: string;
         type: string;
         required: boolean;
     }[];
-    export { configFields_19 as configFields };
-    export function run_17({ configuration: { seconds } }: {
+    export { configFields_20 as configFields };
+    export function run_18({ configuration: { seconds } }: {
         configuration: {
             seconds: any;
         };
     }): Promise<{
         eval_js: string;
     }>;
-    export { run_17 as run };
+    export { run_18 as run };
 }
 export namespace notify_user {
-    const description_19: string;
-    export { description_19 as description };
-    export function configFields_20(): ({
+    const description_20: string;
+    export { description_20 as description };
+    export function configFields_21(): ({
         name: string;
         label: string;
         type: string;
@@ -831,18 +877,18 @@ export namespace notify_user {
         required: boolean;
         type: string;
     })[];
-    export { configFields_20 as configFields };
-    export function run_18({ row, user, configuration: { title, body, link, user_spec }, }: {
+    export { configFields_21 as configFields };
+    export function run_19({ row, user, configuration: { title, body, link, user_spec }, }: {
         row: object;
         configuration: object;
         user: object;
     }): Promise<void>;
-    export { run_18 as run };
+    export { run_19 as run };
 }
 export namespace convert_session_to_user {
-    const description_20: string;
-    export { description_20 as description };
-    export function configFields_21({ table }: {
+    const description_21: string;
+    export { description_21 as description };
+    export function configFields_22({ table }: {
         table: any;
     }): Promise<({
         name: string;
@@ -863,8 +909,8 @@ export namespace convert_session_to_user {
         input_type?: undefined;
         options?: undefined;
     })[]>;
-    export { configFields_21 as configFields };
-    export function run_19({ row, configuration: { table_name, session_field, user_field }, user, }: {
+    export { configFields_22 as configFields };
+    export function run_20({ row, configuration: { table_name, session_field, user_field }, user, }: {
         row: any;
         configuration: {
             table_name: any;
@@ -873,7 +919,7 @@ export namespace convert_session_to_user {
         };
         user: any;
     }): Promise<void>;
-    export { run_19 as run };
+    export { run_20 as run };
 }
 export {};
 //# sourceMappingURL=actions.d.ts.map

package/dist/base-plugin/actions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../../base-plugin/actions.js"],"names":[],"mappings":"AAyEA;;;;;;;;;GASG;AACH;;;;;;;;;;iBA6EC;;;;;;;;;;;;;;IAuCiB;;;;;;;;;;;;;;;;;;;;;;;;;;;SAqBb;;IAQI;;;;sBAWJ;;;;;;;;;;;;;;;;;;;IA+BI;;;wBAQJ;;;;;;IAca;;;;;;SAeb;;IAUI;;;;;wBA0CJ;;;;;;IAea;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA+Ib;;;IAUI;;;;;wBAqHJ;;;;;;IAea;;;;;;;;SAYb;;;;IAUI;;;;;wBAsBJ;;;;;;IAaa,0CAAQ;;;;IASjB;;;;wBAKJ;;;;;;IAgBa;;;;;;;;;;;;;;;;;;;;;;UAiBb;;IAMI;;sBAgBJ;;;;;;IAea;;;;;;;;;;;;;;;;;;UAmBb;;IAUI;;;;;;kCAiBJ;;;;;;IAca;;;;;;;;;;;;;;;;;;;;;;;;UA0Bb;;;;IAEI;;;;;;;;;qBAkBJ;;;;;;;;;;;;;;;;;;;;;;;;;;IAuCI;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAkBJ;;;;;;;;;;;;;;;;;;;;;;;;;;IA2BI;;;;;;;;;;;;;;;;;;;mBAYJ;;;;;;;;;;;;;;;;;;IAuBI;;;;;;;;;;;;;;OA6BJ;;;;;;;;;;;;;;;;;;;;;;IA2BI;;;;;;;;;;;;;;;;;;;;OAYJ;;;;;;IAea;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA+Eb;;;;;IAQa;;uBAsBb;;;;IAEI;;;;;;;;;;OAUJ;;;;;;IASa;;;;;;;;;;;;SAcb;;IACI;;;;;;;;;OAgBJ;;;;;;IAea;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAyDb;;IASI;;;;;kCAmFJ;;;;;;IAIa;;;;;;;;;;;;;;;;UAkBb;;IACI;;;;;;;;;OAQJ;;;;;;;;;;;;;IAYI;;;;;;OAMJ;;;;;;IAIa;;;;;;;;;;SAsBb;;IAQI;;;;sBAmBJ;;;;;;IAMa;;;;;;;;;;;;;;;;;;;;UA2Cb;;IACI;;;;;;;;sBAeJ"}
+{"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../../base-plugin/actions.js"],"names":[],"mappings":"AA4EA;;;;;;;;;GASG;AACH;;;;;;;;;;iBAyFC;;;;;;;;;;;;;;IAuCiB;;;;;;;;;;;;;;;;;;;;;;;;;;;SAqBb;;IAQI;;;;sBAWJ;;;;;;;;;;;;;;;;;;;IA+BI;;;wBAQJ;;;;;;IAca;;;;;;SAeb;;IAUI;;;;;wBA0CJ;;;;;;IAea;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA+Ib;;;IAUI;;;;;wBA2IJ;;;;;;IAea;;;;;;;;SAYb;;;;IAUI;;;;;wBAsBJ;;;;;;IAaa,0CAAQ;;;;IASjB;;;;wBAKJ;;;;;;IAgBa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAwBb;;IAMI;;sBAwBJ;;;;;;IAea;;;;;;;;;;;;;;;;;;UAmBb;;IAUI;;;;;;kCAiBJ;;;;;;IAca;;;;;;;;;;;;;;;;;;;;;;;;UA0Bb;;;;IAEI;;;;;;;;;qBAkBJ;;;;;;;;;;;;;;;;;;;;;;;;;;IAwCI;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAoBJ;;;;;;;;;;;;;;;;;;;;;;;;;;IA2BI;;;;;;;;;;;;;;;;;;;mBAYJ;;;;;;;;;;;;;;;;;;IA6BI;;;;;;;;;;;;;;OA+BJ;;;;;;;;;;;;;;;;;;;;;;IA2BI;;;;;;;;;;;;;;;;;;;;OAYJ;;;;;;;;;IAkBa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA+Eb;;;;;;;IAca;;;;;;;;;;;;;;;;;;;;;;UAkCb;;;;;;;;IAoCa;;uBAsBb;;;;IAEI;;;;;;;;;;OAUJ;;;;;;IASa;;;;;;;;;;;;SAcb;;IACI;;;;;;;;;OAgBJ;;;;;;IAea;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAyDb;;IASI;;;;;kCAmFJ;;;;;;IAIa;;;;;;;;;;;;;;;;UAkBb;;IACI;;;;;;;;;OAaJ;;;;;;;;;;;;;IAYI;;;;;;OAMJ;;;;;;IAIa;;;;;;;;;;SAsBb;;IAQI;;;;sBAmBJ;;;;;;IAMa;;;;;;;;;;;;;;;;;;;;UA2Cb;;IACI;;;;;;;;sBAeJ"}

package/dist/base-plugin/actions.js

@@ -16,7 +16,7 @@ const User = require("../models/user");
 const Trigger = require("../models/trigger");
 const Notification = require("../models/notification");
 const { getMailTransport, viewToEmailHtml, loadAttachments, getFileAggregations, mjml2html, } = require("../models/email");
-const { get_async_expression_function, recalculate_for_stored, eval_expression, } = require("../models/expression");
+const { get_async_expression_function, recalculate_for_stored, eval_expression, freeVariablesInInterpolation, add_free_variables_to_joinfields, freeVariables, } = require("../models/expression");
 const { div, code, a, span } = require("@saltcorn/markup/tags");
 const { sleep, getSessionId, urlStringToObject, dollarizeObject, objectToQueryString, interpolate, } = require("../utils");
 const db = require("../db");
@@ -85,6 +85,17 @@ const run_code = async ({ row, table, channel, configuration: { code, run_where
             });
         };
     }
+    const run_js_code = async ({ code, ...restArgs }) => {
+        return await run_code({
+            row,
+            table,
+            channel,
+            configuration: { code, run_where },
+            user,
+            ...rest,
+            ...restArgs,
+        });
+    };
     const emitEvent = (eventType, channel, payload) => Trigger.emitEvent(eventType, channel, user, payload);
     const fetchJSON = async (...args) => await (await fetch(...args)).json();
     const sysState = getState();
@@ -100,6 +111,7 @@ const run_code = async ({ row, table, channel, configuration: { code, run_where
         sleep,
         fetchJSON,
         fetch,
+        run_js_code,
         URL,
         File,
         User,
@@ -117,7 +129,7 @@ const run_code = async ({ row, table, channel, configuration: { code, run_where
         request_headers: rest?.req?.headers,
         request_ip: rest?.req?.ip,
         ...(row || {}),
-        ...getState().function_context,
+        ...getState().eval_context,
         ...rest,
     });
     return await f();
@@ -435,14 +447,31 @@ module.exports = {
          */
         run: async ({ row, table, configuration: { body_type, body_field, viewname, subject, subject_formula, to_email, to_email_field, to_email_fixed, cc_email, only_if, attachment_path, disable_notify, confirm_field, }, user, }) => {
             let to_addr;
+            let useRow = row;
+            const fvs = [
+                ...freeVariablesInInterpolation(to_email_fixed),
+                ...freeVariablesInInterpolation(cc_email),
+                ...(subject_formula ? freeVariables(subject) : []),
+                ...freeVariables(only_if),
+            ];
+            if (fvs.length > 0) {
+                const joinFields = {};
+                const fields = table.getFields();
+                add_free_variables_to_joinfields(new Set(fvs), joinFields, fields);
+                useRow = await table.getJoinedRow({
+                    where: { [table.pk_name]: row[table.pk_name] },
+                    joinFields,
+                    forUser: user,
+                });
+            }
             if (only_if) {
-                const bres = eval_expression(only_if, row);
+                const bres = eval_expression(only_if, useRow, user, "send_email only if formula");
                 if (!bres)
                     return;
             }
             switch (to_email) {
                 case "Fixed":
-                    to_addr = interpolate(to_email_fixed, row, user);
+                    to_addr = interpolate(to_email_fixed, useRow, user);
                     break;
                 case "User":
                     to_addr = user.email;
@@ -481,10 +510,10 @@ module.exports = {
             const from = getState().getConfig("email_from");
             const attachments = await loadAttachments(attachment_path, row, user ? user : { role_id: 100 });
             const the_subject = subject_formula
-                ? eval_expression(subject, row)
+                ? eval_expression(subject, useRow, user, "send_email subject formula")
                 : subject;
             getState().log(3, `Sending email from ${from} to ${to_addr} with subject ${the_subject}`);
-            const cc = cc_email ? interpolate(cc_email, row, user) : undefined;
+            const cc = cc_email ? interpolate(cc_email, useRow, user) : undefined;
             const email = {
                 from,
                 to: to_addr,
@@ -626,6 +655,13 @@ module.exports = {
                     type: "Bool",
                     showIf: table ? { table: table.name } : {},
                 },
+                {
+                    name: "where",
+                    label: "Recalculate where",
+                    sublabel: "Where-expression for subset of rows to recalculate",
+                    type: "String",
+                    class: "validate-expression",
+                },
             ];
         },
         /**
@@ -633,7 +669,7 @@ module.exports = {
          * @param {object} opts.configuration
          * @returns {Promise<void>}
          */
-        run: async ({ table, row, configuration }) => {
+        run: async ({ table, row, configuration, user }) => {
             const table_for_recalc = Table.findOne({
                 name: configuration.table,
             });
@@ -644,6 +680,10 @@ module.exports = {
                 row[table.pk_name]) {
                 await table.updateRow({}, row[table.pk_name], undefined, true);
             }
+            else if (configuration.where) {
+                const where = eval_expression(configuration.where, row || {}, user, "recalculate_stored_fields where");
+                recalculate_for_stored(table_for_recalc, where);
+            }
             else if (table_for_recalc)
                 recalculate_for_stored(table_for_recalc);
             else
@@ -787,6 +827,7 @@ module.exports = {
                         "Back",
                         "Reload page",
                         "Close modal",
+                        "Close tab",
                     ],
                 },
             },
@@ -807,6 +848,8 @@ module.exports = {
                     return { popup: url1 };
                 case "Back":
                     return { eval_js: isNode() ? "history.back()" : "parent.goBack()" };
+                case "Close tab":
+                    return { eval_js: "window.close()" };
                 case "Close modal":
                     return { eval_js: "close_saltcorn_modal()" };
                 case "Reload page":
@@ -869,7 +912,13 @@ module.exports = {
                 type: "String",
                 required: true,
                 attributes: {
-                    options: ["Submit", "Save", "Reset", "Submit with Ajax"],
+                    options: [
+                        "Submit",
+                        "Save",
+                        "Reset",
+                        "Submit with Ajax",
+                        "Ajax Save Form Data",
+                    ],
                 },
             },
         ],
@@ -894,6 +943,8 @@ module.exports = {
                     return { eval_js: jqGet + ".trigger('reset')" };
                 case "Submit with Ajax":
                     return { eval_js: `submitWithAjax(${jqGet})` };
+                case "Ajax Save Form Data":
+                    return { eval_js: `ajaxSubmitForm(${jqGet}, true)` };
                 default:
                     return { eval_js: jqGet + ".submit()" };
             }
@@ -948,6 +999,9 @@ module.exports = {
          * @returns {Promise<object[]>}
          */
         description: "Run arbitrary JavaScript code",
+        configFormOptions: {
+            formStyle: "vert",
+        },
         configFields: async ({ table }) => {
             const fields = table ? table.getFields().map((f) => f.name) : [];
             const vars = [
@@ -1023,6 +1077,77 @@ module.exports = {
          **/
         run: run_code,
     },
+    run_js_code_in_field: {
+        /**
+         * @param {object} opts
+         * @param {object} opts.table
+         * @returns {Promise<object[]>}
+         */
+        description: "Run arbitrary JavaScript code from a String field",
+        configFields: async ({ table }) => {
+            const field_opts = table.fields
+                .filter((f) => f.type?.name === "String")
+                .map((f) => f.name);
+            table.fields.forEach((f) => {
+                if (f.is_fkey && f.type !== "File") {
+                    const refTable = Table.findOne({ name: f.reftable_name });
+                    if (!refTable)
+                        throw new Error(`Unable to find table '${f.reftable_name}`);
+                    field_opts.push(...refTable.fields
+                        .filter((jf) => jf.type?.name === "String")
+                        .map((jf) => `${f.name}.${jf.name}`));
+                }
+            });
+            return [
+                {
+                    name: "code_field",
+                    label: "Code field",
+                    sublabel: "String field that contains the JavaScript code to run",
+                    type: "String",
+                    required: true,
+                    attributes: {
+                        options: field_opts,
+                    },
+                },
+                {
+                    name: "run_where",
+                    label: "Run where",
+                    input_type: "select",
+                    options: ["Server", "Client page"],
+                },
+            ];
+        },
+        requireRow: true,
+        /**
+         * @type {base-plugin/actions~run_code}
+         * @see base-plugin/actions~run_code
+         **/
+        run: async ({ table, configuration: { code_field, run_where }, row, ...rest }) => {
+            let code;
+            if (code_field.includes(".")) {
+                const [ref, target] = code_field.split(".");
+                if (typeof row[ref] === "object")
+                    code = row[ref][target];
+                else if (!row[ref])
+                    return;
+                else {
+                    const keyfield = table.getField(ref);
+                    const refTable = Table.findOne({ name: keyfield.reftable_name });
+                    const refRow = await refTable.getRow({ id: row[ref] });
+                    code = refRow[target];
+                }
+            }
+            else
+                code = row[code_field];
+            code = code || "";
+            return await run_code({
+                ...rest,
+                table,
+                row,
+                configuration: { run_where, code },
+            });
+        },
+    },
     duplicate_row_prefill_edit: {
         configFields: async ({ table }) => {
             const fields = table ? table.getFields() : [];
@@ -1254,7 +1379,7 @@ module.exports = {
         },
         run: async ({ row, user, configuration: { view, new_state_fml } }) => {
             if (new_state_fml) {
-                const new_state = eval_expression(new_state_fml, row || {}, user);
+                const new_state = eval_expression(new_state_fml, row || {}, user, "reload_embedded_view new state formula");
                 const newqs = objectToQueryString(new_state);
                 return {
                     eval_js: `reload_embedded_view('${view}', '${newqs}')`,
@@ -1317,7 +1442,7 @@ module.exports = {
                 ? { email: user_spec }
                 : user_spec === "*"
                     ? {}
-                    : eval_expression(user_spec, row || {});
+                    : eval_expression(user_spec, row || {}, user, "Notify user user where");
             const users = await User.find(user_where);
             for (const user of users) {
                 await Notification.create({