@saltcorn/server 1.1.1-beta.1 → 1.1.1-beta.3

package/routes/pageedit.js

@@ -146,7 +146,9 @@ const pagePropertiesForm = async (req, isNew) => {
       {
         name: "request_fluid_layout",
         label: req.__("Fluid layout"),
-        sublabel: req.__("Request fluid layout from theme for a wider display for this page"),
+        sublabel: req.__(
+          "Request fluid layout from theme for a wider display for this page"
+        ),
         type: "Bool",
       },
     ],
@@ -256,6 +258,7 @@ const pageBuilderData = async (req, context) => {
     next_button_label: "Done",
     fonts: getState().fonts,
     tables: [],
+    keyframes: getState().keyframes,
   };
 };
 
@@ -503,12 +506,21 @@ router.post(
           pageRow.layout = {};
         }
         await Page.update(+id, pageRow);
+        Trigger.emitEvent("AppChange", `Page ${dbPage.name}`, req.user, {
+          entity_type: "Page",
+          entity_name: dbPage.name,
+        });
         if (req.xhr) res.json({ success: "ok" });
         else res.redirect(`/pageedit/`);
       } else {
         if (!pageRow.layout) pageRow.layout = {};
         if (!pageRow.fixed_states) pageRow.fixed_states = {};
         await Page.create(pageRow);
+        Trigger.emitEvent("AppChange", `Page ${pageRow.name}`, req.user, {
+          entity_type: "Page",
+          entity_name: pageRow.name,
+        });
+
         if (!html_file)
           res.redirect(
             addOnDoneRedirect(`/pageedit/edit/${pageRow.name}`, req)
@@ -679,6 +691,10 @@ router.post(
       await Page.update(page.id, {
         layout: decodeURIComponent(req.body.layout),
       });
+      Trigger.emitEvent("AppChange", `Page ${page.name}`, req.user, {
+        entity_type: "Page",
+        entity_name: page.name,
+      });
       req.flash("success", req.__(`Page %s saved`, pagename));
       res.redirect(redirectTarget);
     } else if (req.body.code) {
@@ -687,6 +703,10 @@ router.post(
         const file = await File.findOne(page.html_file);
         if (!file) throw new Error(req.__("File not found"));
         await fsp.writeFile(file.location, req.body.code);
+        Trigger.emitEvent("AppChange", `Page ${page.name}`, req.user, {
+          entity_type: "Page",
+          entity_name: page.name,
+        });
         if (!req.xhr) {
           req.flash("success", req.__(`Page %s saved`, pagename));
           res.redirect(redirectTarget);
@@ -723,6 +743,11 @@ router.post(
 
     if (id && req.body.layout) {
       await Page.update(+id, { layout: req.body.layout });
+      const page = await Page.findOne({ id });
+      Trigger.emitEvent("AppChange", `Page ${page.name}`, req.user, {
+        entity_type: "Page",
+        entity_name: page.name,
+      });
       res.json({
         success: "ok",
       });
@@ -744,6 +769,10 @@ router.post(
   error_catcher(async (req, res) => {
     const { id } = req.params;
     const page = await Page.findOne({ id });
+    Trigger.emitEvent("AppChange", `Page ${page.name}`, req.user, {
+      entity_type: "Page",
+      entity_name: page.name,
+    });
     await page.delete();
     req.flash("success", req.__(`Page deleted`));
     res.redirect(`/pageedit`);
@@ -796,6 +825,7 @@ router.post(
       min_role: page.min_role,
       pagename: page.name,
     });
+    Trigger.emitEvent("AppChange", `Menu`, req.user, {});
     req.flash(
       "success",
       req.__(
@@ -820,6 +850,10 @@ router.post(
     const { id } = req.params;
     const page = await Page.findOne({ id });
     const newpage = await page.clone();
+    Trigger.emitEvent("AppChange", `Page ${newpage.name}`, req.user, {
+      entity_type: "Page",
+      entity_name: newpage.name,
+    });
     req.flash(
       "success",
       req.__("Page %s duplicated as %s", page.name, newpage.name)

package/routes/tables.js

@@ -711,6 +711,7 @@ const attribBadges = (f) => {
           "table",
           "agg_field",
           "agg_relation",
+          "calc_joinfields"
         ].includes(k)
       )
         return;

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,
@@ -426,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

@@ -13,6 +13,13 @@ const load_script = (fnm) => {
   document.body.appendChild(scriptEl);
 };
 
+class IntersectionObserver {
+  constructor() {}
+  observe() {}
+}
+
+window.IntersectionObserver = IntersectionObserver;
+
 load_script("jquery-3.6.0.min.js");
 load_script("saltcorn-common.js");
 load_script("saltcorn.js");
@@ -90,6 +97,21 @@ 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(