@saltcorn/data 0.9.4-beta.9 → 0.9.4

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

@@ -484,10 +484,10 @@ export namespace navigate {
     } | undefined>;
     export { run_9 as run };
 }
-export namespace form_action {
+export namespace step_control_flow {
     const description_11: string;
     export { description_11 as description };
-    const configFields_11: {
+    const configFields_11: ({
         name: string;
         label: string;
         type: string;
@@ -495,21 +495,76 @@ export namespace form_action {
         attributes: {
             options: string[];
         };
-    }[];
+        showIf?: undefined;
+    } | {
+        name: string;
+        label: string;
+        type: string;
+        required: boolean;
+        showIf: {
+            control_action: string[];
+        };
+        attributes?: undefined;
+    })[];
     export { configFields_11 as configFields };
-    export function run_10({ configuration: { form_action } }: {
+    export function run_10({ row, user, configuration: { control_action, step } }: {
+        row: any;
+        user: any;
+        configuration: {
+            control_action: any;
+            step: any;
+        };
+    }): Promise<{
+        halt_steps: boolean;
+        goto_step?: undefined;
+        clear_return_values?: undefined;
+    } | {
+        goto_step: any;
+        halt_steps?: undefined;
+        clear_return_values?: undefined;
+    } | {
+        clear_return_values: boolean;
+        halt_steps?: undefined;
+        goto_step?: undefined;
+    } | undefined>;
+    export { run_10 as run };
+}
+export namespace form_action {
+    const description_12: string;
+    export { description_12 as description };
+    const requireRow_4: boolean;
+    export { requireRow_4 as requireRow };
+    const configFields_12: {
+        name: string;
+        label: string;
+        type: string;
+        required: boolean;
+        attributes: {
+            options: string[];
+        };
+    }[];
+    export { configFields_12 as configFields };
+    export function run_11({ row, table, configuration: { form_action } }: {
+        row: any;
+        table: any;
         configuration: {
             form_action: any;
         };
     }): Promise<{
         eval_js: string;
+        set_fields?: undefined;
+    } | {
+        set_fields: {
+            [x: number]: any;
+        };
+        eval_js?: undefined;
     }>;
-    export { run_10 as run };
+    export { run_11 as run };
 }
 export namespace toast {
-    const description_12: string;
-    export { description_12 as description };
-    const configFields_12: ({
+    const description_13: string;
+    export { description_13 as description };
+    const configFields_13: ({
         name: string;
         label: string;
         type: string;
@@ -524,8 +579,8 @@ export namespace toast {
         required: boolean;
         attributes?: undefined;
     })[];
-    export { configFields_12 as configFields };
-    export function run_11({ row, user, configuration: { type, notify_type, text } }: {
+    export { configFields_13 as configFields };
+    export function run_12({ row, user, configuration: { type, notify_type, text } }: {
         row: any;
         user: any;
         configuration: {
@@ -546,12 +601,12 @@ export namespace toast {
         error?: undefined;
         notify_success?: undefined;
     }>;
-    export { run_11 as run };
+    export { run_12 as run };
 }
 export namespace run_js_code {
-    const description_13: string;
-    export { description_13 as description };
-    export function configFields_13({ table }: {
+    const description_14: string;
+    export { description_14 as description };
+    export function configFields_14({ table }: {
         table: any;
     }): Promise<({
         name: string;
@@ -591,17 +646,17 @@ export namespace run_js_code {
         help?: undefined;
         showIf?: undefined;
     })[]>;
-    export { configFields_13 as configFields };
+    export { configFields_14 as configFields };
     export { run_code as run };
 }
 export namespace duplicate_row_prefill_edit {
-    export function configFields_14({ table }: {
+    export function configFields_15({ table }: {
         table: any;
     }): Promise<any[]>;
-    export { configFields_14 as configFields };
-    const requireRow_4: boolean;
-    export { requireRow_4 as requireRow };
-    export function run_12({ row, table, configuration: { viewname, ...flds }, user }: {
+    export { configFields_15 as configFields };
+    const requireRow_5: boolean;
+    export { requireRow_5 as requireRow };
+    export function run_13({ row, table, configuration: { viewname, ...flds }, user }: {
         row: any;
         table: any;
         configuration: {
@@ -612,12 +667,12 @@ export namespace duplicate_row_prefill_edit {
     }): Promise<{
         goto: string;
     }>;
-    export { run_12 as run };
+    export { run_13 as run };
 }
 export namespace set_user_language {
-    const description_14: string;
-    export { description_14 as description };
-    export function configFields_15({ table }: {
+    const description_15: string;
+    export { description_15 as description };
+    export function configFields_16({ table }: {
         table: any;
     }): Promise<{
         name: string;
@@ -630,8 +685,8 @@ export namespace set_user_language {
             }[];
         };
     }[]>;
-    export { configFields_15 as configFields };
-    export function run_13({ configuration: { language }, user, req, res }: {
+    export { configFields_16 as configFields };
+    export function run_14({ configuration: { language }, user, req, res }: {
         configuration: {
             language: any;
         };
@@ -641,12 +696,12 @@ export namespace set_user_language {
     }): Promise<{
         reload_page: boolean;
     }>;
-    export { run_13 as run };
+    export { run_14 as run };
 }
 export namespace sync_table_from_external {
-    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;
@@ -701,60 +756,71 @@ export namespace sync_table_from_external {
         attributes?: undefined;
         default?: undefined;
     })[]>;
-    export { configFields_16 as configFields };
-    export function run_14({ configuration: { row_expr, table_src, table_dest, pk_field, delete_rows, match_field_names, }, user, ...rest }: {
+    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 }: {
         row: object;
         configuration: object;
         user: object;
         rest: any;
     }): Promise<boolean | object>;
-    export { run_14 as run };
+    export { run_15 as run };
 }
 export namespace reload_embedded_view {
-    const description_16: string;
-    export { description_16 as description };
-    export function configFields_17(): Promise<{
+    const description_17: string;
+    export { description_17 as description };
+    export function configFields_18(): Promise<({
         name: string;
         label: string;
+        class: string;
         type: string;
         required: boolean;
         attributes: {
             options: any[];
         };
-    }[]>;
-    export { configFields_17 as configFields };
-    export function run_15({ configuration: { view } }: {
+    } | {
+        name: string;
+        label: string;
+        type: string;
+        class: string;
+        required?: undefined;
+        attributes?: undefined;
+    })[]>;
+    export { configFields_18 as configFields };
+    export function run_16({ 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 { run_16 as run };
 }
 export namespace sleep {
-    const description_17: string;
-    export { description_17 as description };
-    const configFields_18: {
+    const description_18: string;
+    export { description_18 as description };
+    const configFields_19: {
         name: string;
         label: string;
         type: string;
         required: boolean;
     }[];
-    export { configFields_18 as configFields };
-    export function run_16({ configuration: { seconds } }: {
+    export { configFields_19 as configFields };
+    export function run_17({ configuration: { seconds } }: {
         configuration: {
             seconds: any;
         };
     }): Promise<{
         eval_js: string;
     }>;
-    export { run_16 as run };
+    export { run_17 as run };
 }
 export namespace notify_user {
-    const description_18: string;
-    export { description_18 as description };
-    export function configFields_19(): ({
+    const description_19: string;
+    export { description_19 as description };
+    export function configFields_20(): ({
         name: string;
         label: string;
         type: string;
@@ -765,18 +831,18 @@ export namespace notify_user {
         required: boolean;
         type: string;
     })[];
-    export { configFields_19 as configFields };
-    export function run_17({ row, user, configuration: { title, body, link, user_spec }, }: {
+    export { configFields_20 as configFields };
+    export function run_18({ row, user, configuration: { title, body, link, user_spec }, }: {
         row: object;
         configuration: object;
         user: object;
     }): Promise<void>;
-    export { run_17 as run };
+    export { run_18 as run };
 }
 export namespace convert_session_to_user {
-    const description_19: string;
-    export { description_19 as description };
-    export function configFields_20({ table }: {
+    const description_20: string;
+    export { description_20 as description };
+    export function configFields_21({ table }: {
         table: any;
     }): Promise<({
         name: string;
@@ -797,8 +863,8 @@ export namespace convert_session_to_user {
         input_type?: undefined;
         options?: undefined;
     })[]>;
-    export { configFields_20 as configFields };
-    export function run_18({ row, configuration: { table_name, session_field, user_field }, user, }: {
+    export { configFields_21 as configFields };
+    export function run_19({ row, configuration: { table_name, session_field, user_field }, user, }: {
         row: any;
         configuration: {
             table_name: any;
@@ -807,7 +873,7 @@ export namespace convert_session_to_user {
         };
         user: any;
     }): Promise<void>;
-    export { run_18 as run };
+    export { run_19 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":"AAqDA;;;;;;;;;GASG;AACH;;;;;;;;;;iBAyEC;;;;;;;;;;;;;;IAuCiB;;;;;;;;;;;;;;;;;;;;;;;;;;;SAqBb;;IAQI;;;;sBAWJ;;;;;;;;;;;;;;;;;;;IA+BI;;;wBAQJ;;;;;;IAca;;;;;;SAeb;;IAUI;;;;;wBA0CJ;;;;;;IAea;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA+Ib;;;IAUI;;;;;wBAoHJ;;;;;;IAea;;;;;;;;SAYb;;;;IAUI;;;;;wBAsBJ;;;;;;IAaa,0CAAQ;;;;IASjB;;;;wBAKJ;;;;;;IAgBa;;;;;;;;;;;;;;;;;;;;;;UAiBb;;IAMI;;sBAgBJ;;;;;;IAea;;;;;;;;;;;;;;;;;;UAmBb;;IAUI;;;;;;kCAiBJ;;;;;;IAca;;;;;;;;;;;;;;;;;;;;;;;;UA0Bb;;;;IAEI;;;;;;;;;qBAkBJ;;;;;;;;;;;;;;;;;;;;;;;;;;IAuCI;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAkBJ;;;;;;;;;;;;;;;;IAqBI;;;;;;OAcJ;;;;;;;;;;;;;;;;;;;;;;IA2BI;;;;;;;;;;;;;;;;;;;;OAYJ;;;;;;IAea;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA+Eb;;;;;IAQa;;uBAsBb;;;;IAEI;;;;;;;;;;OAUJ;;;;;;IASa;;;;;;;;;;;;SAcb;;IACI;;;;;;;;;OAgBJ;;;;;;IAea;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAyDb;;IASI;;;;;kCAmFJ;;;;;;IAIa;;;;;;;;SAWb;;IACI;;;;;;OAEJ;;;;;;;;;;;;;IAYI;;;;;;OAMJ;;;;;;IAIa;;;;;;;;;;SAsBb;;IAQI;;;;sBAmBJ;;;;;;IAKa;;;;;;;;;;;;;;;;;;;;UA2Cb;;IACI;;;;;;;;sBAeJ"}
+{"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../../base-plugin/actions.js"],"names":[],"mappings":"AAyEA;;;;;;;;;GASG;AACH;;;;;;;;;;iBA4EC;;;;;;;;;;;;;;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"}

package/dist/base-plugin/actions.js

@@ -18,22 +18,29 @@ 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, interpolate, } = require("../utils");
 const db = require("../db");
-const { isNode } = require("../utils");
+const { isNode, ppVal } = 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;
+const consoleInterceptor = (state) => {
+    const handle = (printer, level, message, optionalParams) => {
+        printer(message, ...optionalParams);
+        if (state.hasJoinedLogSockets && state.logLevel >= level) {
+            const s = ppVal(message);
+            state.emitLog(state.tenant || "public", level, optionalParams.length === 0
+                ? s
+                : `${s} ${optionalParams.map((val) => ppVal(val)).join(" ")}`);
+        }
+    };
+    return {
+        log: (message, ...optionalParams) => handle(console.log, 5, message, optionalParams),
+        info: (message, ...optionalParams) => handle(console.info, 5, message, optionalParams),
+        debug: (message, ...optionalParams) => handle(console.debug, 5, message, optionalParams),
+        warn: (message, ...optionalParams) => handle(console.warn, 2, message, optionalParams),
+        error: (message, ...optionalParams) => handle(console.error, 1, message, optionalParams),
+    };
 };
 /**
  * @param opts
@@ -59,7 +66,7 @@ const run_code = async ({ row, table, channel, configuration: { code, run_where
     const Actions = {};
     Object.entries(getState().actions).forEach(([k, v]) => {
         Actions[k] = (args = {}) => {
-            v.run({ row, table, user, configuration: args, ...rest, ...args });
+            return v.run({ row, table, user, configuration: args, ...rest, ...args });
         };
     });
     const trigger_actions = await Trigger.find({
@@ -68,7 +75,7 @@ const run_code = async ({ row, table, channel, configuration: { code, run_where
     for (const trigger of trigger_actions) {
         const state_action = getState().actions[trigger.action];
         Actions[trigger.name] = (args = {}) => {
-            state_action.run({
+            return state_action.run({
                 row,
                 table,
                 configuration: trigger.configuration,
@@ -87,7 +94,7 @@ const run_code = async ({ row, table, channel, configuration: { code, run_where
         table,
         row,
         user,
-        console,
+        console: consoleInterceptor(getState()),
         Actions,
         emitEvent,
         sleep,
@@ -99,12 +106,15 @@ const run_code = async ({ row, table, channel, configuration: { code, run_where
         View,
         EventLog,
         Buffer,
+        Notification,
         setTimeout,
         require,
         setConfig: (k, v) => sysState.setConfig(k, v),
         getConfig: (k) => sysState.getConfig(k),
         channel: table ? table.name : channel,
         session_id: rest.req && getSessionId(rest.req),
+        request_headers: rest?.req?.headers,
+        request_ip: rest?.req?.ip,
         ...(row || {}),
         ...getState().function_context,
         ...rest,
@@ -484,7 +494,8 @@ module.exports = {
             };
             try {
                 const sendres = await getMailTransport().sendMail(email);
-                if (confirm_field && sendres.accepted.includes(to_addr)) {
+                getState().log(5, `send_email result: ${JSON.stringify(sendres)}`);
+                if (confirm_field && sendres.accepted.length > 0) {
                     const confirm_fld = table.getField(confirm_field);
                     if (confirm_fld && confirm_fld.type.name === "Date")
                         await table.updateRow({ [confirm_field]: new Date() }, row[table.pk_name]);
@@ -804,6 +815,44 @@ module.exports = {
             }
         },
     },
+    step_control_flow: {
+        /**
+         * @param {object} opts
+         * @param {*} opts.table
+         * @returns {Promise<object[]>}
+         */
+        description: "Step control flow",
+        configFields: [
+            {
+                name: "control_action",
+                label: "Control action",
+                type: "String",
+                required: true,
+                attributes: {
+                    options: ["Halt steps", "Goto step", "Clear return values"],
+                },
+            },
+            {
+                name: "step",
+                label: "Step",
+                type: "Integer",
+                required: true,
+                showIf: { control_action: ["Goto step"] },
+            },
+        ],
+        run: async ({ row, user, configuration: { control_action, step } }) => {
+            switch (control_action) {
+                case "Halt steps":
+                    return { halt_steps: true };
+                case "Goto step":
+                    return { goto_step: step };
+                case "Clear return values":
+                    return { clear_return_values: true };
+                default:
+                    break;
+            }
+        },
+    },
     form_action: {
         /**
          * @param {object} opts
@@ -811,6 +860,7 @@ module.exports = {
          * @returns {Promise<object[]>}
          */
         description: "Action on form in Edit view",
+        requireRow: true,
         configFields: [
             {
                 name: "form_action",
@@ -822,12 +872,22 @@ module.exports = {
                 },
             },
         ],
-        run: async ({ configuration: { form_action } }) => {
+        run: async ({ row, table, configuration: { form_action } }) => {
             const jqGet = `$('form[data-viewname="'+viewname+'"]')`;
             switch (form_action) {
                 case "Submit":
                     return { eval_js: jqGet + ".submit()" };
                 case "Save":
+                    if (!row[table.pk_name]) {
+                        //we will save server side so we can set id
+                        const result = await table.tryInsertRow(row);
+                        if (result.success)
+                            return { set_fields: { [table.pk_name]: result.success } };
+                        else {
+                            getState().log(3, `form_actions Save failed server side, result: ${JSON.stringify(result)} row ${JSON.stringify(row)}`);
+                            return { eval_js: `return saveAndContinueAsync(${jqGet})` };
+                        }
+                    }
                     return { eval_js: `return saveAndContinueAsync(${jqGet})` };
                 case "Reset":
                     return { eval_js: jqGet + ".trigger('reset')" };
@@ -1178,14 +1238,29 @@ module.exports = {
                 {
                     name: "view",
                     label: "View to refresh",
+                    class: "selectizable",
                     type: "String",
                     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: {