@saltcorn/server 0.8.5-beta.3 → 0.8.5-beta.5

package/routes/admin.js

@@ -10,6 +10,7 @@ const {
   error_catcher,
   getGitRevision,
   setTenant,
+  admin_config_route,
   get_sys_info,
 } = require("./utils.js");
 const Table = require("@saltcorn/data/models/table");
@@ -84,7 +85,6 @@ const {
   //send_files_page,
   config_fields_form,
   save_config_from_form,
-  flash_restart_if_required,
 } = require("../markup/admin.js");
 const packagejson = require("../package.json");
 const Form = require("@saltcorn/data/models/form");
@@ -107,52 +107,6 @@ const Crash = require("@saltcorn/data/models/crash");
 const router = new Router();
 module.exports = router;
 
-/**
- * Site identity form
- * @param {object} req -http request
- * @returns {Promise<Form>} form
- */
-const site_id_form = (req) =>
-  config_fields_form({
-    req,
-    field_names: [
-      "site_name",
-      "timezone",
-      "base_url",
-      ...(getConfigFile() ? ["multitenancy_enabled"] : []),
-      { section_header: "Logo image" },
-      "site_logo_id",
-      "favicon_id",
-      { section_header: "Custom code" },
-      "page_custom_css",
-      "page_custom_html",
-      { section_header: "Extension store" },
-      "plugins_store_endpoint",
-      "packs_store_endpoint",
-    ],
-    action: "/admin",
-    submitLabel: req.__("Save"),
-  });
-/**
- * Email settings form
- * @param {object} req request
- * @returns {Promise<Form>} form
- */
-const email_form = async (req) => {
-  return await config_fields_form({
-    req,
-    field_names: [
-      "smtp_host",
-      "smtp_username",
-      "smtp_password",
-      "smtp_port",
-      "smtp_secure",
-      "email_from",
-    ],
-    action: "/admin/email",
-  });
-};
-
 const app_files_table = (files, buildDirName, req) =>
   mkTable(
     [
@@ -182,17 +136,27 @@ const app_files_table = (files, buildDirName, req) =>
     files
   );
 
-/**
- * Router get /
- * @name get
- * @function
- * @memberof module:routes/admin~routes/adminRouter
- */
-router.get(
-  "/",
-  isAdmin,
-  error_catcher(async (req, res) => {
-    const form = await site_id_form(req);
+admin_config_route({
+  router,
+  path: "/",
+  super_path: "/admin",
+  flash: "Site identity settings updated",
+  field_names: [
+    "site_name",
+    "timezone",
+    "base_url",
+    ...(getConfigFile() ? ["multitenancy_enabled"] : []),
+    { section_header: "Logo image" },
+    "site_logo_id",
+    "favicon_id",
+    { section_header: "Custom code" },
+    "page_custom_css",
+    "page_custom_html",
+    { section_header: "Extension store" },
+    "plugins_store_endpoint",
+    "packs_store_endpoint",
+  ],
+  response(form, req, res) {
     send_admin_page({
       res,
       req,
@@ -204,53 +168,23 @@ router.get(
         contents: [renderForm(form, req.csrfToken())],
       },
     });
-  })
-);
-
-/**
- * @name post
- * @function
- * @memberof module:routes/admin~routes/adminRouter
- */
-router.post(
-  "/",
-  isAdmin,
-  error_catcher(async (req, res) => {
-    const form = await site_id_form(req);
-    form.validate(req.body);
-    if (form.hasErrors) {
-      send_admin_page({
-        res,
-        req,
-        active_sub: "Site identity",
-        contents: {
-          type: "card",
-          title: req.__("Site identity settings"),
-          contents: [renderForm(form, req.csrfToken())],
-        },
-      });
-    } else {
-      flash_restart_if_required(form, req);
-      await save_config_from_form(form);
-
-      if (!req.xhr) {
-        req.flash("success", req.__("Site identity settings updated"));
-        res.redirect("/admin");
-      } else res.json({ success: "ok" });
-    }
-  })
-);
+  },
+});
 
-/**
- * @name get/email
- * @function
- * @memberof module:routes/admin~routes/adminRouter
- */
-router.get(
-  "/email",
-  isAdmin,
-  error_catcher(async (req, res) => {
-    const form = await email_form(req);
+admin_config_route({
+  router,
+  path: "/email",
+  super_path: "/admin",
+  flash: "Email settings updated",
+  field_names: [
+    "smtp_host",
+    "smtp_username",
+    "smtp_password",
+    "smtp_port",
+    "smtp_secure",
+    "email_from",
+  ],
+  response(form, req, res) {
     send_admin_page({
       res,
       req,
@@ -272,8 +206,8 @@ router.get(
         ],
       },
     });
-  })
-);
+  },
+});
 
 /**
  * @name get/send-test-email
@@ -305,38 +239,6 @@ router.get(
   })
 );
 
-/**
- * @name post/email
- * @function
- * @memberof module:routes/admin~routes/adminRouter
- */
-router.post(
-  "/email",
-  isAdmin,
-  error_catcher(async (req, res) => {
-    const form = await email_form(req);
-    form.validate(req.body);
-    if (form.hasErrors) {
-      send_admin_page({
-        res,
-        req,
-        active_sub: "Email",
-        contents: {
-          type: "card",
-          title: req.__("Email settings"),
-          contents: [renderForm(form, req.csrfToken())],
-        },
-      });
-    } else {
-      await save_config_from_form(form);
-      if (!req.xhr) {
-        req.flash("success", req.__("Email settings updated"));
-        res.redirect("/admin/email");
-      } else res.json({ success: "ok" });
-    }
-  })
-);
-
 /**
  * @name get/backup
  * @function
@@ -1321,12 +1223,16 @@ router.get(
   "/configuration-check",
   isAdmin,
   error_catcher(async (req, res) => {
-    const filename = `${moment().format("YYYYMMDDHHmm")}.html`;
+    const start = new Date();
+    const filename = `${moment(start).format("YYYYMMDDHHmm")}.html`;
     await File.new_folder("configuration_checks");
     const go = async () => {
       const { passes, errors, pass, warnings } = await runConfigurationCheck(
         req
       );
+      const end = new Date();
+      const secs = Math.round((end.getTime() - start.getTime()) / 1000);
+
       const mkError = (err) =>
         div(
           { class: "alert alert-danger", role: "alert" },
@@ -1355,6 +1261,11 @@ router.get(
           h3("Passes"),
 
           pre(code(passes.join("\n")))
+        ) +
+        p(
+          `Configuration check completed in ${
+            secs > 60 ? `${Math.floor(secs / 60)}m ${secs % 60}s` : secs + "s"
+          }`
         );
       await File.from_contents(
         filename,
@@ -1958,42 +1869,31 @@ router.post(
   })
 );
 
-/**
- * Developer settings form
- * @param {object} req request
- * @returns {Promise<Form>} form
- */
-const dev_form = async (req) => {
-  const role_to_create_tenant = +getRootState().getConfig(
-    "role_to_create_tenant"
-  );
-  const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
+admin_config_route({
+  router,
+  path: "/dev",
+  super_path: "/admin",
+  flash: "Development mode settings updated",
+  async get_form(req) {
+    const tenants_set_npm_modules = getRootState().getConfig(
+      "tenants_set_npm_modules",
+      false
+    );
+    const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
 
-  return await config_fields_form({
-    req,
-    field_names: [
-      "development_mode",
-      "log_sql",
-      "log_client_errors",
-      "log_level",
-      ...(isRoot || role_to_create_tenant < 10
-        ? ["npm_available_js_code"]
-        : []),
-    ],
-    action: "/admin/dev",
-  });
-};
-/**
- * Developer Mode page
- * @name get/dev
- * @function
- * @memberof module:routes/admin~routes/adminRouter
- */
-router.get(
-  "/dev",
-  isAdmin,
-  error_catcher(async (req, res) => {
-    const form = await dev_form(req);
+    return await config_fields_form({
+      req,
+      field_names: [
+        "development_mode",
+        "log_sql",
+        "log_client_errors",
+        "log_level",
+        ...(isRoot || tenants_set_npm_modules ? ["npm_available_js_code"] : []),
+      ],
+      action: "/admin/dev",
+    });
+  },
+  response(form, req, res) {
     send_admin_page({
       res,
       req,
@@ -2002,51 +1902,42 @@ router.get(
         type: "card",
         title: req.__("Development settings"),
         titleAjaxIndicator: true,
-        contents: [
-          renderForm(form, req.csrfToken()) /*,
-                    a(
-                        {
-                            id: "testemail",
-                            href: "/admin/send-test-email",
-                            class: "btn btn-primary",
-                        },
-                        req.__("Send test email")
-                    ),*/,
-        ],
+        contents: [renderForm(form, req.csrfToken())],
       },
     });
-  })
-);
+  },
+});
 
