@saltcorn/server 1.3.1-beta.1 → 1.3.1-beta.11

package/routes/menu.js

@@ -119,6 +119,8 @@ const menuForm = async (req) => {
           "View",
           "Page",
           "Page Group",
+          "Admin Page",
+          "User Page",
           "Link",
           "Header",
           "Dynamic",
@@ -150,6 +152,39 @@ const menuForm = async (req) => {
         options: pages.map((r) => r.name),
         showIf: { type: "Page" },
       },
+      {
+        name: "admin_page",
+        label: req.__("Admin Page"),
+        input_type: "select",
+        class: "item-menu",
+        options: [
+          "Tables",
+          "Views",
+          "Pages",
+          "About application",
+          "Modules",
+          "Users and security",
+          "Site structure",
+          "Files",
+          "Events",
+          "Settings",
+        ],
+        showIf: { type: "Admin Page" },
+      },
+      {
+        name: "user_page",
+        label: req.__("User Page"),
+        input_type: "select",
+        class: "item-menu",
+        options: [
+          "Notifications",
+          "User settings",
+          "Login",
+          "Logout",
+          "Signup",
+        ],
+        showIf: { type: "User Page" },
+      },
       {
         name: "viewname",
         label: req.__("View"),
@@ -247,6 +282,16 @@ const menuForm = async (req) => {
         required: true,
         showIf: { type: "Dynamic" },
       },
+      {
+        name: "user_menu_header",
+        label: req.__("User menu header"),
+        sublabel: req.__("Some themes display this header differently"),
+        type: "Bool",
+        class: "item-menu",
+        required: false,
+        default: false,
+        showIf: { type: "Header" },
+      },
       {
         name: "text",
         label: req.__("Text label"),
@@ -263,6 +308,8 @@ const menuForm = async (req) => {
             "Dynamic",
             "Search",
             "Action",
+            "Admin Page",
+            "User Page",
           ],
         },
       },
@@ -274,7 +321,16 @@ const menuForm = async (req) => {
           html: `<button type="button" id="myEditor_icon" class="btn btn-outline-secondary"></button>`,
         },
         showIf: {
-          type: ["View", "Page", "Page Group", "Link", "Header", "Action"],
+          type: [
+            "View",
+            "Page",
+            "Page Group",
+            "Link",
+            "Header",
+            "Action",
+            "Admin Page",
+            "User Page",
+          ],
         },
       },
       {
@@ -282,7 +338,16 @@ const menuForm = async (req) => {
         class: "item-menu",
         input_type: "hidden",
         showIf: {
-          type: ["View", "Page", "Page Group", "Link", "Header", "Action"],
+          type: [
+            "View",
+            "Page",
+            "Page Group",
+            "Link",
+            "Header",
+            "Action",
+            "Admin Page",
+            "User Page",
+          ],
         },
       },
       {
@@ -301,6 +366,8 @@ const menuForm = async (req) => {
             "Dynamic",
             "Search",
             "Action",
+            "Admin Page",
+            "User Page",
           ],
         },
       },
