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

package/routes/actions.js

@@ -179,6 +179,7 @@ const triggerForm = async (req, trigger) => {
     workflow: true,
   });
   const table_triggers = ["Insert", "Update", "Delete", "Validate"];
+  const additional_triggers_with_onlyif = ["Login", "PageLoad"];
   const action_options = {};
   const actionsNotRequiringRow = Trigger.action_options({
     notRequireRow: true,
@@ -337,6 +338,19 @@ const triggerForm = async (req, trigger) => {
         type: "String",
         showIf: { when_trigger: ["API call"], _raw_output: true },
       },
+      {
+        name: "_only_if",
+        label: req.__("Only if"),
+        type: "String",
+        class: "validate-expression",
+        sublabel: req.__(
+          "Optional JavaScript expression to determine if the trigger should run."
+        ),
+        parent_field: "configuration",
+        showIf: {
+          when_trigger: [...table_triggers, ...additional_triggers_with_onlyif],
+        },
+      },
     ],
   });
   // if (trigger) {

package/routes/admin.js

@@ -500,11 +500,12 @@ router.get(
       "backup_s3_access_secret"
     );
     backupForm.values.backup_s3_region =
-    getState().getConfig("backup_s3_region");
+      getState().getConfig("backup_s3_region");
     aBackupFilePrefixForm.values.backup_with_event_log = getState().getConfig(
       "backup_with_event_log"
     );
-    aBackupFilePrefixForm.values.backup_password = getState().getConfig("backup_password");
+    aBackupFilePrefixForm.values.backup_password =
+      getState().getConfig("backup_password");
     const aSnapshotForm = snapshotForm(req);
     aSnapshotForm.values.snapshots_enabled =
       getState().getConfig("snapshots_enabled");
@@ -4126,6 +4127,8 @@ router.post(
       await db.deleteWhere("_sc_config", { not: { key: "letsencrypt" } });
     }
     await getState().refresh();
+    await require("@saltcorn/data/standard-menu")();
+
     if (form.values.users) {
       await db.deleteWhere("_sc_notifications");
 
@@ -4532,7 +4535,6 @@ admin_config_route({
   path: "/notifications",
   super_path: "/admin",
   field_names: [
-    "notification_in_menu",
     { section_header: "Progressive Web Application" },
     "pwa_enabled",
     { name: "pwa_display", showIf: { pwa_enabled: true } },

package/routes/common_lists.js

@@ -138,6 +138,7 @@ const tablesList = async (
         hover: true,
         tableClass: listClass(tagId, showList),
         tableId: domId,
+        class: "table-valign-middle",
       }
     ) +
     (tables.length == 0 && !filterOnTag
@@ -442,6 +443,7 @@ const viewsList = async (
         hover: true,
         tableClass: listClass(tagId, showList),
         tableId: domId,
+        class: "table-valign-middle",
       }
     ) +
     (views.length == 0 && !filterOnTag
@@ -625,6 +627,7 @@ const getPageList = async (
       hover: true,
       tableClass: tagId ? `collapse ${showList ? "show" : ""}` : "",
       tableId: domId,
+      class: "table-valign-middle",
     }
   );
 };
@@ -657,6 +660,7 @@ const getPageGroupList = (rows, roles, req) => {
     rows,
     {
       hover: true,
+      class: "table-valign-middle",
     }
   );
 };
@@ -729,6 +733,8 @@ const getTriggerList = async (
       )
     );
   };
+  const whenCanHaveTable = (when) =>
+    ["Insert", "Update", "Delete", "Validate", "Never"].includes(when);
   return mkTable(
     [
       { label: req.__("Name"), key: "name" },
@@ -781,7 +787,7 @@ const getTriggerList = async (
       {
         label: req.__("Table or Channel"),
         key: (r) =>
-          r.table_name
+          r.table_name && whenCanHaveTable(r.when_trigger)
             ? user_can_inspect_tables
               ? a({ href: `/table/${r.table_name}` }, r.table_name)
               : r.table_name
@@ -807,6 +813,7 @@ const getTriggerList = async (
       hover: true,
       tableClass: tagId ? `collapse ${showList ? "show" : ""}` : "",
       tableId: domId,
+      class: "table-valign-middle",
     }
   );
 };

package/routes/eventlog.js

@@ -81,6 +81,18 @@ const logSettingsForm = async (req) => {
       input_type: "date",
       attributes: { minDate: new Date(), maxDate: hoursFuture(24 * 7 * 2) },
     },
+    {
+      input_type: "section_header",
+      label: req.__("Dynamic server side updates"),
+    },
+    {
+      name: "enable_dynamic_updates",
+      label: req.__("Enable dynamic updates"),
+      type: "Bool",
+      sublabel: req.__(
+        "Enable server side updates from within run_js_code actions"
+      ),
+    },
     {
       input_type: "section_header",
       label: req.__("Delete old workflow runs with status after days"),
@@ -168,6 +180,10 @@ router.get(
       "next_weekly_event",
       {}
     );
+    form.values.enable_dynamic_updates = getState().getConfig(
+      "enable_dynamic_updates",
+      true
+    );
     ["error", "finished", "running", "waiting"].forEach((k) => {
       let cfgk = `delete_${k}_workflows_days`;
       form.values[cfgk] = getState().getConfig(cfgk);
@@ -377,6 +393,10 @@ router.post(
           delete form.values[k];
         }
       }
+      await getState().setConfig(
+        "enable_dynamic_updates",
+        form.values.enable_dynamic_updates
+      );
       for (const status of ["error", "finished", "running", "waiting"]) {
         let k = `delete_${status}_workflows_days`;
         if (form.values[k]) {

package/routes/fields.js

@@ -1530,7 +1530,7 @@ router.post(
     const table = Table.findOne({ name: table_name });
     const field = table.getField(field_name);
     let val = field.type?.read
-      ? field.type?.read(req.body[field_name])
+      ? field.type?.read(req.body[field_name], field.attributes)
       : req.body[field_name];
     await db.withTransaction(async () => {
       await table.updateRow({ [field_name]: val }, pk, req.user);

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

@@ -290,7 +290,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;
@@ -382,6 +383,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 +428,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,
@@ -544,11 +561,26 @@ 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";
@@ -596,7 +628,7 @@ 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();
     });
 
@@ -620,7 +652,30 @@ 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 =
+        get_tenant_from_req(socket.request, 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();
     });
 
@@ -628,12 +683,20 @@ const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
       const tenant =
         get_tenant_from_req(socket.request, 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();
     });
   });
 
@@ -681,8 +744,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) => {
@@ -744,8 +807,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)