@saltcorn/server 0.9.6-beta.18 → 0.9.6-beta.19

package/public/saltcorn-builder.css

@@ -509,3 +509,26 @@ div.builder-config-field {
   border: 1px solid black;
   margin-top: 2px;
 }
+
+div.componets-and-library-accordion {
+  padding-right: 0 !important;
+}
+.builder-left-shrunk .componets-and-library-accordion {
+  min-height: 0 !important;
+  padding-right: 0;
+}
+.toolbox-card .builder-layers {
+  min-height: 200px;
+  overflow-y: auto;
+  max-height: max-content !important;
+}
+.toolbox-card:nth-child(2) {
+  margin-bottom: 0px;
+}
+#builder-main-canvas {
+  height: calc(100dvh - 50px) !important;
+  min-height: 600px;
+}
+#builder-main-canvas.h-100 {
+  height: 100% !important;
+}

package/public/saltcorn.css

@@ -536,3 +536,53 @@ button.monospace-copy-btn:hover {
 button.monospace-copy-btn {
   position: absolute;
 }
+
+#page-inner-content.sbadmin2-theme .table.table-card-rows {
+  border-spacing: 0px 8px;
+  border-collapse: separate;
+}
+#page-inner-content.sbadmin2-theme .table.table-card-rows tbody {
+  transform: translateY(8px);
+}
+#page-inner-content.sbadmin2-theme .table.table-card-rows tr {
+  border-radius: 6px;
+}
+#page-inner-content.sbadmin2-theme
+  .table-hover.table-card-rows
+  > tbody
+  > tr:hover
+  > * {
+  --tblr-table-bg-state: transparent !important;
+  --bs-table-accent-bg: transparent !important;
+  color: var(--bs-table-hover-color);
+  background-color: var(--bs-table-hover-bg);
+}
+#page-inner-content.sbadmin2-theme .table.table-card-rows thead th {
+  background-color: #eaecf4;
+  border-block: 1px solid #d3d3d3 !important;
+  padding: 18px 15px;
+  font-weight: 600;
+}
+#page-inner-content.sbadmin2-theme .table.table-card-rows thead th:first-child {
+  border-left: 1px solid #d3d3d3 !important;
+  border-radius: 6px 0 0 6px;
+}
+#page-inner-content.sbadmin2-theme .table.table-card-rows thead th:last-child {
+  border-right: 1px #d3d3d3 !important;
+  border-radius: 0 6px 6px 0;
+}
+#page-inner-content.sbadmin2-theme .table.table-card-rows tbody td {
+  border-block: 1px solid #e3e6f0 !important;
+  position: relative;
+  z-index: 11;
+  padding: 15px 15px;
+  background-color: #fff;
+}
+#page-inner-content.sbadmin2-theme .table.table-card-rows tbody td:first-child {
+  border-left: 1px solid #e3e6f0 !important;
+  border-radius: 6px 0 0 6px;
+}
+#page-inner-content.sbadmin2-theme .table.table-card-rows tbody td:last-child {
+  border-right: 1px #e3e6f0 !important;
+  border-radius: 0 6px 6px 0;
+}

package/public/saltcorn.js

@@ -1034,6 +1034,84 @@ function execLink(path) {
   window.location.href = `${location.origin}${path}`;
 }
 
