@saltcorn/data 1.1.0-beta.8 → 1.1.0

package/dist/models/workflow_trace.d.ts

@@ -0,0 +1,57 @@
+import type { Where, SelectOptions } from "@saltcorn/db-common/internal";
+import type { WorkflowTraceCfg } from "@saltcorn/types/model-abstracts/abstract_workflow_trace";
+/**
+ * WorkflowTrace Class
+ * @category saltcorn-data
+ */
+declare class WorkflowTrace {
+    id?: number;
+    run_id: number;
+    context: any;
+    step_name_run: string;
+    wait_info?: any;
+    step_started_at: Date;
+    elapsed: number;
+    user_id?: number;
+    error?: string;
+    status: "Pending" | "Running" | "Finished" | "Waiting" | "Error";
+    /**
+     * WorkflowTrace constructor
+     * @param {object} o
+     */
+    constructor(o: WorkflowTraceCfg | WorkflowTrace);
+    /**
+     * @param {object} lib_in
+     */
+    static create(run_in: WorkflowTraceCfg): Promise<WorkflowTrace>;
+    /**
+     * @type {...*}
+     */
+    get toJson(): any;
+    /**
+     * @param {*} where
+     * @param {*} selectopts
+     * @returns {WorkflowTrace[]}
+     */
+    static find(where: Where, selectopts?: SelectOptions): Promise<WorkflowTrace[]>;
+    /**
+     * @param {*} where
+     * @returns {WorkflowTrace}
+     */
+    static findOne(where: Where): Promise<WorkflowTrace>;
+    /**
+     * @param {*} what
+     * @returns {object}
+     */
+    /**
+     * @returns {Promise<void>}
+     */
+    delete(): Promise<void>;
+    /**
+     * @param {*} row
+     * @returns {Promise<void>}
+     */
+    static count(where?: Where): Promise<number>;
+}
+export = WorkflowTrace;
+//# sourceMappingURL=workflow_trace.d.ts.map

package/dist/models/workflow_trace.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workflow_trace.d.ts","sourceRoot":"","sources":["../../models/workflow_trace.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,KAAK,EAAE,aAAa,EAAO,MAAM,8BAA8B,CAAC;AAC9E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yDAAyD,CAAC;AAEhG;;;GAGG;AACH,cAAM,aAAa;IACjB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,GAAG,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,eAAe,EAAE,IAAI,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,UAAU,GAAG,SAAS,GAAG,OAAO,CAAC;IAEjE;;;OAGG;gBACS,CAAC,EAAE,gBAAgB,GAAG,aAAa;IAe/C;;OAEG;WACU,MAAM,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC;IAOrE;;OAEG;IACH,IAAI,MAAM,IAAI,GAAG,CAGhB;IAED;;;;OAIG;WACU,IAAI,CACf,KAAK,EAAE,KAAK,EACZ,UAAU,CAAC,EAAE,aAAa,GACzB,OAAO,CAAC,aAAa,EAAE,CAAC;IAK3B;;;OAGG;WACU,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;IAK1D;;;OAGG;IACH;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAO7B;;;OAGG;WAEU,KAAK,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;CAGnD;AAED,SAAS,aAAa,CAAC"}

package/dist/models/workflow_trace.js

@@ -0,0 +1,90 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+/**
+ * Workflow Trace Database Access Layer
+ * @category saltcorn-data
+ * @module models/workflow_trace
+ * @subcategory models
+ */
+const db_1 = __importDefault(require("../db"));
+/**
+ * WorkflowTrace Class
+ * @category saltcorn-data
+ */
+class WorkflowTrace {
+    /**
+     * WorkflowTrace constructor
+     * @param {object} o
+     */
+    constructor(o) {
+        this.id = o.id;
+        this.run_id = o.run_id;
+        this.context =
+            typeof o.context === "string" ? JSON.parse(o.context) : o.context || {};
+        this.wait_info =
+            typeof o.wait_info === "string" ? JSON.parse(o.wait_info) : o.wait_info;
+        this.step_started_at = o.step_started_at || new Date();
+        this.user_id = o.user_id;
+        this.error = o.error;
+        this.status = o.status || "Pending";
+        this.step_name_run = o.step_name_run;
+        this.elapsed = o.elapsed;
+    }
+    /**
+     * @param {object} lib_in
+     */
+    static async create(run_in) {
+        const run = new WorkflowTrace(run_in);
+        const id = await db_1.default.insert("_sc_workflow_trace", run.toJson);
+        run.id = id;
+        return run;
+    }
+    /**
+     * @type {...*}
+     */
+    get toJson() {
+        const { id, ...rest } = this;
+        return rest;
+    }
+    /**
+     * @param {*} where
+     * @param {*} selectopts
+     * @returns {WorkflowTrace[]}
+     */
+    static async find(where, selectopts) {
+        const us = await db_1.default.select("_sc_workflow_trace", where, selectopts);
+        return us.map((u) => new WorkflowTrace(u));
+    }
+    /**
+     * @param {*} where
+     * @returns {WorkflowTrace}
+     */
+    static async findOne(where) {
+        const u = await db_1.default.selectMaybeOne("_sc_workflow_trace", where);
+        return u ? new WorkflowTrace(u) : u;
+    }
+    /**
+     * @param {*} what
+     * @returns {object}
+     */
+    /**
+     * @returns {Promise<void>}
+     */
+    async delete() {
+        const schema = db_1.default.getTenantSchemaPrefix();
+        await db_1.default.query(`delete FROM ${schema}_sc_workflow_trace WHERE id = $1`, [
+            this.id,
+        ]);
+    }
+    /**
+     * @param {*} row
+     * @returns {Promise<void>}
+     */
+    static async count(where) {
+        return await db_1.default.count("_sc_workflow_trace", where);
+    }
+}
+module.exports = WorkflowTrace;
+//# sourceMappingURL=workflow_trace.js.map

