@saltcorn/data 1.0.0 → 1.1.0-beta.0

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

@@ -554,7 +554,113 @@ export const types: ({
         show: {
             isEdit: boolean;
             description: string;
-            run: (s: any) => any;
+            run: (v: any, req: any) => any;
+        };
+        checkboxes: {
+            isEdit: boolean;
+            description: string;
+            run: (v: any) => any;
+        };
+        TrueFalse: {
+            isEdit: boolean;
+            description: string;
+            run: (v: any) => "" | "True" | "False";
+        };
+        edit: {
+            isEdit: boolean;
+            description: string;
+            configFields: ({
+                name: string;
+                label: string;
+                type: string;
+                attributes: {
+                    options: string[];
+                };
+            } | {
+                name: string;
+                label: string;
+                type: string;
+                attributes?: undefined;
+            })[];
+            run: (nm: any, v: any, attrs: any, cls: any, required: any, field: any) => any;
+        };
+        switch: {
+            isEdit: boolean;
+            description: string;
+            run: (nm: any, v: any, attrs: any, cls: any, required: any, field: any) => any;
+        };
+        show_with_html: {
+            configFields: {
+                input_type: string;
+                name: string;
+                label: string;
+                sublabel: string;
+                default: string;
+                attributes: {
+                    mode: string;
+                };
+            }[];
+            isEdit: boolean;
+            description: string;
+            run: (v: any, req: any, attrs?: {}) => any;
+        };
+        tristate: {
+            isEdit: boolean;
+            description: string;
+            configFields: {
+                name: string;
+                label: string;
+                type: string;
+            }[];
+            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;
+    validate: () => boolean;
+} | {
+    name: string;
+    description: string;
+    sql_name: string;
+    js_type: string;
+    contract: () => Function;
+    attributes: object[];
+    fieldviews: {
+        show: {
+            isEdit: boolean;
+            description: string;
+            run: (d: any, req: any, attrs?: {}) => any;
+        };
+        showDay: {
+            isEdit: boolean;
+            description: string;
+            run: (d: any, req: any) => any;
+        };
+        format: {
+            isEdit: boolean;
+            description: string;
+            configFields: {
+                name: string;
+                label: string;
+                type: string;
+                help: {
+                    topic: string;
+                };
+            }[];
+            run: (d: any, req: any, options: any) => any;
+        };
+        relative: {
+            isEdit: boolean;
+            description: string;
+            run: (d: any, req: any) => string;
+        };
+        yearsAgo: {
+            isEdit: boolean;
+            description: string;
+            run: (d: any, req: any) => string;
         };
         show_with_html: {
             configFields: {
@@ -577,9 +683,17 @@ export const types: ({
             description: string;
             run: (nm: any, v: any, attrs: any, cls: any, required: any, field: any) => any;
         };
+        editDay: {
+            isEdit: boolean;
+            blockDisplay: boolean;
+            description: string;
+            run: (nm: any, v: any, attrs: any, cls: any, required: any, field: any) => any;
+        };
     };
-    attributes: object[];
-    read: (v: object) => object;
+    presets: {
+        Now: () => Date;
+    };
+    read: (v: object, attrs: object) => object;
     validate: () => boolean;
 } | {
     name: string;
@@ -834,40 +948,11 @@ export const types: ({
     sql_name: string;
     js_type: string;
     contract: () => Function;
-    attributes: object[];
     fieldviews: {
         show: {
             isEdit: boolean;
             description: string;
-            run: (d: any, req: any, attrs?: {}) => any;
-        };
-        showDay: {
-            isEdit: boolean;
-            description: string;
-            run: (d: any, req: any) => any;
-        };
-        format: {
-            isEdit: boolean;
-            description: string;
-            configFields: {
-                name: string;
-                label: string;
-                type: string;
-                help: {
-                    topic: string;
-                };
-            }[];
-            run: (d: any, req: any, options: any) => any;
-        };
-        relative: {
-            isEdit: boolean;
-            description: string;
-            run: (d: any, req: any) => string;
-        };
-        yearsAgo: {
-            isEdit: boolean;
-            description: string;
-            run: (d: any, req: any) => string;
+            run: (s: any) => any;
         };
         show_with_html: {
             configFields: {
@@ -890,97 +975,73 @@ export const types: ({
             description: string;
             run: (nm: any, v: any, attrs: any, cls: any, required: any, field: any) => any;
         };
-        editDay: {
-            isEdit: boolean;
-            blockDisplay: boolean;
-            description: string;
-            run: (nm: any, v: any, attrs: any, cls: any, required: any, field: any) => any;
-        };
     };
-    presets: {
-        Now: () => Date;
-    };
-    read: (v: object, attrs: object) => object;
+    attributes: object[];
+    read: (v: object) => object;
     validate: () => boolean;
-} | {
+})[];
+export const viewtemplates: ({
     name: string;
     description: string;
-    sql_name: string;
-    js_type: string;
-    contract: () => Function;
-    fieldviews: {
-        show: {
-            isEdit: boolean;
-            description: string;
-            run: (v: any, req: any) => any;
-        };
-        checkboxes: {
-            isEdit: boolean;
-            description: string;
-            run: (v: any) => any;
-        };
-        TrueFalse: {
-            isEdit: boolean;
-            description: string;
-            run: (v: any) => "" | "True" | "False";
-        };
-        edit: {
-            isEdit: boolean;
-            description: string;
-            configFields: ({
-                name: string;
-                label: string;
-                type: string;
-                attributes: {
-                    options: string[];
-                };
-            } | {
-                name: string;
-                label: string;
-                type: string;
-                attributes?: undefined;
-            })[];
-            run: (nm: any, v: any, attrs: any, cls: any, required: any, field: any) => any;
-        };
-        switch: {
-            isEdit: boolean;
-            description: string;
-            run: (nm: any, v: any, attrs: any, cls: any, required: any, field: any) => any;
-        };
-        show_with_html: {
-            configFields: {
-                input_type: string;
-                name: string;
-                label: string;
-                sublabel: string;
-                default: string;
-                attributes: {
-                    mode: string;
-                };
-            }[];
-            isEdit: boolean;
-            description: string;
-            run: (v: any, req: any, attrs?: {}) => any;
-        };
-        tristate: {
-            isEdit: boolean;
-            description: string;
-            configFields: {
-                name: string;
-                label: string;
-                type: string;
-            }[];
-            run: (nm: any, v: any, attrs: any, cls: any, required: any, field: any) => any;
+    configuration_workflow: (req: object) => import("../models/workflow");
+    run: (table_id: string | number, viewname: string, { columns, layout, view_to_create, create_view_display, create_view_label, default_state, create_view_location, create_link_style, create_link_size, create_view_showif, }: {
+        columns: object[];
+        view_to_create?: string | undefined;
+        create_view_display: string;
+        create_view_label?: string | undefined;
+        default_state?: object | undefined;
+        create_view_location?: string | undefined;
+    }, stateWithId?: object | undefined, extraOpts: object, { listQuery }: {
+        listQuery: any;
+    }) => Promise<any>;
+    view_quantity: string;
+    get_state_fields: (table_id: string, viewname: any, { columns }: {
+        columns: object[];
+    }) => Function;
+    initial_config: Function;
+    on_delete: (table_id: any, viewname: string, { default_state }: {
+        default_state: any;
+    }) => Promise<void>;
+    routes: {
+        run_action: (table_id: number, viewname: any, { columns, layout }: {
+            columns: object[];
+            layout: any;
+        }, body: object, { req, res }: {
+            req: object;
+            res: any;
+        }, { getRowQuery }: {
+            getRowQuery: any;
+        }) => Promise<object>;
+    };
+    display_state_form: (opts: object) => boolean;
+    default_state_form: ({ default_state }: object) => boolean;
+    getStringsForI18n({ columns, create_view_label }: {
+        columns: any;
+        create_view_label: any;
+    }): string[];
+    queries: ({ table_id, exttable_name, name, configuration: { columns, layout, default_state }, req, }: {
+        table_id: any;
+        exttable_name: any;
+        name: any;
+        configuration: {
+            columns: any;
+            layout: any;
+            default_state: any;
         };
+        req: any;
+    }) => {
+        listQuery(state: any, stateHash: any): Promise<{
+            rows: import("@saltcorn/db-common/internal").Row[];
+            rowCount: number | undefined;
+        }>;
+        getRowQuery(id: any): Promise<import("@saltcorn/db-common/internal").Row | null>;
     };
-    attributes: 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: ({
+    configCheck: (view: any) => Promise<{
+        errors: string[];
+        warnings: string[];
+    }>;
+    connectedObjects: (configuration: any) => Promise<import("@saltcorn/types/base_types").ConnectedObjects>;
+} | {
     name: string;
     description: string;
     configuration_workflow: (req: object) => import("../models/workflow");
@@ -1082,7 +1143,7 @@ export const viewtemplates: ({
         actionQuery(): Promise<{
             json: any;
         }>;
-        optionsQuery(reftable_name: any, type: any, attributes: any, where: any): Promise<any>;
+        optionsQuery(reftable_name: any, type: any, attributes: any, where: any): Promise<import("@saltcorn/db-common/internal").Row[]>;
         updateMatchingQuery(where: any, updateVals: any, repeatFields: any, childRows: any): Promise<any[] | {
             rowError: any;
             inEditError?: undefined;
@@ -1212,67 +1273,6 @@ export const viewtemplates: ({
         warnings: string[];
     }>;
     connectedObjects: (configuration: any) => Promise<import("@saltcorn/types/base_types").ConnectedObjects>;
-} | {
-    name: string;
-    description: string;
-    configuration_workflow: (req: object) => import("../models/workflow");
-    run: (table_id: string | number, viewname: string, { columns, layout, view_to_create, create_view_display, create_view_label, default_state, create_view_location, create_link_style, create_link_size, create_view_showif, }: {
-        columns: object[];
-        view_to_create?: string | undefined;
-        create_view_display: string;
-        create_view_label?: string | undefined;
-        default_state?: object | undefined;
-        create_view_location?: string | undefined;
-    }, stateWithId?: object | undefined, extraOpts: object, { listQuery }: {
-        listQuery: any;
-    }) => Promise<any>;
-    view_quantity: string;
-    get_state_fields: (table_id: string, viewname: any, { columns }: {
-        columns: object[];
-    }) => Function;
-    initial_config: Function;
-    on_delete: (table_id: any, viewname: string, { default_state }: {
-        default_state: any;
-    }) => Promise<void>;
-    routes: {
-        run_action: (table_id: number, viewname: any, { columns, layout }: {
-            columns: object[];
-            layout: any;
-        }, body: object, { req, res }: {
-            req: object;
-            res: any;
-        }, { getRowQuery }: {
-            getRowQuery: any;
-        }) => Promise<object>;
-    };
-    display_state_form: (opts: object) => boolean;
-    default_state_form: ({ default_state }: object) => boolean;
-    getStringsForI18n({ columns, create_view_label }: {
-        columns: any;
-        create_view_label: any;
-    }): string[];
-    queries: ({ table_id, exttable_name, name, configuration: { columns, layout, default_state }, req, }: {
-        table_id: any;
-        exttable_name: any;
-        name: any;
-        configuration: {
-            columns: any;
-            layout: any;
-            default_state: any;
-        };
-        req: any;
-    }) => {
-        listQuery(state: any, stateHash: any): Promise<{
-            rows: import("@saltcorn/db-common/internal").Row[];
-            rowCount: number | undefined;
-        }>;
-        getRowQuery(id: any): Promise<import("@saltcorn/db-common/internal").Row | null>;
-    };
-    configCheck: (view: any) => Promise<{
-        errors: string[];
-        warnings: string[];
-    }>;
-    connectedObjects: (configuration: any) => Promise<import("@saltcorn/types/base_types").ConnectedObjects>;
 } | {
     name: string;
     description: string;

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

@@ -218,7 +218,7 @@ export declare function queries({ table_id, name, configuration: { columns, defa
     actionQuery(): Promise<{
         json: any;
     }>;
-    optionsQuery(reftable_name: any, type: any, attributes: any, where: any): Promise<any>;
+    optionsQuery(reftable_name: any, type: any, attributes: any, where: any): Promise<import("@saltcorn/db-common/internal").Row[]>;
     updateMatchingQuery(where: any, updateVals: any, repeatFields: any, childRows: any): Promise<any[] | {
         rowError: any;
         inEditError?: undefined;

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":"AAoGA;;;GAGG;AAEH,4CAJW,MAAM,GACJ,QAAQ,CAoVjB;AA+CJ;;;;;;;;;;;GAWG;AACH,8BAXW,MAAM,YACN,MAAM,mBAIN,MAAM;IAEU,GAAG,EAAnB,MAAM;IACU,GAAG,EAAnB,MAAM;;;IACJ,QAAQ,IAAI,CAAC,CAYzB;AAED;;;;;;;;;GASG;AACH,kCATW,MAAM,YACN,MAAM;IAEE,OAAO;IACP,MAAM;wBAEd,MAAM;;;;IACJ,QAAQ,IAAI,EAAE,CAAC,CAyC3B;AAgfD;;;;;;;;;;;;;;;;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,CAsSzB;AA0FD,mKA6BC;AAGD,sHA6BC;AAljCD;;;;;;GAMG;AACH;IAHmB,OAAO;IACb,QAAQ,MAAM,EAAE,CAAC,CAQ7B;AA6BD,uBAAuB;AACvB,sCAAuD;AA47BvD;;;;;;GAMG;AACH;IALwB,IAAI,EAAjB,MAAM;IACO,QAAQ,EAArB,MAAM;IACO,GAAG,EAAhB,MAAM;;;IACJ,QAAQ,OAAO,CAAC,CAO5B;;;;AAiED;;;;;;;;;;;GAWG;AACH,sCAXW,MAAM;IAGS,OAAO,EAAtB,MAAM,EAAE;IACA,MAAM;;IAGE,GAAG,EAAnB,MAAM;IACK,GAAG;;;IACZ,QAAQ,MAAM,CAAC,CAe3B;AAED;;;;;;;;;;;;;;;;;;;;;;kBA0GC;;2BAkUY,MAAM;kCAEN,MAAM;yCAUN,OAAO;AASH;;;;;qBAEd;AACD;;;;GAIG;AACH;;aAEC;AAPD;;;;GAIG;AACH;;aAEC;AACQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuYP;;;;;AAEF,sGAeC;AAfD,sGAeC;AACY;;;GA2DZ;AACiB,6HAEjB"}
+{"version":3,"file":"edit.d.ts","sourceRoot":"","sources":["../../../base-plugin/viewtemplates/edit.js"],"names":[],"mappings":"AAoGA;;;GAGG;AAEH,4CAJW,MAAM,GACJ,QAAQ,CAoVjB;AA+CJ;;;;;;;;;;;GAWG;AACH,8BAXW,MAAM,YACN,MAAM,mBAIN,MAAM;IAEU,GAAG,EAAnB,MAAM;IACU,GAAG,EAAnB,MAAM;;;IACJ,QAAQ,IAAI,CAAC,CAYzB;AAED;;;;;;;;;GASG;AACH,kCATW,MAAM,YACN,MAAM;IAEE,OAAO;IACP,MAAM;wBAEd,MAAM;;;;IACJ,QAAQ,IAAI,EAAE,CAAC,CAyC3B;AAgfD;;;;;;;;;;;;;;;;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,CAsSzB;AA0FD,mKA6BC;AAGD,sHA6BC;AAljCD;;;;;;GAMG;AACH;IAHmB,OAAO;IACb,QAAQ,MAAM,EAAE,CAAC,CAQ7B;AA6BD,uBAAuB;AACvB,sCAAuD;AA47BvD;;;;;;GAMG;AACH;IALwB,IAAI,EAAjB,MAAM;IACO,QAAQ,EAArB,MAAM;IACO,GAAG,EAAhB,MAAM;;;IACJ,QAAQ,OAAO,CAAC,CAO5B;;;;AAiED;;;;;;;;;;;GAWG;AACH,sCAXW,MAAM;IAGS,OAAO,EAAtB,MAAM,EAAE;IACA,MAAM;;IAGE,GAAG,EAAnB,MAAM;IACK,GAAG;;;IACZ,QAAQ,MAAM,CAAC,CAe3B;AAED;;;;;;;;;;;;;;;;;;;;;;kBA0GC;;2BAkUY,MAAM;kCAEN,MAAM;yCAUN,OAAO;AASH;;;;;qBAEd;AACD;;;;GAIG;AACH;;aAEC;AAPD;;;;GAIG;AACH;;aAEC;AACQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2YP;;;;;AAEF,sGAeC;AAfD,sGAeC;AACY;;;GA2DZ;AACiB,6HAEjB"}

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

@@ -1750,12 +1750,19 @@ module.exports = {
             }
         },
         async optionsQuery(reftable_name, type, attributes, where) {
-            const rows = await db.select(reftable_name, type === "File" ? attributes.select_file_where : where);
+            const refTable = Table.findOne({ name: reftable_name });
+            const rows = await refTable.getRows(where, {
+                forUser: req.user,
+                forPublic: !req.user,
+            });
             return rows;
         },
         async updateMatchingQuery(where, updateVals, repeatFields, childRows) {
             const table = Table.findOne(table_id);
-            const rows = await table.getRows(where);
+            const rows = await table.getRows(where, {
+                forUser: req.user,
+                forPublic: !req.user,
+            });
             const results = [];
             let inTransaction = false;
             try {