+let defferedPrompt;
+window.addEventListener("beforeinstallprompt", (e) => {
+  e.preventDefault();
+  defferedPrompt = e;
+});
+
+function isAndroidMobile() {
+  const ua = navigator.userAgent || navigator.vendor || window.opera;
+  return /android/i.test(ua) && /mobile/i.test(ua);
+}
+
+function validatePWAManifest(manifest) {
+  const errors = [];
+  if (!manifest) errors.push("The manifest.json file is missing. ");
+  else {
+    if (!manifest.icons || manifest.icons.length === 0)
+      errors.push("At least one icon is required");
+    else if (
+      manifest.icons.length > 0 &&
+      !manifest.icons.some((icon) => {
+        const sizes = icon.sizes.split("x");
+        const x = parseInt(sizes[0]);
+        const y = parseInt(sizes[1]);
+        return x === y && x >= 144;
+      })
+    ) {
+      errors.push(
+        "At least one square icon of size 144x144 or larger is required"
+      );
+    }
+    if (isAndroidMobile() && manifest.display === "browser") {
+      errors.push(
+        "The display property 'browser' may not work on mobile devices"
+      );
+    }
+  }
+  return errors;
+}
+
+function supportsBeforeInstallPrompt() {
+  return "onbeforeinstallprompt" in window;
+}
+
+function installPWA() {
+  if (defferedPrompt) defferedPrompt.prompt();
+  else if (!supportsBeforeInstallPrompt()) {
+    notifyAlert({
+      type: "danger",
+      text:
+        "It looks like your browser doesn’t support this feature. " +
+        "Please try the standard installation method provided by your browser, or switch to a different browser.",
+    });
+  } else {
+    const manifestUrl = `${window.location.origin}/notifications/manifest.json`;
+    notifyAlert({
+      type: "danger",
+      text:
+        "Unable to install the app. " +
+        "Please check if the app is already installed or " +
+        `inspect your manifest.json <a href="${manifestUrl}?pretty=true" target="_blank">here</a>`,
+    });
+    $.ajax(manifestUrl, {
+      success: (res) => {
+        const errors = validatePWAManifest(res);
+        if (errors.length > 0)
+          notifyAlert({
+            type: "warning",
+            text: `${errors.join(", ")}`,
+          });
+      },
+      error: (res) => {
+        console.log("Error fetching manifest.json");
+        console.log(res);
+      },
+    });
+  }
+}
+
 (() => {
   const e = document.querySelector("[data-sidebar-toggler]");
   let closed = localStorage.getItem("sidebarClosed") === "true";

package/routes/fields.js

@@ -84,6 +84,10 @@ const fieldForm = async (req, fkey_opts, existing_names, id, hasData) => {
         sublabel: req.__("Name of the field"),
         type: "String",
         attributes: { autofocus: true },
+        help: {
+          topic: "Field label",
+          context: {},
+        },
         validator(s) {
           if (!s || s === "") return req.__("Missing label");
           if (!id && existing_names.includes(Field.labelToName(s)))
@@ -104,6 +108,10 @@ const fieldForm = async (req, fkey_opts, existing_names, id, hasData) => {
           "The type determines the kind of data that can be stored in the field"
         ),
         input_type: "select",
+        help: {
+          topic: "Field types",
+          context: {},
+        },
         options: isPrimary
           ? primaryTypes
           : getState().type_names.concat(fkey_opts || []),

package/routes/homepage.js

@@ -459,8 +459,10 @@ const welcome_page = async (req) => {
           viewCard(views, req),
           pageCard(pages, req),
         ],
+        class: "welcome-page-row1",
       },
       {
+        class: "welcome-page-row2",
         besides: [
           {
             type: "card",

package/routes/notifications.js

@@ -184,8 +184,9 @@ router.post(
 );
 
 router.get(
-  "/manifest.json",
+  "/manifest.json:opt_cache_bust?",
   error_catcher(async (req, res) => {
+    const { pretty } = req.query;
     const state = getState();
     const manifest = {
       name: state.getConfig("site_name"),
@@ -216,6 +217,11 @@ router.get(
         "red"
       );
     }
-    res.json(manifest);
+    if (!pretty) res.json(manifest);
+    else {
+      const prettyJson = JSON.stringify(manifest, null, 2);
+      res.setHeader("Content-Type", "application/json");
+      res.send(prettyJson);
+    }
   })
 );

package/routes/tables.js

@@ -93,14 +93,45 @@ const tableForm = async (table, req) => {
     noSubmitButton: true,
     onChange: "saveAndContinue(this)",
     fields: [
+      {
+        label: req.__("Minimum role to read"),
+        sublabel: req.__(
+          "User must have this role or higher to read rows from the table, unless they are the owner"
+        ),
+        help: {
+          topic: "Table roles",
+          context: {},
+        },
+        name: "min_role_read",
+        input_type: "select",
+        options: roleOptions,
+        attributes: { asideNext: !table.external && !table.provider_name },
+      },
       ...(!table.external && !table.provider_name
         ? [
+            {
+              label: req.__("Minimum role to write"),
+              name: "min_role_write",
+              input_type: "select",
+              help: {
+                topic: "Table roles",
+                context: {},
+              },
+              sublabel: req.__(
+                "User must have this role or higher to edit or create new rows in the table, unless they are the owner"
+              ),
+              options: roleOptions,
+            },
             {
               label: req.__("Ownership field"),
               name: "ownership_field_id",
               sublabel: req.__(
                 "The user referred to in this field will be the owner of the row"
               ),
+              help: {
+                topic: "Ownership field",
+                context: {},
+              },
               input_type: "select",
               options: [
                 { value: "", label: req.__("None") },
@@ -114,6 +145,10 @@ const tableForm = async (table, req) => {
               validator: expressionValidator,
               type: "String",
               class: "validate-expression",
+              help: {
+                topic: "Ownership formula",
+                context: {},
+              },
               sublabel:
                 req.__("User is treated as owner if true. In scope: ") +
                 ["user", ...fields.map((f) => f.name)]
@@ -126,6 +161,10 @@ const tableForm = async (table, req) => {
               sublabel: req.__(
                 "Add relations to this table in dropdown options for ownership field"
               ),
+              help: {
+                topic: "User groups",
+                context: {},
+              },
               name: "is_user_group",
               type: "Bool",
             },
@@ -141,28 +180,9 @@ const tableForm = async (table, req) => {
         ),
         //options: roleOptions,
       },
-      {
-        label: req.__("Minimum role to read"),
-        sublabel: req.__(
-          "User must have this role or higher to read rows from the table, unless they are the owner"
-        ),
-        name: "min_role_read",
-        input_type: "select",
-        options: roleOptions,
-        attributes: { asideNext: !table.external && !table.provider_name },
-      },
       ...(table.external || table.provider_name
         ? []
         : [
-            {
-              label: req.__("Minimum role to write"),
-              name: "min_role_write",
-              input_type: "select",
-              sublabel: req.__(
-                "User must have this role or higher to edit or create new rows in the table, unless they are the owner"
-              ),
-              options: roleOptions,
-            },
             {
               label: req.__("Version history"),
               sublabel: req.__("Track table data changes over time"),

package/routes/tenant.js

@@ -44,7 +44,7 @@ const {
 const db = require("@saltcorn/data/db");
 
 const { loadAllPlugins, loadAndSaveNewPlugin } = require("../load_plugins");
-const { isAdmin, error_catcher } = require("./utils.js");
+const { isAdmin, error_catcher, is_ip_address } = require("./utils.js");
 const User = require("@saltcorn/data/models/user");
 const File = require("@saltcorn/data/models/file");
 const {
@@ -117,18 +117,6 @@ const create_tenant_allowed = (req) => {
   return user_role <= required_role;
 };
 
-/**
- * Check that String is IPv4 address
- * @param {string} hostname
- * @returns {boolean|string[]}
- */
-// TBD not sure that false is correct return if type of is not string
-// TBD Add IPv6 support
-const is_ip_address = (hostname) => {
-  if (typeof hostname !== "string") return false;
-  return hostname.split(".").every((s) => +s >= 0 && +s <= 255);
-};
-
 const get_cfg_tenant_base_url = (req) =>
   remove_leading_chars(
     ".",

package/routes/utils.js

@@ -155,6 +155,8 @@ const get_tenant_from_req = (req, hostPartsOffset) => {
   if (req.subdomains && req.subdomains.length == 0)
     return db.connectObj.default_schema;
   if (!req.subdomains && req.headers.host) {
+    if (is_ip_address(req.headers.host.split(":")[0]))
+      return db.connectObj.default_schema;
     const parts = req.headers.host.split(".");
     if (parts.length < (!hostPartsOffset ? 3 : 3 - hostPartsOffset))
       return db.connectObj.default_schema;
@@ -297,7 +299,7 @@ const getGitRevision = () => db.connectObj.git_commit;
  * Gets session store
  * @returns {session|cookieSession}
  */
-const getSessionStore = () => {
+const getSessionStore = (pruneInterval) => {
   /*if (getState().getConfig("cookie_sessions", false)) {
     return cookieSession({
       keys: [db.connectObj.session_secret || is.str.generate()],
@@ -320,6 +322,7 @@ const getSessionStore = () => {
         schemaName: db.connectObj.default_schema,
         pool: db.pool,
         tableName: "_sc_session",
+        pruneSessionInterval: pruneInterval > 0 ? pruneInterval : false,
       }),
       secret: db.connectObj.session_secret || is.str.generate(),
       resave: false,
@@ -348,6 +351,18 @@ const is_relative_url = (url) => {
   return typeof url === "string" && !url.includes(":/") && !url.includes("//");
 };
 
+/**
+ * Check that String is IPv4 address
+ * @param {string} hostname
+ * @returns {boolean|string[]}
+ */
+// TBD not sure that false is correct return if type of is not string
+// TBD Add IPv6 support
+const is_ip_address = (hostname) => {
+  if (typeof hostname !== "string") return false;
+  return hostname.split(".").every((s) => +s >= 0 && +s <= 255);
+};
+
 const admin_config_route = ({
   router,
   path,
@@ -556,6 +571,7 @@ module.exports = {
   get_tenant_from_req,
   addOnDoneRedirect,
   is_relative_url,
+  is_ip_address,
   get_sys_info,
   admin_config_route,
   sendHtmlFile,

package/serve.js

@@ -235,6 +235,10 @@ module.exports =
       : defaultNCPUs;
 
     const letsEncrypt = await getConfig("letsencrypt", false);
+    const pruneSessionInterval = +(await getConfig(
+      "prune_session_interval",
+      900
+    ));
     const masterState = {
       started: false,
       listeningTo: new Set([]),
@@ -287,7 +291,11 @@ module.exports =
           })
           .ready((glx) => {
             const httpsServer = glx.httpsServer();
-            setupSocket(appargs?.subdomainOffset, httpsServer);
+            setupSocket(
+              appargs?.subdomainOffset,
+              pruneSessionInterval,
+              httpsServer
+            );
             httpsServer.setTimeout(timeout * 1000);
             process.on("message", workerDispatchMsg);
             glx.serveApp(app);
@@ -344,6 +352,10 @@ const nonGreenlockWorkerSetup = async (appargs, port) => {
   const cert = getState().getConfig("custom_ssl_certificate", "");
   const key = getState().getConfig("custom_ssl_private_key", "");
   const timeout = +getState().getConfig("timeout", 120);
+  const pruneSessionInterval = +(await getState().getConfig(
+    "prune_session_interval",
+    900
+  ));
   // Server with http on port 80 / https on 443
   // todo  resolve hardcode
   if (port === 80 && cert && key) {
@@ -354,7 +366,12 @@ const nonGreenlockWorkerSetup = async (appargs, port) => {
     // todo timeout to config
     httpServer.setTimeout(timeout * 1000);
     httpsServer.setTimeout(timeout * 1000);
-    setupSocket(appargs?.subdomainOffset, httpServer, httpsServer);
+    setupSocket(
+      appargs?.subdomainOffset,
+      pruneSessionInterval,
+      httpServer,
+      httpsServer
+    );
     httpServer.listen(port, () => {
       console.log("HTTP Server running on port 80");
     });
@@ -367,7 +384,7 @@ const nonGreenlockWorkerSetup = async (appargs, port) => {
     // server with http only
     const http = require("http");
     const httpServer = http.createServer(app);
-    setupSocket(appargs?.subdomainOffset, httpServer);
+    setupSocket(appargs?.subdomainOffset, pruneSessionInterval, httpServer);
 
     // todo timeout to config
     // todo refer in doc to httpserver doc
@@ -384,7 +401,7 @@ const nonGreenlockWorkerSetup = async (appargs, port) => {
  *
  * @param  {...*} servers
  */
-const setupSocket = (subdomainOffset, ...servers) => {
+const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
   // https://socket.io/docs/v4/middlewares/
   const wrap = (middleware) => (socket, next) =>
     middleware(socket.request, {}, next);
@@ -395,7 +412,7 @@ const setupSocket = (subdomainOffset, ...servers) => {
   }
 
   const passportInit = passport.initialize();
-  const sessionStore = getSessionStore();
+  const sessionStore = getSessionStore(pruneSessionInterval);
   const setupNamespace = (namespace) => {
     //io.of(namespace).use(wrap(setTenant));
     io.of(namespace).use(wrap(sessionStore));
@@ -452,6 +469,11 @@ const setupSocket = (subdomainOffset, ...servers) => {
             socketIds.push(socket.id);
             await getState().setConfig("joined_log_socket_ids", [...socketIds]);
             callback({ status: "ok" });
+            setTimeout(() => {
+              io.of("/")
+                .to(`_logs_${tenant}_`)
+                .emit("test_conn_msg", { text: "test message" });
+            }, 1000);
           }
         } catch (err) {
           getState().log(1, `Socket join_logs stream: ${err.stack}`);

package/wrapper.js

@@ -170,6 +170,7 @@ const get_headers = (req, version_tag, description, extras = []) => {
   const favicon = state.getConfig("favicon_id", null);
   const notification_in_menu = state.getConfig("notification_in_menu");
   const pwa_enabled = state.getConfig("pwa_enabled");
+  const is_root = req.user?.role_id === 1;
 
   const iconHeader = favicon
     ? [
@@ -219,7 +220,9 @@ const get_headers = (req, version_tag, description, extras = []) => {
     from_cfg.push({ scriptBody: domReady(`check_saltcorn_notifications()`) });
   if (pwa_enabled) {
     from_cfg.push({
-      headerTag: `<link rel="manifest" href="/notifications/manifest.json">`,
+      headerTag: `<link rel="manifest" href="/notifications/manifest.json${
+        is_root ? new Date().valueOf() : ""
+      }">`,
     });
     from_cfg.push({
       scriptBody: `if('serviceWorker' in navigator) {