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

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

@@ -256,79 +256,17 @@ export const types: ({
     fieldviews: {
         show: {
             isEdit: boolean;
-            run: (v: any) => any;
-        };
-        checkboxes: {
-            isEdit: boolean;
-            run: (v: any) => any;
-        };
-        TrueFalse: {
-            isEdit: boolean;
-            run: (v: any) => "" | "True" | "False";
+            run: (s: any) => any;
         };
         edit: {
             isEdit: boolean;
-            run: (nm: any, v: any, attrs: any, cls: any, required: any, field: any) => any;
-        };
-        tristate: {
-            isEdit: boolean;
+            blockDisplay: boolean;
             run: (nm: any, v: any, attrs: any, cls: any, required: any, field: any) => any;
         };
     };
     attributes: object[];
-    readFromFormRecord: (rec: any, name: string) => boolean | null;
-    read: (v: object) => boolean | null;
-    readFromDB: (v: object) => object;
-    listAs: (v: object) => object;
+    read: (v: object) => object;
     validate: () => boolean;
-} | {
-    name: string;
-    sql_name: string;
-    contract: () => Function;
-    attributes: object[];
-    fieldviews: {
-        show: {
-            isEdit: boolean;
-            run: (d: any, req: any) => any;
-        };
-        showDay: {
-            isEdit: boolean;
-            run: (d: any, req: any) => any;
-        };
-        format: {
-            isEdit: boolean;
-            configFields: {
-                name: string;
-                label: string;
-                type: string;
-                sublabel: string;
-            }[];
-            run: (d: any, req: any, options: any) => string;
-        };
-        relative: {
-            isEdit: boolean;
-            run: (d: any, req: any) => string;
-        };
-        yearsAgo: {
-            isEdit: boolean;
-            run: (d: any, req: any) => string;
-        };
-        edit: {
-            isEdit: boolean;
-            blockDisplay: boolean;
-            run: (nm: any, v: any, attrs: any, cls: any, required: any, field: any) => any;
-        };
-        editDay: {
-            isEdit: boolean;
-            blockDisplay: boolean;
-            run: (nm: any, v: any, attrs: any, cls: any, required: any, field: any) => any;
-        };
-    };
-    presets: {
-        Now: () => Date;
-    };
-    read: (v: object, attrs: object) => object;
-    validate: ({}: object) => boolean;
 } | {
     name: string;
     sql_name: string;
@@ -402,22 +340,114 @@ export const types: ({
     name: string;
     sql_name: string;
     contract: () => Function;
+    attributes: object[];
     fieldviews: {
         show: {
             isEdit: boolean;
-            run: (s: any) => any;
+            run: (d: any, req: any) => any;
+        };
+        showDay: {
+            isEdit: boolean;
+            run: (d: any, req: any) => any;
+        };
+        format: {
+            isEdit: boolean;
+            configFields: {
+                name: string;
+                label: string;
+                type: string;
+                sublabel: string;
+            }[];
+            run: (d: any, req: any, options: any) => string;
+        };
+        relative: {
+            isEdit: boolean;
+            run: (d: any, req: any) => string;
+        };
+        yearsAgo: {
+            isEdit: boolean;
+            run: (d: any, req: any) => string;
         };
         edit: {
             isEdit: boolean;
             blockDisplay: boolean;
             run: (nm: any, v: any, attrs: any, cls: any, required: any, field: any) => any;
         };
+        editDay: {
+            isEdit: boolean;
+            blockDisplay: boolean;
+            run: (nm: any, v: any, attrs: any, cls: any, required: any, field: any) => any;
+        };
+    };
+    presets: {
+        Now: () => Date;
+    };
+    read: (v: object, attrs: object) => object;
+    validate: ({}: object) => boolean;
+} | {
+    name: string;
+    sql_name: string;
+    contract: () => Function;
+    fieldviews: {
+        show: {
+            isEdit: boolean;
+            run: (v: any) => any;
+        };
+        checkboxes: {
+            isEdit: boolean;
+            run: (v: any) => any;
+        };
+        TrueFalse: {
+            isEdit: boolean;
+            run: (v: any) => "" | "True" | "False";
+        };
+        edit: {
+            isEdit: boolean;
+            run: (nm: any, v: any, attrs: any, cls: any, required: any, field: any) => any;
+        };
+        tristate: {
+            isEdit: boolean;
+            run: (nm: any, v: any, attrs: any, cls: any, required: any, field: any) => any;
+        };
     };
     attributes: object[];
-    read: (v: object) => object;
+    readFromFormRecord: (rec: any, name: string) => boolean | null;
+    read: (v: object) => boolean | null;
+    readFromDB: (v: object) => object;
+    listAs: (v: object) => object;
     validate: () => boolean;
 })[];
 export const viewtemplates: ({
+    name: string;
+    description: string;
+    configuration_workflow: (req: object) => import("../models/workflow");
+    run: (table_id: string, viewname: string, { list_view, show_view, list_width, subtables }: {
+        list_view: string;
+        show_view: string;
+        subtables: object;
+    }, state: any, extraArgs: any, { getRowQuery }: {
+        getRowQuery: any;
+    }) => Promise<div>;
+    get_state_fields: (table_id: any, viewname: any, { list_view, show_view }: {
+        list_view: string;
+        show_view: any;
+    }) => Promise<object[]>;
+    display_state_form: ({ list_view, _omit_state_form }: {
+        list_view: string;
+        _omit_state_form: boolean;
+    }) => boolean;
+    queries: ({ table_id, viewname, configuration: { columns, default_state }, req, }: {
+        table_id: any;
+        viewname: any;
+        configuration: {
+            columns: any;
+            default_state: any;
+        };
+        req: any;
+    }) => {
+        getRowQuery(uniques: any): Promise<import("@saltcorn/db-common/internal").Row | null>;
+    };
+} | {
     name: string;
     description: string;
     configuration_workflow: (req: object) => import("../models/workflow");
@@ -472,92 +502,6 @@ export const viewtemplates: ({
         getRowQuery(id: any): Promise<import("@saltcorn/db-common/internal").Row | null>;
     };
     configCheck: (view: any) => Promise<string[]>;
-} | {
-    name: string;
-    description: string;
-    configuration_workflow: (req: object) => import("../models/workflow");
-    run: (table_id: number, viewname: string, {}: {
-        columns: any;
-        layout: any;
-    }, state: string, { res, req }: {
-        req: object;
-        res: object;
-    }, { editQuery }: {
-        editQuery: any;
-    }) => Promise<import("../models/form")>;
-    runMany: (table_id: number, viewname: string, { columns, layout, auto_save }: {
-        columns: any;
-        layout: any;
-    }, state: State, extra: object, { editManyQuery, getRowQuery }: {
-        editManyQuery: any;
-        getRowQuery: any;
-    }) => Promise<import("../models/form")[]>;
-    runPost: (table_id: number, viewname: string, { columns, layout, fixed, view_when_done, formula_destinations, auto_save, destination_type, }: {
-        columns: object[];
-        layout: Layout;
-        fixed: object;
-        view_when_done: boolean;
-        formula_destinations: object[];
-    }, state: object, body: any, { res, req, redirect }: {
-        res: object;
-        req: object;
-        redirect: string;
-    }, { tryInsertQuery, tryUpdateQuery, getRowQuery }: {
-        tryInsertQuery: any;
-        tryUpdateQuery: any;
-        getRowQuery: any;
-    }) => Promise<void>;
-    get_state_fields: (table_id: any, viewname: any, { columns }: {
-        columns: any;
-    }) => Promise<object[]>;
-    initial_config: Function;
-    display_state_form: boolean;
-    authorise_post: ({ body, table_id, req }: {
-        body: object;
-        table_id: string;
-        req: object;
-    }, { authorizePostQuery }: {
-        authorizePostQuery: any;
-    }) => Promise<boolean>;
-    authorise_get: ({ query, table_id, req }: {
-        query: object;
-        rest: any;
-    }, { authorizeGetQuery }: {
-        authorizeGetQuery: any;
-    }) => Promise<boolean>;
-    getStringsForI18n({ layout }: {
-        layout: Layout;
-    }): string[];
-    queries: ({ table_id, name, configuration: { columns, default_state, layout, auto_save, destination_type, }, req, res, }: {
-        table_id: any;
-        name: any;
-        configuration: {
-            columns: any;
-            default_state: any;
-            layout: any;
-            auto_save: any;
-            destination_type: any;
-        };
-        req: any;
-        res: any;
-    }) => {
-        editQuery(state: any): Promise<import("../models/form")>;
-        editManyQuery(state: any): Promise<{
-            table: import("../models/table") | null;
-            fields: import("../models/field")[];
-            rows: import("@saltcorn/db-common/internal").Row[];
-        }>;
-        tryInsertQuery(row: any): Promise<{
-            error: string;
-        } | {
-            success: any;
-        }>;
-        tryUpdateQuery(row: any, id: any): Promise<import("@saltcorn/types/common_types").ResultMessage>;
-        authorizePostQuery(body: any, table_id: any): Promise<boolean | "" | null | undefined>;
-        authorizeGetQuery(query: any, table_id: any): Promise<boolean | "" | null | undefined>;
-        getRowQuery(table_id: any, view_select: any, row_id: any): Promise<import("@saltcorn/db-common/internal").Row[]>;
-    };
-    configCheck: (view: any) => Promise<string[]>;
 } | {
     name: string;
     description: string;
@@ -601,7 +545,7 @@ export const viewtemplates: ({
         query: any;
         table_id: any;
     }) => Promise<any>;
-    queries: ({ table_id, viewname, configuration: { columns, layout }, req }: {
+    queries: ({ table_id, viewname, configuration: { columns, layout }, req, }: {
         table_id: any;
         viewname: any;
         configuration: {
@@ -630,36 +574,6 @@ export const viewtemplates: ({
         authorizeGetQuery(query: any, table_id: any): Promise<boolean>;
     };
     configCheck: (view: any) => Promise<string[]>;
-} | {
-    name: string;
-    description: string;
-    configuration_workflow: (req: object) => import("../models/workflow");
-    run: (table_id: string, viewname: string, { list_view, show_view, list_width, subtables }: {
-        list_view: string;
-        show_view: string;
-        subtables: object;
-    }, state: any, extraArgs: any, { getRowQuery }: {
-        getRowQuery: any;
-    }) => Promise<div>;
-    get_state_fields: (table_id: any, viewname: any, { list_view, show_view }: {
-        list_view: string;
-        show_view: any;
-    }) => Promise<object[]>;
-    display_state_form: ({ list_view, _omit_state_form }: {
-        list_view: string;
-        _omit_state_form: boolean;
-    }) => boolean;
-    queries: ({ table_id, viewname, configuration: { columns, default_state }, req, }: {
-        table_id: any;
-        viewname: any;
-        configuration: {
-            columns: any;
-            default_state: any;
-        };
-        req: any;
-    }) => {
-        getRowQuery(uniques: any): Promise<import("@saltcorn/db-common/internal").Row | null>;
-    };
 } | {
     name: string;
     description: string;
@@ -699,36 +613,6 @@ export const viewtemplates: ({
     }) => {
         countRowsQuery(state: any): Promise<number>;
     };
-} | {
-    name: string;
-    description: string;
-    get_state_fields: () => object[];
-    configuration_workflow: () => import("../models/workflow");
-    run: (table_id: number, viewname: string, { columns, layout }: {
-        columns: object[];
-        layout: object;
-    }, state: object, extra: object, { distinctValuesQuery }: {
-        distinctValuesQuery: any;
-    }) => Promise<Layout>;
-    initial_config: () => Promise<object>;
-    display_state_form: boolean;
-    getStringsForI18n({ layout }: {
-        layout: any;
-    }): string[];
-    queries: ({ table_id, viewname, configuration: { columns, default_state }, req, }: {
-        table_id: any;
-        viewname: any;
-        configuration: {
-            columns: any;
-            default_state: any;
-        };
-        req: any;
-    }) => {
-        distinctValuesQuery(): Promise<{
-            distinct_values: {};
-            role: any;
-        }>;
-    };
 } | {
     name: string;
     description: string;
@@ -820,6 +704,122 @@ export const viewtemplates: ({
         }>;
         fetchOlderMsgQuery(participant_field: any, body: any): Promise<import("@saltcorn/db-common/internal").Row | null>;
     };
+} | {
+    name: string;
+    description: string;
+    configuration_workflow: (req: object) => import("../models/workflow");
+    run: (table_id: number, viewname: string, {}: {
+        columns: any;
+        layout: any;
+    }, state: string, { res, req }: {
+        req: object;
+        res: object;
+    }, { editQuery }: {
+        editQuery: any;
+    }) => Promise<import("../models/form")>;
+    runMany: (table_id: number, viewname: string, { columns, layout, auto_save }: {
+        columns: any;
+        layout: any;
+    }, state: State, extra: object, { editManyQuery, getRowQuery }: {
+        editManyQuery: any;
+        getRowQuery: any;
+    }) => Promise<import("../models/form")[]>;
+    runPost: (table_id: number, viewname: string, { columns, layout, fixed, view_when_done, formula_destinations, auto_save, destination_type, }: {
+        columns: object[];
+        layout: Layout;
+        fixed: object;
+        view_when_done: boolean;
+        formula_destinations: object[];
+    }, state: object, body: any, { res, req, redirect }: {
+        res: object;
+        req: object;
+        redirect: string;
+    }, { tryInsertQuery, tryUpdateQuery, getRowQuery }: {
+        tryInsertQuery: any;
+        tryUpdateQuery: any;
+        getRowQuery: any;
+    }, remote: any) => Promise<void>;
+    get_state_fields: (table_id: any, viewname: any, { columns }: {
+        columns: any;
+    }) => Promise<object[]>;
+    initial_config: Function;
+    display_state_form: boolean;
+    authorise_post: ({ body, table_id, req }: {
+        body: object;
+        table_id: string;
+        req: object;
+    }, { authorizePostQuery }: {
+        authorizePostQuery: any;
+    }) => Promise<boolean>;
+    authorise_get: ({ query, table_id, req }: {
+        query: object;
+        rest: any;
+    }, { authorizeGetQuery }: {
+        authorizeGetQuery: any;
+    }) => Promise<boolean>;
+    getStringsForI18n({ layout }: {
+        layout: Layout;
+    }): string[];
+    queries: ({ table_id, name, configuration: { columns, default_state, layout, auto_save, destination_type, }, req, res, }: {
+        table_id: any;
+        name: any;
+        configuration: {
+            columns: any;
+            default_state: any;
+            layout: any;
+            auto_save: any;
+            destination_type: any;
+        };
+        req: any;
+        res: any;
+    }) => {
+        editQuery(state: any): Promise<import("../models/form")>;
+        editManyQuery(state: any): Promise<{
+            table: import("../models/table") | null;
+            fields: import("../models/field")[];
+            rows: import("@saltcorn/db-common/internal").Row[];
+        }>;
+        tryInsertQuery(row: any): Promise<{
+            error: string;
+        } | {
+            success: any;
+        }>;
+        tryUpdateQuery(row: any, id: any): Promise<import("@saltcorn/types/common_types").ResultMessage>;
+        authorizePostQuery(body: any, table_id: any): Promise<boolean | "" | null | undefined>;
+        authorizeGetQuery(query: any, table_id: any): Promise<boolean | "" | null | undefined>;
+        getRowQuery(table_id: any, view_select: any, row_id: any): Promise<import("@saltcorn/db-common/internal").Row[]>;
+    };
+    configCheck: (view: any) => Promise<string[]>;
+} | {
+    name: string;
+    description: string;
+    get_state_fields: () => object[];
+    configuration_workflow: () => import("../models/workflow");
+    run: (table_id: number, viewname: string, { columns, layout }: {
+        columns: object[];
+        layout: object;
+    }, state: object, extra: object, { distinctValuesQuery }: {
+        distinctValuesQuery: any;
+    }) => Promise<Layout>;
+    initial_config: () => Promise<object>;
+    display_state_form: boolean;
+    getStringsForI18n({ layout }: {
+        layout: any;
+    }): string[];
+    queries: ({ table_id, viewname, configuration: { columns, default_state }, req, }: {
+        table_id: any;
+        viewname: any;
+        configuration: {
+            columns: any;
+            default_state: any;
+        };
+        req: any;
+    }) => {
+        distinctValuesQuery(): Promise<{
+            distinct_values: {};
+            role: any;
+        }>;
+    };
 })[];
 import fileviews = require("./fileviews");
 import actions = require("./actions");

package/dist/base-plugin/viewtemplates/edit.d.ts

@@ -72,7 +72,7 @@ export function runPost(table_id: number, viewname: string, { columns, layout, f
     tryInsertQuery: any;
     tryUpdateQuery: any;
     getRowQuery: any;
-}): Promise<void>;
+}, remote: any): Promise<void>;
 /**
  * @param {*} table_id
  * @param {*} viewname

package/dist/base-plugin/viewtemplates/edit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edit.d.ts","sourceRoot":"","sources":["../../../base-plugin/viewtemplates/edit.js"],"names":[],"mappings":"AAkDA;;;GAGG;AACH,4CAHW,MAAM,GACJ,QAAQ,CA6PjB;AAgCJ;;;;;;;;;;;GAWG;AACH,8BAXW,MAAM,YACN,MAAM;IAEK,OAAO;IACP,MAAM;UACjB,MAAM;IAEU,GAAG,EAAnB,MAAM;IACU,GAAG,EAAnB,MAAM;;;IACJ,QAAQ,IAAI,CAAC,CAWzB;AAED;;;;;;;;;GASG;AACH,kCATW,MAAM,YACN,MAAM;IAEE,OAAO;IACP,MAAM;wBAEd,MAAM;;;IACJ,QAAQ,IAAI,EAAE,CAAC,CA2B3B;AA+LD;;;;;;;;;;;;;;;;GAgBG;AACH,kCAhBW,MAAM,YACN,MAAM;IAEY,OAAO,EAAzB,MAAM,EAAE;IACQ,MAAM;IACN,KAAK,EAArB,MAAM;IACW,cAAc,EAA/B,OAAO;IACW,oBAAoB,EAAtC,MAAM,EAAE;UACR,MAAM;IAGU,GAAG,EAAnB,MAAM;IACU,GAAG,EAAnB,MAAM;IACU,QAAQ,EAAxB,MAAM;;;;;IACJ,QAAQ,IAAI,CAAC,CAyLzB;AA/dD;;;;;;GAMG;AACH;IAHmB,OAAO;IACb,QAAQ,MAAM,EAAE,CAAC,CAQ7B;AAcD,uBAAuB;AACvB,sCAAuD;AA0dvD;;;;;;GAMG;AACH;IALwB,IAAI,EAAjB,MAAM;IACO,QAAQ,EAArB,MAAM;IACO,GAAG,EAAhB,MAAM;;;IACJ,QAAQ,OAAO,CAAC,CAO5B;;;;;2BAEY,MAAM;kCAEN,MAAM;yCAQN,OAAO;AASH;;;;;qBAEd;AACD;;;;GAIG;AACH;;aAEC;AAPD;;;;GAIG;AACH;;aAEC;AACQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2GP;AACW,kEAyBZ"}
+{"version":3,"file":"edit.d.ts","sourceRoot":"","sources":["../../../base-plugin/viewtemplates/edit.js"],"names":[],"mappings":"AAkDA;;;GAGG;AACH,4CAHW,MAAM,GACJ,QAAQ,CA6PjB;AAgCJ;;;;;;;;;;;GAWG;AACH,8BAXW,MAAM,YACN,MAAM;IAEK,OAAO;IACP,MAAM;UACjB,MAAM;IAEU,GAAG,EAAnB,MAAM;IACU,GAAG,EAAnB,MAAM;;;IACJ,QAAQ,IAAI,CAAC,CAWzB;AAED;;;;;;;;;GASG;AACH,kCATW,MAAM,YACN,MAAM;IAEE,OAAO;IACP,MAAM;wBAEd,MAAM;;;IACJ,QAAQ,IAAI,EAAE,CAAC,CA2B3B;AA+LD;;;;;;;;;;;;;;;;GAgBG;AACH,kCAhBW,MAAM,YACN,MAAM;IAEY,OAAO,EAAzB,MAAM,EAAE;IACQ,MAAM;IACN,KAAK,EAArB,MAAM;IACW,cAAc,EAA/B,OAAO;IACW,oBAAoB,EAAtC,MAAM,EAAE;UACR,MAAM;IAGU,GAAG,EAAnB,MAAM;IACU,GAAG,EAAnB,MAAM;IACU,QAAQ,EAAxB,MAAM;;;;;iBACJ,QAAQ,IAAI,CAAC,CAwMzB;AA9eD;;;;;;GAMG;AACH;IAHmB,OAAO;IACb,QAAQ,MAAM,EAAE,CAAC,CAQ7B;AAcD,uBAAuB;AACvB,sCAAuD;AAyevD;;;;;;GAMG;AACH;IALwB,IAAI,EAAjB,MAAM;IACO,QAAQ,EAArB,MAAM;IACO,GAAG,EAAhB,MAAM;;;IACJ,QAAQ,OAAO,CAAC,CAO5B;;;;;2BAEY,MAAM;kCAEN,MAAM;yCAQN,OAAO;AASH;;;;;qBAEd;AACD;;;;GAIG;AACH;;aAEC;AAPD;;;;GAIG;AACH;;aAEC;AACQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2GP;AACW,kEAyBZ"}

package/dist/base-plugin/viewtemplates/edit.js

@@ -295,7 +295,7 @@ const run = async (table_id, viewname, {}, state, { res, req }, { editQuery }) =
  * @returns {Promise<Form[]>}
  */
 const runMany = async (table_id, viewname, { columns, layout, auto_save }, state, extra, { editManyQuery, getRowQuery }) => {
-    const { table, fields, rows } = editManyQuery();
+    const { table, fields, rows } = await editManyQuery();
     return await asyncMap(rows, async (row) => {
         const html = await render({
             table,
@@ -480,7 +480,7 @@ const render = async ({ table, fields, viewname, columns, layout, row, req, stat
  * @param {string} optsTwo.redirect
  * @returns {Promise<void>}
  */
-const runPost = async (table_id, viewname, { columns, layout, fixed, view_when_done, formula_destinations, auto_save, destination_type, }, state, body, { res, req, redirect }, { tryInsertQuery, tryUpdateQuery, getRowQuery }) => {
+const runPost = async (table_id, viewname, { columns, layout, fixed, view_when_done, formula_destinations, auto_save, destination_type, }, state, body, { res, req, redirect }, { tryInsertQuery, tryUpdateQuery, getRowQuery }, remote) => {
     const table = await Table.findOne({ id: table_id });
     const fields = await table.getFields();
     const form = await getForm(table, viewname, columns, layout, body.id, req);
@@ -527,7 +527,14 @@ const runPost = async (table_id, viewname, { columns, layout, fixed, view_when_d
         const file_fields = form.fields.filter((f) => f.type === "File");
         for (const field of file_fields) {
             if (req.files && req.files[field.name]) {
-                const file = await File.from_req_files(req.files[field.name], req.user ? req.user.id : null, (field.attributes && +field.attributes.min_role_read) || 1);
+                if (!isNode() && !remote) {
+                    req.flash("error", "The mobile-app supports no local files, please use a remote table.");
+                    res.sendWrap(viewname, renderForm(form, req.csrfToken ? req.csrfToken() : false));
+                    return;
+                }
+                const file = isNode()
+                    ? await File.from_req_files(req.files[field.name], req.user ? req.user.id : null, (field.attributes && +field.attributes.min_role_read) || 1)
+                    : await File.upload(req.files[field.name]);
                 row[field.name] = file.id;
             }
             else {