@saltcorn/server 1.1.2-beta.9 → 1.1.3-beta.0

package/routes/api.js

@@ -78,8 +78,8 @@ function accessAllowedRead(req, user, table, allow_ownership) {
     req.user && req.user.id
       ? req.user.role_id
       : user && user.role_id
-      ? user.role_id
-      : 100;
+        ? user.role_id
+        : 100;
 
   return (
     role <= table.min_role_read ||
@@ -101,8 +101,8 @@ function accessAllowedWrite(req, user, table) {
     req.user && req.user.id
       ? req.user.role_id
       : user && user.role_id
-      ? user.role_id
-      : 100;
+        ? user.role_id
+        : 100;
 
   return (
     role <= table.min_role_write ||
@@ -122,8 +122,8 @@ function accessAllowed(req, user, trigger) {
     req.user && req.user.id
       ? req.user.role_id
       : user && user.role_id
-      ? user.role_id
-      : 100;
+        ? user.role_id
+        : 100;
 
   return role <= trigger.min_role;
 }
@@ -397,8 +397,8 @@ router.get(
             const derefs = Array.isArray(dereference)
               ? dereference
               : !dereference
-              ? []
-              : [dereference];
+                ? []
+                : [dereference];
             derefs.forEach((f) => {
               const field = table.getField(f);
               if (field?.attributes?.summary_field)
@@ -701,7 +701,7 @@ router.delete(
               );
             } else
               await table.deleteRows(
-                { id },
+                { [table.pk_name]: id },
                 user || req.user || { role_id: 100 }
               );
             res.json({ success: true });

package/routes/delete.js

@@ -35,9 +35,11 @@ router.post(
     // todo check that works after where change
     const table = Table.findOne({ name: tableName });
     const role = req.user && req.user.id ? req.user.role_id : 100;
+    const where = { [table.pk_name]: id };
+
     try {
       if (role <= table.min_role_write)
-        await table.deleteRows({ id }, req.user || { role_id: 100 });
+        await table.deleteRows(where, req.user || { role_id: 100 });
       else if (
         (table.ownership_field_id || table.ownership_formula) &&
         req.user
@@ -47,7 +49,7 @@ router.post(
           { forUser: req.user, forPublic: !req.user }
         );
         if (row && table.is_owner(req.user, row))
-          await table.deleteRows({ id }, req.user || { role_id: 100 });
+          await table.deleteRows(where, req.user || { role_id: 100 });
         else req.flash("error", req.__("Not authorized"));
       } else
         req.flash(

package/routes/eventlog.js

@@ -459,33 +459,70 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
-    const ev = await EventLog.findOneWithUser(id);
+    const { or_less, or_more } = req.query;
     const locale = getState().getConfig("default_locale", "en");
-    send_events_page({
-      res,
-      req,
-      active_sub: "Event log",
-      sub2_page: ev.id,
-      contents: {
-        type: "card",
-        contents:
-          table(
-            { class: "table eventlog" },
-            tbody(
-              tr(
-                th(req.__("When")),
-                td(localeDateTime(ev.occur_at, {}, locale))
-              ),
-              tr(th(req.__("Type")), td(ev.event_type)),
-              tr(th(req.__("Channel")), td(ev.channel)),
-              tr(th(req.__("User")), td(ev.email))
-            )
-          ) +
-          div(
-            { class: "eventpayload" },
-            ev.payload ? pre(text(JSON.stringify(ev.payload, null, 2))) : ""
-          ),
-      },
-    });
+    let ev = await EventLog.findOneWithUser(id);
+    if (!ev && (or_less || or_more)) {
+      const evFound = await EventLog.find(
+        {
+          id: or_less ? { lt: +id } : { gt: +id },
+        },
+        { limit: 1, orderBy: "id", orderDesc: !!or_less }
+      );
+      if (evFound.length) ev = await EventLog.findOneWithUser(evFound[0].id);
+    }
+    if (!ev) {
+      req.flash("warning", "Event not found");
+      res.redirect("/eventlog");
+    } else
+      send_events_page({
+        res,
+        req,
+        active_sub: "Event log",
+        sub2_page: ev.id,
+        contents: {
+          type: "card",
+          contents:
+            table(
+              { class: "table eventlog" },
+              tbody(
+                tr(
+                  th(req.__("When")),
+                  td(
+                    div(
+                      { class: "d-flex justify-content-between" },
+                      div(localeDateTime(ev.occur_at, {}, locale)),
+                      div(
+                        +id > 1
+                          ? a(
+                              {
+                                href: `/eventlog/${ev.id - 1}?or_less=1`,
+                                class: "btn btn-sm btn-secondary me-1",
+                              },
+                              i({ class: "fas fa-chevron-left" })
+                            )
+                          : "",
+                        a(
+                          {
+                            href: `/eventlog/${ev.id + 1}?or_more=1`,
+                            class: "btn btn-sm btn-secondary",
+                          },
+                          i({ class: "fas fa-chevron-right" })
+                        )
+                      )
+                    )
+                  )
+                ),
+                tr(th(req.__("Type")), td(ev.event_type)),
+                tr(th(req.__("Channel")), td(ev.channel)),
+                tr(th(req.__("User")), td(ev.email))
+              )
+            ) +
+            div(
+              { class: "eventpayload" },
+              ev.payload ? pre(text(JSON.stringify(ev.payload, null, 2))) : ""
+            ),
+        },
+      });
   })
 );

package/routes/fields.js

@@ -303,6 +303,7 @@ const fieldFlow = (req) =>
         fldRow.is_unique = false;
         fldRow.required = false;
       }
+      const table = Table.findOne({ id: table_id });
       if (context.id) {
         const field = await Field.findOne({ id: context.id });
         try {
@@ -311,10 +312,15 @@ const fieldFlow = (req) =>
           }
 
           await field.update(fldRow);
-          Trigger.emitEvent("AppChange", `Field ${fldRow.name}`, req.user, {
-            entity_type: "Field",
-            entity_name: fldRow.name || fldRow.label,
-          });
+          Trigger.emitEvent(
+            "AppChange",
+            `Field ${fldRow.name} on table ${table?.name}`,
+            req.user,
+            {
+              entity_type: "Field",
+              entity_name: fldRow.name || fldRow.label,
+            }
+          );
         } catch (e) {
           return {
             redirect: `/table/${context.table_id}`,
@@ -324,10 +330,15 @@ const fieldFlow = (req) =>
       } else {
         try {
           await Field.create(fldRow);
-          Trigger.emitEvent("AppChange", `Field ${fldRow.name}`, req.user, {
-            entity_type: "Field",
-            entity_name: fldRow.name || fldRow.label,
-          });
+          Trigger.emitEvent(
+            "AppChange",
+            `Field ${fldRow.name} on table ${table?.name}`,
+            req.user,
+            {
+              entity_type: "Field",
+              entity_name: fldRow.name || fldRow.label,
+            }
+          );
         } catch (e) {
           return {
             redirect: `/table/${context.table_id}`,
@@ -669,8 +680,8 @@ const fieldFlow = (req) =>
               a.type?.name === "String" && b.type?.name !== "String"
                 ? -1
                 : a.type?.name !== "String" && b.type?.name === "String"
-                ? 1
-                : 0
+                  ? 1
+                  : 0
             )
             .map((f) => ({
               value: f.name,
@@ -1165,8 +1176,8 @@ router.post(
               typeof value === "string"
                 ? value
                 : value?.toString
-                ? value.toString()
-                : `${value}`
+                  ? value.toString()
+                  : `${value}`
             );
           return;
         }
@@ -1289,8 +1300,8 @@ router.post(
       field.type === "Key"
         ? state.keyFieldviews
         : field.type === "File"
-        ? state.fileviews
-        : field.type.fieldviews;
+          ? state.fileviews
+          : field.type.fieldviews;
     if (!field.type || !fieldviews) {
       res.send("");
       return;

package/routes/files.js

@@ -19,6 +19,7 @@ const {
   error_catcher,
   setTenant,
   is_relative_url,
+  isAdminOrHasConfigMinRole,
 } = require("./utils.js");
 const {
   h1,
@@ -156,7 +157,7 @@ router.get(
  */
 router.get(
   "/",
-  isAdmin,
+  isAdminOrHasConfigMinRole("min_role_edit_files"),
   error_catcher(async (req, res) => {
     // todo limit select from file by 10 or 20
     const { dir, search } = req.query;
@@ -245,8 +246,7 @@ router.get(
 
 router.post(
   "/download-zip",
-  isAdmin,
-
+  isAdminOrHasConfigMinRole("min_role_edit_files"),
   error_catcher(async (req, res) => {
     const role = req.user && req.user.id ? req.user.role_id : 100;
     const user_id = req.user && req.user.id;
@@ -377,7 +377,7 @@ router.get(
  */
 router.post(
   "/setrole/*serve_path",
-  isAdmin,
+  isAdminOrHasConfigMinRole("min_role_edit_files"),
   error_catcher(async (req, res) => {
     const serve_path = path.join(...req.params.serve_path);
     const file = await File.findOne(serve_path);
@@ -397,7 +397,7 @@ router.post(
 
 router.post(
   "/move/*serve_path",
-  isAdmin,
+  isAdminOrHasConfigMinRole("min_role_edit_files"),
   error_catcher(async (req, res) => {
     const serve_path = path.join(...req.params.serve_path);
     const file = await File.findOne(serve_path);
@@ -424,7 +424,7 @@ router.post(
  */
 router.post(
   "/setname/*serve_path",
-  isAdmin,
+  isAdminOrHasConfigMinRole("min_role_edit_files"),
   error_catcher(async (req, res) => {
     const serve_path = path.join(...req.params.serve_path);
     const filename = (req.body || {}).value;
@@ -444,7 +444,7 @@ router.post(
  */
 router.post(
   "/unzip/*serve_path",
-  isAdmin,
+  isAdminOrHasConfigMinRole("min_role_edit_files"),
   error_catcher(async (req, res) => {
     const serve_path = path.join(...req.params.serve_path);
     const filename = (req.body || {}).value;
@@ -458,7 +458,7 @@ router.post(
 
 router.post(
   "/new-folder",
-  isAdmin,
+  isAdminOrHasConfigMinRole("min_role_edit_files"),
   error_catcher(async (req, res) => {
     const { name, folder } = req.body || {};
     await File.new_folder(name, folder);
@@ -535,7 +535,7 @@ router.post(
  */
 router.post(
   "/delete/*serve_path",
-  isAdmin,
+  isAdminOrHasConfigMinRole("min_role_edit_files"),
   error_catcher(async (req, res) => {
     const serve_path = path.join(...req.params.serve_path);
     const { redirect } = req.query;

package/routes/infoarch.js

@@ -5,7 +5,12 @@
  */
 
 const Router = require("express-promise-router");
-const { isAdmin, setTenant, error_catcher } = require("./utils.js");
+const {
+  isAdmin,
+  setTenant,
+  error_catcher,
+  isAdminOrHasConfigMinRole,
+} = require("./utils.js");
 const {
   send_infoarch_page,
   send_admin_page,
@@ -13,9 +18,10 @@ const {
   save_config_from_form,
 } = require("../markup/admin.js");
 const { getState } = require("@saltcorn/data/db/state");
-const { div, a, i, text } = require("@saltcorn/markup/tags");
+const { div, a, i, text, button } = require("@saltcorn/markup/tags");
 const { mkTable, renderForm, post_delete_btn } = require("@saltcorn/markup");
 const Form = require("@saltcorn/data/models/form");
+const Snapshot = require("@saltcorn/admin-models/models/snapshot");
 
 /**
  * @type {object}
@@ -41,6 +47,55 @@ router.get(
   })
 );
 
+router.get(
+  "/create-snapshot",
+  isAdminOrHasConfigMinRole("min_role_create_snapshots"),
+  error_catcher(async (req, res) => {
+    send_infoarch_page({
+      res,
+      req,
+      active_sub: "Snapshots",
+      contents: {
+        type: "card",
+        contents: div(
+          button(
+            {
+              class: "btn btn-outline-secondary",
+              type: "button",
+              onclick:
+                "ajax_post('/site-structure/create-snapshot/'+prompt('Name of snapshot (optional)'))",
+            },
+            req.__("Snapshot now")
+          )
+        ),
+      },
+    });
+  })
+);
+
+router.post(
+  "/create-snapshot/:snapshotname",
+  isAdminOrHasConfigMinRole("min_role_create_snapshots"),
+  error_catcher(async (req, res) => {
+    const { snapshotname } = req.params;
+    if (snapshotname == "null") {
+      //user clicked cancel on prompt
+      res.json({ success: true });
+      return;
+    }
+
+    try {
+      const taken = await Snapshot.take_if_changed(snapshotname);
+      if (taken) req.flash("success", req.__("Snapshot successful"));
+      else
+        req.flash("success", req.__("No changes detected, snapshot skipped"));
+    } catch (e) {
+      req.flash("error", e.message);
+    }
+    res.json({ reload_page: true });
+  })
+);
+
 /**
  * @param {object} req
  * @returns {Form}

package/routes/list.js

@@ -282,6 +282,7 @@ router.get(
       cellClick: "__delete_tabulator_row",
     });
     const isDark = getState().getLightDarkMode(req.user) === "dark";
+    const pkNm = table.pk_name
     res.sendWrap(
       {
         title: req.__(`%s data table`, table.name),
@@ -401,6 +402,7 @@ router.get(
                     col[k] = window[v.substring(2)];
                 })
               })   
+              window.tabulator_table_primary_key = "${table.pk_name}";
               window.tabulator_table = new Tabulator("#jsGrid", {
                   ajaxURL:"/api/${encodeURIComponent(
                     table.name
@@ -420,7 +422,7 @@ router.get(
                   ajaxContentType:"json",
                   sortMode:"remote",
                   initialSort:[
-                    {column:"id", dir:"asc"},
+                    {column:"${table.pk_name}", dir:"asc"},
                   ],                 
               });
               window.tabulator_table.on("cellEdited", function(cell){
@@ -428,7 +430,7 @@ router.get(
                 ajax_indicator(true);
                 $.ajax({
                   type: "POST",
-                  url: "/api/${table.name}/" + (row.id||""),
+                  url: "/api/${table.name}/" + (row.${pkNm}||""),
                   data: row,
                   headers: {
                     "CSRF-Token": _sc_globalCsrf,
@@ -438,8 +440,8 @@ router.get(
                   ajax_indicator(false);
                   //if (item._versions) item._versions = +item._versions + 1;
                   //data.resolve(fixKeys(item));
-                  if(resp.success &&(typeof resp.success ==="number" || typeof resp.success ==="string") && !row.id) {
-                    window.tabulator_table.updateRow(cell.getRow(), {id: resp.success});
+                  if(resp.success &&(typeof resp.success ==="number" || typeof resp.success ==="string") && !row.${pkNm}) {
+                    window.tabulator_table.updateRow(cell.getRow(), {${pkNm}: resp.success});
                   }
 
                 }).fail(function (resp) {

package/routes/pageedit.js

@@ -289,7 +289,7 @@ const getRootPageForm = (pages, pageGroups, roles, req) => {
           input_type: "select",
           options: [
             "",
-            ...pages.map((p) => p.name),
+            ...pages.filter((p) => p.min_role >= r.id).map((p) => p.name),
             ...pageGroups.map((g) => ({
               label: `${g.name} (group)`,
               value: g.name,

package/routes/plugins.js

@@ -495,6 +495,17 @@ const store_actions_dropdown = (req) => {
           '<i class="far fa-arrow-alt-circle-up"></i>&nbsp;' +
             req.__("Upgrade installed modules")
         ),
+      db.getTenantSchema() === db.connectObj.default_schema &&
+        a(
+          {
+            class: "dropdown-item",
+            href: `/plugins/reinstall-all`,
+            onClick: `notifyAlert('${req.__("Upgrading modules...")}', true)`,
+          },
+          '<i class="fas fa-pump-medical"></i>&nbsp;' +
+            req.__("Clean modules and restart")
+        ),
+
       (db.getTenantSchema() === db.connectObj.default_schema ||
         tenants_install_git) &&
         a(
@@ -558,7 +569,7 @@ const plugin_store_html = (items, req) => {
       },
       {
         besides: items.map(store_item_html(req)),
-        gy:3,
+        gy: 3,
         widths: items.map(() => 4),
       },
     ],
@@ -1397,6 +1408,30 @@ router.get(
   })
 );
 
+/**
+ * @name get/upgrade
+ * @function
+ * @memberof module:routes/plugins~pluginsRouter
+ * @function
+ */
+router.get(
+  "/reinstall-all",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    //TODO make this post
+    const schema = db.getTenantSchema();
+    if (schema === db.connectObj.default_schema) {
+      await PluginInstaller.cleanPluginsDirectory();
+      req.flash("success", req.__(`Modules cleaned, server restarting...`));
+      setTimeout(() => {
+        if (process.send) getState().processSend("RestartServer");
+        else process.exit(0);
+      }, 1000);
+    }
+    res.redirect(`/plugins`);
+  })
+);
+
 /**
  * @name get/upgrade-plugin/:name
  * @function

package/routes/search.js

@@ -10,7 +10,11 @@ const { span, h5, h4, nbsp, p, a, div } = require("@saltcorn/markup/tags");
 const { getState } = require("@saltcorn/data/db/state");
 const db = require("@saltcorn/data/db");
 
-const { isAdmin, error_catcher } = require("./utils.js");
+const {
+  isAdmin,
+  error_catcher,
+  isAdminOrHasConfigMinRole,
+} = require("./utils.js");
 const Form = require("@saltcorn/data/models/form");
 const Table = require("@saltcorn/data/models/table");
 const View = require("@saltcorn/data/models/view");
@@ -94,7 +98,7 @@ const searchConfigForm = (tables, views, req) => {
  */
 router.get(
   "/config",
-  isAdmin,
+  isAdminOrHasConfigMinRole("min_role_edit_search"),
   error_catcher(async (req, res) => {
     const views = await View.find({}, { orderBy: "name" });
     const tables = await Table.find();
@@ -131,7 +135,7 @@ router.get(
  */
 router.post(
   "/config",
-  isAdmin,
+  isAdminOrHasConfigMinRole("min_role_edit_search"),
   error_catcher(async (req, res) => {
     const views = await View.find({}, { orderBy: "name" });
     const tables = await Table.find();