@saltcorn/server 0.7.3 → 0.7.4-beta.2

package/serve.js

@@ -30,7 +30,7 @@ const { getConfig } = require("@saltcorn/data/models/config");
 const { migrate } = require("@saltcorn/data/migrate");
 const socketio = require("socket.io");
 const { createAdapter, setupPrimary } = require("@socket.io/cluster-adapter");
-const { setTenant, getSessionStore } = require("./routes/utils");
+const { setTenant, getSessionStore, get_tenant_from_req } = require("./routes/utils");
 const passport = require("passport");
 const { authenticate } = require("passport");
 const View = require("@saltcorn/data/models/view");
@@ -44,6 +44,11 @@ const {
   getAllTenants,
 } = require("@saltcorn/admin-models/models/tenant");
 const { auto_backup_now } = require("@saltcorn/admin-models/models/backup");
+const Snapshot = require("@saltcorn/admin-models/models/snapshot");
+
+const take_snapshot = async () => {
+  return await Snapshot.take_if_changed();
+};
 
 // helpful https://gist.github.com/jpoehls/2232358
 /**
@@ -132,32 +137,33 @@ const workerDispatchMsg = ({ tenant, ...msg }) => {
  */
 const onMessageFromWorker =
   (masterState, { port, watchReaper, disableScheduler, pid }) =>
