@saltcorn/data 0.7.3-beta.2 → 0.7.3-beta.3

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

@@ -418,61 +418,6 @@ export const types: ({
     validate: () => boolean;
 })[];
 export const viewtemplates: ({
-    name: string;
-    description: string;
-    configuration_workflow: (req: object) => import("../models/workflow");
-    run: (table_id: string | number, viewname: string, { columns, view_to_create, create_view_display, create_view_label, default_state, create_view_location, }: {
-        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, viewname, configuration: { columns, default_state }, req, }: {
-        table_id: any;
-        viewname: any;
-        configuration: {
-            columns: any;
-            default_state: any;
-        };
-        req: any;
-    }) => {
-        listQuery(state: any): Promise<{
-            rows: import("@saltcorn/db-common/internal").Row[];
-            rowCount: number;
-        }>;
-        getRowQuery(id: any): Promise<import("@saltcorn/db-common/internal").Row | null>;
-    };
-    configCheck: (view: any) => Promise<string[]>;
-} | {
     name: string;
     description: string;
     get_state_fields: () => object[];
@@ -514,6 +459,8 @@ export const viewtemplates: ({
     authorise_get: ({ query, table_id }: {
         query: any;
         table_id: any;
+    }, { authorizeGetQuery }: {
+        authorizeGetQuery: any;
     }) => Promise<any>;
     queries: ({ table_id, viewname, configuration: { columns, layout }, req, }: {
         table_id: any;
@@ -548,99 +495,41 @@ export const viewtemplates: ({
     name: string;
     description: string;
     configuration_workflow: (req: object) => import("../models/workflow");
-    run: (table_id: number, viewname: string, { show_view, order_field, descending, view_to_create, create_view_display, in_card, masonry_columns, rows_per_page, hide_pagination, create_view_label, create_view_location, always_create_view, include_fml, ...cols }: {
-        show_view: string;
-        order_field: name;
-        descending: boolean;
+    run: (table_id: string | number, viewname: string, { columns, view_to_create, create_view_display, create_view_label, default_state, create_view_location, }: {
+        columns: object[];
         view_to_create?: string | undefined;
         create_view_display: string;
-        in_card: boolean;
-        masonry_columns: string;
-        rows_per_page?: number | undefined;
-        hide_pagination: boolean;
         create_view_label?: string | undefined;
+        default_state?: object | undefined;
         create_view_location?: string | undefined;
-        always_create_view: boolean;
-        cols: any;
-    }, state: object, extraArgs: any, { countRowsQuery }: {
-        countRowsQuery: any;
-    }) => Promise<div>;
-    get_state_fields: (table_id: number, viewname: any, { show_view }: {
-        show_view: any;
-    }) => Promise<import("../models/field")>;
-    display_state_form: boolean;
-    getStringsForI18n({ create_view_label }: {
-        create_view_label: any;
-    }): string[] | Object[];
-    queries: ({ table_id, viewname, configuration: { columns, default_state }, req, }: {
-        table_id: any;
-        viewname: any;
-        configuration: {
-            columns: any;
-            default_state: any;
-        };
-        req: any;
-    }) => {
-        countRowsQuery(state: any): Promise<number>;
-    };
-} | {
-    name: string;
-    description: string;
-    configuration_workflow: (req: object) => import("../models/workflow");
-    run: (table_id: string, viewname: string, { participant_field, msg_relation, msgsender_field, msgview, msgform, participant_maxread_field, }: {
-        participant_field: string;
-        msg_relation: string;
-        msgsender_field: any;
-        msgview: string;
-        msgform: string;
-        participant_maxread_field: string;
-    }, state: object, { req, res }: {
-        req: object;
-        res: object;
-    }, { getRowQuery, updateQuery }: {
-        getRowQuery: any;
-        updateQuery: any;
-    }) => Promise<div>;
-    get_state_fields: () => object[];
-    display_state_form: boolean;
+    }, 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: {
-        submit_msg_ajax: (table_id: any, viewname: string, { participant_field, msg_relation, msgsender_field, msgview, msgform, participant_maxread_field, }: {
-            participant_field: string;
-            msg_relation: string;
-            msgsender_field: any;
-            msgview: string;
-            msgform: string;
-            participant_maxread_field: string;
-        }, body: any, { req, res }: {
+        run_action: (table_id: number, viewname: any, { columns, layout }: {
+            columns: object[];
+            layout: any;
+        }, body: object, { req, res }: {
             req: object;
-            res: object;
-        }, { submitAjaxQuery }: {
-            submitAjaxQuery: any;
+            res: any;
+        }, { getRowQuery }: {
+            getRowQuery: any;
         }) => Promise<object>;
-        ack_read: (table_id: any, viewname: any, { participant_field, participant_maxread_field }: {
-            participant_field: string;
-            participant_maxread_field: string;
-        }, body: any, { req, res }: {
-            req: object;
-            res: object;
-        }, { ackReadQuery }: {
-            ackReadQuery: any;
-        }) => Promise<void>;
-        fetch_older_msg: (table_id: any, viewname: any, { participant_field, msg_relation, msgsender_field, msgview, msgform, participant_maxread_field, }: object, body: object, { req, res }: string, { fetchOlderMsgQuery }: any) => Promise<object>;
     };
-    noAutoTest: boolean;
-    authorize_join: ({ participant_field }: {
-        participant_field: object;
-    }, room_id: string, user: object) => Promise<object>;
-    virtual_triggers: (table_id: any, viewname: string, { participant_field, msg_relation, msgsender_field, msgview, msgform, participant_maxread_field, }: {
-        participant_field: any;
-        msg_relation: string;
-        msgsender_field: string;
-        msgview: string;
-        msgform: any;
-        participant_maxread_field: any;
-    }) => object[];
-    getStringsForI18n(): 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, viewname, configuration: { columns, default_state }, req, }: {
         table_id: any;
         viewname: any;
@@ -650,36 +539,13 @@ export const viewtemplates: ({
         };
         req: any;
     }) => {
-        getRowQuery(state_id: any, part_table_name: any, part_user_field: any, part_key_to_room: any): Promise<import("@saltcorn/db-common/internal").Row | null>;
-        updateQuery(partRow: any, part_table_name: any, max_read_id: any, part_maxread_field: any): Promise<void>;
-        submitAjaxQuery(msg_relation: any, participant_field: any, body: any, msgform: any, msgsender_field: any, participant_maxread_field: any): Promise<{
-            json: {
-                msgid: {
-                    error: string;
-                } | {
-                    success: any;
-                };
-                error?: undefined;
-            };
-        } | {
-            json: {
-                error: any;
-                msgid?: undefined;
-            };
-        }>;
-        ackReadQuery(participant_field: any, participant_maxread_field: any, body: any): Promise<{
-            json: {
-                error: string;
-                success?: undefined;
-            };
-        } | {
-            json: {
-                success: string;
-                error?: undefined;
-            };
+        listQuery(state: any): Promise<{
+            rows: import("@saltcorn/db-common/internal").Row[];
+            rowCount: number;
         }>;
-        fetchOlderMsgQuery(participant_field: any, body: any): Promise<import("@saltcorn/db-common/internal").Row | null>;
+        getRowQuery(id: any): Promise<import("@saltcorn/db-common/internal").Row | null>;
     };
+    configCheck: (view: any) => Promise<string[]>;
 } | {
     name: string;
     description: string;
@@ -696,9 +562,10 @@ export const viewtemplates: ({
     runMany: (table_id: number, viewname: string, { columns, layout, auto_save }: {
         columns: any;
         layout: any;
-    }, state: State, extra: object, { editManyQuery, getRowQuery }: {
+    }, state: State, extra: object, { editManyQuery, getRowQuery, optionsQuery }: {
         editManyQuery: any;
         getRowQuery: any;
+        optionsQuery: 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[];
@@ -750,7 +617,13 @@ export const viewtemplates: ({
         res: any;
     }) => {
         editQuery(state: any): Promise<import("../models/form")>;
-        editManyQuery(state: any, extra: any): Promise<{
+        editManyQuery(state: any, { limit, offset, orderBy, orderDesc, where }: {
+            limit: any;
+            offset: any;
+            orderBy: any;
+            orderDesc: any;
+            where: any;
+        }): Promise<{
             table: import("../models/table") | null;
             fields: import("../models/field")[];
             rows: import("@saltcorn/db-common/internal").Row[];
@@ -767,6 +640,7 @@ export const viewtemplates: ({
         actionQuery(): Promise<{
             json: any;
         }>;
+        optionsQuery(reftable_name: any, type: any, attributes: any, where: any): Promise<any>;
     };
     routes: {
         run_action: (table_id: number, viewname: any, { columns, layout }: {
@@ -810,6 +684,45 @@ export const viewtemplates: ({
     }) => {
         getRowQuery(uniques: 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, { show_view, order_field, descending, view_to_create, create_view_display, in_card, masonry_columns, rows_per_page, hide_pagination, create_view_label, create_view_location, always_create_view, include_fml, ...cols }: {
+        show_view: string;
+        order_field: name;
+        descending: boolean;
+        view_to_create?: string | undefined;
+        create_view_display: string;
+        in_card: boolean;
+        masonry_columns: string;
+        rows_per_page?: number | undefined;
+        hide_pagination: boolean;
+        create_view_label?: string | undefined;
+        create_view_location?: string | undefined;
+        always_create_view: boolean;
+        cols: any;
+    }, state: object, extraArgs: any, { countRowsQuery }: {
+        countRowsQuery: any;
+    }) => Promise<div>;
+    get_state_fields: (table_id: number, viewname: any, { show_view }: {
+        show_view: any;
+    }) => Promise<import("../models/field")>;
+    display_state_form: boolean;
+    getStringsForI18n({ create_view_label }: {
+        create_view_label: any;
+    }): string[] | Object[];
+    queries: ({ table_id, viewname, configuration: { columns, default_state }, req, }: {
+        table_id: any;
+        viewname: any;
+        configuration: {
+            columns: any;
+            default_state: any;
+        };
+        req: any;
+    }) => {
+        countRowsQuery(state: any): Promise<number>;
+    };
 } | {
     name: string;
     description: string;
@@ -840,6 +753,105 @@ export const viewtemplates: ({
             role: any;
         }>;
     };
+} | {
+    name: string;
+    description: string;
+    configuration_workflow: (req: object) => import("../models/workflow");
+    run: (table_id: string, viewname: string, { participant_field, msg_relation, msgsender_field, msgview, msgform, participant_maxread_field, }: {
+        participant_field: string;
+        msg_relation: string;
+        msgsender_field: any;
+        msgview: string;
+        msgform: string;
+        participant_maxread_field: string;
+    }, state: object, { req, res }: {
+        req: object;
+        res: object;
+    }, { getRowQuery, updateQuery, optionsQuery }: {
+        getRowQuery: any;
+        updateQuery: any;
+        optionsQuery: any;
+    }) => Promise<div>;
+    get_state_fields: () => object[];
+    display_state_form: boolean;
+    routes: {
+        submit_msg_ajax: (table_id: any, viewname: string, { participant_field, msg_relation, msgsender_field, msgview, msgform, participant_maxread_field, }: {
+            participant_field: string;
+            msg_relation: string;
+            msgsender_field: any;
+            msgview: string;
+            msgform: string;
+            participant_maxread_field: string;
+        }, body: any, { req, res }: {
+            req: object;
+            res: object;
+        }, { submitAjaxQuery }: {
+            submitAjaxQuery: any;
+        }) => Promise<object>;
+        ack_read: (table_id: any, viewname: any, { participant_field, participant_maxread_field }: {
+            participant_field: string;
+            participant_maxread_field: string;
+        }, body: any, { req, res }: {
+            req: object;
+            res: object;
+        }, { ackReadQuery }: {
+            ackReadQuery: any;
+        }) => Promise<void>;
+        fetch_older_msg: (table_id: any, viewname: any, { participant_field, msg_relation, msgsender_field, msgview, msgform, participant_maxread_field, }: object, body: object, { req, res }: string, { fetchOlderMsgQuery }: any) => Promise<object>;
+    };
+    noAutoTest: boolean;
+    authorize_join: ({ participant_field }: {
+        participant_field: object;
+    }, room_id: string, user: object) => Promise<object>;
+    virtual_triggers: (table_id: any, viewname: string, { participant_field, msg_relation, msgsender_field, msgview, msgform, participant_maxread_field, }: {
+        participant_field: any;
+        msg_relation: string;
+        msgsender_field: string;
+        msgview: string;
+        msgform: any;
+        participant_maxread_field: any;
+    }) => object[];
+    getStringsForI18n(): object[];
+    queries: ({ table_id, viewname, configuration: { columns, default_state }, req, }: {
+        table_id: any;
+        viewname: any;
+        configuration: {
+            columns: any;
+            default_state: any;
+        };
+        req: any;
+    }) => {
+        getRowQuery(state_id: any, part_table_name: any, part_user_field: any, part_key_to_room: any): Promise<import("@saltcorn/db-common/internal").Row | null>;
+        updateQuery(partRow: any, part_table_name: any, max_read_id: any, part_maxread_field: any): Promise<void>;
+        submitAjaxQuery(msg_relation: any, participant_field: any, body: any, msgform: any, msgsender_field: any, participant_maxread_field: any): Promise<{
+            json: {
+                msgid: {
+                    error: string;
+                } | {
+                    success: any;
+                };
+                error?: undefined;
+            };
+        } | {
+            json: {
+                error: any;
+                msgid?: undefined;
+            };
+        }>;
+        ackReadQuery(participant_field: any, participant_maxread_field: any, body: any): Promise<{
+            json: {
+                error: string;
+                success?: undefined;
+            };
+        } | {
+            json: {
+                success: string;
+                error?: undefined;
+            };
+        }>;
+        fetchOlderMsgQuery(participant_field: any, body: any): Promise<import("@saltcorn/db-common/internal").Row | null>;
+        optionsQuery(reftable_name: any, type: any, attributes: any, where: any): Promise<any>;
+    };
 })[];
 import fileviews = require("./fileviews");
 import actions = require("./actions");

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../base-plugin/index.js"],"names":[],"mappings":"AAuCA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAAsD;AACtD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAA2E;;;;4CAG9D,MAAM;yCAYN,MAAM"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../base-plugin/index.js"],"names":[],"mappings":"AAuCA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAAsD;AACtD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAA2E;;;;4CAG9D,MAAM;yCAYN,MAAM"}

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

@@ -37,9 +37,10 @@ export function run(table_id: number, viewname: string, {}: {
 export function runMany(table_id: number, viewname: string, { columns, layout, auto_save }: {
     columns: any;
     layout: any;
-}, state: State, extra: object, { editManyQuery, getRowQuery }: {
+}, state: State, extra: object, { editManyQuery, getRowQuery, optionsQuery }: {
     editManyQuery: any;
     getRowQuery: any;
+    optionsQuery: any;
 }): Promise<Form[]>;
 /**
  * @param {number} table_id
@@ -163,7 +164,13 @@ export declare function queries({ table_id, name, configuration: { columns, defa
     res: any;
 }): {
     editQuery(state: any): Promise<Form>;
-    editManyQuery(state: any, extra: any): Promise<{
+    editManyQuery(state: any, { limit, offset, orderBy, orderDesc, where }: {
+        limit: any;
+        offset: any;
+        orderBy: any;
+        orderDesc: any;
+        where: any;
+    }): Promise<{
         table: Table | null;
         fields: Field[];
         rows: import("@saltcorn/db-common/internal").Row[];
@@ -180,6 +187,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>;
 };
 export declare namespace routes {
     export { run_action };

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":"AAiEA;;;GAGG;AAEH,4CAJW,MAAM,GACJ,QAAQ,CA+PjB;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,CA6B3B;AAoND;;;;;;;;;;;;;;;;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,CA+MzB;AA5gBD;;;;;;GAMG;AACH;IAHmB,OAAO;IACb,QAAQ,MAAM,EAAE,CAAC,CAQ7B;AAcD,uBAAuB;AACvB,sCAAuD;AAugBvD;;;;;;GAMG;AACH;IALwB,IAAI,EAAjB,MAAM;IACO,QAAQ,EAArB,MAAM;IACO,GAAG,EAAhB,MAAM;;;IACJ,QAAQ,OAAO,CAAC,CAO5B;;;;AAED;;;;;;;;;;;GAWG;AACH,sCAXW,MAAM;IAGS,OAAO,EAAtB,MAAM,EAAE;IACA,MAAM;;IAGE,GAAG,EAAnB,MAAM;IACK,GAAG;;;IACZ,QAAQ,MAAM,CAAC,CAe3B;;2BAGY,MAAM;kCAEN,MAAM;yCAQN,OAAO;AASH;;;;;qBAEd;AACD;;;;GAIG;AACH;;aAEC;AAPD;;;;GAIG;AACH;;aAEC;AACQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgIP;;;;AAGW,kEAyBZ"}
+{"version":3,"file":"edit.d.ts","sourceRoot":"","sources":["../../../base-plugin/viewtemplates/edit.js"],"names":[],"mappings":"AAkEA;;;GAGG;AAEH,4CAJW,MAAM,GACJ,QAAQ,CA+PjB;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,CAsC3B;AAqND;;;;;;;;;;;;;;;;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,CA+MzB;AAthBD;;;;;;GAMG;AACH;IAHmB,OAAO;IACb,QAAQ,MAAM,EAAE,CAAC,CAQ7B;AAcD,uBAAuB;AACvB,sCAAuD;AAihBvD;;;;;;GAMG;AACH;IALwB,IAAI,EAAjB,MAAM;IACO,QAAQ,EAArB,MAAM;IACO,GAAG,EAAhB,MAAM;;;IACJ,QAAQ,OAAO,CAAC,CAO5B;;;;AAED;;;;;;;;;;;GAWG;AACH,sCAXW,MAAM;IAGS,OAAO,EAAtB,MAAM,EAAE;IACA,MAAM;;IAGE,GAAG,EAAnB,MAAM;IACK,GAAG;;;IACZ,QAAQ,MAAM,CAAC,CAe3B;;2BAGY,MAAM;kCAEN,MAAM;yCAQN,OAAO;AASH;;;;;qBAEd;AACD;;;;GAIG;AACH;;aAEC;AAPD;;;;GAIG;AACH;;aAEC;AACQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqIP;;;;AAGW,kEAyBZ"}

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

@@ -18,13 +18,14 @@ const { text, text_attr } = require("@saltcorn/markup/tags");
 const { renderForm } = require("@saltcorn/markup");
 const FieldRepeat = require("../../models/fieldrepeat");
 const { get_expression_function, expressionChecker, } = require("../../models/expression");
-const { InvalidConfiguration, isNode } = require("../../utils");
+const { InvalidConfiguration, isNode, mergeIntoWhere } = require("../../utils");
 const Library = require("../../models/library");
 const { check_view_columns } = require("../../plugin-testing");
 const { initial_config_all_fields, calcfldViewOptions, calcfldViewConfig, get_parent_views, get_link_view_opts, picked_fields_to_query, stateFieldsToWhere, stateFieldsToQuery, strictParseInt, run_action_column, } = require("../../plugin-helper");
 const { splitUniques, getForm, fill_presets, parse_view_select, get_view_link_query, objToQueryString, action_url, action_link, } = require("./viewable_fields");
 const { traverse, getStringsForI18n, translateLayout, traverseSync, } = require("../../models/layout");
 const { asyncMap, isWeb } = require("../../utils");
+const db = require("../../db");
 const builtInActions = [
     "Save",
     "SaveAndContinue",
@@ -305,10 +306,18 @@ const run = async (table_id, viewname, {}, state, { res, req }, { editQuery }) =
  * @param {object} extra
  * @returns {Promise<Form[]>}
  */
-const runMany = async (table_id, viewname, { columns, layout, auto_save }, state, extra, { editManyQuery, getRowQuery }) => {
-    const { table, fields, rows } = isNode()
-        ? await editManyQuery(state, extra) // quick fix
-        : await editManyQuery(state); // TODO ch change query call signature
+const runMany = async (table_id, viewname, { columns, layout, auto_save }, state, extra, { editManyQuery, getRowQuery, optionsQuery }) => {
+    let { table, fields, rows } = await editManyQuery(state, {
+        limit: extra.limit,
+        offset: extra.offset,
+        orderBy: extra.orderBy,
+        orderDesc: extra.orderDesc,
+        where: extra.where,
+    });
+    if (!isNode()) {
+        table = Table.findOne({ id: table.id });
+        fields = await table.getFields();
+    }
     return await asyncMap(rows, async (row) => {
         const html = await render({
             table,
@@ -322,6 +331,7 @@ const runMany = async (table_id, viewname, { columns, layout, auto_save }, state
             state,
             auto_save,
             getRowQuery,
+            optionsQuery,
         });
         return { html, row };
     });
@@ -445,7 +455,7 @@ const transformForm = async ({ form, table, req, row, res, getRowQuery, viewname
  * @param {object} opts.res
  * @returns {Promise<Form>}
  */
-const render = async ({ table, fields, viewname, columns, layout, row, req, state, res, auto_save, destination_type, isRemote, getRowQuery, }) => {
+const render = async ({ table, fields, viewname, columns, layout, row, req, state, res, auto_save, destination_type, isRemote, getRowQuery, optionsQuery, }) => {
     const form = await getForm(table, viewname, columns, layout, state.id, req, isRemote);
     if (auto_save)
         form.onChange = `saveAndContinue(this, ${!isWeb(req) ? `'${form.action}'` : undefined})`;
@@ -477,7 +487,7 @@ const render = async ({ table, fields, viewname, columns, layout, row, req, stat
             }
         }
     });
-    await form.fill_fkey_options();
+    await form.fill_fkey_options(false, optionsQuery);
     await transformForm({ form, table, req, row, res, getRowQuery, viewname });
     return renderForm(form, !isRemote && req.csrfToken ? req.csrfToken() : false);
 };
@@ -772,21 +782,22 @@ module.exports = {
                 isRemote,
             });
         },
-        // TODO ch move 'extra' to query signature (quick fix)
-        async editManyQuery(state, extra) {
+        async editManyQuery(state, { limit, offset, orderBy, orderDesc, where }) {
             const table = await Table.findOne({ id: table_id });
             const fields = await table.getFields();
             const { joinFields, aggregations } = picked_fields_to_query(columns, fields);
             const qstate = await stateFieldsToWhere({ fields, state });
             const q = await stateFieldsToQuery({ state, fields });
+            if (where)
+                mergeIntoWhere(qstate, where);
             const rows = await table.getJoinedRows({
                 where: qstate,
                 joinFields,
                 aggregations,
-                ...(extra && extra.limit && { limit: extra.limit }),
-                ...(extra && extra.offset && { offset: extra.offset }),
-                ...(extra && extra.orderBy && { orderBy: extra.orderBy }),
-                ...(extra && extra.orderDesc && { orderDesc: extra.orderDesc }),
+                ...(limit && { limit: limit }),
+                ...(offset && { offset: offset }),
+                ...(orderBy && { orderBy: orderBy }),
+                ...(orderDesc && { orderDesc: orderDesc }),
                 ...q,
             });
             return {
@@ -848,6 +859,10 @@ module.exports = {
                 return { json: { error: e.message || e } };
             }
         },
+        async optionsQuery(reftable_name, type, attributes, where) {
+            const rows = await db.select(reftable_name, type === "File" ? attributes.select_file_where : where);
+            return rows;
+        },
     }),
     routes: { run_action },
     configCheck: async (view) => {