@saltcorn/data 1.1.0-beta.11 → 1.1.0-beta.12

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,87 @@ 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;
+    get_state_fields: () => object[];
+    configuration_workflow: (req: object) => import("../models/workflow");
+    run: (table_id: string, viewname: string, { columns, layout, page_title, page_title_formula }: {
+        columns: object[];
+        layout: object;
+        page_title?: string | undefined;
+        page_title_formula: boolean;
+    }, state: object, extra: object, { showQuery }: {
+        showQuery: any;
+    }) => Promise<string>;
+    runMany: (table_id: number, viewname: string, { columns, layout }: {
+        columns: object[];
+        layout: object;
+    }, state: object, extra: object, { runManyQuery }: {
+        runManyQuery: any;
+    }) => Promise<object[]>;
+    renderRows: (table: object, viewname: string, { columns, layout }: {
+        columns: object[];
+        layout: object;
+    }, extra: object, rows: object[], state: any) => Promise<string>;
+    initial_config: Function;
+    display_state_form: boolean;
+    routes: {
+        run_action: (table_id: number, viewname: any, { columns, layout }: {
+            columns: object[];
+            layout: any;
+        }, body: any, { req, res }: {
+            req: object;
+            res: any;
+        }, { actionQuery }: {
+            actionQuery: any;
+        }) => Promise<object>;
+    };
+    getStringsForI18n({ layout }: {
+        layout: object;
+    }): string[];
+    interpolate_title_string(table_id: any, title: any, state: any): Promise<any>;
+    queries: ({ table_id, exttable_name, name, configuration: { columns, layout }, req, res, }: {
+        table_id: any;
+        exttable_name: any;
+        name: any;
+        configuration: {
+            columns: any;
+            layout: any;
         };
+        req: any;
+        res: any;
+    }) => {
+        showQuery(state: any): Promise<{
+            rows: null;
+            message: string;
+        } | {
+            rows: import("@saltcorn/db-common/internal").Row[];
+            message: null;
+        }>;
+        runManyQuery(state: any, { where, limit, offset, joinFieldsExtra, orderBy, orderDesc }: {
+            where: any;
+            limit: any;
+            offset: any;
+            joinFieldsExtra: any;
+            orderBy: any;
+            orderDesc: any;
+        }): Promise<import("@saltcorn/db-common/internal").Row[]>;
+        actionQuery(): Promise<{
+            json: 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;
-})[];
-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");
@@ -1198,81 +1273,6 @@ export const viewtemplates: ({
         warnings: string[];
     }>;
     connectedObjects: (configuration: any) => Promise<import("@saltcorn/types/base_types").ConnectedObjects>;
-} | {
-    name: string;
-    description: string;
-    get_state_fields: () => object[];
-    configuration_workflow: (req: object) => import("../models/workflow");
-    run: (table_id: string, viewname: string, { columns, layout, page_title, page_title_formula }: {
-        columns: object[];
-        layout: object;
-        page_title?: string | undefined;
-        page_title_formula: boolean;
-    }, state: object, extra: object, { showQuery }: {
-        showQuery: any;
-    }) => Promise<string>;
-    runMany: (table_id: number, viewname: string, { columns, layout }: {
-        columns: object[];
-        layout: object;
-    }, state: object, extra: object, { runManyQuery }: {
-        runManyQuery: any;
-    }) => Promise<object[]>;
-    renderRows: (table: object, viewname: string, { columns, layout }: {
-        columns: object[];
-        layout: object;
-    }, extra: object, rows: object[], state: any) => Promise<string>;
-    initial_config: Function;
-    display_state_form: boolean;
-    routes: {
-        run_action: (table_id: number, viewname: any, { columns, layout }: {
-            columns: object[];
-            layout: any;
-        }, body: any, { req, res }: {
-            req: object;
-            res: any;
-        }, { actionQuery }: {
-            actionQuery: any;
-        }) => Promise<object>;
-    };
-    getStringsForI18n({ layout }: {
-        layout: object;
-    }): string[];
-    interpolate_title_string(table_id: any, title: any, state: any): Promise<any>;
-    queries: ({ table_id, exttable_name, name, configuration: { columns, layout }, req, res, }: {
-        table_id: any;
-        exttable_name: any;
-        name: any;
-        configuration: {
-            columns: any;
-            layout: any;
-        };
-        req: any;
-        res: any;
-    }) => {
-        showQuery(state: any): Promise<{
-            rows: null;
-            message: string;
-        } | {
-            rows: import("@saltcorn/db-common/internal").Row[];
-            message: null;
-        }>;
-        runManyQuery(state: any, { where, limit, offset, joinFieldsExtra, orderBy, orderDesc }: {
-            where: any;
-            limit: any;
-            offset: any;
-            joinFieldsExtra: any;
-            orderBy: any;
-            orderDesc: any;
-        }): Promise<import("@saltcorn/db-common/internal").Row[]>;
-        actionQuery(): Promise<{
-            json: any;
-        }>;
-    };
-    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.js

@@ -1312,7 +1312,7 @@ const prepare = async (viewname, table, fields, { columns, layout, fixed, auto_s
             }
             else {
                 const file = req.files[field.name];
-                if (file?.name) {
+                if (file) {
                     const serverResp = await File.upload(req.files[field.name]);
                     if (serverResp?.location)
                         row[field.name] = serverResp.location;