@saltcorn/data 0.9.3-beta.7 → 0.9.3-rc.1

package/dist/models/scheduler.js

@@ -40,11 +40,29 @@ const intervalIsNow = async (name) => {
     due = new Date(due);
     return due < now;
 };
+const regexHHMM = /^([0-1]?[0-9]|2[0-3]):([0-5][0-9])$/;
 /**
  * @param {string} name
  * @param {number} hours
  * @returns {Promise<Trigger[]>}
  */
+const getDailyTriggersDueNow = (tickSeconds) => {
+    let triggers = trigger_1.default.find({ when_trigger: "Daily" });
+    return triggers.filter((tr) => {
+        if (!tr.channel)
+            return false;
+        const m = tr.channel.match?.(regexHHMM);
+        if (!m)
+            return false;
+        const time_to_run = new Date();
+        time_to_run.setHours(+m[1]);
+        time_to_run.setMinutes(+m[2]);
+        const now = new Date();
+        const nextTick = new Date();
+        nextTick.setSeconds(nextTick.getSeconds() + tickSeconds);
+        return time_to_run >= now && time_to_run < nextTick;
+    });
+};
 const getIntervalTriggersDueNow = async (name, hours) => {
     const state = getState();
     const cfgField = `next_${name.toLowerCase()}_event`;
@@ -65,7 +83,11 @@ const getIntervalTriggersDueNow = async (name, hours) => {
     if (due > now)
         return [];
     //console.log("after check", {due, name, now});
-    const triggers = await trigger_1.default.find({ when_trigger: name });
+    let triggers = await trigger_1.default.find({ when_trigger: name });
+    // legacy: daily events without a specified time
+    if (name === "Daily") {
+        triggers = triggers.filter((tr) => !tr.channel || !tr.channel.match?.(regexHHMM));
+    }
     due.setHours(due.getHours() + hours);
     if (now > due) {
         // we must have skipped events, e.g. if not running continuously
@@ -151,12 +173,14 @@ const runScheduler = async ({ stop_when = () => false, tickSeconds = 60 * 5, wat
                 const triggers = await trigger_1.default.find({ when_trigger: "Often" });
                 const trsHourly = await getIntervalTriggersDueNow("Hourly", 1);
                 const trsDaily = await getIntervalTriggersDueNow("Daily", 24);
+                const trsDailyNowTime = getDailyTriggersDueNow(tickSeconds);
                 const trsWeekly = await getIntervalTriggersDueNow("Weekly", 24 * 7);
                 const allTriggers = [
                     ...triggers,
                     ...trsHourly,
                     ...trsDaily,
                     ...trsWeekly,
+                    ...trsDailyNowTime,
                 ];
                 for (const trigger of allTriggers) {
                     try {

package/dist/models/scheduler.js.map

@@ -1 +1 @@
-{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../models/scheduler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../models/scheduler.ts"],"names":[],"mappings":"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"}

package/dist/plugin-helper.d.ts

@@ -216,7 +216,31 @@ export function build_schema_data(): Promise<{
         }[];
     }[];
 }>;
+/**
+ * tries to match a type to a relation
+ * if it's not ChildList, ParentShow, Own, or Independent then RelationPath is returned
+ * @param {View} subView
+ * @param {string[]} path
+ * @param {Table} srcTable
+ * @returns ChildList, ParentShow, Own, Independent or RelationPath
+ */
+export function relationTypeFromPath(subview: any, path: string[], srcTable: Table): "ChildList" | "ParentShow" | "Own" | "Independent" | "RelationPath";
+/**
+ * creates a state object from a relation path
+ * @param {View} subview
+ * @param {string} relation
+ * @param {string[]} pathArr
+ * @param {Function} getRowVal
+ * @param {Table} srcTbl
+ */
+export function pathToState(subview: View, relation: string, pathArr: string[], getRowVal: Function, srcTbl: Table): {
+    [x: number]: any;
+    id?: undefined;
+} | {
+    id: any;
+};
 import Table = require("./models/table");
 import Field = require("./models/field");
+import View = require("./models/view");
 export { add_free_variables_to_joinfields };
 //# sourceMappingURL=plugin-helper.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"plugin-helper.d.ts","sourceRoot":"","sources":["../plugin-helper.js"],"names":[],"mappings":"AAsvBA;;;;;;;;;GASG;AACH,wHARW,KAAK,GAAC,MAAM,GAMV,QAAQ,MAAM,EAAE,CAAC,CAmmB7B;AAqGD;;;;;;;;GAQG;AACH,gDANW,MAAM,EAAE,UACR,KAAK,EAAE,gBAGL,MAAM,CAkLlB;AA5RD;;;;;;;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;AA8SD;;;;;;;;GAQG;AACH;IANyB,MAAM,EAApB,KAAK,EAAE;IACM,KAAK,EAAlB,MAAM;IACS,WAAW;IACd,KAAK,EAAjB,KAAK;IACH,MAAM,CAyPlB;AArVD;;;;;GAKG;AACH,2FAHW,MAAM,GACJ,MAAM,CA8ClB;AAqSD;;;;;GAKG;AACH,iEA+GG;AAl7DH;;;;;;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;AAi3CD;;;;;;GAMG;AACH,iCALW,MAAM,UACN,MAAM,EAAE,aAEN,MAAM,CA0ClB;AAED;;;;;;GAMG;AACH,uCAJW,MAAM,UACN,MAAM,EAAE,GACN,OAAO,MAAE,CAiCrB;AA/iED;;;;GAIG;AACH,gEAFa,MAAM,CAoBlB;AA5HD;;;;;;;;;;;;;;;;GAgBG;AACH,gCAfW,MAAM,SACN,MAAM,oUAYJ,UAAQ,CAoFpB;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;AAgxDD;;;;GAIG;AAEH,kCAJW,MAAM,GACJ,MAAM,GAAC,SAAS,CAM5B;AAmND;;;;;;GAMG;AACH,yDALW,MAAM,GAGJ,YAAU,CA2CtB;AAzKD;;;;;;GAMG;AACH,8EAHW,MAAM,EAAE,GACN,MAAM,CAkHlB;;AAr4DD;;;;;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;AA4xDD;;;;;;;;;;;;;;;;;;;GA8BC"}
+{"version":3,"file":"plugin-helper.d.ts","sourceRoot":"","sources":["../plugin-helper.js"],"names":[],"mappings":"AAsvBA;;;;;;;;;GASG;AACH,wHARW,KAAK,GAAC,MAAM,GAMV,QAAQ,MAAM,EAAE,CAAC,CAymB7B;AAqGD;;;;;;;;GAQG;AACH,gDANW,MAAM,EAAE,UACR,KAAK,EAAE,gBAGL,MAAM,CAkLlB;AA5RD;;;;;;;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;AAiVD;;;;;;;;GAQG;AACH;IANyB,MAAM,EAApB,KAAK,EAAE;IACM,KAAK,EAAlB,MAAM;IACS,WAAW;IACd,KAAK,EAAjB,KAAK;IACH,MAAM,CAiOlB;AAhWD;;;;;GAKG;AACH,2FAHW,MAAM,GACJ,MAAM,CA8ClB;AAgTD;;;;;GAKG;AACH,iEA+GG;AAn8DH;;;;;;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;AAk4CD;;;;;;GAMG;AACH,iCALW,MAAM,UACN,MAAM,EAAE,aAEN,MAAM,CA0ClB;AAED;;;;;;GAMG;AACH,uCAJW,MAAM,UACN,MAAM,EAAE,GACN,OAAO,MAAE,CAiCrB;AAhkED;;;;GAIG;AACH,gEAFa,MAAM,CAoBlB;AA5HD;;;;;;;;;;;;;;;;GAgBG;AACH,gCAfW,MAAM,SACN,MAAM,oUAYJ,UAAQ,CAoFpB;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;AAiyDD;;;;GAIG;AAEH,kCAJW,MAAM,GACJ,MAAM,GAAC,SAAS,CAM5B;AAmND;;;;;;GAMG;AACH,yDALW,MAAM,GAGJ,YAAU,CA2CtB;AAzKD;;;;;;GAMG;AACH,8EAHW,MAAM,EAAE,GACN,MAAM,CAkHlB;;AAt5DD;;;;;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;AA6yDD;;;;;;;;;;;;;;;;;;;GA8BC;AAED;;;;;;;GAOG;AACH,yDAJW,MAAM,EAAE,YACR,KAAK,uEAYf;AAED;;;;;;;GAOG;AACH,qCANW,IAAI,YACJ,MAAM,WACN,MAAM,EAAE,+BAER,KAAK;;;;;EA2Bf"}

package/dist/plugin-helper.js

@@ -807,8 +807,13 @@ const field_picker_fields = async ({ table, viewname, req, has_click_to_edit, ha
             name: "formula",
             label: __("Formula"),
             type: "String",
+            fieldview: "textarea",
             class: "validate-expression",
             showIf: { type: "FormulaValue" },
+            attributes: {
+                rows: 2,
+                spellcheck: false,
+            },
         },
         {
             name: "field_name",
@@ -1538,6 +1543,38 @@ const queryToString = (query) => {
     };
     return JSON.stringify(relObj);
 };
+const handleRelationPath = (queryObj, qstate) => {
+    if (queryObj.path.length > 0) {
+        const levels = [];
+        let lastTableName = queryObj.sourcetable;
+        let where = null;
+        for (const level of queryObj.path) {
+            if (level.inboundKey) {
+                levels.push({ ...level });
+                lastTableName = level.table;
+                if (!where)
+                    where = {
+                        [db.sqlsanitize(level.inboundKey)]: queryObj.srcId !== "NULL" ? queryObj.srcId : null,
+                    };
+            }
+            else {
+                const lastTable = Table.findOne({ name: lastTableName });
+                const refField = lastTable.fields.find((field) => field.name === level.fkey);
+                levels.push({ table: refField.reftable_name, fkey: level.fkey });
+                lastTableName = refField.reftable_name;
+                if (!where)
+                    where = { id: queryObj.srcId !== "NULL" ? queryObj.srcId : null };
+            }
+        }
+        addOrCreateList(qstate, "id", {
+            inSelectWithLevels: {
+                joinLevels: levels,
+                schema: db.getTenantSchema(),
+                where,
+            },
+        });
+    }
+};
 /**
  * @function
  * @param {object} opts
@@ -1567,36 +1604,12 @@ const stateFieldsToWhere = ({ fields, state, approximate = true, table }) => {
             return;
         }
         const field = fields.find((fld) => fld.name === k);
-        if (k === "_relation_path_" || k === "_inbound_relation_path_") {
-            const queryObj = typeof v === "string" ? stringToQuery(v) : v;
-            if (queryObj.path.length > 0) {
-                const levels = [];
-                let lastTableName = queryObj.sourcetable;
-                let where = null;
-                for (const level of queryObj.path) {
-                    if (level.inboundKey) {
-                        levels.push({ ...level });
-                        lastTableName = level.table;
-                        if (!where)
-                            where = { [db.sqlsanitize(level.inboundKey)]: queryObj.srcId };
-                    }
-                    else {
-                        const lastTable = Table.findOne({ name: lastTableName });
-                        const refField = lastTable.fields.find((field) => field.name === level.fkey);
-                        levels.push({ table: refField.reftable_name, fkey: level.fkey });
-                        lastTableName = refField.reftable_name;
-                        if (!where)
-                            where = { id: queryObj.srcId };
-                    }
-                }
-                addOrCreateList(qstate, "id", {
-                    inSelectWithLevels: {
-                        joinLevels: levels,
-                        schema: db.getTenantSchema(),
-                        where,
-                    },
-                });
-            }
+        if (k === "_relation_path_" || k === "_inbound_relation_path_")
+            handleRelationPath(typeof v === "string" ? stringToQuery(v) : v, qstate);
+        else if (k.startsWith(".")) {
+            const queryObj = parseRelationPath(k);
+            queryObj.srcId = v;
+            handleRelationPath(queryObj, qstate);
         }
         else if (k.startsWith("_fromdate_")) {
             const datefield = db.sqlsanitize(k.replace("_fromdate_", ""));
@@ -2224,6 +2237,58 @@ const build_schema_data = async () => {
     })));
     return { views, tables };
 };
+/**
+ * tries to match a type to a relation
+ * if it's not ChildList, ParentShow, Own, or Independent then RelationPath is returned
+ * @param {View} subView
+ * @param {string[]} path
+ * @param {Table} srcTable
+ * @returns ChildList, ParentShow, Own, Independent or RelationPath
+ */
+const relationTypeFromPath = (subview, path, srcTable) => {
+    if (path.length === 1 && path[0].inboundKey)
+        return "ChildList"; // works for OneToOneShow as well
+    else if (path.length === 2 && path.every((p) => p.inboundKey))
+        return "ChildList";
+    else if (path.length === 1 && path[0].fkey)
+        return "ParentShow";
+    else if (path.length === 0)
+        return subview.table_id === srcTable.id ? "Own" : "Independent";
+    else
+        return "RelationPath";
+};
+/**
+ * creates a state object from a relation path
+ * @param {View} subview
+ * @param {string} relation
+ * @param {string[]} pathArr
+ * @param {Function} getRowVal
+ * @param {Table} srcTbl
+ */
+const pathToState = (subview, relation, pathArr, getRowVal, srcTbl) => {
+    const subTbl = Table.findOne({ id: subview.table_id });
+    const pkName = subTbl.pk_name;
+    switch (relationTypeFromPath(subview, pathArr, srcTbl)) {
+        case "ChildList":
+            return pathArr.length === 1
+                ? {
+                    [pathArr[0].inboundKey]: getRowVal(pkName), // works for OneToOneShow as well
+                }
+                : {
+                    [`${pathArr[1].table}.${pathArr[1].inboundKey}.${pathArr[0].table}.${pathArr[0].inboundKey}`]: getRowVal(pkName),
+                };
+        case "ParentShow":
+            return { id: getRowVal(pathArr[0].fkey) };
+        case "Own":
+            return { [pkName]: getRowVal(pkName) };
+        case "Independent":
+            return {};
+        case "RelationPath":
+            return {
+                [relation]: getRowVal(pathArr[0].fkey ? pathArr[0].fkey : pkName) || "NULL",
+            };
+    }
+};
 module.exports = {
     field_picker_fields,
     picked_fields_to_query,
@@ -2249,5 +2314,7 @@ module.exports = {
     get_inbound_self_relation_opts,
     get_many_to_many_relation_opts,
     build_schema_data,
+    relationTypeFromPath,
+    pathToState,
 };
 //# sourceMappingURL=plugin-helper.js.map