package/dist/models/workflow_trace.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workflow_trace.js","sourceRoot":"","sources":["../../models/workflow_trace.ts"],"names":[],"mappings":";;;;AAAA;;;;;GAKG;AACH,+CAAuB;AAIvB;;;GAGG;AACH,MAAM,aAAa;IAYjB;;;OAGG;IACH,YAAY,CAAmC;QAC7C,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;QACf,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC;QACvB,IAAI,CAAC,OAAO;YACV,OAAO,CAAC,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC;QAC1E,IAAI,CAAC,SAAS;YACZ,OAAO,CAAC,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC1E,IAAI,CAAC,eAAe,GAAG,CAAC,CAAC,eAAe,IAAI,IAAI,IAAI,EAAE,CAAC;QACvD,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,IAAI,SAAS,CAAC;QACpC,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC,aAAa,CAAC;QACrC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAwB;QAC1C,MAAM,GAAG,GAAG,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC;QACtC,MAAM,EAAE,GAAG,MAAM,YAAE,CAAC,MAAM,CAAC,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;QAC7D,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC;QACZ,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;OAEG;IACH,IAAI,MAAM;QACR,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,IAAI,CACf,KAAY,EACZ,UAA0B;QAE1B,MAAM,EAAE,GAAG,MAAM,YAAE,CAAC,MAAM,CAAC,oBAAoB,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QACpE,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;IAClD,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,KAAY;QAC/B,MAAM,CAAC,GAAG,MAAM,YAAE,CAAC,cAAc,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;QAC/D,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtC,CAAC;IAED;;;OAGG;IACH;;OAEG;IACH,KAAK,CAAC,MAAM;QACV,MAAM,MAAM,GAAG,YAAE,CAAC,qBAAqB,EAAE,CAAC;QAC1C,MAAM,YAAE,CAAC,KAAK,CAAC,eAAe,MAAM,kCAAkC,EAAE;YACtE,IAAI,CAAC,EAAE;SACR,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IAEH,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,KAAa;QAC9B,OAAO,MAAM,YAAE,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;IACrD,CAAC;CACF;AAED,iBAAS,aAAa,CAAC"}

