@saltcorn/data 0.7.2-beta.3 → 0.7.2-beta.6

package/dist/models/trigger.js

@@ -169,6 +169,7 @@ class Trigger {
                         ...(payload || {}),
                     }));
             }
+            //intentionally omit await
             eventlog_1.default.create({
                 event_type: eventType,
                 channel,
@@ -190,6 +191,7 @@ class Trigger {
         for (const trigger of triggers) {
             trigger.run(row); // getTableTriggers ensures run is set
         }
+        //intentionally omit await
         eventlog_1.default.create({
             event_type: when_trigger,
             channel: table.name,

package/dist/models/trigger.js.map

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

package/dist/models/view.d.ts

@@ -105,6 +105,7 @@ declare class View {
     static update(v: any, id: number): Promise<void>;
     /**
      * @param {*} arg
+     * @param {boolean} remote
      * @returns {Promise<object>}
      */
     authorise_post(arg: {
@@ -114,6 +115,7 @@ declare class View {
     }, remote?: boolean): Promise<boolean>;
     /**
      * @param {*} arg
+     * @param {boolean} remote
      * @returns {Promise<object>}
      */
     authorise_get(arg: {
@@ -127,8 +129,9 @@ declare class View {
     getStringsForI18n(): string[];
     /**
      * Run (Execute) View
-     * @param query
-     * @param extraArgs
+     * @param {any} query
+     * @param  {RunExtra} extraArgs
+     * @param {boolean}  remote
      * @returns {Promise<*>}
      */
     run(query: any, extraArgs: RunExtra, remote?: boolean): Promise<any>;
@@ -141,12 +144,14 @@ declare class View {
      * @param {*} query
      * @param {*} req
      * @param {*} res
+     * @param {boolean} remote
      * @returns {Promise<object>}
      */
     run_possibly_on_page(query: any, req: any, res: any, remote?: boolean): Promise<string>;
     /**
      * @param {*} query
      * @param {*} extraArgs
+     * @param {boolean} remote
      * @throws {InvalidConfiguration}
      * @returns {Promise<object>}
      */
@@ -158,6 +163,7 @@ declare class View {
      * @param {*} query
      * @param {*} body
      * @param {*} extraArgs
+     * @param {boolean} remote
      * @returns {Promise<object>}
      */
     runPost(query: GenObj, body: GenObj, extraArgs: RunExtra, remote?: boolean): Promise<any>;
@@ -166,6 +172,7 @@ declare class View {
      * @param {*} body
      * @param {*} res
      * @param {*} extraArgs
+     * @param {boolean} remote
      * @returns {Promise<void>}
      */
     runRoute(route: string, body: any, res: NonNullable<any>, extraArgs: RunExtra, remote?: boolean): Promise<any>;

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

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

package/dist/models/view.js

@@ -7,7 +7,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -132,7 +136,7 @@ class View {
      * @returns {Promise<object[]>}
      */
     static async find_table_views_where(table, pred) {
-        var link_view_opts = [];
+        let link_view_opts = [];
         const link_views = await View.find(typeWithDefinedMember(table, "id")
             ? {
                 table_id: table.id,
@@ -172,7 +176,7 @@ class View {
      * @returns {Promise<object>}
      */
     static async find_all_views_where(pred) {
-        var link_view_opts = [];
+        let link_view_opts = [];
         const link_views = await View.find({}, { orderBy: "name", nocase: true });
         for (const viewrow of link_views) {
             // may fail if incomplete view
@@ -206,7 +210,7 @@ class View {
             delete v.is_public;
         }
         const { table, ...row } = v;
-        // insert view defintion into _sc_views
+        // insert view definition into _sc_views
         const id = await db_1.default.insert("_sc_views", row);
         // refresh views list cache
         await require("../db/state").getState().refresh_views();
@@ -275,6 +279,7 @@ class View {
     }
     /**
      * @param {*} arg
+     * @param {boolean} remote
      * @returns {Promise<object>}
      */
     async authorise_post(arg, remote = false) {
@@ -284,6 +289,7 @@ class View {
     }
     /**
      * @param {*} arg
+     * @param {boolean} remote
      * @returns {Promise<object>}
      */
     async authorise_get(arg, remote = false) {
@@ -301,8 +307,9 @@ class View {
     }
     /**
      * Run (Execute) View
-     * @param query
-     * @param extraArgs
+     * @param {any} query
+     * @param  {RunExtra} extraArgs
+     * @param {boolean}  remote
      * @returns {Promise<*>}
      */
     async run(query, extraArgs, remote = !isNode()) {
@@ -324,8 +331,8 @@ class View {
             const { getState } = require("../db/state");
             const base_url = getState().getConfig("base_url") || "http://10.0.2.2:3000"; //TODO default from req
             const queries = {};
-            const vtQueries = queryObj;
-            Object.entries(vtQueries).forEach(([k, v]) => {
+            //const vtQueries = queryObj;
+            Object.entries(queryObj).forEach(([k, v]) => {
                 queries[k] = async (...args) => {
                     const url = `${base_url}/api/viewQuery/${this.name}/${k}`;
                     const token = window.localStorage.getItem("auth_jwt");
@@ -356,6 +363,7 @@ class View {
      * @param {*} query
      * @param {*} req
      * @param {*} res
+     * @param {boolean} remote
      * @returns {Promise<object>}
      */
     async run_possibly_on_page(query, req, res, remote = false) {
@@ -365,19 +373,20 @@ class View {
             const Page = require("../models/page");
             const db_page = await Page.findOne({ name: view.default_render_page });
             if (db_page) {
-                const contents = await db_page.run(query, { res, req });
-                return contents;
+                // return contents
+                return await db_page.run(query, { res, req });
             }
         }
         const state = view.combine_state_and_default_state(query);
         const resp = await view.run(state, { res, req }, remote);
         const state_form = await view.get_state_form(state, req);
-        const contents = div(state_form ? renderForm(state_form, req.csrfToken()) : "", resp);
-        return contents;
+        // return contents
+        return div(state_form ? renderForm(state_form, req.csrfToken()) : "", resp);
     }
     /**
      * @param {*} query
      * @param {*} extraArgs
+     * @param {boolean} remote
      * @throws {InvalidConfiguration}
      * @returns {Promise<object>}
      */
@@ -416,6 +425,7 @@ class View {
      * @param {*} query
      * @param {*} body
      * @param {*} extraArgs
+     * @param {boolean} remote
      * @returns {Promise<object>}
      */
     async runPost(query, body, extraArgs, remote = !isNode()) {
@@ -426,13 +436,14 @@ class View {
         this.check_viewtemplate();
         if (!this.viewtemplateObj.runPost)
             throw new InvalidConfiguration(`Unable to call runPost, ${this.viewtemplate} is missing 'runPost'.`);
-        return await this.viewtemplateObj.runPost(this.table_id, this.name, this.configuration, removeEmptyStrings(query), removeEmptyStrings(body), extraArgs, this.queries(remote, extraArgs.req));
+        return await this.viewtemplateObj.runPost(this.table_id, this.name, this.configuration, removeEmptyStrings(query), removeEmptyStrings(body), extraArgs, this.queries(remote, extraArgs.req), remote);
     }
     /**
      * @param {*} route
      * @param {*} body
      * @param {*} res
      * @param {*} extraArgs
+     * @param {boolean} remote
      * @returns {Promise<void>}
      */
     async runRoute(route, body, res, extraArgs, remote = false) {

package/dist/models/view.js.map

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

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@saltcorn/data",
-    "version": "0.7.2-beta.2",
+    "version": "0.7.2-beta.5",
     "description": "Data models for Saltcorn, open-source no-code platform",
     "homepage": "https://saltcorn.com",
     "scripts": {
@@ -36,14 +36,14 @@
         "dist/**/*"
     ],
     "optionalDependencies": {
-        "@saltcorn/postgres": "0.7.2-beta.2",
-        "@saltcorn/sqlite": "0.7.2-beta.2"
+        "@saltcorn/postgres": "0.7.2-beta.5",
+        "@saltcorn/sqlite": "0.7.2-beta.5"
     },
     "dependencies": {
-        "@saltcorn/types": "0.7.2-beta.2",
-        "@saltcorn/markup": "0.7.2-beta.2",
-        "@saltcorn/db-common": "0.7.2-beta.2",
-        "@saltcorn/sqlite-mobile": "0.7.2-beta.0",
+        "@saltcorn/types": "0.7.2-beta.5",
+        "@saltcorn/markup": "0.7.2-beta.5",
+        "@saltcorn/db-common": "0.7.2-beta.5",
+        "@saltcorn/sqlite-mobile": "0.7.2-beta.5",
         "acorn": "^8.0.3",
         "astring": "^1.4.3",
         "axios": "^0.26.1",

package/dist/plugin-helper.d.ts

@@ -108,7 +108,7 @@ export function stateToQueryString(state?: object | undefined): string;
  * @param {string} [link_textcol]
  * @returns {button|a}
  */
-export function link_view(url0: any, label: string, popup?: boolean | undefined, link_style?: string | undefined, link_size?: string | undefined, link_icon?: string | undefined, textStyle?: string | undefined, link_bgcol?: string | undefined, link_bordercol?: string | undefined, link_textcol?: string | undefined, extraClass: any, extraState: any): button | a;
+export function link_view(url0: any, label: string, popup?: boolean | undefined, link_style?: string | undefined, link_size?: string | undefined, link_icon?: string | undefined, textStyle?: string | undefined, link_bgcol?: string | undefined, link_bordercol?: string | undefined, link_textcol?: string | undefined, extraClass: any, extraState: any, link_target_blank: any): button | a;
 /**
  * Get Action configuration fields
  * @param {object} action
@@ -144,6 +144,7 @@ export function run_action_column({ col, req, ...rest }: object): Promise<any>;
  * @returns {object}
  */
 export function json_list_to_external_table(get_json_list: Function, fields0: object[]): object;
+export function add_free_variables_to_joinfields(freeVars: any, joinFields: any, fields: any): void;
 import Table = require("./models/table");
 import Field = require("./models/field");
 //# 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":"AA+TA;;;;;;GAMG;AACH,8DALW,KAAK,GAAC,MAAM,GAGV,QAAQ,MAAM,EAAE,CAAC,CAib7B;AA8FD;;;;;;;GAOG;AACH,gDALW,MAAM,EAAE,UACR,KAAK,EAAE,gBAEL,MAAM,CA8IlB;AAhPD;;;;;;GAMG;AACH,uCAJW,KAAK,GAAC,MAAM,YACZ,MAAM,sBACJ,QAAQ,MAAM,EAAE,CAAC,CAiC7B;AAED;;;;;;GAMG;AACH,wCAJW,KAAK,GAAC,MAAM,YACZ,MAAM,GACJ,QAAQ,MAAM,EAAE,CAAC,CAoB7B;AA6ND;;;;;;;GAOG;AACH;IALyB,MAAM,EAApB,KAAK,EAAE;IACM,KAAK,EAAlB,MAAM;IACS,WAAW;IACxB,MAAM,CA0HlB;AA5KD;;;;;;GAMG;AACH,8DALW,MAAM,GAGJ,MAAM,CAyBlB;AAgJD;;;;;GAKG;AACH,iEAqGG;AAzpCH;;;;;GAKG;AACH,2CAJW,KAAK,EAAE,cAEL,MAAM,CAuFlB;AAwCD;;;;;;GAMG;AACH,0CALW,KAAK,GAAC,MAAM,YACZ,MAAM,GAEJ,QAAQ,MAAM,EAAE,CAAC,CAiE7B;AA49BD;;;;;GAKG;AACH,iCAJW,MAAM,UACN,MAAM,EAAE,aACN,MAAM,CAwBlB;AAED;;;;;GAKG;AACH,uCAJW,MAAM,UACN,MAAM,EAAE,GACN,OAAO,MAAE,CA4BrB;AAtvCD;;;;GAIG;AACH,gEAFa,MAAM,CAclB;AArFD;;;;;;;;;;;;;GAaG;AACH,4CAXW,MAAM,4SASJ,UAAQ,CAsDpB;AAgOD;;;;;GAKG;AACH,8CAJW,MAAM,SACN,MAAM,GACJ,QAAQ,MAAM,EAAE,CAAC,CAKC;AAvH/B;;;;;GAKG;AACH,0CAJW,KAAK,EAAE,mCAEL,QAAQ,MAAM,CAAC,CAgC3B;AA0hCD;;;;GAIG;AACH,kCAHW,MAAM,GACJ,MAAM,GAAC,SAAS,CAK5B;AA0ID;;;;;;GAMG;AACH,yDALW,MAAM,GAGJ,YAAU,CAiBtB;AA/FD;;;;;GAKG;AACH,8EAHW,MAAM,EAAE,GACN,MAAM,CAmElB"}
+{"version":3,"file":"plugin-helper.d.ts","sourceRoot":"","sources":["../plugin-helper.js"],"names":[],"mappings":"AAiUA;;;;;;GAMG;AACH,8DALW,KAAK,GAAC,MAAM,GAGV,QAAQ,MAAM,EAAE,CAAC,CAib7B;AA8FD;;;;;;;GAOG;AACH,gDALW,MAAM,EAAE,UACR,KAAK,EAAE,gBAEL,MAAM,CA+GlB;AAjND;;;;;;GAMG;AACH,uCAJW,KAAK,GAAC,MAAM,YACZ,MAAM,sBACJ,QAAQ,MAAM,EAAE,CAAC,CAiC7B;AAED;;;;;;GAMG;AACH,wCAJW,KAAK,GAAC,MAAM,YACZ,MAAM,GACJ,QAAQ,MAAM,EAAE,CAAC,CAoB7B;AAkOD;;;;;;;GAOG;AACH;IALyB,MAAM,EAApB,KAAK,EAAE;IACM,KAAK,EAAlB,MAAM;IACS,WAAW;IACxB,MAAM,CAiJlB;AAnMD;;;;;;GAMG;AACH,8DALW,MAAM,GAGJ,MAAM,CAyBlB;AAuKD;;;;;GAKG;AACH,iEAqGG;AArrCH;;;;;GAKG;AACH,2CAJW,KAAK,EAAE,cAEL,MAAM,CAuFlB;AAwCD;;;;;;GAMG;AACH,0CALW,KAAK,GAAC,MAAM,YACZ,MAAM,GAEJ,QAAQ,MAAM,EAAE,CAAC,CAiE7B;AAw/BD;;;;;GAKG;AACH,iCAJW,MAAM,UACN,MAAM,EAAE,aACN,MAAM,CAwBlB;AAED;;;;;GAKG;AACH,uCAJW,MAAM,UACN,MAAM,EAAE,GACN,OAAO,MAAE,CA4BrB;AAlxCD;;;;GAIG;AACH,gEAFa,MAAM,CAclB;AAvFD;;;;;;;;;;;;;GAaG;AACH,4CAXW,MAAM,oUASJ,UAAQ,CAwDpB;AAgOD;;;;;GAKG;AACH,8CAJW,MAAM,SACN,MAAM,GACJ,QAAQ,MAAM,EAAE,CAAC,CAKC;AAvH/B;;;;;GAKG;AACH,0CAJW,KAAK,EAAE,mCAEL,QAAQ,MAAM,CAAC,CAgC3B;AAsjCD;;;;GAIG;AACH,kCAHW,MAAM,GACJ,MAAM,GAAC,SAAS,CAK5B;AA0ID;;;;;;GAMG;AACH,yDALW,MAAM,GAGJ,YAAU,CAiBtB;AA/FD;;;;;GAKG;AACH,8EAHW,MAAM,EAAE,GACN,MAAM,CAmElB;AAteD,oGAkCC"}

package/dist/plugin-helper.js

@@ -30,7 +30,7 @@ const { isNode } = require("./utils");
  * @param {string} [link_textcol]
  * @returns {button|a}
  */
-const link_view = (url0, label, popup, link_style = "", link_size = "", link_icon = "", textStyle = "", link_bgcol, link_bordercol, link_textcol, extraClass, extraState) => {
+const link_view = (url0, label, popup, link_style = "", link_size = "", link_icon = "", textStyle = "", link_bgcol, link_bordercol, link_textcol, extraClass, extraState, link_target_blank) => {
     let style = link_style === "btn btn-custom-color"
         ? `background-color: ${link_bgcol || "#000000"};border-color: ${link_bordercol || "#000000"}; color: ${link_textcol || "#000000"}`
         : null;
@@ -60,6 +60,7 @@ const link_view = (url0, label, popup, link_style = "", link_size = "", link_ico
             href: url,
             class: [textStyle, link_style, link_size, extraClass],
             style,
+            target: link_target_blank ? "_blank" : undefined,
         }, link_icon ? i({ class: link_icon }) + " " : "", text(label));
 };
 /**
@@ -626,7 +627,7 @@ const field_picker_fields = async ({ table, viewname, req }) => {
             label: __("Open in new tab"),
             type: "Bool",
             required: false,
-            showIf: { type: "Link" },
+            showIf: { type: ["ViewLink", "Link"] },
         },
         {
             name: "in_modal",
@@ -785,7 +786,6 @@ const picked_fields_to_query = (columns, fields, layout) => {
     var joinFields = {};
     var aggregations = {};
     let freeVars = new Set(); // for join fields
-    const joinFieldNames = new Set(fields.filter((f) => f.is_fkey).map((f) => f.name));
     (columns || []).forEach((column) => {
         if (column.type === "JoinField") {
             if (column.join_field && column.join_field.split) {
@@ -891,9 +891,14 @@ const picked_fields_to_query = (columns, fields, layout) => {
             },
         });
     }
+    add_free_variables_to_joinfields(freeVars, joinFields, fields);
+    return { joinFields, aggregations };
+};
+const add_free_variables_to_joinfields = (freeVars, joinFields, fields) => {
+    const joinFieldNames = new Set(fields.filter((f) => f.is_fkey).map((f) => f.name));
     [...freeVars]
         .filter((v) => v.includes("."))
-        .map((v) => {
+        .forEach((v) => {
         const kpath = v.split(".");
         if (joinFieldNames.has(kpath[0]))
             if (kpath.length === 2) {
@@ -923,7 +928,6 @@ const picked_fields_to_query = (columns, fields, layout) => {
                 };
             }
     });
-    return { joinFields, aggregations };
 };
 /**
  * @function
@@ -981,7 +985,7 @@ const addOrCreateList = (container, key, x) => {
  */
 const stateFieldsToWhere = ({ fields, state, approximate = true }) => {
     var qstate = {};
-    Object.entries(state).forEach(([k, v]) => {
+    Object.entries(state || {}).forEach(([k, v]) => {
         if (k === "_fts") {
             qstate[k] = {
                 searchTerm: v.replace(/\0/g, ""),
@@ -1027,14 +1031,39 @@ const stateFieldsToWhere = ({ fields, state, approximate = true }) => {
         else if (field && field.type.name === "Bool" && state[k] === "?") {
             // omit
         }
-        else if (typeof v === "object" &&
-            Object.keys(v).length === 1 &&
-            field?.type?.name === "JSON") {
+        else if (typeof v === "object" && v && field?.type?.name === "JSON") {
+            let json = {};
+            if (Object.values(v).length === 1 && Object.values(v)[0] === "")
+                return;
+            Object.entries(v).forEach(([kj, vj]) => {
+                if (vj === "")
+                    return;
+                if (kj.endsWith("__lte")) {
+                    json[kj.replace("__lte", "")] = {
+                        lte: +vj,
+                        ...(json[kj.replace("__lte", "")] || {}),
+                    };
+                }
+                else if (kj.endsWith("__gte")) {
+                    json[kj.replace("__gte", "")] = {
+                        gte: +vj,
+                        ...(json[kj.replace("__gte", "")] || {}),
+                    };
+                }
+                else {
+                    json[kj] = vj;
+                    if (field.attributes?.hasSchema) {
+                        const s = field.attributes.schema.find((f) => f.key === Object.keys(v)[0]);
+                        if (s?.type === "String") {
+                            json[kj] = { ilike: vj };
+                        }
+                    }
+                }
+            });
             qstate[k] = [
                 ...(qstate[k] ? [qstate[k]] : []),
                 {
-                    // where jFieldNm in (select id from jtnm where lblField=v)
-                    json: [Object.keys(v)[0], Object.values(v)[0]],
+                    json,
                 },
             ];
         }
@@ -1386,5 +1415,6 @@ module.exports = {
     strictParseInt,
     run_action_column,
     json_list_to_external_table,
+    add_free_variables_to_joinfields,
 };
 //# sourceMappingURL=plugin-helper.js.map