-  (msg) => {
-    //console.log("worker msg", typeof msg, msg);
-    if (msg === "Start" && !masterState.started) {
-      masterState.started = true;
-      runScheduler({
-        port,
-        watchReaper,
-        disableScheduler,
-        eachTenant,
-        auto_backup_now,
-      });
-      require("./systemd")({ port });
-      return true;
-    } else if (msg === "RestartServer") {
-      process.exit(0);
-      return true;
-    } else if (msg.tenant || msg.createTenant) {
-      ///ie from saltcorn
-      //broadcast
-      Object.entries(cluster.workers).forEach(([wpid, w]) => {
-        if (wpid !== pid) w.send(msg);
-      });
-      workerDispatchMsg(msg); //also master
-      return true;
-    }
-  };
+    (msg) => {
+      //console.log("worker msg", typeof msg, msg);
+      if (msg === "Start" && !masterState.started) {
+        masterState.started = true;
+        runScheduler({
+          port,
+          watchReaper,
+          disableScheduler,
+          eachTenant,
+          auto_backup_now,
+          take_snapshot,
+        });
+        require("./systemd")({ port });
+        return true;
+      } else if (msg === "RestartServer") {
+        process.exit(0);
+        return true;
+      } else if (msg.tenant || msg.createTenant) {
+        ///ie from saltcorn
+        //broadcast
+        Object.entries(cluster.workers).forEach(([wpid, w]) => {
+          if (wpid !== pid) w.send(msg);
+        });
+        workerDispatchMsg(msg); //also master
+        return true;
+      }
+    };
 
 module.exports =
   /**
@@ -274,6 +280,7 @@ module.exports =
           disableScheduler,
           eachTenant,
           auto_backup_now,
+          take_snapshot,
         });
       }
       Trigger.emitEvent("Startup");
@@ -345,24 +352,33 @@ const setupSocket = (...servers) => {
     io.attach(server);
   }
 
-  io.use(wrap(setTenant));
+  //io.use(wrap(setTenant));
   io.use(wrap(getSessionStore()));
   io.use(wrap(passport.initialize()));
   io.use(wrap(passport.authenticate(["jwt", "session"])));
   if (process.send && !cluster.isMaster) io.adapter(createAdapter());
-  getState().setRoomEmitter((viewname, room_id, msg) => {
-    io.to(`${viewname}_${room_id}`).emit("message", msg);
+  getState().setRoomEmitter((tenant, viewname, room_id, msg) => {
+    io.to(`${tenant}_${viewname}_${room_id}`).emit("message", msg);
   });
   io.on("connection", (socket) => {
     socket.on("join_room", ([viewname, room_id]) => {
-      const view = View.findOne({ name: viewname });
-      if (view.viewtemplateObj.authorize_join) {
-        view.viewtemplateObj
-          .authorize_join(view.configuration, room_id, socket.request.user)
-          .then((authorized) => {
-            if (authorized) socket.join(`${viewname}_${room_id}`);
-          });
-      } else socket.join(`${viewname}_${room_id}`);
+      const ten = get_tenant_from_req(socket.request) || "public";
+      const f = () => {
+        try {
+          const view = View.findOne({ name: viewname });
+          if (view.viewtemplateObj.authorize_join) {
+            view.viewtemplateObj
+              .authorize_join(view.configuration, room_id, socket.request.user)
+              .then((authorized) => {
+                if (authorized) socket.join(`${ten}_${viewname}_${room_id}`);
+              });
+          } else socket.join(`${ten}_${viewname}_${room_id}`);
+        } catch (err) {
+          getState().log(1, `Socket join_room error: ${err.stack}`);
+        }
+      }
+      if (ten && ten !== "public") db.runWithTenant(ten, f);
+      else f();
     });
   });
 };

package/tests/admin.test.js

@@ -57,7 +57,7 @@ describe("admin page", () => {
     await request(app)
       .get("/settings")
       .set("Cookie", loginCookie)
-      .expect(toInclude("Plugin and pack installation and control"));
+      .expect(toInclude("Module installation and control"));
   });
   it("show admin page", async () => {
     const app = await getApp({ disableCsrf: true });

package/tests/api.test.js

@@ -84,6 +84,23 @@ describe("API read", () => {
         )
       );
   });
+  it("should handle fkey args ", async () => {
+    const loginCookie = await getAdminLoginCookie();
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .get("/api/patients/?favbook=1")
+      .set("Cookie", loginCookie)
+      .expect(succeedJsonWith((rows) => rows.length == 1));
+  });
+  it("should handle fkey args with no value", async () => {
+    const loginCookie = await getAdminLoginCookie();
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .get("/api/patients/?favbook=")
+      .set("Cookie", loginCookie)
+      .expect(succeedJsonWith((rows) => rows.length == 0));
+  });
+
   it("should get books for public with search and one field", async () => {
     const app = await getApp({ disableCsrf: true });
     await request(app)

package/tests/clientjs.test.js

@@ -34,8 +34,18 @@ test("updateQueryStringParameter", () => {
   expect(removeQueryStringParameter("/foo?name=Bar&age=45", "age")).toBe(
     "/foo?name=Bar"
   );
+  expect(
+    updateQueryStringParameter("/foo", "publisher.publisher->name", "AK")
+  ).toBe("/foo?publisher.publisher->name=AK");
+  expect(
+    updateQueryStringParameter(
+      "/foo?publisher.publisher->name=AB",
+      "publisher.publisher->name",
+      "AK"
+    )
+  ).toBe("/foo?publisher.publisher->name=AK");
 });
-
+//publisher.publisher->name
 test("updateQueryStringParameter hash", () => {
   expect(updateQueryStringParameter("/foo#baz", "age", 43)).toBe(
     "/foo?age=43#baz"

package/tests/plugins.test.js

@@ -30,7 +30,7 @@ describe("Plugin Endpoints", () => {
     await request(app)
       .get("/plugins")
       .set("Cookie", loginCookie)
-      .expect(toInclude("Plugin and pack store"));
+      .expect(toInclude("Module store"));
   });
 
   it("should show new", async () => {

package/tests/viewedit.test.js

@@ -54,7 +54,7 @@ describe("viewedit new List", () => {
     await request(app)
       .get("/viewedit/new")
       .set("Cookie", loginCookie)
-      .expect(toInclude("Template"));
+      .expect(toInclude("View pattern"));
   });
   it("submit new view", async () => {
     const loginCookie = await getAdminLoginCookie();

package/wrapper.js

@@ -13,7 +13,7 @@ const renderLayout = require("@saltcorn/markup/layout");
  * @returns {T[]}
  */
 const getFlashes = (req) =>
-  ["error", "success", "danger", "warning","information"]
+  ["error", "success", "danger", "warning", "information"]
     .map((type) => {
       return { type, msg: req.flash(type) };
     })