package/dist/plugin-helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-helper.d.ts","sourceRoot":"","sources":["../plugin-helper.js"],"names":[],"mappings":"AAiwBA;;;;;;;;;GASG;AACH,wHARW,KAAK,GAAC,MAAM,GAMV,QAAQ,MAAM,EAAE,CAAC,CA0mB7B;AAkLD;;;;;;;;GAQG;AACH,gDANW,MAAM,EAAE,UACR,KAAK,EAAE,sCAGL,MAAM,CAyNlB;AA7SD;;;;;;;;;;;;;;;;;;;;;;;;;EA2EC;AA9KD;;;;;;;GAOG;AACH,uCALW,KAAK,GAAC,MAAM,YACZ,MAAM,sBAEJ,QAAQ,MAAM,EAAE,CAAC,CAoC7B;AAED;;;;;;GAMG;AACH,wCAJW,KAAK,GAAC,MAAM,YACZ,MAAM,GACJ,QAAQ,MAAM,EAAE,CAAC,CAoB7B;AA8dD;;;;;;;;;GASG;AACH;IAPyB,MAAM,EAApB,KAAK,EAAE;IACM,KAAK,EAAlB,MAAM;IACQ,MAAM;IACL,WAAW;IACd,KAAK,EAAjB,KAAK;IACH,MAAM,CAsPlB;AA/YD;;;;;GAKG;AACH,2FAHW,MAAM,GACJ,MAAM,CAuElB;AAsUD;;;;;GAKG;AACH,iEAuHG;AA/mEH;;;;;;GAMG;AACH,2CALW,KAAK,EAAE,sCAGL,MAAM,CA2FlB;AAED;;;;;;GAMG;AACH,+EAkBC;AA0TD;;;;;GAKG;AACH,0CAJW,KAAK,GAAC,MAAM,YACZ,MAAM;oBACqB,MAAM,EAAE;GAqJ7C;AA8iDD;;;;;;GAMG;AACH,iCALW,MAAM,UACN,MAAM,EAAE,aAEN,MAAM,CA0ClB;AAED;;;;;;GAMG;AACH,uCAJW,MAAM,UACN,MAAM,EAAE,GACN,OAAO,MAAE,CAiCrB;AA5uED;;;;GAIG;AACH,iFAFa,MAAM,CAoBlB;AA3HD;;;;;;;;;;;;;;;;GAgBG;AACH,gCAfW,MAAM,SACN,MAAM,sWAYJ,UAAQ,CAmFpB;AA2mBD;;;;;GAKG;AACH,8CAJW,MAAM,SACN,MAAM,eACJ,QAAQ,MAAM,EAAE,CAAC,CAKC;AA5d/B;;;;;;GAMG;AACH,0CALW,KAAK,EAAE,mCAGL,QAAQ,MAAM,CAAC,CAkC3B;AA68DD;;;;GAIG;AAEH,kCAJW,MAAM,GACJ,MAAM,GAAC,SAAS,CAM5B;AAgOD;;;;;;GAMG;AACH,yDALW,MAAM,GAGJ,YAAU,CAmFtB;AA9ND;;;;;;GAMG;AACH,8EAHW,MAAM,EAAE,GACN,MAAM,CA+HlB;;AA/kED;;;;;GAKG;AACH,kDAJW,KAAK,YACL,MAAM,8BAgDhB;AAED;;;;;;;GAOG;AACH,uDAJW,KAAK,YACL,MAAM;;;KAkChB;AAED;;;;;;;GAOG;AACH,uDANW,KAAK,YACL,MAAM,SACN,MAAM,QACN,MAAM,EAAE,OAuElB;AAwgED;;;;;;;;;;;;;;;;;;;;GAoCC;AAED;;;;GAIG;AACH;;;;;cA0BC;AA5ED,mDAK6B"}
+{"version":3,"file":"plugin-helper.d.ts","sourceRoot":"","sources":["../plugin-helper.js"],"names":[],"mappings":"AAkwBA;;;;;;;;;GASG;AACH,wHARW,KAAK,GAAC,MAAM,GAMV,QAAQ,MAAM,EAAE,CAAC,CA0mB7B;AAkLD;;;;;;;;GAQG;AACH,gDANW,MAAM,EAAE,UACR,KAAK,EAAE,sCAGL,MAAM,CA2NlB;AA/SD;;;;;;;;;;;;;;;;;;;;;;;;;EA2EC;AA9KD;;;;;;;GAOG;AACH,uCALW,KAAK,GAAC,MAAM,YACZ,MAAM,sBAEJ,QAAQ,MAAM,EAAE,CAAC,CAoC7B;AAED;;;;;;GAMG;AACH,wCAJW,KAAK,GAAC,MAAM,YACZ,MAAM,GACJ,QAAQ,MAAM,EAAE,CAAC,CAoB7B;AAgeD;;;;;;;;;GASG;AACH;IAPyB,MAAM,EAApB,KAAK,EAAE;IACM,KAAK,EAAlB,MAAM;IACQ,MAAM;IACL,WAAW;IACd,KAAK,EAAjB,KAAK;IACH,MAAM,CAsPlB;AA/YD;;;;;GAKG;AACH,2FAHW,MAAM,GACJ,MAAM,CAuElB;AAsUD;;;;;GAKG;AACH,iEAuHG;AAjnEH;;;;;;GAMG;AACH,2CALW,KAAK,EAAE,sCAGL,MAAM,CA2FlB;AAED;;;;;;GAMG;AACH,+EAkBC;AA0TD;;;;;GAKG;AACH,0CAJW,KAAK,GAAC,MAAM,YACZ,MAAM;oBACqB,MAAM,EAAE;GAqJ7C;AAgjDD;;;;;;GAMG;AACH,iCALW,MAAM,UACN,MAAM,EAAE,aAEN,MAAM,CA0ClB;AAED;;;;;;GAMG;AACH,uCAJW,MAAM,UACN,MAAM,EAAE,GACN,OAAO,MAAE,CAiCrB;AA9uED;;;;GAIG;AACH,iFAFa,MAAM,CAoBlB;AA3HD;;;;;;;;;;;;;;;;GAgBG;AACH,gCAfW,MAAM,SACN,MAAM,sWAYJ,UAAQ,CAmFpB;AA2mBD;;;;;GAKG;AACH,8CAJW,MAAM,SACN,MAAM,eACJ,QAAQ,MAAM,EAAE,CAAC,CAKC;AA5d/B;;;;;;GAMG;AACH,0CALW,KAAK,EAAE,mCAGL,QAAQ,MAAM,CAAC,CAkC3B;AA+8DD;;;;GAIG;AAEH,kCAJW,MAAM,GACJ,MAAM,GAAC,SAAS,CAM5B;AAgOD;;;;;;GAMG;AACH,yDALW,MAAM,GAGJ,YAAU,CAuFtB;AAlOD;;;;;;GAMG;AACH,8EAHW,MAAM,EAAE,GACN,MAAM,CA+HlB;;AAjlED;;;;;GAKG;AACH,kDAJW,KAAK,YACL,MAAM,8BAgDhB;AAED;;;;;;;GAOG;AACH,uDAJW,KAAK,YACL,MAAM;;;KAkChB;AAED;;;;;;;GAOG;AACH,uDANW,KAAK,YACL,MAAM,SACN,MAAM,QACN,MAAM,EAAE,OAuElB;AA8gED;;;;;;;;;;;;;;;;;;;;GAoCC;AAED;;;;GAIG;AACH;;;;;cA0BC;AA5ED,mDAK6B"}

