@saltcorn/server 1.1.1-beta.0 → 1.1.1-beta.2

package/routes/utils.js

@@ -23,6 +23,7 @@ const Crash = require("@saltcorn/data/models/crash");
 const File = require("@saltcorn/data/models/file");
 const User = require("@saltcorn/data/models/user");
 const Page = require("@saltcorn/data/models/page");
+const Trigger = require("@saltcorn/data/models/trigger");
 const si = require("systeminformation");
 const {
   config_fields_form,
@@ -107,6 +108,7 @@ const setLanguage = (req, res, state) => {
   } else if (req.cookies?.lang) {
     req.setLocale(req.cookies?.lang);
   }
+  if (req.user) Object.freeze(req.user);
   set_custom_http_headers(res, req, state);
 };
 
@@ -425,6 +427,9 @@ const admin_config_route = ({
         const restart_required = check_if_restart_required(form, req);
 
         await save_config_from_form(form);
+        Trigger.emitEvent("AppChange", `Config`, req.user, {
+          config_keys: Object.keys(form.values),
+        });
         if (!req.xhr) {
           if (restart_required) {
             flash_restart(req);

package/routes/view.js

@@ -139,18 +139,20 @@ router.get(
           : contents0;
       res.sendWrap(
         title,
-        add_edit_bar({
-          role,
-          title: view.name,
-          what: req.__("View"),
-          url: `/viewedit/edit/${encodeURIComponent(view.name)}`,
-          cfgUrl: `/viewedit/config/${encodeURIComponent(view.name)}`,
-          contents,
-          req,
-          view,
-          viewtemplate: view.viewtemplate,
-          table: view.table_id || view.exttable_name,
-        })
+        !req.smr
+          ? add_edit_bar({
+              role,
+              title: view.name,
+              what: req.__("View"),
+              url: `/viewedit/edit/${encodeURIComponent(view.name)}`,
+              cfgUrl: `/viewedit/config/${encodeURIComponent(view.name)}`,
+              contents,
+              req,
+              view,
+              viewtemplate: view.viewtemplate,
+              table: view.table_id || view.exttable_name,
+            })
+          : contents
       );
     }
   })

package/routes/viewedit.js

@@ -27,6 +27,7 @@ const Table = require("@saltcorn/data/models/table");
 const View = require("@saltcorn/data/models/view");
 const Workflow = require("@saltcorn/data/models/workflow");
 const User = require("@saltcorn/data/models/user");
+const Trigger = require("@saltcorn/data/models/trigger");
 const Page = require("@saltcorn/data/models/page");
 const File = require("@saltcorn/data/models/file");
 const Tag = require("@saltcorn/data/models/tag");
@@ -551,6 +552,10 @@ router.post(
           //console.log(v);
           await View.create(v);
         }
+        Trigger.emitEvent("AppChange", `View ${v.name}`, req.user, {
+          entity_type: "View",
+          entity_name: v.name,
+        });
         if (req.xhr) res.json({ success: "ok" });
         else
           res.redirect(
@@ -733,6 +738,10 @@ router.post(
         };
       else newcfg = { ...view.configuration, ...context };
       await View.update({ configuration: newcfg }, view.id);
+      Trigger.emitEvent("AppChange", `View ${view.name}`, req.user, {
+        entity_type: "View",
+        entity_name: view.name,
+      });
     };
     const wfres = await configFlow.run(req.body, req);
 
@@ -761,6 +770,7 @@ router.post(
       min_role: view.min_role,
       viewname: view.name,
     });
+    Trigger.emitEvent("AppChange", `Menu`, req.user, {});
     req.flash(
       "success",
       req.__(
@@ -790,6 +800,10 @@ router.post(
     const { id } = req.params;
     const view = await View.findOne({ id });
     const newview = await view.clone();
+    Trigger.emitEvent("AppChange", `View ${newview.name}`, req.user, {
+      entity_type: "View",
+      entity_name: newview.name,
+    });
     req.flash(
       "success",
       req.__("View %s duplicated as %s", view.name, newview.name)
@@ -841,6 +855,10 @@ router.post(
       const exview = await View.findOne({ id });
       let newcfg = { ...exview.configuration, ...req.body };
       await View.update({ configuration: newcfg }, +id);
+      Trigger.emitEvent("AppChange", `View ${exview.name}`, req.user, {
+        entity_type: "View",
+        entity_name: exview.name,
+      });
       res.json({ success: "ok" });
     } else {
       res.json({ error: req.__("Unable to save: No view") });
@@ -879,6 +897,10 @@ router.post(
             };
           else newcfg = { ...view.configuration, ...step.renderForm.values };
           await View.update({ configuration: newcfg }, view.id);
+          Trigger.emitEvent("AppChange", `View ${view.name}`, req.user, {
+            entity_type: "View",
+            entity_name: view.name,
+          });
           res.json({ success: "ok" });
         } else {
           res.json({ error: step.renderForm.errorSummary });
@@ -906,6 +928,10 @@ router.post(
     const role = req.body.role;
     await View.update({ min_role: role }, +id);
     const view = await View.findOne({ id });
+    Trigger.emitEvent("AppChange", `View ${view.name}`, req.user, {
+      entity_type: "View",
+      entity_name: view.name,
+    });
     const roles = await User.get_roles();
     const roleRow = roles.find((r) => r.id === +role);
     const message =

package/tests/clientjs.test.js

@@ -90,6 +90,25 @@ test("updateQueryStringParameter hash", () => {
     "/foo?name=Bar#Baz"
   );
 });
+test("addQueryStringParameter", () => {
+  expect(addQueryStringParameter("/foo", "age", 43)).toBe(
+    "/foo?age=43"
+  );
+  expect(addQueryStringParameter("/foo?age=43", "age", 44)).toBe(
+    "/foo?age=43&age=44"
+  );
+  expect(addQueryStringParameter("/foo?age=43", "age", 43)).toBe(
+    "/foo?age=43"
+  );
+});
+test("addQueryStringParameter hash", () => {
+  expect(addQueryStringParameter("/foo#baz", "age", 43)).toBe(
+    "/foo?age=43#baz"
+  );
+  expect(addQueryStringParameter("/foo?age=43#baz", "age", 44)).toBe(
+    "/foo?age=43&age=44#baz"
+  );
+});
 test("unique_field_from_rows test", () => {
   $("body").append(`<input id="mkuniq6" value="bar"></div>`);
   unique_field_from_rows(

package/tests/view.test.js

@@ -194,6 +194,43 @@ describe("render view with slug", () => {
   });
 });
 
+describe("frozen user object", () => {
+  it("should create view writing to user object", async () => {
+    const table = Table.findOne({ name: "books" });
+    const configuration = {
+      layout: {
+        type: "container",
+        style: {},
+        contents: {
+          type: "blank",
+          contents: "'userid='+user.id",
+          isFormula: {
+            text: true,
+          },
+        },
+        showIfFormula: "user.id=1",
+      },
+      columns: [],
+    };
+    await View.create({
+      table_id: table.id,
+      name: "ShowBookWriteUser",
+      viewtemplate: "Show",
+      configuration,
+      min_role: 100,
+    });
+  });
+  it("should run view setting user", async () => {
+    const loginCookie = await getStaffLoginCookie();
+
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .get("/view/ShowBookWriteUser?id=1")
+      .set("Cookie", loginCookie)
+      .expect(toInclude(">userid=2</div>"));
+  });
+});
+
 describe("action row_variable", () => {
   const createFilterView = async ({
     configuration,