@saltcorn/data 0.9.4-beta.1 → 0.9.4-beta.11

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

@@ -38,6 +38,11 @@ export namespace emit_event {
         required: boolean;
         input_type: string;
         options: string[];
+        /**
+         * @param {object} opts
+         * @param {*} opts.table
+         * @returns {Promise<object[]>}
+         */
         type?: undefined;
         fieldview?: undefined;
         sublabel?: undefined;
@@ -84,7 +89,7 @@ export namespace webhook {
         fieldview: string;
     })[];
     export { configFields_2 as configFields };
-    export function run_1({ row, configuration: { url, body } }: {
+    export function run_1({ row, user, configuration: { url, body } }: {
         url: string;
         body: object;
     }): Promise<object>;
@@ -155,6 +160,11 @@ export namespace send_email {
             body_type: string;
             to_email?: undefined;
         };
+        /**
+         * @param {object} opts
+         * @param {*} opts.table
+         * @returns {Promise<object[]>}
+         */
         type?: undefined;
         required?: undefined;
         attributes?: undefined;
@@ -167,6 +177,11 @@ export namespace send_email {
         input_type: string;
         required: boolean;
         options: string[];
+        /**
+         * @param {object} opts
+         * @param {*} opts.table
+         * @returns {Promise<object[]>}
+         */
         type?: undefined;
         attributes?: undefined;
         showIf?: undefined;
@@ -182,6 +197,11 @@ export namespace send_email {
             to_email: string;
             body_type?: undefined;
         };
+        /**
+         * @param {object} opts
+         * @param {*} opts.table
+         * @returns {Promise<object[]>}
+         */
         type?: undefined;
         required?: undefined;
         attributes?: undefined;
@@ -207,49 +227,49 @@ export namespace send_email {
         label: string;
         sublabel: string;
         type: string;
-        class: string;
-        required: boolean;
+        required?: undefined;
         attributes?: undefined;
         showIf?: undefined;
         input_type?: undefined;
         options?: undefined;
+        class?: undefined;
         default?: undefined;
     } | {
         name: string;
         label: string;
+        sublabel: string;
         type: string;
+        class: string;
         required: boolean;
         attributes?: undefined;
         showIf?: undefined;
-        sublabel?: undefined;
         input_type?: undefined;
         options?: undefined;
-        class?: undefined;
         default?: undefined;
     } | {
         name: string;
         label: string;
-        sublabel: string;
-        input_type: string;
-        options: string[];
         type: string;
-        default: string;
-        required?: undefined;
+        required: boolean;
         attributes?: undefined;
         showIf?: undefined;
+        sublabel?: undefined;
+        input_type?: undefined;
+        options?: undefined;
         class?: undefined;
+        default?: undefined;
     } | {
         name: string;
         label: string;
         sublabel: string;
+        input_type: string;
+        options: string[];
         type: string;
+        default: string;
         required?: undefined;
         attributes?: undefined;
         showIf?: undefined;
-        input_type?: undefined;
-        options?: undefined;
         class?: undefined;
-        default?: undefined;
     } | {
         name: string;
         label: string;
@@ -279,7 +299,7 @@ export namespace send_email {
     })[]>;
     export { configFields_4 as configFields };
     export const requireRow: boolean;
-    export function run_3({ row, table, configuration: { body_type, body_field, viewname, subject, subject_formula, to_email, to_email_field, to_email_fixed, only_if, attachment_path, disable_notify, confirm_field, }, user, }: {
+    export function run_3({ 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, }: {
         row: object;
         table: object;
         configuration: object;
@@ -335,6 +355,11 @@ export namespace recalculate_stored_fields {
         sublabel: string;
         input_type: string;
         options: string[];
+        /**
+         * @param {object} opts
+         * @param {*} opts.table
+         * @returns {Promise<object[]>}
+         */
         type?: undefined;
         showIf?: undefined;
     } | {
@@ -367,6 +392,11 @@ export namespace insert_any_row {
         sublabel: string;
         input_type: string;
         options: string[];
+        /**
+         * @param {object} opts
+         * @param {*} opts.table
+         * @returns {Promise<object[]>}
+         */
         type?: undefined;
         fieldview?: undefined;
     } | {
@@ -402,6 +432,11 @@ export namespace modify_row {
             mode: string;
             options?: undefined;
         };
+        /**
+         * @param {object} opts
+         * @param {*} opts.table
+         * @returns {Promise<object[]>}
+         */
         type?: undefined;
         required?: undefined;
     } | {
@@ -454,7 +489,9 @@ export namespace navigate {
         attributes?: undefined;
     })[];
     export { configFields_10 as configFields };
-    export function run_9({ configuration: { nav_action, url } }: {
+    export function run_9({ row, user, configuration: { nav_action, url } }: {
+        row: any;
+        user: any;
         configuration: {
             nav_action: any;
             url: any;
@@ -523,7 +560,9 @@ export namespace toast {
         attributes?: undefined;
     })[];
     export { configFields_12 as configFields };
-    export function run_11({ configuration: { type, notify_type, text } }: {
+    export function run_11({ row, user, configuration: { type, notify_type, text } }: {
+        row: any;
+        user: any;
         configuration: {
             type: any;
             notify_type: any;
@@ -650,6 +689,11 @@ export namespace sync_table_from_external {
         sublabel: string;
         input_type: string;
         options: string[];
+        /**
+         * @param {object} opts
+         * @param {*} opts.table
+         * @returns {Promise<object[]>}
+         */
         type?: undefined;
         required?: undefined;
         attributes?: undefined;
@@ -709,7 +753,7 @@ export namespace sync_table_from_external {
 export namespace reload_embedded_view {
     const description_16: string;
     export { description_16 as description };
-    export function configFields_17(): Promise<{
+    export function configFields_17(): Promise<({
         name: string;
         label: string;
         type: string;
@@ -717,21 +761,51 @@ export namespace reload_embedded_view {
         attributes: {
             options: any[];
         };
-    }[]>;
+        class?: undefined;
+    } | {
+        name: string;
+        label: string;
+        type: string;
+        class: string;
+        required?: undefined;
+        attributes?: undefined;
+    })[]>;
     export { configFields_17 as configFields };
-    export function run_15({ configuration: { view } }: {
+    export function run_15({ row, user, configuration: { view, new_state_fml } }: {
+        row: any;
+        user: any;
         configuration: {
             view: any;
+            new_state_fml: any;
         };
     }): Promise<{
         eval_js: string;
     }>;
     export { run_15 as run };
 }
-export namespace notify_user {
+export namespace sleep {
     const description_17: string;
     export { description_17 as description };
-    export function configFields_18(): ({
+    const configFields_18: {
+        name: string;
+        label: string;
+        type: string;
+        required: boolean;
+    }[];
+    export { configFields_18 as configFields };
+    export function run_16({ configuration: { seconds } }: {
+        configuration: {
+            seconds: any;
+        };
+    }): Promise<{
+        eval_js: string;
+    }>;
+    export { run_16 as run };
+}
+export namespace notify_user {
+    const description_18: string;
+    export { description_18 as description };
+    export function configFields_19(): ({
         name: string;
         label: string;
         type: string;
@@ -742,18 +816,18 @@ export namespace notify_user {
         required: boolean;
         type: string;
     })[];
-    export { configFields_18 as configFields };
-    export function run_16({ row, configuration: { title, body, link, user_spec } }: {
+    export { configFields_19 as configFields };
+    export function run_17({ row, user, configuration: { title, body, link, user_spec }, }: {
         row: object;
         configuration: object;
         user: object;
     }): Promise<void>;
-    export { run_16 as run };
+    export { run_17 as run };
 }
 export namespace convert_session_to_user {
-    const description_18: string;
-    export { description_18 as description };
-    export function configFields_19({ table }: {
+    const description_19: string;
+    export { description_19 as description };
+    export function configFields_20({ table }: {
         table: any;
     }): Promise<({
         name: string;
@@ -761,6 +835,11 @@ export namespace convert_session_to_user {
         sublabel: string;
         input_type: string;
         options: string[];
+        /**
+         * @param {object} opts
+         * @param {*} opts.table
+         * @returns {Promise<object[]>}
+         */
         type?: undefined;
         attributes?: undefined;
     } | {
@@ -774,8 +853,8 @@ export namespace convert_session_to_user {
         input_type?: undefined;
         options?: undefined;
     })[]>;
-    export { configFields_19 as configFields };
-    export function run_17({ row, configuration: { table_name, session_field, user_field }, user, }: {
+    export { configFields_20 as configFields };
+    export function run_18({ row, configuration: { table_name, session_field, user_field }, user, }: {
         row: any;
         configuration: {
             table_name: any;
@@ -784,7 +863,7 @@ export namespace convert_session_to_user {
         };
         user: any;
     }): Promise<void>;
-    export { run_17 as run };
+    export { run_18 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":"AA2CA;;;;;;;;;GASG;AACH;;;;;;;;;;iBAyEC;;;;;;;;;;;;;;IAuCiB;;;;;;;;;;;;;;;;;;;;;;;;;;;SAqBb;;IAQI;;;;sBAWJ;;;;;;;;;;;;;;;;;;;IA+BI;;;wBAMJ;;;;;;IAca;;;;;;SAeb;;IAUI;;;;;wBA0CJ;;;;;;IAea;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAuIb;;;IAUI;;;;;wBAyGJ;;;;;;IAea;;;;;;;;SAYb;;;;IAUI;;;;;wBAsBJ;;;;;;IAaa,0CAAQ;;;;IASjB;;;;wBAKJ;;;;;;IAgBa;;;;;;;;;;;;;;;;;;;;;;UAiBb;;IAMI;;sBAgBJ;;;;;;IAea;;;;;;;;;;;;;;;;;;UAmBb;;IAUI;;;;;;kCAiBJ;;;;;;IAca;;;;;;;;;;;;;;;;;;;;;;;;UA0Bb;;;;IAEI;;;;;;;;;qBAkBJ;;;;;;;;;;;;;;;;;;;;;;;;;;IAuCI;;;;;;;;;;;;;;;;;;;;;;;;;mBAgBJ;;;;;;;;;;;;;;;;IAqBI;;;;;;OAcJ;;;;;;;;;;;;;;;;;;;;;;IA2BI;;;;;;;;;;;;;;;;;;OAUJ;;;;;;IAea;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA+Eb;;;;;IAQa;;uBAsBb;;;;IAEI;;;;;;;;;;OAUJ;;;;;;IASa;;;;;;;;;;;;SAcb;;IACI;;;;;;;;;OAgBJ;;;;;;IAea;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAyDb;;IASI;;;;;kCAmFJ;;;;;;IAIa;;;;;;;;SAWb;;IACI;;;;;;OAEJ;;;;;;IAIa;;;;;;;;;;SAsBb;;IAQI;;;;sBAUJ;;;;;;IAKa;;;;;;;;;;;;;;;;;;;;UA2Cb;;IACI;;;;;;;;sBAeJ"}
+{"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../../base-plugin/actions.js"],"names":[],"mappings":"AAsDA;;;;;;;;;GASG;AACH;;;;;;;;;;iBAyEC;;;;;;;;;;;;;;IAuCiB;;;;;;QA2sBd;;;;WAIG;;;;;;;;;;;;;;;;;;;;;;SA1rBF;;IAQI;;;;sBAWJ;;;;;;;;;;;;;;;;;;;IA+BI;;;wBAQJ;;;;;;IAca;;;;;;SAeb;;IAUI;;;;;wBA0CJ;;;;;;IAea;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA4hBd;;;;WAIG;;;;;;;;;;;;;QAJH;;;;WAIG;;;;;;;;;;;;;;;;QAJH;;;;WAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAjZF;;;IAUI;;;;;wBAoHJ;;;;;;IAea;;;;;;;;SAYb;;;;IAUI;;;;;wBAsBJ;;;;;;IAaa,0CAAQ;;;;IASjB;;;;wBAKJ;;;;;;IAgBa;;;;;;;;QAyKd;;;;WAIG;;;;;;;;;;;;;;;UA5JF;;IAMI;;sBAgBJ;;;;;;IAea;;;;;;;;QAmHd;;;;WAIG;;;;;;;;;;;UApGF;;IAUI;;;;;;kCAiBJ;;;;;;IAca;;;;;;;;;;;QAuDd;;;;WAIG;;;;;;;;;;;;;;UAjCF;;;;IAEI;;;;;;;;;qBAkBJ;;;;;;;;;;;;;;;;;;;;;;;;;;IAuCI;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAkBJ;;;;;;;;;;;;;;;;IAqBI;;;;;;OAcJ;;;;;;;;;;;;;;;;;;;;;;IA2BI;;;;;;;;;;;;;;;;;;;;OAYJ;;;;;;IAea;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA+Eb;;;;;IAQa;;uBAsBb;;;;IAEI;;;;;;;;;;OAUJ;;;;;;IASa;;;;;;;;;;;;SAcb;;IACI;;;;;;;;;OAgBJ;;;;;;IAea;;;;;;;;QAzTd;;;;WAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA8WF;;IASI;;;;;kCAmFJ;;;;;;IAIa;;;;;;;;;;;;;;;;UAiBb;;IACI;;;;;;;;;OAQJ;;;;;;;;;;;;;IAYI;;;;;;OAMJ;;;;;;IAIa;;;;;;;;;;SAsBb;;IAQI;;;;sBAmBJ;;;;;;IAKa;;;;;;;;QAxjBd;;;;WAIG;;;;;;;;;;;;;UA+lBF;;IACI;;;;;;;;sBAeJ"}

package/dist/base-plugin/actions.js

@@ -18,12 +18,23 @@ 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 { div, code, a, span } = require("@saltcorn/markup/tags");
-const { sleep, getSessionId, urlStringToObject, dollarizeObject, } = require("../utils");
+const { sleep, getSessionId, urlStringToObject, dollarizeObject, objectToQueryString, } = require("../utils");
 const db = require("../db");
 const { isNode } = require("../utils");
 const { available_languages } = require("../models/config");
+const _ = require("underscore");
 //action use cases: field modify, like/rate (insert join), notify, send row to webhook
 // todo add translation
+const interpolate = (s, row, user) => {
+    if (s && row) {
+        const template = _.template(s, {
+            interpolate: /\{\{([^#].+?)\}\}/g,
+        });
+        return template({ row, user, ...row });
+    }
+    else
+        return s;
+};
 /**
  * @param opts
  * @param opts.row
@@ -197,8 +208,9 @@ module.exports = {
          * @param {object} opts.body
          * @returns {Promise<object>}
          */
-        run: async ({ row, configuration: { url, body } }) => {
-            return await fetch(url, {
+        run: async ({ row, user, configuration: { url, body } }) => {
+            let url1 = interpolate(url, row, user);
+            return await fetch(url1, {
                 method: "post",
                 body: body || JSON.stringify(row),
                 headers: { "Content-Type": "application/json" },
@@ -349,10 +361,16 @@ module.exports = {
                 {
                     name: "to_email_fixed",
                     label: "Fixed address",
-                    sublabel: "Email address to send emails",
+                    sublabel: "To addresses, comma separated, <code>{{ }}</code> interpolations usable",
                     type: "String",
                     showIf: { to_email: "Fixed" },
                 },
+                {
+                    name: "cc_email",
+                    label: "cc address",
+                    sublabel: "cc addresses, comma separated, <code>{{ }}</code> interpolations usable",
+                    type: "String",
+                },
                 {
                     name: "subject",
                     label: "Subject",
@@ -404,7 +422,7 @@ module.exports = {
          * @param {object} opts.user
          * @returns {Promise<object>}
          */
-        run: async ({ row, table, configuration: { body_type, body_field, viewname, subject, subject_formula, to_email, to_email_field, to_email_fixed, only_if, attachment_path, disable_notify, confirm_field, }, user, }) => {
+        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;
             if (only_if) {
                 const bres = eval_expression(only_if, row);
@@ -413,7 +431,7 @@ module.exports = {
             }
             switch (to_email) {
                 case "Fixed":
-                    to_addr = to_email_fixed;
+                    to_addr = interpolate(to_email_fixed, row, user);
                     break;
                 case "User":
                     to_addr = user.email;
@@ -447,7 +465,7 @@ module.exports = {
             }
             else {
                 const view = await View.findOne({ name: viewname });
-                setBody.html = await viewToEmailHtml(view, { id: row.id });
+                setBody.html = await viewToEmailHtml(view, { id: row[table.pk_name] });
             }
             const from = getState().getConfig("email_from");
             const attachments = await loadAttachments(attachment_path, row, user ? user : { role_id: 100 });
@@ -455,9 +473,11 @@ module.exports = {
                 ? eval_expression(subject, row)
                 : 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 email = {
                 from,
                 to: to_addr,
+                cc,
                 subject: the_subject,
                 ...setBody,
                 attachments,
@@ -467,9 +487,9 @@ module.exports = {
                 if (confirm_field && sendres.accepted.includes(to_addr)) {
                     const confirm_fld = table.getField(confirm_field);
                     if (confirm_fld && confirm_fld.type.name === "Date")
-                        await table.updateRow({ [confirm_field]: new Date() }, row.id);
+                        await table.updateRow({ [confirm_field]: new Date() }, row[table.pk_name]);
                     else if (confirm_fld && confirm_fld.type.name === "Bool")
-                        await table.updateRow({ [confirm_field]: true }, row.id);
+                        await table.updateRow({ [confirm_field]: true }, row[table.pk_name]);
                 }
                 if (disable_notify)
                     return;
@@ -480,7 +500,7 @@ module.exports = {
                 if (confirm_field) {
                     const confirm_fld = table.getField(confirm_field);
                     if (confirm_fld && confirm_fld.type.name === "Bool")
-                        await table.updateRow({ [confirm_field]: false }, row.id);
+                        await table.updateRow({ [confirm_field]: false }, row[table.pk_name]);
                     throw e;
                 }
             }
@@ -766,12 +786,13 @@ module.exports = {
                 showIf: { nav_action: ["Go to URL", "Popup modal"] },
             },
         ],
-        run: async ({ configuration: { nav_action, url } }) => {
+        run: async ({ row, user, configuration: { nav_action, url } }) => {
+            let url1 = interpolate(url, row, user);
             switch (nav_action) {
                 case "Go to URL":
-                    return { goto: url };
+                    return { goto: url1 };
                 case "Popup modal":
-                    return { popup: url };
+                    return { popup: url1 };
                 case "Back":
                     return { eval_js: isNode() ? "history.back()" : "parent.goBack()" };
                 case "Close modal":
@@ -841,15 +862,16 @@ module.exports = {
                 required: true,
             },
         ],
-        run: async ({ configuration: { type, notify_type, text } }) => {
+        run: async ({ row, user, configuration: { type, notify_type, text } }) => {
             //type is legacy. this name gave react problems
+            let text1 = interpolate(text, row, user);
             switch (notify_type || type) {
                 case "Error":
-                    return { error: text };
+                    return { error: text1 };
                 case "Success":
-                    return { notify_success: text };
+                    return { notify_success: text1 };
                 default:
-                    return { notify: text };
+                    return { notify: text1 };
             }
         },
     },
@@ -1160,10 +1182,40 @@ module.exports = {
                     required: true,
                     attributes: { options: views.map((v) => v.select_option) },
                 },
+                {
+                    name: "new_state_fml",
+                    label: "New state formula",
+                    type: "String",
+                    class: "validate-expression",
+                },
             ];
         },
-        run: async ({ configuration: { view } }) => {
-            return { eval_js: `reload_embedded_view('${view}')` };
+        run: async ({ row, user, configuration: { view, new_state_fml } }) => {
+            if (new_state_fml) {
+                const new_state = eval_expression(new_state_fml, row || {}, user);
+                const newqs = objectToQueryString(new_state);
+                return {
+                    eval_js: `reload_embedded_view('${view}', '${newqs}')`,
+                };
+            }
+            else
+                return { eval_js: `reload_embedded_view('${view}')` };
+        },
+    },
+    sleep: {
+        description: "Delay for a set number of seconds",
+        configFields: [
+            {
+                name: "seconds",
+                label: "Seconds",
+                type: "Float",
+                required: true,
+            },
+        ],
+        run: async ({ configuration: { seconds } }) => {
+            return {
+                eval_js: `return new Promise((resolve) => setTimeout(resolve, ${(seconds || 0) * 1000}));`,
+            };
         },
     },
     notify_user: {
@@ -1198,7 +1250,7 @@ module.exports = {
          * @param {object} opts.user
          * @returns {Promise<void>}
          */
-        run: async ({ row, configuration: { title, body, link, user_spec } }) => {
+        run: async ({ row, user, configuration: { title, body, link, user_spec }, }) => {
             const user_where = User.valid_email(user_spec)
                 ? { email: user_spec }
                 : user_spec === "*"
@@ -1206,7 +1258,12 @@ module.exports = {
                     : eval_expression(user_spec, row || {});
             const users = await User.find(user_where);
             for (const user of users) {
-                await Notification.create({ title, body, link, user_id: user.id });
+                await Notification.create({
+                    title: interpolate(title, row, user),
+                    body: interpolate(body, row, user),
+                    link: interpolate(link, row, user),
+                    user_id: user.id,
+                });
             }
         },
     },