@saltcorn/server 0.7.3-beta.7 → 0.7.4-beta.1

package/routes/view.js

@@ -20,6 +20,7 @@ const {
 } = require("../routes/utils.js");
 const { add_edit_bar } = require("../markup/admin.js");
 const { InvalidConfiguration } = require("@saltcorn/data/utils");
+const { getState } = require("@saltcorn/data/db/state");
 
 /**
  * @type {object}
@@ -44,8 +45,11 @@ router.get(
     const query = { ...req.query };
     const view = await View.findOne({ name: viewname });
     const role = req.user && req.user.id ? req.user.role_id : 10;
+    const state = getState();
+    state.log(3, `Route /view/${viewname} user=${req.user?.id}`);
     if (!view) {
       req.flash("danger", req.__(`No such view: %s`, text(viewname)));
+      state.log(2, `View ${viewname} not found`);
       res.redirect("/");
       return;
     }
@@ -56,6 +60,7 @@ router.get(
       !(await view.authorise_get({ query, req, ...view }))
     ) {
       req.flash("danger", req.__("Not authorized"));
+      state.log(2, `View ${viewname} not authorized`);
       res.redirect("/");
       return;
     }
@@ -123,13 +128,21 @@ router.post(
   error_catcher(async (req, res) => {
     const { viewname, route } = req.params;
     const role = req.user && req.user.id ? req.user.role_id : 10;
+    const state = getState();
+    state.log(
+      3,
+      `Route /view/${viewname} viewroute ${route} user=${req.user?.id}`
+    );
 
     const view = await View.findOne({ name: viewname });
     if (!view) {
       req.flash("danger", req.__(`No such view: %s`, text(viewname)));
+      state.log(2, `View ${viewname} not found`);
       res.redirect("/");
     } else if (role > view.min_role) {
       req.flash("danger", req.__("Not authorized"));
+      state.log(2, `View ${viewname} viewroute ${route} not authorized`);
+
       res.redirect("/");
     } else {
       await view.runRoute(route, req.body, res, { res, req });
@@ -150,10 +163,12 @@ router.post(
     const { viewname } = req.params;
     const role = req.user && req.user.id ? req.user.role_id : 10;
     const query = { ...req.query };
-
+    const state = getState();
+    state.log(3, `Route /view/${viewname} POST user=${req.user?.id}`);
     const view = await View.findOne({ name: viewname });
     if (!view) {
       req.flash("danger", req.__(`No such view: %s`, text(viewname)));
+      state.log(2, `View ${viewname} not found`);
       res.redirect("/");
       return;
     }
@@ -164,6 +179,8 @@ router.post(
       !(await view.authorise_post({ body: req.body, req, ...view }))
     ) {
       req.flash("danger", req.__("Not authorized"));
+      state.log(2, `View ${viewname} POST not authorized`);
+
       res.redirect("/");
     } else if (!view.runPost) {
       throw new InvalidConfiguration(

package/routes/viewedit.js

@@ -98,6 +98,13 @@ const view_dropdown = (view, req) =>
       '<i class="far fa-copy"></i>&nbsp;' + req.__("Duplicate"),
       req
     ),
+    a(
+      {
+        class: "dropdown-item",
+        href: `javascript:ajax_modal('/admin/snapshot-restore/view/${view.name}')`,
+      },
+      '<i class="fas fa-undo-alt"></i>&nbsp;' + req.__("Restore")
+    ),
     div({ class: "dropdown-divider" }),
     post_dropdown_item(
       `/viewedit/delete/${view.id}`,
@@ -138,57 +145,57 @@ router.get(
     const viewMarkup =
       views.length > 0
         ? mkTable(
-            [
-              {
-                label: req.__("Name"),
-                key: (r) => link(`/view/${encodeURIComponent(r.name)}`, r.name),
-                sortlink: `javascript:set_state_field('_sortby', 'name')`,
-              },
-              // description - currently I dont want to show description in view list
-              // because description can be long
-              /*
-              {
-                  label: req.__("Description"),
-                  key: "description",
-                  // this is sorting by column
-                  sortlink: `javascript:set_state_field('_sortby', 'description')`,
-              },
-              */
-              // template
-              {
-                label: req.__("Template"),
-                key: "viewtemplate",
-                sortlink: `javascript:set_state_field('_sortby', 'viewtemplate')`,
-              },
-              {
-                label: req.__("Table"),
-                key: (r) => link(`/table/${r.table}`, r.table),
-                sortlink: `javascript:set_state_field('_sortby', 'table')`,
-              },
-              {
-                label: req.__("Role to access"),
-                key: (row) => editViewRoleForm(row, roles, req),
-              },
-              {
-                label: "",
-                key: (r) =>
-                  link(
-                    `/viewedit/config/${encodeURIComponent(r.name)}`,
-                    req.__("Configure")
-                  ),
-              },
-              {
-                label: "",
-                key: (r) => view_dropdown(r, req),
-              },
-            ],
-            views,
-            { hover: true }
-          )
+          [
+            {
+              label: req.__("Name"),
+              key: (r) => link(`/view/${encodeURIComponent(r.name)}`, r.name),
+              sortlink: `javascript:set_state_field('_sortby', 'name')`,
+            },
+            // description - currently I dont want to show description in view list
+            // because description can be long
+            /*
+            {
+                label: req.__("Description"),
+                key: "description",
+                // this is sorting by column
+                sortlink: `javascript:set_state_field('_sortby', 'description')`,
+            },
+            */
+            // template
+            {
+              label: req.__("Pattern"),
+              key: "viewtemplate",
+              sortlink: `javascript:set_state_field('_sortby', 'viewtemplate')`,
+            },
+            {
+              label: req.__("Table"),
+              key: (r) => link(`/table/${r.table}`, r.table),
+              sortlink: `javascript:set_state_field('_sortby', 'table')`,
+            },
+            {
+              label: req.__("Role to access"),
+              key: (row) => editViewRoleForm(row, roles, req),
+            },
+            {
+              label: "",
+              key: (r) =>
+                link(
+                  `/viewedit/config/${encodeURIComponent(r.name)}`,
+                  req.__("Configure")
+                ),
+            },
+            {
+              label: "",
+              key: (r) => view_dropdown(r, req),
+            },
+          ],
+          views,
+          { hover: true }
+        )
         : div(
-            h4(req.__("No views defined")),
-            p(req.__("Views define how table rows are displayed to the user"))
-          );
+          h4(req.__("No views defined")),
+          p(req.__("Views define how table rows are displayed to the user"))
+        );
     res.sendWrap(req.__(`Views`), {
       above: [
         {
@@ -203,14 +210,14 @@ router.get(
             viewMarkup,
             tables.length > 0
               ? a(
-                  { href: `/viewedit/new`, class: "btn btn-primary" },
-                  req.__("Create view")
-                )
+                { href: `/viewedit/new`, class: "btn btn-primary" },
+                req.__("Create view")
+              )
               : p(
-                  req.__(
-                    "You must create at least one table before you can create views."
-                  )
-                ),
+                req.__(
+                  "You must create at least one table before you can create views."
+                )
+              ),
           ],
         },
       ],
