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

package/auth/admin.js

@@ -23,7 +23,16 @@ const {
 const { isAdmin, error_catcher } = require("../routes/utils");
 const { send_reset_email } = require("./resetpw");
 const { getState } = require("@saltcorn/data/db/state");
-const { a, div, span, code, h5, i, p } = require("@saltcorn/markup/tags");
+const {
+  a,
+  div,
+  span,
+  code,
+  h5,
+  i,
+  p,
+  input,
+} = require("@saltcorn/markup/tags");
 const Table = require("@saltcorn/data/models/table");
 const {
   send_users_page,
@@ -243,6 +252,18 @@ router.get(
         type: "card",
         title: req.__("Users"),
         contents: [
+          div(
+            { class: "row mb-3" },
+            div(
+              { class: "col-sm-6 offset-sm-3" },
+              input({
+                class: "form-control",
+                type: "search",
+                "data-filter-table": "table.user-admin",
+                placeholder: "🔍 Search",
+              })
+            )
+          ),
           mkTable(
             [
               { label: req.__("ID"), key: "id" },
@@ -273,7 +294,7 @@ router.get(
               },
             ],
             users,
-            { hover: true }
+            { hover: true, class: "user-admin" }
           ),
           link(`/useradmin/new`, req.__("Create user")),
         ],

package/locales/da.json

@@ -704,5 +704,7 @@
 	"Tables organise data by fields and rows.": "Tables organise data by fields and rows.",
 	"Views display data from tables. A view is a view pattern applied to a table, with configuration.": "Views display data from tables. A view is a view pattern applied to a table, with configuration.",
 	"No views": "No views",
-	"No pages": "No pages"
+	"No pages": "No pages",
+	"Welcome to Saltcorn!": "Welcome to Saltcorn!",
+	"Notifications": "Notifications"
 }

package/locales/en.json

@@ -1126,5 +1126,23 @@
 	"Install git plugins": "Install git plugins",
 	"Set available npm modules": "Set available npm modules",
 	"Only store modules can be installed on tenant instances": "Only store modules can be installed on tenant instances",
-	"Unsafe modules": "Unsafe modules"
+	"Unsafe modules": "Unsafe modules",
+	"Notifications": "Notifications",
+	"No notifications": "No notifications",
+	"In user menu": "In user menu",
+	"Show notifications in the user menu": "Show notifications in the user menu",
+	"Notification settings": "Notification settings",
+	"PWA": "PWA",
+	"Progressive Web Application": "Progressive Web Application",
+	"Display": "Display",
+	"Progressive Web Application enabled": "Progressive Web Application enabled",
+	"Saltcorn test email": "Saltcorn test email",
+	"Hello from Saltcorn": "Hello from Saltcorn",
+	"Set colors": "Set colors",
+	"Theme color": "Theme color",
+	"Background color": "Background color",
+	"Table provider": "Table provider",
+	"Database table": "Database table",
+	"Configure provider": "Configure provider",
+	"In scope:": "In scope:"
 }

package/locales/pl.json

@@ -1106,5 +1106,21 @@
 	"Clear": "Wyczyść",
 	"Restore a snapshot": "Przywróć snapshot",
 	"Snapshot restored": "Snapshot przywrócony",
-	"Configuration check report": "Raport sprawdzenia konfiguracji"
+	"Configuration check report": "Raport sprawdzenia konfiguracji",
+	"Re-run": "Uruchom ponownie",
+	"Add constraint:": "Dodaj ograniczenie:",
+	"Index": "Index",
+	"Add constraint: ": "Dodaj ograniczenie: ",
+	"Choose the field to be indexed": "Wybierz pole do indeksacji",
+	"Constraint formula": "Formuła ograniczenia",
+	"Formula must evaluate to true for valid rows. In scope: ": "Formuła musi być prawdziwa dla uwierzytelnienia wierszy. W zakresie: ",
+	"Add %s constraint to %s": "Dodaj %s ograniczenie do %s",
+	"What": "Co",
+	"Choose the field to be indexed. This make searching the table faster.": "Wybierz pola, jakie mają być indeksowane. To przyspieszy wyszukiwanie w tabeli.",
+	"Disk usage": "Zużycie dysku",
+	"CPU usage": "Zużycie procesora",
+	"Mem usage": "Zużycie pamięci",
+	"The field that will be shown to the user when choosing a value": "Pole jakie będzie pokazane użytkownikowi przy wyborze wartości",
+	"String value must match regular expression": "Wartość ciągu musi odpowiadać wyrażeniu regularnemu",
+	"Modules up-to-date. Please restart server": "Moduły zaktualizowane. Proszę zresetować serwer"
 }