@@ -44,11 +44,13 @@ const get_extra_menu = (role, state, req) => {
         link:
           item.type === "Link"
             ? item.url
-            : item.type === "View"
-            ? `/view/${encodeURIComponent(item.viewname)}`
-            : item.type === "Page"
-            ? `/page/${encodeURIComponent(item.pagename)}`
-            : undefined,
+            : item.type === "Action"
+              ? `javascript:ajax_post_json('/menu/runaction/${item.action_name}')`
+              : item.type === "View"
+                ? `/view/${encodeURIComponent(item.viewname)}`
+                : item.type === "Page"
+                  ? `/page/${encodeURIComponent(item.pagename)}`
+                  : undefined,
         ...(item.subitems ? { subitems: transform(item.subitems) } : {}),
       }));
   return transform(cfg);
@@ -68,41 +70,41 @@ const get_menu = (req) => {
   const extra_menu = get_extra_menu(role, state, req);
   const authItems = isAuth
     ? [
-        {
-          label: req.__("User"),
-          icon: "far fa-user",
-          isUser: true,
-          subitems: [
-            { label: small((req.user.email || "").split("@")[0]) },
-            {
-              label: req.__("User Settings"),
-              icon: "fas fa-user-cog",
+      {
+        label: req.__("User"),
+        icon: "far fa-user",
+        isUser: true,
+        subitems: [
+          { label: small((req.user.email || "").split("@")[0]) },
+          {
+            label: req.__("User Settings"),
+            icon: "fas fa-user-cog",
 
-              link: "/auth/settings",
-            },
-            {
-              link: "/auth/logout",
-              icon: "fas fa-sign-out-alt",
-              label: req.__("Logout"),
-            },
-          ],
-        },
-      ]
+            link: "/auth/settings",
+          },
+          {
+            link: "/auth/logout",
+            icon: "fas fa-sign-out-alt",
+            label: req.__("Logout"),
+          },
+        ],
+      },
+    ]
     : [
-        ...(allow_signup
-          ? [{ link: "/auth/signup", label: req.__("Sign up") }]
-          : []),
-        ...(login_menu
-          ? [{ link: "/auth/login", label: req.__("Login") }]
-          : []),
-      ];
+      ...(allow_signup
+        ? [{ link: "/auth/signup", label: req.__("Sign up") }]
+        : []),
+      ...(login_menu
+        ? [{ link: "/auth/login", label: req.__("Login") }]
+        : []),
+    ];
   // const schema = db.getTenantSchema();
   // Admin role id (todo move to common constants)
   const isAdmin = role === 1;
-    /*
-     * Admin Menu items
-     *
-     */
+  /*
+   * Admin Menu items
+   *
+   */
   const adminItems = [
     { link: "/table", icon: "fas fa-table", label: req.__("Tables") },
     { link: "/viewedit", icon: "far fa-eye", label: req.__("Views") },
@@ -116,7 +118,7 @@ const get_menu = (req) => {
           icon: "fas fa-tools",
           label: req.__("About application"),
         },
-        { link: "/plugins", icon: "fas fa-plug", label: req.__("Plugins") },
+        { link: "/plugins", icon: "fas fa-cubes", label: req.__("Modules") },
         {
           link: "/useradmin",
           icon: "fas fa-users-cog",
@@ -177,17 +179,17 @@ const get_headers = (req, version_tag, description, extras = []) => {
 
   const iconHeader = favicon
     ? [
-        {
-          headerTag: `<link rel="icon" type="image/png" href="/files/serve/${favicon}">`,
-        },
-      ]
+      {
+        headerTag: `<link rel="icon" type="image/png" href="/files/serve/${favicon}">`,
+      },
+    ]
     : [];
   const meta_description = description
     ? [
-        {
-          headerTag: `<meta name="description" content="${description}">`,
-        },
-      ]
+      {
+        headerTag: `<meta name="description" content="${description}">`,
+      },
+    ]
     : [];
   const stdHeaders = [
     {
@@ -228,12 +230,12 @@ const get_brand = (state) => {
   };
 };
 module.exports = (version_tag) =>
-    /**
-     *
-     * @param req
-     * @param res
-     * @param next
-     */
+  /**
+   *
+   * @param req
+   * @param res
+   * @param next
+   */
   function (req, res, next) {
     const role = (req.user || {}).role_id || 10;
 
@@ -349,7 +351,7 @@ const defaultRenderToHtml = (s, role) =>
   typeof s === "string"
     ? s
     : renderLayout({
-        blockDispatch: {},
-        role,
-        layout: s,
-      });
+      blockDispatch: {},
+      role,
+      layout: s,
+    });