@saltcorn/server 1.3.1-beta.2 → 1.3.1-beta.4

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/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/serve.js

@@ -383,6 +383,12 @@ module.exports =
               masterState.listeningTo.add(id);
             }
           });
+          getState().sendMessageToWorkers = (msg) => {
+            Object.entries(cluster.workers).forEach(([wpid, w]) => {
+              w.send(msg);
+            });
+          };
+
           if (masterState.listeningTo.size < useNCpus)
             setTimeout(initMasterListeners, 250);
         };
@@ -421,6 +427,11 @@ 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);
+          });
+        };
 
         cluster.on("exit", (worker, code, signal) => {
           console.log(`worker ${worker.process.pid} died`);
@@ -545,11 +556,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";
@@ -625,6 +651,27 @@ const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
       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 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") db.runWithTenant(tenant, f);
+      else await f();
+    });
+
     socket.on("disconnect", async () => {
       const tenant =
         get_tenant_from_req(socket.request, subdomainOffset) || "public";

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/wrapper.js

@@ -30,207 +30,23 @@ const get_menu = (req) => {
   const state = getState();
   const role = (req.user || {}).role_id || 100;
 
-  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;
-  const extra_menu = get_extra_menu(role, __, req.user || {}, locale);
-  const authItems = isAuth
-    ? [
-        {
-          label: req.__("User"),
-          icon: "far fa-user",
-          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",
-
-              link: "/auth/settings",
-            },
-            {
-              link: "/auth/logout",
-              icon: "fas fa-sign-out-alt",
-              label: req.__("Logout"),
-            },
-          ],
-        },
-      ]
-    : [
-        ...(allow_signup
-          ? [
-              {
-                link: "/auth/signup",
-                icon: "fas fa-user-plus",
-                label: req.__("Sign up"),
-              },
-            ]
-          : []),
-        ...(login_menu
-          ? [
-              {
-                link: "/auth/login",
-                icon: "fas fa-sign-in-alt",
-                label: req.__("Login"),
-              },
-            ]
-          : []),
-      ];
-  // const schema = db.getTenantSchema();
-  // Admin role id (todo move to common constants)
-
-  const canEditTables = state.getConfig("min_role_edit_tables", 1) >= role;
-  const canInspectTables =
-    state.getConfig("min_role_inspect_tables", 1) >= role;
-  const canEditViews = state.getConfig("min_role_edit_views", 1) >= role;
-  const canEditPages = state.getConfig("min_role_edit_pages", 1) >= role;
-  const canEditTriggers = state.getConfig("min_role_edit_triggers", 1) >= role;
-  const canEditMenu = state.getConfig("min_role_edit_menu", 1) >= role;
-  const canEditFiles = state.getConfig("min_role_edit_files", 1) >= role;
-  const canEditSearch = state.getConfig("min_role_edit_search", 1) >= role;
-  const isAdmin = role === 1;
-  const hasAdmin =
-    isAdmin ||
-    canEditTables ||
-    canInspectTables ||
-    canEditPages ||
-    canEditViews ||
-    canEditMenu ||
-    canEditTriggers ||
-    canEditFiles ||
-    canEditSearch;
-  /*
-   * Admin Menu items
-   *
-   */
-  const adminItems = [];
-  if (hasAdmin) {
-    if (isAdmin || canInspectTables || canEditTables)
-      adminItems.push({
-        link: "/table",
-        icon: "fas fa-table",
-        label: req.__("Tables"),
-      });
-    if (isAdmin || canEditViews)
-      adminItems.push({
-        link: "/viewedit",
-        icon: "far fa-eye",
-        label: req.__("Views"),
-      });
-    if (isAdmin || canEditPages)
-      adminItems.push({
-        link: "/pageedit",
-        icon: "far fa-file",
-        label: req.__("Pages"),
-      });
-    if (canEditTriggers && !canEditMenu && !isAdmin)
-      adminItems.push({
-        link: "/actions",
-        altlinks: ["/events", "/eventlog", "/crashlog"],
-        icon: "fas fa-calendar-check",
-        label: req.__("Triggers"),
-      });
-    if ((canEditMenu || canEditSearch) && !isAdmin) {
-      const subitems = [
-        {
-          link: canEditMenu ? "/menu" : "/search/config",
-          altlinks: [
-            "/site-structure",
-            "/search/config",
-            "/library/list",
-            "/tenant/list",
-          ],
-          icon: "fas fa-compass",
-          label: req.__("Site structure"),
-        },
-      ];
-      if (canEditTriggers)
-        subitems.push({
-          link: "/actions",
-          altlinks: ["/events", "/eventlog", "/crashlog"],
-          icon: "fas fa-calendar-check",
-          label: req.__("Triggers"),
-        });
-      if (canEditFiles)
-        subitems.push({
-          link: "/files",
-          icon: "far fa-images",
-          label: req.__("Files"),
-        });
-      adminItems.push({
-        label: req.__("Settings"),
-        icon: "fas fa-wrench",
-        subitems,
-      });
-    }
-
-    if (isAdmin)
-      adminItems.push({
-        label: req.__("Settings"),
-        icon: "fas fa-wrench",
-        subitems: [
-          {
-            link: "/admin",
-            icon: "fas fa-tools",
-            label: req.__("About application"),
-          },
-          { link: "/plugins", icon: "fas fa-cubes", label: req.__("Modules") },
-          {
-            link: "/useradmin",
-            icon: "fas fa-users-cog",
-            altlinks: ["/roleadmin"],
-            label: req.__("Users and security"),
-          },
-          {
-            link: "/site-structure",
-            altlinks: [
-              "/menu",
-              "/search/config",
-              "/library/list",
-              "/tenant/list",
-            ],
-            icon: "fas fa-compass",
-            label: req.__("Site structure"),
-          },
-          { link: "/files", icon: "far fa-images", label: req.__("Files") },
-          {
-            link: "/events",
-            altlinks: ["/actions", "/eventlog", "/crashlog"],
-            icon: "fas fa-calendar-check",
-            label: req.__("Events"),
-          },
-        ],
-      });
-  }
-
+  const extra_menu_all = get_extra_menu(role, __, req.user || {}, locale);
+  const extra_menu = extra_menu_all.filter((item) => !item.isUser);
+  const user_menu = extra_menu_all.filter((item) => item.isUser);
   // return menu
   return [
     extra_menu.length > 0 && {
       section: req.__("Menu"),
       items: extra_menu,
     },
-    hasAdmin && {
-      section: req.__("Admin"),
-      items: adminItems,
-    },
-    ...(authItems.length
+    ...(user_menu.length
       ? [
           {
             section: req.__("User"),
             isUser: true,
-            items: authItems,
+            items: user_menu,
           },
         ]
       : []),
@@ -247,9 +63,15 @@ 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 notification_in_menu = JSON.stringify(
+    state.getConfig("menu_items", [])
+  ).includes('"Notifications');
   const pwa_enabled = state.getConfig("pwa_enabled");
   const push_notify_enabled = state.getConfig("enable_push_notify", false);
+  const dynamic_updates_enabled = state.getConfig(
+    "enable_dynamic_updates",
+    true
+  );
   const is_root = req.user?.role_id === 1;
 
   const iconHeader = favicon
@@ -282,6 +104,11 @@ const get_headers = (req, version_tag, description, extras = []) => {
     { script: `/static_assets/${version_tag}/saltcorn.js` },
     { script: `/static_assets/${version_tag}/dayjs.min.js` },
   ];
+  if (dynamic_updates_enabled) {
+    stdHeaders.push({
+      script: `/static_assets/${version_tag}/socket.io.min.js`,
+    });
+  }
   if (locale !== "en") {
     stdHeaders.push({
       script: `/static_assets/${version_tag}/dayjslocales/${locale}.js`,