@@ -343,7 +410,16 @@ const menuForm = async (req) => {
         type: "Bool",
         required: false,
         class: "item-menu",
-        showIf: { type: ["View", "Page", "Page Group", "Link"] },
+        showIf: {
+          type: [
+            "View",
+            "Page",
+            "Page Group",
+            "Link",
+            "Admin Page",
+            "User Page",
+          ],
+        },
       },
       {
         name: "in_modal",
@@ -351,7 +427,16 @@ const menuForm = async (req) => {
         type: "Bool",
         required: false,
         class: "item-menu",
-        showIf: { type: ["View", "Page", "Page Group", "Link"] },
+        showIf: {
+          type: [
+            "View",
+            "Page",
+            "Page Group",
+            "Link",
+            "Admin Page",
+            "User Page",
+          ],
+        },
       },
       {
         name: "style",
@@ -369,6 +454,8 @@ const menuForm = async (req) => {
             "Header",
             "Dynamic",
             "Action",
+            "Admin Page",
+            "User Page",
           ],
         },
         attributes: {
@@ -403,6 +490,8 @@ const menuForm = async (req) => {
             "Search",
             "Separator",
             "Action",
+            "Admin Page",
+            "User Page",
           ],
         },
         sublabel: req.__("Not all themes support all locations"),
@@ -628,14 +717,17 @@ router.post(
   "/action/:rndid",
   error_catcher(async (req, res, next) => {
     const state = getState();
-    const maintenanceModeEnabled = state.getConfig("maintenance_mode_enabled", false);
+    const maintenanceModeEnabled = state.getConfig(
+      "maintenance_mode_enabled",
+      false
+    );
 
     if (maintenanceModeEnabled && (!req.user || req.user.role_id > 1)) {
       res.status(503).json({ error: "in maintenance mode" });
       return;
     }
     next();
-  }),
+  })
 );
 
 const getIcons = () => {

package/routes/page.js

@@ -46,18 +46,21 @@ const findPageOrGroup = (pagename) => {
 
 const runPage = async (page, req, res, tic) => {
   const role = req.user && req.user.id ? req.user.role_id : 100;
+  // let resultCollector = {};
   if (role <= page.min_role) {
     const contents = await page.run(req.query, { res, req });
     const title = scan_for_page_title(contents, page.title);
     const tock = new Date();
     const ms = tock.getTime() - tic.getTime();
-    if (!isTest())
+
+    if (!isTest()) {
       Trigger.emitEvent("PageLoad", null, req.user, {
         text: req.__("Page '%s' was loaded", page.name),
         type: "page",
         name: page.name,
         render_time: ms,
       });
+    }
     if (contents.html_file) await sendHtmlFile(req, res, contents.html_file);
     else
       res.sendWrap(

package/routes/pageedit.js

@@ -201,6 +201,7 @@ const pageBuilderData = async (req, context) => {
   const actionsNotRequiringRow = Trigger.action_options({
     notRequireRow: true,
     apiNeverTriggers: true,
+    forBuilder: true,
     builtInLabel: "Page Actions",
     builtIns: ["GoBack"],
   });

package/routes/plugins.js

@@ -238,7 +238,7 @@ const cfg_link = (req, row) => {
   if (plugin.configuration_workflow)
     return a(
       {
-        class: "btn btn-secondary btn-sm d-inline me-1",
+        class: "btn btn-secondary btn-sm d-inline-block",
         role: "button",
         href: `/plugins/configure/${encodeURIComponent(row.name)}`,
         title: req.__("Configure plugin"),
@@ -256,7 +256,7 @@ const cfg_link = (req, row) => {
 const info_link = (req, row) =>
   a(
     {
-      class: "btn btn-secondary btn-sm d-inline",
+      class: "btn btn-secondary btn-sm d-inline-block me-1",
       role: "button",
       href: `/plugins/info/${encodeURIComponent(row.name)}`,
       title: req.__("Information about plugin"),
@@ -306,7 +306,7 @@ const store_item_html = (req) => (item) => ({
       !item.installed &&
         item.plugin &&
         div(
-          { class: "me-2 d-inline" },
+          { class: "d-inline" },
           post_btn(
             `/plugins/install/${encodeURIComponent(item.name)}`,
             req.__("Install"),
@@ -331,10 +331,11 @@ const store_item_html = (req) => (item) => ({
             onClick: "press_store_button(this)",
           }
         ),
-
-      item.installed && item.plugin && cfg_link(req, item),
-      item.installed && item.plugin && info_link(req, item),
-
+      div(
+        { class: "btn-group", role: "group" },
+        item.installed && item.plugin && cfg_link(req, item),
+        item.installed && item.plugin && info_link(req, item)
+      ),
       item.installed &&
         item.pack &&
         post_btn(

package/routes/tables.js

@@ -1309,6 +1309,17 @@ router.post(
       } else rest.ownership_formula = null;
       await db.withTransaction(async () => {
         await table.update(rest);
+        // Update table field's min_role_write attributes
+        const fields = table.getFields();
+
+        for (const f of fields) {
+          if (f.attributes?.min_role_write) {
+            f.attributes.min_role_write = parseInt(rest.min_role_write);
+            await f.update({
+              attributes: f.attributes,
+            });
+          }
+        }
       });
       await getState().refresh_tables();
       if (!req.xhr) {

package/routes/view.js

@@ -43,7 +43,10 @@ router.get(
   ["/:viewname", "/:viewname/*slug"],
   error_catcher(async (req, res) => {
     const state = getState();
-    const maintenanceModeEnabled = state.getConfig("maintenance_mode_enabled", false);
+    const maintenanceModeEnabled = state.getConfig(
+      "maintenance_mode_enabled",
+      false
+    );
     const maintenanceModePage = state.getConfig("maintenance_mode_page", "");
 
     if (
@@ -242,7 +245,10 @@ router.post(
   "/:viewname/:route",
   error_catcher(async (req, res, next) => {
     const state = getState();
-    const maintenanceModeEnabled = state.getConfig("maintenance_mode_enabled", false);
+    const maintenanceModeEnabled = state.getConfig(
+      "maintenance_mode_enabled",
+      false
+    );
 
     if (maintenanceModeEnabled && (!req.user || req.user.role_id > 1)) {
       res.status(503).json({ error: "in maintenance mode" });
@@ -287,7 +293,10 @@ router.post(
   ["/:viewname", "/:viewname/*slug"],
   error_catcher(async (req, res, next) => {
     const state = getState();
-    const maintenanceModeEnabled = state.getConfig("maintenance_mode_enabled", false);
+    const maintenanceModeEnabled = state.getConfig(
+      "maintenance_mode_enabled",
+      false
+    );
     if (maintenanceModeEnabled && (!req.user || req.user.role_id > 1)) {
       res.status(503).send("Page Unavailable: in maintenance mode");
       return;

package/serve.js

@@ -14,6 +14,7 @@ const {
   init_multi_tenant,
   restart_tenant,
   add_tenant,
+  get_other_domain_tenant,
 } = require("@saltcorn/data/db/state");
 const { create_tenant } = require("@saltcorn/admin-models/models/tenant");
 
@@ -79,17 +80,6 @@ const ensureJwtSecret = () => {
   }
 };
 
-/**
- * Ensure the engines cache is up to date with the current sc version
- */
-const ensureEnginesCache = async () => {
-  const cacheScVersion = await getConfig("engines_cache_sc_version", "");
-  if (!cacheScVersion || cacheScVersion !== getState().scVersion) {
-    await setConfig("engines_cache", {});
-    await setConfig("engines_cache_sc_version", getState().scVersion);
-  }
-};
-
 /**
  * validate all plugins folders and remove invalid entries
  * A folder is invalid when it has dependencies but not node_modules directory
@@ -205,12 +195,6 @@ const initMaster = async ({ disableMigrate }, useClusterAdaptor = true) => {
     const tenants = await getAllTenants();
     await init_multi_tenant(loadAllPlugins, disableMigrate, tenants);
   }
-  eachTenant(async () => {
-    const state = getState();
-    if (state) {
-      await state.setConfig("joined_log_socket_ids", []);
-    }
-  });
   if (useClusterAdaptor) setupPrimary();
 };
 
@@ -234,7 +218,11 @@ const workerDispatchMsg = ({ tenant, ...msg }) => {
     console.error("no State for tenant", tenant);
     return;
   }
-  if (msg.refresh) getState()[`refresh_${msg.refresh}`](true);
+  if (msg.refresh) {
+    if (msg.refresh === "ephemeral_config")
+      getState().refresh_ephemeral_config(msg.key, msg.value);
+    else getState()[`refresh_${msg.refresh}`](true);
+  }
   if (msg.createTenant) {
     const tenant_template = getState().getConfig("tenant_template");
     add_tenant(msg.createTenant);
@@ -290,7 +278,8 @@ const onMessageFromWorker =
       ///ie from saltcorn
       //broadcast
       Object.entries(cluster.workers).forEach(([wpid, w]) => {
-        if (wpid !== pid) w.send(msg);
+        //if it is plugin refresh, we need sender to get it as wll
+        if (wpid !== pid || msg?.refresh_plugin_cfg) w.send(msg);
       });
       workerDispatchMsg(msg); //also master
       return true;
@@ -322,7 +311,6 @@ module.exports =
   } = {}) => {
     if (cluster.isMaster) {
       ensureJwtSecret();
-      await ensureEnginesCache();
       await ensurePluginsFolder();
       await ensureNotificationSubscriptions();
     }
@@ -382,6 +370,13 @@ module.exports =
               masterState.listeningTo.add(id);
             }
           });
+          getState().sendMessageToWorkers = (msg) => {
+            Object.entries(cluster.workers).forEach(([wpid, w]) => {
+              w.send(msg);
+            });
+            workerDispatchMsg(msg); //also master
+          };
+
           if (masterState.listeningTo.size < useNCpus)
             setTimeout(initMasterListeners, 250);
         };
@@ -420,12 +415,21 @@ module.exports =
 
       if (forkAnyWorkers) {
         for (let i = 0; i < useNCpus; i++) addWorker(cluster.fork());
+        getState().sendMessageToWorkers = (msg) => {
+          Object.entries(cluster.workers).forEach(([wpid, w]) => {
+            w.send(msg);
+          });
+          workerDispatchMsg(msg); //also master
+        };
 
         cluster.on("exit", (worker, code, signal) => {
           console.log(`worker ${worker.process.pid} died`);
           addWorker(cluster.fork());
         });
       } else {
+        getState().sendMessageToWorkers = (msg) => {
+          workerDispatchMsg(msg); //also master
+        };
         await nonGreenlockWorkerSetup(appargs, port, host);
         runScheduler({
           port,
@@ -508,6 +512,16 @@ const nonGreenlockWorkerSetup = async (appargs, port, host) => {
   getState().processSend("Start");
 };
 
+const tenantFromSocket = (socket, hostPartOffset) => {
+  const header = socket.request.headers.host;
+  const hostOnly = header?.split(":")[0];
+  if (hostOnly) {
+    const tenant = get_other_domain_tenant(hostOnly);
+    if (tenant) return tenant;
+  }
+  return get_tenant_from_req(socket.request, hostPartOffset);
+};
+
 /**
  *
  * @param  {...*} servers
@@ -544,14 +558,29 @@ const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
       .emit("log_msg", { text: msg, time, level });
   });
 
-  // Real-time collaboration emitter
+  // Real-time collaboration emitter (tied to views)
   getState().setCollabEmitter((tenant, type, data) => {
     io.of("/").to(`_${tenant}_collab_room_`).emit(type, data);
   });
 
+  // dynamic updates emitter (for run_js_actions)
+  getState().setDynamicUpdateEmitter((tenant, data, userIds) => {
+    if (userIds) {
+      for (const userId of userIds) {
+        io.of("/")
+          .to(`_${tenant}:${userId}_dynamic_update_room`)
+          .emit("dynamic_update", data);
+      }
+    } else {
+      io.of("/")
+        .to(`_${tenant}_dynamic_update_room`)
+        .emit("dynamic_update", data);
+    }
+  });
+
   io.of("/").on("connection", (socket) => {
     socket.on("join_room", ([viewname, room_id]) => {
-      const ten = get_tenant_from_req(socket.request) || "public";
+      const ten = tenantFromSocket(socket, subdomainOffset) || "public";
       const f = () => {
         try {
           const view = View.findOne({ name: viewname });
@@ -571,8 +600,7 @@ const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
     });
 
     socket.on("join_log_room", async (callback) => {
-      const tenant =
-        get_tenant_from_req(socket.request, subdomainOffset) || "public";
+      const tenant = tenantFromSocket(socket, subdomainOffset) || "public";
       const f = async () => {
         try {
           const user = socket.request.user;
@@ -596,14 +624,13 @@ const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
           callback({ status: "error", msg: err.message || "unknown error" });
         }
       };
-      if (tenant && tenant !== "public") db.runWithTenant(tenant, f);
+      if (tenant && tenant !== "public") await db.runWithTenant(tenant, f);
       else await f();
     });
 
     // or join the room more generally and later register views ??
     socket.on("join_collab_room", async (viewname, callback) => {
-      const tenant =
-        get_tenant_from_req(socket.request, subdomainOffset) || "public";
+      const tenant = tenantFromSocket(socket, subdomainOffset) || "public";
       const f = async () => {
         try {
           const view = View.findOne({ name: viewname });
@@ -620,20 +647,49 @@ const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
             callback({ status: "error", msg: err.message || "unknown error" });
         }
       };
-      if (tenant && tenant !== "public") db.runWithTenant(tenant, f);
+      if (tenant && tenant !== "public") await db.runWithTenant(tenant, f);
+      else await f();
+    });
+
+    // join_dynamic_update_room for events emitted from run_js_actions
+    socket.on("join_dynamic_update_room", async (callback) => {
+      const tenant = tenantFromSocket(socket, subdomainOffset) || "public";
+      const f = async () => {
+        try {
+          const enabled = getState().getConfig("enable_dynamic_updates", true);
+          if (!enabled) throw new Error("Dynamic updates are not enabled");
+          const user = socket.request.user;
+          if (!user) throw new Error("Not authorized");
+          socket.join(`_${tenant}_dynamic_update_room`);
+          socket.join(`_${tenant}:${user.id}_dynamic_update_room`);
+          if (typeof callback === "function") callback({ status: "ok" });
+        } catch (err) {
+          getState().log(1, `Socket join_dynamic_update_room: ${err.stack}`);
+          if (typeof callback === "function")
+            callback({ status: "error", msg: err.message || "unknown error" });
+        }
+      };
+      if (tenant && tenant !== "public") await db.runWithTenant(tenant, f);
       else await f();
     });
 
     socket.on("disconnect", async () => {
-      const tenant =
-        get_tenant_from_req(socket.request, subdomainOffset) || "public";
+      const tenant = tenantFromSocket(socket, subdomainOffset) || "public";
       const f = async () => {
-        const socketIds = await getState().getConfig("joined_log_socket_ids");
-        const newSocketIds = socketIds.filter((id) => id !== socket.id);
-        await getState().setConfig("joined_log_socket_ids", newSocketIds);
+        const state = getState();
+        if (state) {
+          const socketIds = state.getConfig("joined_log_socket_ids");
+          const newSocketIds = socketIds.filter((id) => id !== socket.id);
+          await state.setConfig("joined_log_socket_ids", newSocketIds);
+        } else {
+          console.error("No state found in socket disconnect");
+          console.error("The current tenantSchema is:", db.getTenantSchema());
+          console.error("The current tenant from request is:", tenant);
+          console.error("node version:", process.version);
+        }
       };
-      if (tenant && tenant !== "public") db.runWithTenant(tenant, f);
-      else f();
+      if (tenant && tenant !== "public") await db.runWithTenant(tenant, f);
+      else await f();
     });
   });
 
@@ -643,8 +699,7 @@ const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
     socket.on(
       "open_data_stream",
       async ([viewName, id, fieldName, fieldView, targetOpts], callback) => {
-        const tenant =
-          get_tenant_from_req(socket.request, subdomainOffset) || "public";
+        const tenant = tenantFromSocket(socket, subdomainOffset) || "public";
         const f = async () => {
           try {
             const user = socket.request.user;
@@ -681,8 +736,8 @@ const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
             callback({ status: "error", msg: err.message || "unknown error" });
           }
         };
-        if (tenant && tenant !== "public") db.runWithTenant(tenant, f);
-        else f();
+        if (tenant && tenant !== "public") await db.runWithTenant(tenant, f);
+        else await f();
       }
     );
     socket.on("write_to_stream", async (data, callback) => {
@@ -723,8 +778,7 @@ const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
     });
 
     socket.on("disconnect", async () => {
-      const tenant =
-        get_tenant_from_req(socket.request, subdomainOffset) || "public";
+      const tenant = tenantFromSocket(socket, subdomainOffset) || "public";
       const f = async () => {
         if (dataStream)
           dataStream.close((err) => {
@@ -744,8 +798,8 @@ const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
             }
           });
       };
-      if (tenant && tenant !== "public") db.runWithTenant(tenant, f);
-      else f();
+      if (tenant && tenant !== "public") await db.runWithTenant(tenant, f);
+      else await f();
     });
   });
 };

package/tests/admin.test.js

@@ -387,7 +387,7 @@ describe("actions", () => {
       .send("table_id=2")
       .send("name=mynewaction")
       .send("when_trigger=Insert")
-      .expect(toRedirect("/actions/configure/3"));
+      .expect(toRedirect("/actions/configure/7"));
   });
   it("show edit", async () => {
     const app = await getApp({ disableCsrf: true });
@@ -451,9 +451,9 @@ describe("actions", () => {
       .send("action=run_js_code")
       .send("when_trigger=API+call")
       .send("min_role=1")
-      .expect(toRedirect("/actions/configure/4"));
+      .expect(toRedirect("/actions/configure/8"));
     await request(app)
-      .post("/actions/configure/4")
+      .post("/actions/configure/8")
       .set("Cookie", loginCookie)
       .send("code=return 27")
       .expect(toRedirect("/actions/"));

package/tests/auth.test.js

@@ -166,6 +166,7 @@ describe("AuthTest forgot password", () => {
       .post("/auth/reset")
       .send("email=staff1@foo.com")
       .send("password=bazzRGGR65zoo")
+      .send("confirm_password=bazzRGGR65zoo")
       .send("token=" + token)
       .expect(toRedirect("/auth/login"));
     await request(app)

package/tests/viewedit.test.js

@@ -208,6 +208,7 @@ describe("viewedit new List", () => {
       .send("contextEnc=" + ctx)
       .send("stepName=Options")
       .send("_row_click_type=Nothing")
+      .send("_cell_valign=Middle")
       .set("Cookie", loginCookie)
       .expect(toRedirect("/viewedit"));
   });
@@ -332,6 +333,7 @@ describe("viewedit new List with one field", () => {
       .send("contextEnc=" + ctx)
       .send("stepName=Options")
       .send("_row_click_type=Nothing")
+      .send("_cell_valign=Middle")
       .set("Cookie", loginCookie)
       .expect(toRedirect("/viewedit"));
   });