@@ -263,10 +270,10 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
         ),
       }),
       new Field({
-        label: req.__("Template"),
+        label: req.__("View pattern"),
         name: "viewtemplate",
         input_type: "select",
-        sublabel: req.__("Views are based on a view template"),
+        sublabel: req.__("The view pattern sets the foundation of how the view relates to the table and the behaviour of the view"),
         options: Object.keys(getState().viewtemplates),
         attributes: {
           explainers: mapObjectValues(
@@ -320,15 +327,15 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
       }),
       ...(isEdit
         ? [
-            new Field({
-              name: "viewtemplate",
-              input_type: "hidden",
-            }),
-            new Field({
-              name: "table_name",
-              input_type: "hidden",
-            }),
-          ]
+          new Field({
+            name: "viewtemplate",
+            input_type: "hidden",
+          }),
+          new Field({
+            name: "table_name",
+            input_type: "hidden",
+          }),
+        ]
         : []),
     ],
     values,
@@ -355,7 +362,7 @@ router.get(
     }
     const tables = await Table.find_with_external();
     const currentTable = tables.find(
-      (t) => t.id === viewrow.table_id || t.name === viewrow.exttable_name
+      (t) => (t.id && t.id === viewrow.table_id) || t.name === viewrow.exttable_name
     );
     viewrow.table_name = currentTable && currentTable.name;
     if (viewrow.slug && currentTable) {
@@ -584,7 +591,7 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;
-
+    const { step } = req.query;
     const view = await View.findOne({ name });
     if (!view) {
       req.flash("error", `View not found: ${text(name)}`);
@@ -601,6 +608,7 @@ router.get(
         table_id: view.table_id,
         exttable_name: view.exttable_name,
         viewname: name,
+        ...(step ? { stepName: step } : {}),
       },
       req
     );

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,
+    });