package/dist/plugin-helper.js

@@ -14,7 +14,7 @@ const db = require("./db");
 const { button, a, text, i, text_attr } = require("@saltcorn/markup/tags");
 const { show_icon_and_label } = require("@saltcorn/markup/layout_utils");
 const { Relation, RelationType, ViewDisplayType, parseRelationPath, buildRelationPath, } = require("@saltcorn/common-code");
-const { applyAsync, InvalidConfiguration, mergeActionResults, structuredClone, mergeIntoWhere, } = require("./utils");
+const { applyAsync, InvalidConfiguration, mergeActionResults, structuredClone, mergeIntoWhere, validSqlId, } = require("./utils");
 const { jsexprToWhere, freeVariables, add_free_variables_to_joinfields, eval_expression, freeVariablesInInterpolation, } = require("./models/expression");
 const { traverseSync } = require("./models/layout");
 const { isNode } = require("./utils");
@@ -1358,9 +1358,7 @@ const picked_fields_to_query = (columns, fields, layout, req, table) => {
                 if (column.join_field.includes("->")) {
                     const [relation, target] = column.join_field.split("->");
                     const [ontable, ref] = relation.split(".");
-                    const targetNm = `${ref}_${ontable
-                        .replaceAll(" ", "")
-                        .toLowerCase()}_${target}`;
+                    const targetNm = validSqlId(`${ref}_${ontable.replaceAll(" ", "").toLowerCase()}_${target}`);
                     column.targetNm = targetNm;
                     joinFields[targetNm] = {
                         ref,
@@ -1448,7 +1446,7 @@ const picked_fields_to_query = (columns, fields, layout, req, table) => {
                 }
                 //console.log(column);
                 const field = column.agg_field.split("@")[0];
-                let targetNm = db.sqlsanitize((column.stat.replace(" ", "") +
+                let targetNm = validSqlId(db.sqlsanitize((column.stat.replace(" ", "") +
                     "_" +
                     table +
                     "_" +
@@ -1456,7 +1454,7 @@ const picked_fields_to_query = (columns, fields, layout, req, table) => {
                     "_" +
                     field +
                     "_" +
-                    column.aggwhere || "").toLowerCase());
+                    column.aggwhere || "").toLowerCase()));
                 // postgres fields have a max len
                 if (targetNm.length > 58) {
                     targetNm = targetNm
@@ -2222,7 +2220,7 @@ const json_list_to_external_table = (get_json_list, fields0) => {
         const data_filtered = restricts.length === 0
             ? data_in
             : data_in.filter((x) => restricts.every(sat(x)));
-        if (selopts.orderBy) {
+        if (selopts.orderBy && typeof selopts.orderBy === "string") {
             const cmp = selopts.orderDesc
                 ? new Function("a,b", `return b.${selopts.orderBy}-a.${selopts.orderBy}`)
                 : new Function("a,b", `return a.${selopts.orderBy}-b.${selopts.orderBy}`);
@@ -2333,8 +2331,9 @@ const run_action_column = async ({ col, req, ...rest }) => {
         }
         else {
             const trigger = await Trigger.findOne({ name: action_name });
-            if (trigger?.action === "Multi-step action") {
-                goRun = () => trigger.runWithoutRow({ req, ...rest });
+            if (trigger?.action === "Multi-step action" ||
+                trigger?.action === "Workflow") {
+                goRun = () => trigger.runWithoutRow({ req, interactive: true, ...rest });
             }
             else if (trigger) {
                 state_action = getState().actions[trigger.action];