package/markup/admin.js

@@ -315,6 +315,7 @@ const send_admin_page = (args) => {
       { text: "System", href: "/admin/system" },
       { text: "Mobile app", href: "/admin/build-mobile-app" },
       { text: "Development", href: "/admin/dev" },
+      { text: "Notifications", href: "/admin/notifications" },
     ],
     ...args,
   });
@@ -343,7 +344,7 @@ const viewAttributes = async (key) => {
  * @param {*} req
  * @returns {void}
  */
-const flash_restart_if_required = (cfgForm, req) => {
+const check_if_restart_required = (cfgForm, req) => {
   let restart = false;
   cfgForm.fields.forEach((f) => {
     if (configTypes[f.name]?.restart_required) {
@@ -351,7 +352,7 @@ const flash_restart_if_required = (cfgForm, req) => {
       if (current !== cfgForm.values[f.name]) restart = true;
     }
   });
-  if (restart) flash_restart(req);
+  return restart;
 };
 
 /**
@@ -396,14 +397,21 @@ const config_fields_form = async ({
     const tens = await db.select("_sc_tenants");
     return { options: tens.map((t) => t.subdomain) };
   };
-  for (const name of field_names) {
-    if (typeof name === "object" && name.section_header) {
+  for (const name0 of field_names) {
+    if (typeof name0 === "object" && name0.section_header) {
       fields.push({
         input_type: "section_header",
-        label: name.section_header,
+        label: name0.section_header,
       });
       continue;
     }
+    let name, showIf;
+    if (typeof name0 === "object" && name0.name) {
+      name = name0.name;
+      showIf = name0.showIf;
+    } else {
+      name = name0;
+    }
     values[name] = state.getConfig(name);
     // console.log(`config field name: %s`,name);
     if (configTypes[name].root_only && tenant !== db.connectObj.default_schema)
@@ -427,6 +435,7 @@ const config_fields_form = async ({
           ? undefined
           : configTypes[name].type,
       input_type: configTypes[name].input_type,
+      showIf,
       attributes: isView
         ? await viewAttributes(name)
         : isRole
@@ -553,7 +562,7 @@ module.exports = {
   send_admin_page,
   send_files_page,
   save_config_from_form,
-  flash_restart_if_required,
+  check_if_restart_required,
   flash_restart,
   send_tags_page,
 };

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.8.5-beta.4",
+  "version": "0.8.5-beta.5",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.8.5-beta.4",
-    "@saltcorn/builder": "0.8.5-beta.4",
-    "@saltcorn/data": "0.8.5-beta.4",
-    "@saltcorn/admin-models": "0.8.5-beta.4",
-    "@saltcorn/filemanager": "0.8.5-beta.4",
-    "@saltcorn/markup": "0.8.5-beta.4",
-    "@saltcorn/sbadmin2": "0.8.5-beta.4",
+    "@saltcorn/base-plugin": "0.8.5-beta.5",
+    "@saltcorn/builder": "0.8.5-beta.5",
+    "@saltcorn/data": "0.8.5-beta.5",
+    "@saltcorn/admin-models": "0.8.5-beta.5",
+    "@saltcorn/filemanager": "0.8.5-beta.5",
+    "@saltcorn/markup": "0.8.5-beta.5",
+    "@saltcorn/sbadmin2": "0.8.5-beta.5",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn-common.js

@@ -167,7 +167,16 @@ function apply_showif() {
         }
       });
   });
-
+  $("[data-filter-table]").each(function (ix, element) {
+    const e = $(element);
+    const target = $(e.attr("data-filter-table"));
+    $(e).on("keyup", function () {
+      const value = $(this).val().toLowerCase();
+      target.find("tr").filter(function () {
+        $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1);
+      });
+    });
+  });
   $("[data-source-url]").each(function (ix, element) {
     const e = $(element);
     const rec0 = get_form_record(e);
@@ -1045,3 +1054,23 @@ function split_paste_handler(e) {
 function is_paging_param(key) {
   return key.endsWith("_page") || key.endsWith("_pagesize");
 }
+function check_saltcorn_notifications() {
+  $.ajax(`/notifications/count-unread`).then((resp) => {
+    if (resp.success) {
+      const n = resp.success;
+      const menu_item = $(`a.notify-menu-item`);
+
+      menu_item.html(
+        `<i class="fa-fw mr-05 fas fa-bell"></i>Notifications (${n})`
+      );
+      $(".user-nav-section").html(
+        `<i class="fa-fw mr-05 fas fa-user"></i>User (${n})`
+      );
+      $(".user-nav-section-with-span").html(
+        `<i class="fa-fw mr-05 fas fa-user"></i><span>User (${n})</span>`
+      );
+      window.update_theme_notification_count &&
+        window.update_theme_notification_count(n);
+    }
+  });
+}

package/public/saltcorn.css

@@ -398,3 +398,7 @@ table.table-inner-grid td {
     margin: 8px;
   }
 }
+
+div.unread-notify {
+  border-left: 4px solid green;
+}

package/public/saltcorn.js

@@ -326,6 +326,9 @@ function saveAndContinue(e, k) {
           `<input type="hidden" class="form-control  " name="id" value="${res.id}">`
         );
       }
+      if (res.notify) {
+        notifyAlert(res.notify);
+      }
     },
     error: function (request) {
       var ct = request.getResponseHeader("content-type") || "";

package/public/serviceworker.js

@@ -0,0 +1 @@
+// do nothing so far

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
@@ -1967,41 +1869,31 @@ router.post(
   })
 );
 
-/**
- * Developer settings form
- * @param {object} req request
- * @returns {Promise<Form>} form
- */
-const dev_form = async (req) => {
-  const tenants_set_npm_modules = getRootState().getConfig(
-    "tenants_set_npm_modules",
-    false
-  );
-  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 || tenants_set_npm_modules ? ["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,
@@ -2010,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

@@ -348,6 +348,7 @@ router.post(
             const resp = await action.run({
               configuration: trigger.configuration,
               body: req.body,
+              row: req.body,
               req,
             });
             res.json({ success: true, data: resp });

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/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);

package/routes/notifications.js

@@ -0,0 +1,136 @@
+/**
+ * @category server
+ * @module routes/notifications
+ * @subcategory routes
+ */
+
+const Router = require("express-promise-router");
+const { isAdmin, setTenant, error_catcher, loggedIn } = require("./utils.js");
+const Notification = require("@saltcorn/data/models/notification");
+const { div, a, i, text, h5, p, span } = require("@saltcorn/markup/tags");
+const moment = require("moment");
+const { getState } = require("@saltcorn/data/db/state");
+const Form = require("@saltcorn/data/models/form");
+const User = require("@saltcorn/data/models/user");
+const { renderForm } = require("@saltcorn/markup");
+
+const router = new Router();
+module.exports = router;
+
+const notificationSettingsForm = () =>
+  new Form({
+    action: `/notifications/settings`,
+    noSubmitButton: true,
+    onChange: `saveAndContinue(this)`,
+    labelCols: 4,
+    fields: [{ name: "notify_email", label: "Email", type: "Bool" }],
+  });
+
+router.get(
+  "/",
+  loggedIn,
+  error_catcher(async (req, res) => {
+    const nots = await Notification.find(
+      { user_id: req.user.id },
+      { orderBy: "id", orderDesc: true, limit: 20 }
+    );
+    await Notification.mark_as_read({
+      id: { in: nots.filter((n) => !n.read).map((n) => n.id) },
+    });
+    const notifyCards = nots.length
+      ? nots.map((not) => ({
+          type: "card",
+          class: [!not.read && "unread-notify"],
+          contents: [
+            div(
+              { class: "d-flex" },
+              span({ class: "fw-bold" }, not.title),
+              span({ class: "ms-2 text-muted" }, moment(not.created).fromNow())
+            ),
+            not.body && p(not.body),
+            not.link && a({ href: not.link }, "Link"),
+          ],
+        }))
+      : [
+          {
+            type: "card",
+            contents: [h5(req.__("No notifications"))],
+          },
+        ];
+    res.sendWrap(req.__("Notifications"), {
+      above: [
+        {
+          type: "breadcrumbs",
+          crumbs: [{ text: req.__("Notifications") }],
+        },
+        {
+          widths: [4, 8],
+          breakpoint: "md",
+          besides: [
+            {
+              type: "card",
+              contents: [
+                "Receive notifications by:",
+                renderForm(notificationSettingsForm(), req.csrfToken()),
+              ],
+            },
+            { above: notifyCards },
+          ],
+        },
+      ],
+    });
+  })
+);
+
+router.get(
+  "/count-unread",
+  loggedIn,
+  error_catcher(async (req, res) => {
+    const num_unread = await Notification.count({
+      user_id: req.user.id,
+      read: false,
+    });
+    res.set("Cache-Control", "public, max-age=60"); // 1 minute
+    res.json({ success: num_unread });
+  })
+);
+
+router.post(
+  "/settings",
+  loggedIn,
+  error_catcher(async (req, res) => {
+    const user = await User.findOne({ id: req.user.id });
+    const form = notificationSettingsForm();
+    form.validate(req.body);
+    const _attributes = { ...user._attributes, ...form.values };
+    await user.update({ _attributes });
+    res.json({ success: "ok" });
+  })
+);
+
+router.get(
+  "/manifest.json",
+  error_catcher(async (req, res) => {
+    const state = getState();
+    const manifest = {
+      name: state.getConfig("site_name"),
+      start_url: state.getConfig("base_url") || "/",
+      display: state.getConfig("pwa_display", "browser"),
+    };
+    const site_logo = state.getConfig("site_logo_id");
+    if (site_logo)
+      manifest.icons = [
+        {
+          src: `/files/serve/${site_logo}`,
+        },
+      ];
+    if (state.getConfig("pwa_set_colors", false)) {
+      manifest.theme_color = state.getConfig("pwa_theme_color", "black");
+      manifest.background_color = state.getConfig(
+        "pwa_background_color",
+        "red"
+      );
+    }
+    res.json(manifest);
+  })
+);

package/routes/tables.js

@@ -51,6 +51,7 @@ const {
 const { getState } = require("@saltcorn/data/db/state");
 const { cardHeaderTabs } = require("@saltcorn/markup/layout_utils");
 const { tablesList } = require("./common_lists");
+const { InvalidConfiguration } = require("@saltcorn/data/utils");
 
 /**
  * @type {object}
@@ -180,6 +181,7 @@ router.get(
   "/new/",
   isAdmin,
   error_catcher(async (req, res) => {
+    const table_provider_names = Object.keys(getState().table_providers);
     res.sendWrap(req.__(`New table`), {
       above: [
         {
@@ -203,6 +205,20 @@ router.get(
                   input_type: "text",
                   required: true,
                 },
+                ...(table_provider_names.length
+                  ? [
+                      {
+                        label: req.__("Table provider"),
+                        name: "provider_name",
+                        input_type: "select",
+                        options: [
+                          req.__("Database table"),
+                          ...table_provider_names,
+                        ],
+                        required: true,
+                      },
+                    ]
+                  : []),
               ],
             }),
             req.csrfToken()
@@ -548,9 +564,9 @@ router.get(
     const { idorname } = req.params;
     let id = parseInt(idorname);
     let table;
-    if (id) table = await Table.findOne({ id });
+    if (id) table = Table.findOne({ id });
     else {
-      table = await Table.findOne({ name: idorname });
+      table = Table.findOne({ name: idorname });
     }
 
     if (!table) {
@@ -645,7 +661,7 @@ router.get(
     var viewCard;
     if (fields.length > 0) {
       const views = await View.find(
-        table.external ? { exttable_name: table.name } : { table_id: table.id }
+        table.id ? { table_id: table.id } : { exttable_name: table.name }
       );
       var viewCardContents;
       if (views.length > 0) {
@@ -726,6 +742,16 @@ router.get(
             : req.__("Edit")
         )
       ),
+      table.provider_name &&
+        div(
+          { class: "mx-auto" },
+          a(
+            { href: `/table/provider-cfg/${table.id}` },
+            i({ class: "fas fa-2x fa-tools" }),
+            "<br/>",
+            req.__("Configure provider")
+          )
+        ),
       div(
         { class: "mx-auto" },
         a(
@@ -820,7 +846,13 @@ router.get(
           type: "breadcrumbs",
           crumbs: [
             { text: req.__("Tables"), href: "/table" },
-            { text: span({ class: "fw-bold text-body" }, table.name) },
+            {
+              text: span(
+                { class: "fw-bold text-body" },
+                table.name,
+                table.provider_name && ` (${table.provider_name} provider)`
+              ),
+            },
           ],
         },
         {
@@ -875,7 +907,14 @@ router.post(
       } else if (db.sqlsanitize(name) === "") {
         req.flash("error", req.__(`Invalid table name %s`, name));
         res.redirect(`/table/new`);
+      } else if (
+        rest.provider_name &&
+        rest.provider_name !== "Database table"
+      ) {
+        const table = await Table.create(name, rest);
+        res.redirect(`/table/provider-cfg/${table.id}`);
       } else {
+        delete rest.provider_name;
         const table = await Table.create(name, rest);
         req.flash("success", req.__(`Table %s created`, name));
         res.redirect(`/table/${table.id}`);
@@ -1004,23 +1043,6 @@ router.post(
     }
   })
 );
-/**
- * Table badges to show in System Table list views
- * Currently supports:
- * - Owned - if ownership_field_id? What is it?
- * - History - if table has versioning
- * - External - if this is external table
- * @param {object} t table object
- * @param {object} req http request
- * @returns {string} html string with list of badges
- */
-const tableBadges = (t, req) => {
-  let s = "";
-  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"));
-  return s;
-};
 
 /**
  * List Views of Tables (GET Handler)
@@ -1528,3 +1550,119 @@ router.post(
     res.redirect(`/table/${table.id}`);
   })
 );
+
+const respondWorkflow = (table, wf, wfres, req, res) => {
+  const wrap = (contents, noCard, previewURL) => ({
+    above: [
+      {
+        type: "breadcrumbs",
+        crumbs: [
+          { text: req.__("Tables"), href: "/table" },
+          { href: `/table/${table.id || table.name}`, text: table.name },
+          { text: req.__("Configuration") },
+        ],
+      },
+      {
+        type: noCard ? "container" : "card",
+        class: !noCard && "mt-0",
+        title: wfres.title,
+        titleAjaxIndicator: true,
+        contents,
+      },
+    ],
+  });
+  if (wfres.flash) req.flash(wfres.flash[0], wfres.flash[1]);
+  if (wfres.renderForm)
+    res.sendWrap(
+      {
+        title: req.__(`%s configuration`, table.name),
+        headers: [
+          {
+            script: `/static_assets/${db.connectObj.version_tag}/jquery-menu-editor.min.js`,
+          },
+          {
+            script: `/static_assets/${db.connectObj.version_tag}/iconset-fontawesome5-3-1.min.js`,
+          },
+          {
+            script: `/static_assets/${db.connectObj.version_tag}/bootstrap-iconpicker.js`,
+          },
+          {
+            css: `/static_assets/${db.connectObj.version_tag}/bootstrap-iconpicker.min.css`,
+          },
+        ],
+      },
+      wrap(
+        renderForm(wfres.renderForm, req.csrfToken()),
+        false,
+        wfres.previewURL
+      )
+    );
+  else res.redirect(wfres.redirect);
+};
+
+const get_provider_workflow = (table, req) => {
+  const provider = getState().table_providers[table.provider_name];
+  if (!provider) {
+    throw new InvalidConfiguration(
+      `Provider not found for rable ${table.name}: table.provider_name`
+    );
+  }
+  const workflow = provider.configuration_workflow(req);
+  workflow.action = `/table/provider-cfg/${table.id}`;
+  const oldOnDone = workflow.onDone || ((c) => c);
+  workflow.onDone = async (ctx) => {
+    const { table_id, ...configuration } = await oldOnDone(ctx);
+    await table.update({ provider_cfg: configuration });
+
+    return {
+      redirect: `/table/${table.id}`,
+      flash: ["success", `Table ${this.name || ""} saved`],
+    };
+  };
+  return workflow;
+};
+
+router.get(
+  "/provider-cfg/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const { step } = req.query;
+
+    const table = await Table.findOne({ id });
+    if (!table) {
+      req.flash("error", `Table not found`);
+      res.redirect(`/table`);
+      return;
+    }
+    const workflow = get_provider_workflow(table, req);
+    const wfres = await workflow.run(
+      {
+        ...(table.provider_cfg || {}),
+        table_id: table.id,
+        ...(step ? { stepName: step } : {}),
+      },
+      req
+    );
+    respondWorkflow(table, workflow, wfres, req, res);
+  })
+);
+
+router.post(
+  "/provider-cfg/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const { step } = req.query;
+
+    const table = await Table.findOne({ id });
+    if (!table) {
+      req.flash("error", `Table not found`);
+      res.redirect(`/table`);
+      return;
+    }
+    const workflow = get_provider_workflow(table, req);
+    const wfres = await workflow.run(req.body, req);
+    respondWorkflow(table, workflow, wfres, req, res);
+  })
+);

package/routes/utils.js

@@ -19,7 +19,12 @@ const is = require("contractis/is");
 const { validateHeaderName, validateHeaderValue } = require("http");
 const Crash = require("@saltcorn/data/models/crash");
 const si = require("systeminformation");
-
+const {
+  config_fields_form,
+  save_config_from_form,
+  check_if_restart_required,
+  flash_restart,
+} = require("../markup/admin.js");
 const get_sys_info = async () => {
   const disks = await si.fsSize();
   let size = 0;
@@ -318,6 +323,63 @@ const is_relative_url = (url) => {
   return typeof url === "string" && !url.includes(":/") && !url.includes("//");
 };
 
+const admin_config_route = ({
+  router,
+  path,
+  super_path = "",
+  get_form,
+  field_names,
+  response,
+  flash,
+}) => {
+  const getTheForm = async (req) =>
+    !get_form && field_names
+      ? await config_fields_form({
+          req,
+          field_names,
+          action: super_path + path,
+        })
+      : typeof get_form === "function"
+      ? await get_form(req)
+      : get_form;
+
+  router.get(
+    path,
+    isAdmin,
+    error_catcher(async (req, res) => {
+      response(await getTheForm(req), req, res);
+    })
+  );
+  router.post(
+    path,
+    isAdmin,
+    error_catcher(async (req, res) => {
+      const form = await getTheForm(req);
+      form.validate(req.body);
+      if (form.hasErrors) {
+        response(form, req, res);
+      } else {
+        const restart_required = check_if_restart_required(form, req);
+
+        await save_config_from_form(form);
+        if (!req.xhr) {
+          if (restart_required) {
+            flash_restart(req);
+          } else req.flash("success", req.__(flash));
+          res.redirect(super_path + path);
+        } else {
+          if (restart_required)
+            res.json({
+              success: "ok",
+              notify: req.__("Restart required for changes to take effect."),
+            });
+          else res.json({ success: "ok" });
+        }
+      }
+    })
+  );
+};
+
 module.exports = {
   sqlsanitize,
   csrfField,
@@ -333,4 +395,5 @@ module.exports = {
   addOnDoneRedirect,
   is_relative_url,
   get_sys_info,
+  admin_config_route,
 };

package/tests/crud.test.js

@@ -13,6 +13,7 @@ const {
 const db = require("@saltcorn/data/db");
 const Table = require("@saltcorn/data/models/table");
 const View = require("@saltcorn/data/models/view");
+const Notification = require("@saltcorn/data/models/notification");
 const User = require("@saltcorn/data/models/user");
 const reset = require("@saltcorn/data/db/reset_schema");
 
@@ -42,6 +43,58 @@ describe("standard edit form", () => {
   });
 });
 
+describe("notifications", () => {
+  it("show empty notifications", async () => {
+    const loginCookie = await getStaffLoginCookie();
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .get("/notifications")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("No notifications"));
+  });
+  it("no unread notifications", async () => {
+    const loginCookie = await getStaffLoginCookie();
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .get("/notifications/count-unread")
+      .set("Cookie", loginCookie)
+      .expect(succeedJsonWith((n) => n === 0));
+  });
+  it("add notification", async () => {
+    const user = await User.findOne({ role_id: 4 });
+    await Notification.create({
+      user_id: user.id,
+      title: "This is a staff announcement",
+      body: "Will a member of staff please proceed to the checkout area",
+      link: "https://www.sainsburys.co.uk/",
+    });
+  });
+  it("one unread notifications", async () => {
+    const loginCookie = await getStaffLoginCookie();
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .get("/notifications/count-unread")
+      .set("Cookie", loginCookie)
+      .expect(succeedJsonWith((n) => n === 1));
+  });
+  it("show new notifications", async () => {
+    const loginCookie = await getStaffLoginCookie();
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .get("/notifications")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("This is a staff announcement"))
+      .expect(toInclude("unread-notify"));
+  });
+  it("no unread notifications", async () => {
+    const loginCookie = await getStaffLoginCookie();
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .get("/notifications/count-unread")
+      .set("Cookie", loginCookie)
+      .expect(succeedJsonWith((n) => n === 0));
+  });
+});
 describe("homepage", () => {
   it("shows to admin", async () => {
     const loginCookie = await getAdminLoginCookie();

package/tests/plugins.test.js

@@ -318,7 +318,7 @@ describe("config endpoints", () => {
       .send("site_name=FooSiteName")
       .send("multitenancy_enabled=on")
       .set("Cookie", loginCookie)
-      .expect(toRedirect("/admin"));
+      .expect(toRedirect("/admin/"));
     await request(app)
       .get("/admin")
       .set("Cookie", loginCookie)

package/wrapper.js

@@ -5,7 +5,7 @@
 const { getState } = require("@saltcorn/data/db/state");
 const { get_extra_menu } = require("@saltcorn/data/web-mobile-commons");
 //const db = require("@saltcorn/data/db");
-const { h3, div, small } = require("@saltcorn/markup/tags");
+const { h3, div, small, domReady } = require("@saltcorn/markup/tags");
 const { renderForm, link } = require("@saltcorn/markup");
 const renderLayout = require("@saltcorn/markup/layout");
 /**
@@ -30,6 +30,7 @@ const get_menu = (req) => {
   const role = (req.user || {}).role_id || 10;
 
   const allow_signup = state.getConfig("allow_signup");
+  const notification_in_menu = state.getConfig("notification_in_menu");
   const login_menu = state.getConfig("login_menu");
   const locale = req.getLocale();
   const __ = (s) => state.i18n.__({ phrase: s, locale }) || s;
@@ -42,6 +43,16 @@ const get_menu = (req) => {
           isUser: true,
           subitems: [
             { label: small((req.user.email || "").split("@")[0]) },
+            ...(notification_in_menu
+              ? [
+                  {
+                    label: req.__("Notifications"),
+                    icon: "far fa-bell",
+                    class: "notify-menu-item",
+                    link: "/notifications",
+                  },
+                ]
+              : []),
             {
               label: req.__("User Settings"),
               icon: "fas fa-user-cog",
@@ -153,6 +164,8 @@ const get_menu = (req) => {
 const get_headers = (req, version_tag, description, extras = []) => {
   const state = getState();
   const favicon = state.getConfig("favicon_id", null);
+  const notification_in_menu = state.getConfig("notification_in_menu");
+  const pwa_enabled = state.getConfig("pwa_enabled");
 
   const iconHeader = favicon
     ? [
@@ -187,6 +200,18 @@ const get_headers = (req, version_tag, description, extras = []) => {
   for (const hs of Object.values(state.headers)) {
     state_headers.push(...hs);
   }
+  if (notification_in_menu)
+    from_cfg.push({ scriptBody: domReady(`check_saltcorn_notifications()`) });
+  if (pwa_enabled) {
+    from_cfg.push({
+      headerTag: `<link rel="manifest" href="/notifications/manifest.json">`,
+    });
+    from_cfg.push({
+      scriptBody: `if('serviceWorker' in navigator) {
+        navigator.serviceWorker.register('/serviceworker.js', { scope: '/' });
+      }`,
+    });
+  }
   return [
     ...stdHeaders,
     ...iconHeader,