-/**
- * Development mode
- * @name post/email
- * @function
- * @memberof module:routes/admin~routes/adminRouter
- */
-router.post(
-  "/dev",
-  isAdmin,
-  error_catcher(async (req, res) => {
-    const form = await dev_form(req);
-    form.validate(req.body);
-    if (form.hasErrors) {
-      send_admin_page({
-        res,
-        req,
-        active_sub: "Development",
-        contents: {
-          type: "card",
-          title: req.__("Development settings"),
-          contents: [renderForm(form, req.csrfToken())],
-        },
-      });
-    } else {
-      await save_config_from_form(form);
-      if (!req.xhr) {
-        req.flash("success", req.__("Development mode settings updated"));
-        res.redirect("/admin/dev");
-      } else res.json({ success: "ok" });
-    }
-  })
-);
+admin_config_route({
+  router,
+  path: "/notifications",
+  super_path: "/admin",
+  field_names: [
+    "notification_in_menu",
+    { section_header: "Progressive Web Application" },
+    "pwa_enabled",
+    { name: "pwa_display", showIf: { pwa_enabled: true } },
+    { name: "pwa_set_colors", showIf: { pwa_enabled: true } },
+    {
+      name: "pwa_theme_color",
+      showIf: { pwa_enabled: true, pwa_set_colors: true },
+    },
+    {
+      name: "pwa_background_color",
+      showIf: { pwa_enabled: true, pwa_set_colors: true },
+    },
+  ],
+  response(form, req, res) {
+    send_admin_page({
+      res,
+      req,
+      active_sub: "Notifications",
+      contents: {
+        type: "card",
+        title: req.__("Notification settings"),
+        titleAjaxIndicator: true,
+        contents: [renderForm(form, req.csrfToken())],
+      },
+    });
+  },
+});

