@saltcorn/server 0.7.1-beta.1 → 0.7.1

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.7.1-beta.1",
+  "version": "0.7.1",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.7.1-beta.1",
-    "@saltcorn/builder": "0.7.1-beta.1",
-    "@saltcorn/data": "0.7.1-beta.1",
-    "@saltcorn/admin-models": "0.7.1-beta.1",
-    "@saltcorn/markup": "0.7.1-beta.1",
-    "@saltcorn/sbadmin2": "0.7.1-beta.1",
+    "@saltcorn/base-plugin": "0.7.1",
+    "@saltcorn/builder": "0.7.1",
+    "@saltcorn/data": "0.7.1",
+    "@saltcorn/admin-models": "0.7.1",
+    "@saltcorn/markup": "0.7.1",
+    "@saltcorn/sbadmin2": "0.7.1",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "aws-sdk": "^2.1037.0",
@@ -57,7 +57,7 @@
   },
   "repository": "github:saltcorn/saltcorn",
   "devDependencies": {
-    "jest": "^25.1.0",
+    "jest": "26.6.3",
     "supertest": "^4.0.2"
   },
   "scripts": {

package/public/jquery-menu-editor.min.js

@@ -1,9 +1,13 @@
 function MenuEditor(e, t) {
+  const radioValue = (e) =>
+    $(`input:radio[name ='${$(e).attr("name")}']:checked`).val();
   var s = $("#" + e).data("level", "0"),
     l = {
       labelEdit: '<i class="fas fa-edit clickable"></i>',
       labelRemove: '<i class="fas fa-trash-alt clickable"></i>',
       textConfirmDelete: "This item will be deleted. Are you sure?",
+      getLabelText: (e) => e.text,
+      onUpdate: () => {},
       iconPicker: { cols: 4, rows: 4, footer: !1, iconset: "fontawesome5" },
       maxLevel: -1,
       listOptions: {
@@ -28,6 +32,8 @@ function MenuEditor(e, t) {
       },
     };
   $.extend(!0, l, t);
+  var mqeSets = l;
+
   var n = null,
     o = !0,
     i = null,
@@ -35,10 +41,11 @@ function MenuEditor(e, t) {
     a = l.iconPicker,
     c = ((t = l.listOptions), $("#" + e + "_icon").iconpicker(a));
   function d() {
-    i[0].reset(),
-      (c = c.iconpicker(a)).iconpicker("setIcon", "empty"),
-      r.attr("disabled", !0),
-      (n = null);
+    if (!i || !i[0])
+      i[0].reset(),
+        (c = c.iconpicker(a)).iconpicker("setIcon", "empty"),
+        r.attr("disabled", !0),
+        (n = null);
   }
   function p(e) {
     return $("<a>")
@@ -117,7 +124,14 @@ function MenuEditor(e, t) {
         (function (e) {
           var t = e.data();
           $.each(t, function (e, t) {
-            i.find("[name=" + e + "]").val(t);
+            var el = i.find("[name=" + e + "]");
+            if (el.prop("type") == "checkbox") el.prop("checked", !!t);
+            else if (el.prop("type") == "radio") {
+              $(`input[name=${el.prop("name")}][value="${t}"]`).prop(
+                "checked",
+                true
+              );
+            } else el.val(t);
           }),
             i.find(".item-menu").first().focus(),
             t.hasOwnProperty("icon")
@@ -125,6 +139,7 @@ function MenuEditor(e, t) {
               : c.iconpicker("setIcon", "empty");
           r.removeAttr("disabled");
         })((n = $(this).closest("li")));
+      l.onUpdate();
     }),
     s.on("click", ".btnUp", function (e) {
       e.preventDefault();
@@ -180,20 +195,34 @@ function MenuEditor(e, t) {
       if (null !== e) {
         var t = e.data("icon");
         i.find(".item-menu").each(function () {
-          e.data($(this).attr("name"), $(this).val());
+          if (!$(this).prop("disabled"))
+            e.data(
+              $(this).attr("name"),
+              $(this).attr("type") === "radio"
+                ? radioValue(this)
+                : $(this).attr("type") === "checkbox"
+                ? $(this).prop("checked")
+                : $(this).val()
+            );
         }),
           e.children().children("i").removeClass(t).addClass(e.data("icon")),
-          e.find("span.txt").first().text(e.data("text")),
+          e.find("span.txt").first().text(mqeSets.getLabelText(e.data())),
           d();
       }
     }),
     (this.add = function () {
       var e = {};
       i.find(".item-menu").each(function () {
-        e[$(this).attr("name")] = $(this).val();
+        if (!$(this).prop("disabled"))
+          e[$(this).attr("name")] =
+            $(this).attr("type") === "radio"
+              ? radioValue(this)
+              : $(this).attr("type") === "checkbox"
+              ? $(this).prop("checked")
+              : $(this).val();
       });
       var t = u(),
-        l = $("<span>").addClass("txt").text(e.text),
+        l = $("<span>").addClass("txt").text(mqeSets.getLabelText(e)),
         n = $("<i>").addClass(e.icon),
         o = $("<div>")
           .css({ overflow: "auto" })
@@ -251,7 +280,7 @@ function MenuEditor(e, t) {
                 d = $("<i>").addClass(s.icon),
                 p = $("<span>")
                   .addClass("txt")
-                  .append(s.text)
+                  .append(mqeSets.getLabelText(s))
                   .css("margin-right", "5px"),
                 f = u();
               c.append(d).append("&nbsp;").append(p).append(f),
@@ -486,34 +515,38 @@ function MenuEditor(e, t) {
             : h(d),
           (d.oElOld = d.oEl),
           (s.el[0].style.visibility = "hidden"),
-          (d.oEl = oEl = (function (t, s) {
-            if (!document.elementFromPoint) return null;
-            var l = d.isRelEFP;
-            if (null === l) {
-              var n, o;
-              (n = d.doc.scrollTop()) > 0 &&
-                (l =
-                  null ==
-                    (o = document.elementFromPoint(
-                      0,
-                      n + e(window).height() - 1
-                    )) || "HTML" == o.tagName.toUpperCase()),
-                (n = d.doc.scrollLeft()) > 0 &&
+          (d.oEl = oEl =
+            (function (t, s) {
+              if (!document.elementFromPoint) return null;
+              var l = d.isRelEFP;
+              if (null === l) {
+                var n, o;
+                (n = d.doc.scrollTop()) > 0 &&
                   (l =
                     null ==
                       (o = document.elementFromPoint(
-                        n + e(window).width() - 1,
-                        0
-                      )) || "HTML" == o.tagName.toUpperCase());
-            }
-            l && ((t -= d.doc.scrollLeft()), (s -= d.doc.scrollTop()));
-            var i = e(document.elementFromPoint(t, s));
-            if (!d.rootEl.el.find(i).length) return null;
-            if (i.is("#sortableListsPlaceholder") || i.is("#sortableListsHint"))
-              return null;
-            if (!i.is("li")) return (i = i.closest("li"))[0] ? i : null;
-            if (i.is("li")) return i;
-          })(t.pageX, t.pageY)),
+                        0,
+                        n + e(window).height() - 1
+                      )) || "HTML" == o.tagName.toUpperCase()),
+                  (n = d.doc.scrollLeft()) > 0 &&
+                    (l =
+                      null ==
+                        (o = document.elementFromPoint(
+                          n + e(window).width() - 1,
+                          0
+                        )) || "HTML" == o.tagName.toUpperCase());
+              }
+              l && ((t -= d.doc.scrollLeft()), (s -= d.doc.scrollTop()));
+              var i = e(document.elementFromPoint(t, s));
+              if (!d.rootEl.el.find(i).length) return null;
+              if (
+                i.is("#sortableListsPlaceholder") ||
+                i.is("#sortableListsHint")
+              )
+                return null;
+              if (!i.is("li")) return (i = i.closest("li"))[0] ? i : null;
+              if (i.is("li")) return i;
+            })(t.pageX, t.pageY)),
           (s.el[0].style.visibility = "visible"),
           (function (e, t) {
             var s = t.oEl;

package/public/saltcorn.css

@@ -224,6 +224,3 @@ footer.bs-mobile-nav-footer {
 .form-group {
   margin-bottom: 1rem;
 }
-div.dropdown-menu {
-  position: absolute;
-}

package/public/saltcorn.js

@@ -10,13 +10,17 @@ jQuery.fn.swapWith = function (to) {
 
 //avoids hiding in overflow:hidden
 function init_bs5_dropdowns() {
-  $("body").on("show.bs.dropdown", "[data-bs-toggle=dropdown]", function () {
-    let target;
-    if (!$("#page-inner-content").length) target = $("body");
-    else target = $("#page-inner-content");
-    let dropdown = bootstrap.Dropdown.getInstance(this);
-    $(dropdown._menu).insertAfter(target);
-  });
+  $("body").on(
+    "show.bs.dropdown",
+    "table [data-bs-toggle=dropdown]",
+    function () {
+      let target;
+      if (!$("#page-inner-content").length) target = $("body");
+      else target = $("#page-inner-content");
+      let dropdown = bootstrap.Dropdown.getInstance(this);
+      $(dropdown._menu).insertAfter(target);
+    }
+  );
 }
 function sortby(k, desc) {
   set_state_fields({ _sortby: k, _sortdesc: desc ? "on" : { unset: true } });
@@ -108,6 +112,8 @@ function get_form_record(e, select_labels) {
     .each(function () {
       if (select_labels && $(this).prop("tagName").toLowerCase() === "select")
         rec[$(this).attr("name")] = $(this).find("option:selected").text();
+      else if ($(this).prop("type") === "checkbox")
+        rec[$(this).attr("name")] = $(this).prop("checked");
       else rec[$(this).attr("name")] = $(this).val();
     });
   return rec;
@@ -323,17 +329,36 @@ function enable_codemirror(f) {
 }
 
 //https://stackoverflow.com/a/6021027
-function updateQueryStringParameter(uri, key, value) {
+function updateQueryStringParameter(uri1, key, value) {
+  let hash = "";
+  let uri = uri1;
+  if (uri && uri.includes("#")) {
+    let uris = uri1.split("#");
+    hash = "#" + uris[1];
+    uri = uris[0];
+  }
+
   var re = new RegExp("([?&])" + key + "=.*?(&|$)", "i");
   var separator = uri.indexOf("?") !== -1 ? "&" : "?";
   if (uri.match(re)) {
-    return uri.replace(re, "$1" + key + "=" + encodeURIComponent(value) + "$2");
+    return (
+      uri.replace(re, "$1" + key + "=" + encodeURIComponent(value) + "$2") +
+      hash
+    );
   } else {
-    return uri + separator + key + "=" + encodeURIComponent(value);
+    return uri + separator + key + "=" + encodeURIComponent(value) + hash;
   }
 }
 
-function removeQueryStringParameter(uri, key) {
+function removeQueryStringParameter(uri1, key) {
+  let hash = "";
+  let uri = uri1;
+  if (uri && uri.includes("#")) {
+    let uris = uri1.split("#");
+    hash = "#" + uris[1];
+    uri = uris[0];
+  }
+
   var re = new RegExp("([?&])" + key + "=.*?(&|$)", "i");
   var separator = uri.indexOf("?") !== -1 ? "&" : "?";
   if (uri.match(re)) {
@@ -341,7 +366,7 @@ function removeQueryStringParameter(uri, key) {
   }
   if (uri[uri.length - 1] === "?" || uri[uri.length - 1] === "&")
     uri = uri.substring(0, uri.length - 1);
-  return uri;
+  return uri + hash;
 }
 
 function select_id(id) {
@@ -522,7 +547,8 @@ function globalErrorCatcher(message, source, lineno, colno, error) {
 }
 
 function press_store_button(clicked) {
-  $(clicked).html('<i class="fas fa-spinner fa-spin"></i>');
+  const width = $(clicked).width();
+  $(clicked).html('<i class="fas fa-spinner fa-spin"></i>').width(width);
 }
 
 function ajax_modal(url, opts = {}) {
@@ -541,6 +567,10 @@ function ajax_modal(url, opts = {}) {
       </div>
     </div>
   </div>`);
+  } else if ($("#scmodal").hasClass("show")) {
+    var myModalEl = document.getElementById("scmodal");
+    var modal = bootstrap.Modal.getInstance(myModalEl);
+    modal.dispose();
   }
   if (opts.submitReload === false) $("#scmodal").addClass("no-submit-reload");
   else $("#scmodal").removeClass("no-submit-reload");
@@ -800,6 +830,26 @@ async function fill_formula_btn_click(btn, k) {
   if (k) k();
 }
 
+const columnSummary = (col) => {
+  if (!col) return "Unknown";
+  switch (col.type) {
+    case "Field":
+      return `Field ${col.field_name} ${col.fieldview}`;
+    case "Link":
+      return `Link ${col.link_text}`;
+    case "JoinField":
+      return `Join ${col.join_field}`;
+    case "ViewLink":
+      return `View link ${col.view_label || col.view.split(":")[1] || ""}`;
+    case "Action":
+      return `Action ${col.action_label || col.action_name}`;
+    case "Aggregation":
+      return `${col.stat} ${col.agg_field} ${col.agg_relation}`;
+    default:
+      return "Unknown";
+  }
+};
+
 /*
 https://github.com/jeffdavidgreen/bootstrap-html5-history-tabs/blob/master/bootstrap-history-tabs.js
 Copyright (c) 2015 Jeff Green

package/routes/admin.js

@@ -36,6 +36,9 @@ const {
   button,
   span,
   p,
+  code,
+  h5,
+  pre,
 } = require("@saltcorn/markup/tags");
 const db = require("@saltcorn/data/db");
 const {
@@ -50,6 +53,9 @@ const {
   create_backup,
   restore,
 } = require("@saltcorn/admin-models/models/backup");
+const {
+  runConfigurationCheck,
+} = require("@saltcorn/admin-models/models/config-check");
 const fs = require("fs");
 const load_plugins = require("../load_plugins");
 const {
@@ -365,6 +371,18 @@ router.get(
               ),
               hr(),
 
+              a(
+                {
+                  href: "/admin/configuration-check",
+                  class: "btn btn-info",
+                  onClick: "press_store_button(this)",
+                },
+                i({ class: "fas fa-stethoscope" }),
+                " ",
+                req.__("Configuration check")
+              ),
+              hr(),
+
               a(
                 { href: "/admin/clear-all", class: "btn btn-danger" },
                 i({ class: "fas fa-trash-alt" }),
@@ -741,6 +759,49 @@ router.get(
   })
 );
 
+router.get(
+  "/configuration-check",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { passes, errors, pass } = await runConfigurationCheck(req);
+    const mkError = (err) =>
+      div(
+        { class: "alert alert-danger", role: "alert" },
+        pre({ class: "mb-0" }, code(err))
+      );
+    res.sendWrap(req.__(`Admin`), {
+      above: [
+        {
+          type: "breadcrumbs",
+          crumbs: [
+            { text: req.__("Settings") },
+            { text: req.__("Admin"), href: "/admin" },
+            { text: req.__("Configuration check") },
+          ],
+        },
+        {
+          type: "card",
+          title: req.__("Configuration errors"),
+          contents: div(
+            pass
+              ? div(
+                  { class: "alert alert-success", role: "alert" },
+                  i({ class: "fas fa-check-circle fa-lg me-2" }),
+                  h5({ class: "d-inline" }, "No errors detected")
+                )
+              : errors.map(mkError)
+          ),
+        },
+        {
+          type: "card",
+          title: req.__("Configuration checks passed"),
+          contents: div(pre(code(passes.join("\n")))),
+        },
+      ],
+    });
+  })
+);
+
 /**
  * @name post/clear-all
  * @function

package/routes/fields.js

@@ -181,6 +181,7 @@ const fieldFlow = (req) =>
       var attributes = context.attributes || {};
       attributes.default = context.default;
       attributes.summary_field = context.summary_field;
+      attributes.on_delete_cascade = context.on_delete_cascade;
       const {
         table_id,
         name,
@@ -377,6 +378,14 @@ const fieldFlow = (req) =>
                 input_type: "select",
                 options: keyfields,
               }),
+              new Field({
+                name: "on_delete_cascade",
+                label: req.__("On delete cascade"),
+                type: "Bool",
+                sublabel: req.__(
+                  "If the parent row is deleted, automatically delete the child rows."
+                ),
+              }),
             ],
           });
         },
@@ -620,10 +629,14 @@ router.post(
  */
 router.post(
   "/show-calculated/:tableName/:fieldName/:fieldview",
-  isAdmin,
   error_catcher(async (req, res) => {
     const { tableName, fieldName, fieldview } = req.params;
     const table = await Table.findOne({ name: tableName });
+    const role = req.user && req.user.id ? req.user.role_id : 10;
+    if (role > table.min_role_read) {
+      res.status(401).send("");
+      return;
+    }
     const fields = await table.getFields();
     const row = { ...req.body };
     readState(row, fields);
@@ -634,6 +647,10 @@ router.post(
       if (kpath.length === 2 && row[kpath[0]]) {
         const field = fields.find((f) => f.name === kpath[0]);
         const reftable = await Table.findOne({ name: field.reftable_name });
+        if (role > reftable.min_role_read) {
+          res.status(401).send("");
+          return;
+        }
         const targetField = (await reftable.getFields()).find(
           (f) => f.name === kpath[1]
         );
@@ -662,6 +679,10 @@ router.post(
           if (field.is_fkey) {
             const reftable = await Table.findOne({ name: field.reftable_name });
             if (!oldRow[ref]) break;
+            if (role > reftable.min_role_read) {
+              res.status(401).send("");
+              return;
+            }
             const q = { [reftable.pk_name]: oldRow[ref] };
             oldRow = await reftable.getRow(q);
             oldTable = reftable;

package/routes/menu.js

@@ -10,7 +10,6 @@ const Field = require("@saltcorn/data/models/field");
 const Form = require("@saltcorn/data/models/form");
 const { isAdmin, setTenant, error_catcher } = require("./utils.js");
 const { getState } = require("@saltcorn/data/db/state");
-const FieldRepeat = require("@saltcorn/data/models/fieldrepeat");
 const File = require("@saltcorn/data/models/file");
 const User = require("@saltcorn/data/models/user");
 const View = require("@saltcorn/data/models/view");

package/routes/plugins.js

@@ -14,7 +14,7 @@ const {
   post_btn,
   post_delete_btn,
 } = require("@saltcorn/markup");
-const { getState } = require("@saltcorn/data/db/state");
+const { getState, restart_tenant } = require("@saltcorn/data/db/state");
 const Form = require("@saltcorn/data/models/form");
 const Field = require("@saltcorn/data/models/field");
 const Plugin = require("@saltcorn/data/models/plugin");
@@ -52,6 +52,7 @@ const path = require("path");
 const { get_latest_npm_version } = require("@saltcorn/data/models/config");
 const { flash_restart } = require("../markup/admin.js");
 const { sleep } = require("@saltcorn/data/utils");
+const { loadAllPlugins } = require("../load_plugins");
 
 /**
  * @type {object}
@@ -148,6 +149,7 @@ const local_has_theme = (name) => {
  */
 const get_store_items = async () => {
   const installed_plugins = await Plugin.find({});
+  const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
 
   const instore = await Plugin.store_plugins_available();
   const packs_available = await fetch_available_packs();
@@ -155,15 +157,18 @@ const get_store_items = async () => {
   const schema = db.getTenantSchema();
   const installed_plugin_names = installed_plugins.map((p) => p.name);
   const store_plugin_names = instore.map((p) => p.name);
-  const plugins_item = instore.map((plugin) => ({
-    name: plugin.name,
-    installed: installed_plugin_names.includes(plugin.name),
-    plugin: true,
-    description: plugin.description,
-    documentation_link: plugin.documentation_link,
-    has_theme: plugin.has_theme,
-    has_auth: plugin.has_auth,
-  }));
+  const plugins_item = instore
+    .map((plugin) => ({
+      name: plugin.name,
+      installed: installed_plugin_names.includes(plugin.name),
+      plugin: true,
+      description: plugin.description,
+      documentation_link: plugin.documentation_link,
+      has_theme: plugin.has_theme,
+      has_auth: plugin.has_auth,
+      unsafe: plugin.unsafe,
+    }))
+    .filter((p) => !p.unsafe || isRoot);
   const local_logins = installed_plugins
     .filter((p) => !store_plugin_names.includes(p.name) && p.name !== "base")
     .map((plugin) => ({
@@ -647,15 +652,16 @@ router.get(
   error_catcher(async (req, res) => {
     const { plugin } = req.params;
     const filepath = req.params[0];
-    const location = getState().plugin_locations[
-      plugin.includes("@") ? plugin.split("@")[0] : plugin
-    ];
+    const hasVersion = plugin.includes("@");
+    const location =
+      getState().plugin_locations[hasVersion ? plugin.split("@")[0] : plugin];
     if (location) {
       const safeFile = path
         .normalize(filepath)
         .replace(/^(\.\.(\/|\\|$))+/, "");
       const fullpath = path.join(location, "public", safeFile);
-      if (fs.existsSync(fullpath)) res.sendFile(fullpath, { maxAge: "1d" });
+      if (fs.existsSync(fullpath))
+        res.sendFile(fullpath, { maxAge: hasVersion ? "100d" : "1d" });
       else res.status(404).send(req.__("Not found"));
     } else {
       res.status(404).send(req.__("Not found"));
@@ -841,7 +847,9 @@ router.get(
       await plugin.upgrade_version((p, f) => load_plugins.loadPlugin(p, f));
     }
     req.flash("success", req.__(`Plugins up-to-date`));
-
+    await restart_tenant(loadAllPlugins);
+    process.send &&
+      process.send({ restart_tenant: true, tenant: db.getTenantSchema() });
     res.redirect(`/plugins`);
   })
 );
@@ -957,6 +965,15 @@ router.post(
       res.redirect(`/plugins`);
       return;
     }
+    const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
+    if (!isRoot && plugin.unsafe) {
+      req.flash(
+        "error",
+        req.__("Cannot install unsafe plugins on subdomain tenants")
+      );
+      res.redirect(`/plugins`);
+      return;
+    }
     delete plugin.id;
     await load_plugins.loadAndSaveNewPlugin(plugin);
     const plugin_module = getState().plugins[name];

package/routes/viewedit.js

@@ -38,6 +38,7 @@ const View = require("@saltcorn/data/models/view");
 const Workflow = require("@saltcorn/data/models/workflow");
 const User = require("@saltcorn/data/models/user");
 const Page = require("@saltcorn/data/models/page");
+const db = require("@saltcorn/data/db");
 
 const { add_to_menu } = require("@saltcorn/admin-models/models/pack");
 const { editRoleForm } = require("../markup/forms.js");
@@ -534,7 +535,23 @@ const respondWorkflow = (view, wf, wfres, req, res) => {
   if (wfres.flash) req.flash(wfres.flash[0], wfres.flash[1]);
   if (wfres.renderForm)
     res.sendWrap(
-      req.__(`View configuration`),
+      {
+        title: req.__(`View configuration`),
+        headers: [
+          {
+            script: `/static_assets/${db.connectObj.version_tag}/jquery-menu-editor.min.js`,
+          },
+          {
+            script: `/static_assets/${db.connectObj.version_tag}/iconset-fontawesome5-3-1.min.js`,
+          },
+          {
+            script: `/static_assets/${db.connectObj.version_tag}/bootstrap-iconpicker.js`,
+          },
+          {
+            css: `/static_assets/${db.connectObj.version_tag}/bootstrap-iconpicker.min.css`,
+          },
+        ],
+      },
       wrap(renderForm(wfres.renderForm, req.csrfToken()))
     );
   else if (wfres.renderBuilder) {