package/routes/api.js

@@ -31,6 +31,7 @@ const {
   readState,
   strictParseInt,
 } = require("@saltcorn/data/plugin-helper");
+const Crash = require("@saltcorn/data/models/crash");
 
 /**
  * @type {object}
@@ -66,7 +67,7 @@ const limitFields = (fields) => (r) => {
  * @param {Table} table
  * @returns {boolean}
  */
-function accessAllowedRead(req, user, table) {
+function accessAllowedRead(req, user, table, allow_ownership) {
   const role =
     req.user && req.user.id
       ? req.user.role_id
@@ -74,7 +75,12 @@ function accessAllowedRead(req, user, table) {
       ? user.role_id
       : 10;
 
-  return role <= table.min_role_read;
+  return (
+    role <= table.min_role_read ||
+    ((req.user?.id || user?.id) &&
+      allow_ownership &&
+      (table.ownership_field_id || table.ownership_formula))
+  );
 }
 
 /**
@@ -92,7 +98,11 @@ function accessAllowedWrite(req, user, table) {
       ? user.role_id
       : 10;
 
-  return role <= table.min_role_write;
+  return (
+    role <= table.min_role_write ||
+    ((req.user?.id || user?.id) &&
+      (table.ownership_field_id || table.ownership_formula))
+  );
 }
 /**
  * Check that user has right to trigger call
@@ -126,6 +136,7 @@ router.post(
     const view = await View.findOne({ name: viewName });
     const db = require("@saltcorn/data/db");
     if (!view) {
+      getState().log(3, `API viewQuery ${view.name} not found`);
       res.status(404).json({
         error: req.__("View %s not found", viewName),
         view: viewName,
@@ -152,6 +163,10 @@ router.post(
             const resp = await queries[queryName](...args, true);
             res.json({ success: resp, alerts: getFlashes(req) });
           } else {
+            getState().log(
+              3,
+              `API viewQuery ${view.name} ${queryName} not found`
+            );
             res.status(404).json({
               error: req.__("Query %s not found", queryName),
               view: viewName,
@@ -163,6 +178,7 @@ router.post(
             });
           }
         } else {
+          getState().log(3, `API viewQuery ${view.name} not authorized`);
           res.status(401).json({ error: req.__("Not authorized") });
         }
       }
@@ -208,6 +224,10 @@ router.get(
           }
           res.json({ success: dvs });
         } else {
+          getState().log(
+            3,
+            `API distinct ${table.name}.${fieldName} not authorized`
+          );
           res.status(401).json({ error: req.__("Not authorized") });
         }
       }
@@ -234,6 +254,7 @@ router.get(
         : { name: tableName }
     );
     if (!table) {
+      getState().log(3, `API get ${tableName} table not found`);
       res.status(404).json({ error: req.__("Not found") });
       return;
     }
@@ -242,11 +263,13 @@ router.get(
       ["api-bearer", "jwt"],
       { session: false },
       async function (err, user, info) {
-        if (accessAllowedRead(req, user, table)) {
+        if (accessAllowedRead(req, user, table, true)) {
           let rows;
           if (versioncount === "on") {
             const joinOpts = {
               orderBy: "id",
+              forUser: req.user || user || { role_id: 10 },
+              forPublic: !(req.user || user),
               aggregations: {
                 _versions: {
                   table: table.name + "__history",
@@ -266,12 +289,22 @@ router.get(
               state: req_query,
               table,
             });
-            rows = await table.getRows(qstate);
+            rows = await table.getRows(qstate, {
+              forPublic: !(req.user || user),
+              forUser: req.user || user,
+            });
           } else {
-            rows = await table.getRows();
+            rows = await table.getRows(
+              {},
+              {
+                forPublic: !(req.user || user),
+                forUser: req.user || user,
+              }
+            );
           }
           res.json({ success: rows.map(limitFields(fields)) });
         } else {
+          getState().log(3, `API get ${table.name} not authorized`);
           res.status(401).json({ error: req.__("Not authorized") });
         }
       }
@@ -301,6 +334,7 @@ router.post(
     });
 
     if (!trigger) {
+      getState().log(3, `API action ${actionname} not found`);
       res.status(400).json({ error: req.__("Not found") });
       return;
     }
@@ -314,13 +348,16 @@ router.post(
             const resp = await action.run({
               configuration: trigger.configuration,
               body: req.body,
+              row: req.body,
               req,
             });
             res.json({ success: true, data: resp });
           } catch (e) {
+            Crash.create(e, req);
             res.status(400).json({ success: false, error: e.message });
           }
         } else {
+          getState().log(3, `API action ${actionname} not authorized`);
           res.status(401).json({ error: req.__("Not authorized") });
         }
       }
@@ -340,6 +377,7 @@ router.post(
     const { tableName } = req.params;
     const table = await Table.findOne({ name: tableName });
     if (!table) {
+      getState().log(3, `API POST ${tableName} not found`);
       res.status(404).json({ error: req.__("Not found") });
       return;
     }
@@ -378,6 +416,10 @@ router.post(
             }
           });
           if (hasErrors) {
+            getState().log(
+              2,
+              `API POST ${table.name} error: ${errors.join(", ")}`
+            );
             res.status(400).json({ error: errors.join(", ") });
             return;
           }
@@ -385,9 +427,12 @@ router.post(
             row,
             req.user || user || { role_id: 10 }
           );
-          if (ins_res.error) res.status(400).json(ins_res);
-          else res.json(ins_res);
+          if (ins_res.error) {
+            getState().log(2, `API POST ${table.name} error: ${ins_res.error}`);
+            res.status(400).json(ins_res);
+          } else res.json(ins_res);
         } else {
+          getState().log(3, `API POST ${table.name} not authorized`);
           res.status(401).json({ error: req.__("Not authorized") });
         }
       }
@@ -408,6 +453,7 @@ router.post(
     const { tableName, id } = req.params;
     const table = await Table.findOne({ name: tableName });
     if (!table) {
+      getState().log(3, `API POST ${tableName} not found`);
       res.status(404).json({ error: req.__("Not found") });
       return;
     }
@@ -445,6 +491,10 @@ router.post(
             }
           }
           if (hasErrors) {
+            getState().log(
+              2,
+              `API POST ${table.name} error: ${errors.join(", ")}`
+            );
             res.status(400).json({ error: errors.join(", ") });
             return;
           }
@@ -454,9 +504,12 @@ router.post(
             user || req.user || { role_id: 10 }
           );
 
-          if (ins_res.error) res.status(400).json(ins_res);
-          else res.json(ins_res);
+          if (ins_res.error) {
+            getState().log(2, `API POST ${table.name} error: ${ins_res.error}`);
+            res.status(400).json(ins_res);
+          } else res.json(ins_res);
         } else {
+          getState().log(3, `API POST ${table.name} not authorized`);
           res.status(401).json({ error: req.__("Not authorized") });
         }
       }
@@ -477,6 +530,7 @@ router.delete(
     const { tableName, id } = req.params;
     const table = await Table.findOne({ name: tableName });
     if (!table) {
+      getState().log(3, `API DELETE ${tableName} not found`);
       res.status(404).json({ error: req.__("Not found") });
       return;
     }
@@ -502,9 +556,11 @@ router.delete(
               );
             res.json({ success: true });
           } catch (e) {
+            getState().log(2, `API DELETE ${table.name} error: ${e.message}`);
             res.status(400).json({ error: e.message });
           }
         } else {
+          getState().log(3, `API DELETE ${table.name} not authorized`);
           res.status(401).json({ error: req.__("Not authorized") });
         }
       }

package/routes/common_lists.js

@@ -33,6 +33,7 @@ const tableBadges = (t, req) => {
   if (t.ownership_field_id) s += badge("primary", req.__("Owned"));
   if (t.versioned) s += badge("success", req.__("History"));
   if (t.external) s += badge("info", req.__("External"));
+  if (t.provider_name) s += badge("success", t.provider_name);
   return s;
 };
 

package/routes/fields.js

@@ -398,9 +398,16 @@ const fieldFlow = (req) =>
           ];
           const keyfields = orderedFields
             .filter((f) => !f.calculated || f.stored)
+            .sort((a, b) =>
+              a.type?.name === "String" && b.type?.name !== "String"
+                ? -1
+                : a.type?.name !== "String" && b.type?.name === "String"
+                ? 1
+                : 0
+            )
             .map((f) => ({
               value: f.name,
-              label: f.label,
+              label: `${f.label} [${f.type?.name || f.type}]`,
             }));
           const textfields = orderedFields
             .filter(
@@ -412,6 +419,9 @@ const fieldFlow = (req) =>
               new Field({
                 name: "summary_field",
                 label: req.__("Summary field"),
+                sublabel: req.__(
+                  "The field that will be shown to the user when choosing a value"
+                ),
                 input_type: "select",
                 options: keyfields,
               }),

package/routes/index.js

@@ -64,6 +64,7 @@ const edit = require("./edit");
 const config = require("./config");
 const viewedit = require("./viewedit");
 const crashlog = require("./crashlog");
+const notifications = require("./notifications");
 const del = require("./delete");
 const auth = require("../auth/routes");
 const useradmin = require("../auth/admin");
@@ -96,6 +97,7 @@ module.exports =
     app.use("/actions", actions);
     app.use("/eventlog", eventlog);
     app.use("/library", library);
+    app.use("/notifications", notifications);
     app.use("/site-structure", infoarch);
     app.use("/search", search);
     app.use("/admin", admin);