@saltcorn/server 0.8.0 → 0.8.1-beta.1

package/auth/admin.js

@@ -162,6 +162,11 @@ const user_dropdown = (user, req, can_reset) =>
       },
       '<i class="fas fa-edit"></i>&nbsp;' + req.__("Edit")
     ),
+    post_dropdown_item(
+      `/useradmin/become-user/${user.id}`,
+      '<i class="fas fa-ghost"></i>&nbsp;' + req.__("Become user"),
+      req
+    ),
     post_dropdown_item(
       `/useradmin/set-random-password/${user.id}`,
       '<i class="fas fa-random"></i>&nbsp;' + req.__("Set random password"),
@@ -1074,6 +1079,35 @@ router.post(
   })
 );
 
+/**
+ * Become user
+ * @name post/become-user/:id
+ * @function
+ * @memberof module:auth/admin~auth/adminRouter
+ */
+router.post(
+  "/become-user/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const u = await User.findOne({ id });
+    if (u) {
+      u.relogin(req);
+      req.flash(
+        "success",
+        req.__(
+          `Your are now logged in as %s. Logout and login again to assume your usual identity`,
+          u.email
+        )
+      );
+      res.redirect(`/`);
+    } else {
+      req.flash("error", req.__(`User not found`));
+      res.redirect(`/useradmin`);
+    }
+  })
+);
+
 /**
  * @name post/disable/:id
  * @function

package/locales/en.json

@@ -1057,5 +1057,21 @@
 	"Specifies a default filter for what file types the user can pick from the file input dialog box. Example is `.doc, text/csv,audio/*,video/*,image/*`": "Specifies a default filter for what file types the user can pick from the file input dialog box. Example is `.doc, text/csv,audio/*,video/*,image/*`",
 	"Destination page": "Destination page",
 	"Module Store endpoint": "Module Store endpoint",
-	"Authentication settings updated": "Authentication settings updated"
+	"Authentication settings updated": "Authentication settings updated",
+	"Log client errors": "Log client errors",
+	"Record all client errors in the crash log": "Record all client errors in the crash log",
+	"Default File accept filter": "Default File accept filter",
+	"File upload debug": "File upload debug",
+	"Turn on to debug file upload in express-fileupload.": "Turn on to debug file upload in express-fileupload.",
+	"Upload size limit (Kb)": "Upload size limit (Kb)",
+	"Maximum upload file size in kilobytes": "Maximum upload file size in kilobytes",
+	"File upload timeout": "File upload timeout",
+	"Defines how long to wait for data before aborting file upload. Set to 0 if you want to turn off timeout checks. ": "Defines how long to wait for data before aborting file upload. Set to 0 if you want to turn off timeout checks. ",
+	"Files settings": "Files settings",
+	"NPM packages in code": "NPM packages in code",
+	"Comma-separated list of packages which will be available in JavaScript actions": "Comma-separated list of packages which will be available in JavaScript actions",
+	"Become user": "Become user",
+	"Your are now logged in as %s. Logout and login again to assume your usual identity": "Your are now logged in as %s. Logout and login again to assume your usual identity",
+	"Done": "Done",
+	"Configure trigger %s": "Configure trigger %s"
 }

package/locales/fr.json

@@ -274,5 +274,17 @@
 	"Field %s deleted": "Champ %s supprimé",
 	"Language: ": "Langage: ",
 	"Local": "Local",
-	"Language changed to %s": "Langage changé vers %s"
-}
+	"Language changed to %s": "Langage changé vers %s",
+	"CSV upload": "CSV upload",
+	"Create page": "Create page",
+	"Action": "Action",
+	"Table or Channel": "Table or Channel",
+	"Add trigger": "Add trigger",
+	"Upload file(s)": "Upload file(s)",
+	"About application": "About application",
+	"Modules": "Modules",
+	"Users and security": "Users and security",
+	"Site structure": "Site structure",
+	"Events": "Events",
+	"Are you sure?": "Are you sure?"
+}

package/locales/it.json

@@ -484,5 +484,6 @@
 	"Table access": "Table access",
 	"HTTP": "HTTP",
 	"Rights": "Rights",
-	"Permissions": "Permissions"
+	"Permissions": "Permissions",
+	"Become user": "Become user"
 }

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.8.0",
+  "version": "0.8.1-beta.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.8.0",
-    "@saltcorn/builder": "0.8.0",
-    "@saltcorn/data": "0.8.0",
-    "@saltcorn/admin-models": "0.8.0",
-    "@saltcorn/filemanager": "0.8.0",
-    "@saltcorn/markup": "0.8.0",
-    "@saltcorn/sbadmin2": "0.8.0",
+    "@saltcorn/base-plugin": "0.8.1-beta.1",
+    "@saltcorn/builder": "0.8.1-beta.1",
+    "@saltcorn/data": "0.8.1-beta.1",
+    "@saltcorn/admin-models": "0.8.1-beta.1",
+    "@saltcorn/filemanager": "0.8.1-beta.1",
+    "@saltcorn/markup": "0.8.1-beta.1",
+    "@saltcorn/sbadmin2": "0.8.1-beta.1",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "aws-sdk": "^2.1037.0",

package/public/saltcorn-common.js

@@ -36,11 +36,11 @@ function add_repeater(nm) {
   newe.appendTo($("div.repeats-" + nm));
 }
 
-const _apply_showif_plugins = []
+const _apply_showif_plugins = [];
 
-const add_apply_showif_plugin = p => {
-  _apply_showif_plugins.push(p)
-}
+const add_apply_showif_plugin = (p) => {
+  _apply_showif_plugins.push(p);
+};
 function apply_showif() {
   $("[data-show-if]").each(function (ix, element) {
     var e = $(element);
@@ -92,7 +92,8 @@ function apply_showif() {
       } else {
         e.append(
           $(
-            `<option ${`${current}` === `${o.value}` ? "selected" : ""
+            `<option ${
+              `${current}` === `${o.value}` ? "selected" : ""
             } value="${o.value}">${o.label}</option>`
           )
         );
@@ -117,76 +118,127 @@ function apply_showif() {
       e.attr("data-selected", ec.target.value);
     });
 
-    const currentOptionsSet = e.prop('data-fetch-options-current-set')
+    const currentOptionsSet = e.prop("data-fetch-options-current-set");
     if (currentOptionsSet === qs) return;
 
     const activate = (success, qs) => {
       e.empty();
-      e.prop('data-fetch-options-current-set', qs)
+      e.prop("data-fetch-options-current-set", qs);
       if (!dynwhere.required) e.append($(`<option></option>`));
       let currentDataOption = undefined;
-      const dataOptions = []
+      const dataOptions = [];
       success.forEach((r) => {
         const label = dynwhere.label_formula
           ? new Function(
-            `{${Object.keys(r).join(",")}}`,
-            "return " + dynwhere.label_formula
-          )(r)
-          : r[dynwhere.summary_field]
-        const value = r[dynwhere.refname]
-        const selected = `${current}` === `${r[dynwhere.refname]}`
+              `{${Object.keys(r).join(",")}}`,
+              "return " + dynwhere.label_formula
+            )(r)
+          : r[dynwhere.summary_field];
+        const value = r[dynwhere.refname];
+        const selected = `${current}` === `${r[dynwhere.refname]}`;
         dataOptions.push({ text: label, value });
         if (selected) currentDataOption = value;
-        const html = `<option ${selected ? "selected" : ""
-          } value="${value}">${label}</option>`
-        e.append(
-          $(html)
-        );
+        const html = `<option ${
+          selected ? "selected" : ""
+        } value="${value}">${label}</option>`;
+        e.append($(html));
       });
-      element.dispatchEvent(new Event('RefreshSelectOptions'))
+      element.dispatchEvent(new Event("RefreshSelectOptions"));
       if (e.hasClass("selectized") && $().selectize) {
         e.selectize()[0].selectize.clearOptions();
         e.selectize()[0].selectize.addOption(dataOptions);
         if (typeof currentDataOption !== "undefined")
           e.selectize()[0].selectize.setValue(currentDataOption);
-
       }
-    }
+    };
 
-    const cache = e.prop('data-fetch-options-cache') || {}
+    const cache = e.prop("data-fetch-options-cache") || {};
     if (cache[qs]) {
-      activate(cache[qs], qs)
+      activate(cache[qs], qs);
     } else
       $.ajax(`/api/${dynwhere.table}?${qs}`).then((resp) => {
         if (resp.success) {
-          activate(resp.success, qs)
-          const cacheNow = e.prop('data-fetch-options-cache') || {}
-          e.prop('data-fetch-options-cache', { ...cacheNow, [qs]: resp.success })
+          activate(resp.success, qs);
+          const cacheNow = e.prop("data-fetch-options-cache") || {};
+          e.prop("data-fetch-options-cache", {
+            ...cacheNow,
+            [qs]: resp.success,
+          });
         }
       });
   });
 
   $("[data-source-url]").each(function (ix, element) {
     const e = $(element);
-    const rec = get_form_record(e);
+    const rec0 = get_form_record(e);
+
+    const relevantFieldsStr = e.attr("data-relevant-fields");
+    let rec;
+    if (relevantFieldsStr) {
+      rec = {};
+      relevantFieldsStr.split(",").forEach((k) => {
+        rec[k] = rec0[k];
+      });
+    } else rec = rec0;
+    const recS = JSON.stringify(rec);
+
+    const shown = e.prop("data-source-url-current");
+    if (shown === recS) return;
+
+    const cache = e.prop("data-source-url-cache") || {};
+
+    const activate_onchange_coldef = () => {
+      e.closest(".form-namespace")
+        .find("input,select, textarea")
+        .on("change", (ec) => {
+          const $ec = $(ec.target);
+          const k = $ec.attr("name");
+          if (!k || k === "_columndef") return;
+          const v = ec.target.value;
+          const $def = e
+            .closest(".form-namespace")
+            .find("input[name=_columndef]");
+          const def = JSON.parse($def.val());
+          def[k] = v;
+          $def.val(JSON.stringify(def));
+        });
+    };
+
+    if (typeof cache[recS] !== "undefined") {
+      e.html(cache[recS]);
+      activate_onchange_coldef();
+      return;
+    }
     ajax_post_json(e.attr("data-source-url"), rec, {
       success: (data) => {
         e.html(data);
+        const cacheNow = e.prop("data-source-url-cache") || {};
+        e.prop("data-source-url-cache", {
+          ...cacheNow,
+          [recS]: data,
+        });
+        e.prop("data-source-url-current", recS);
+        activate_onchange_coldef();
       },
       error: (err) => {
         console.error(err);
+        const cacheNow = e.prop("data-source-url-cache") || {};
+        e.prop("data-source-url-cache", {
+          ...cacheNow,
+          [recS]: "",
+        });
         e.html("");
       },
     });
   });
-  _apply_showif_plugins.forEach(p => p())
+  _apply_showif_plugins.forEach((p) => p());
 }
 
 function splitTargetMatch(elemValue, target, keySpec) {
   if (!elemValue) return false;
-  const [fld, keySpec1] = keySpec.split("|_")
-  const [sep, pos] = keySpec1.split("_")
-  const elemValueShort = elemValue.split(sep)[pos]
+  const [fld, keySpec1] = keySpec.split("|_");
+  const [sep, pos] = keySpec1.split("_");
+  const elemValueShort = elemValue.split(sep)[pos];
   return elemValueShort === target;
 }
 
@@ -195,7 +247,7 @@ function get_form_record(e, select_labels) {
   e.closest(".form-namespace")
     .find("input[name],select[name]")
     .each(function () {
-      const name = $(this).attr("data-fieldname") || $(this).attr("name")
+      const name = $(this).attr("data-fieldname") || $(this).attr("name");
       if (select_labels && $(this).prop("tagName").toLowerCase() === "select")
         rec[name] = $(this).find("option:selected").text();
       else if ($(this).prop("type") === "checkbox")
@@ -392,10 +444,19 @@ function initialize_page() {
       setTimeout(() => {
         codes.forEach((el) => {
           //console.log($(el).attr("mode"), el);
-          CodeMirror.fromTextArea(el, {
+          const cm = CodeMirror.fromTextArea(el, {
             lineNumbers: true,
             mode: $(el).attr("mode"),
           });
+          cm.on(
+            "change",
+            $.debounce(() => {
+              $(el).closest("form").trigger("change");
+            }),
+            500,
+            null,
+            true
+          );
         });
       }, 100);
     });
@@ -508,14 +569,16 @@ function notifyAlert(note, spin) {
   }
 
   $("#alerts-area")
-    .append(`<div class="alert alert-${type} alert-dismissible fade show ${spin ? "d-flex align-items-center" : ""
-      }" role="alert">
+    .append(`<div class="alert alert-${type} alert-dismissible fade show ${
+    spin ? "d-flex align-items-center" : ""
+  }" role="alert">
   ${txt}
-  ${spin
-        ? `<div class="spinner-border ms-auto" role="status" aria-hidden="true"></div>`
-        : `<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close">
+  ${
+    spin
+      ? `<div class="spinner-border ms-auto" role="status" aria-hidden="true"></div>`
+      : `<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close">
   </button>`
-      }
+  }
 </div>`);
 }
 
@@ -532,8 +595,9 @@ function common_done(res, isWeb = true) {
     (isWeb ? location : parent.location).reload(); //TODO notify to cookie if reload or goto
   }
   if (res.download) {
-    const dataurl = `data:${res.download.mimetype || "application/octet-stream"
-      };base64,${res.download.blob}`;
+    const dataurl = `data:${
+      res.download.mimetype || "application/octet-stream"
+    };base64,${res.download.blob}`;
     fetch(dataurl)
       .then((res) => res.blob())
       .then((blob) => {
@@ -553,15 +617,19 @@ function common_done(res, isWeb = true) {
   else if (res.goto) {
     if (res.target === "_blank") window.open(res.goto, "_blank").focus();
     else {
-      const prev = new URL(window.location.href)
-      const next = new URL(res.goto, prev.origin)
+      const prev = new URL(window.location.href);
+      const next = new URL(res.goto, prev.origin);
       window.location.href = res.goto;
-      if (prev.origin === next.origin && prev.pathname === next.pathname && next.hash !== prev.hash)
-        location.reload()
+      if (
+        prev.origin === next.origin &&
+        prev.pathname === next.pathname &&
+        next.hash !== prev.hash
+      )
+        location.reload();
     }
   }
   if (res.popup) {
-    ajax_modal(res.popup)
+    ajax_modal(res.popup);
   }
 }
 
@@ -572,7 +640,9 @@ const repeaterCopyValuesToForm = (form, editor, noTriggerChange) => {
     const $e = form.find(`input[name="${k}_${ix}"]`);
     if ($e.length) $e.val(v);
     else {
-      const $ne = $(`<input type="hidden" data-repeater-ix="${ix}" name="${k}_${ix}"></input>`);
+      const $ne = $(
+        `<input type="hidden" data-repeater-ix="${ix}" name="${k}_${ix}"></input>`
+      );
       $ne.val(v);
       form.append($ne);
     }
@@ -700,9 +770,9 @@ function room_older(viewname, room_id, btn) {
 function init_room(viewname, room_id) {
   const socket = parent?.config?.server_path
     ? io(parent.config.server_path, {
-      query: `jwt=${localStorage.getItem("auth_jwt")}`,
-      transports: ["websocket"],
-    })
+        query: `jwt=${localStorage.getItem("auth_jwt")}`,
+        transports: ["websocket"],
+      })
     : io({ transports: ["websocket"] });
 
   socket.emit("join_room", [viewname, room_id]);
@@ -735,32 +805,31 @@ function cancel_form(form) {
 }
 
 function split_paste_handler(e) {
-  let clipboardData = e.clipboardData || window.clipboardData || e.originalEvent.clipboardData;
+  let clipboardData =
+    e.clipboardData || window.clipboardData || e.originalEvent.clipboardData;
 
-  const lines = clipboardData.getData('text').split(/\r\n/g)
+  const lines = clipboardData.getData("text").split(/\r\n/g);
 
   // do normal thing if not multiline - do not interfere with ordinary copy paste
   if (lines.length < 2) return;
   e.preventDefault();
-  const form = $(e.target).closest('form')
+  const form = $(e.target).closest("form");
 
   let matched = false;
 
-  form.find('input:not(:disabled):not([readonly]):not(:hidden)').each(function (ix, element) {
-    if (!matched && element === e.target) matched = true;
-    if (matched && lines.length > 0) {
-      const $elem = $(element)
-      if (ix === 0 && $elem.attr("type") !== "number") {
-        //const existing = $elem.val()
-        //const pasted = 
-        $elem.val(lines.shift())
-
-      } else
-        $elem.val(lines.shift())
-    }
-  })
-
-
+  form
+    .find("input:not(:disabled):not([readonly]):not(:hidden)")
+    .each(function (ix, element) {
+      if (!matched && element === e.target) matched = true;
+      if (matched && lines.length > 0) {
+        const $elem = $(element);
+        if (ix === 0 && $elem.attr("type") !== "number") {
+          //const existing = $elem.val()
+          //const pasted =
+          $elem.val(lines.shift());
+        } else $elem.val(lines.shift());
+      }
+    });
 }
 
 function is_paging_param(key) {

package/public/saltcorn.js

@@ -97,7 +97,7 @@ function invalidate_pagings(href) {
   return newhref;
 }
 
-function set_state_fields(kvs) {
+function set_state_fields(kvs, disable_pjax) {
   let newhref = get_current_state_url();
   if (Object.keys(kvs).some((k) => !is_paging_param(k))) {
     newhref = invalidate_pagings(newhref);
@@ -107,7 +107,8 @@ function set_state_fields(kvs) {
       newhref = removeQueryStringParameter(newhref, kv[0]);
     else newhref = updateQueryStringParameter(newhref, kv[0], kv[1]);
   });
-  pjax_to(newhref.replace("&&", "&").replace("?&", "?"));
+  if (disable_pjax) href_to(newhref.replace("&&", "&").replace("?&", "?"));
+  else pjax_to(newhref.replace("&&", "&").replace("?&", "?"));
 }
 function unset_state_field(key) {
   pjax_to(removeQueryStringParameter(get_current_state_url(), key));
@@ -202,6 +203,19 @@ function view_post(viewname, route, data, onDone) {
     });
 }
 let logged_errors = [];
+let error_catcher_enabled = false;
+function enable_error_catcher() {
+  if (error_catcher_enabled) return;
+  document.addEventListener(
+    "DOMContentLoaded",
+    function () {
+      window.onerror = globalErrorCatcher;
+    },
+    false
+  );
+  error_catcher_enabled = true;
+}
+
 function globalErrorCatcher(message, source, lineno, colno, error) {
   if (error && error.preventDefault) error.preventDefault();
   if (logged_errors.includes(message)) return;
@@ -260,16 +274,22 @@ function ajax_modal(url, opts = {}) {
   if (opts.submitReload === false) $("#scmodal").addClass("no-submit-reload");
   else $("#scmodal").removeClass("no-submit-reload");
   $.ajax(url, {
+    headers: {
+      SaltcornModalRequest: "true",
+    },
     success: function (res, textStatus, request) {
       var title = request.getResponseHeader("Page-Title");
+      var width = request.getResponseHeader("SaltcornModalWidth");
+      if (width) $(".modal-dialog").css("max-width", width);
+      else $(".modal-dialog").css("max-width", "");
       if (title) $("#scmodal .modal-title").html(decodeURIComponent(title));
       $("#scmodal .modal-body").html(res);
       $("#scmodal").prop("data-modal-state", url);
       new bootstrap.Modal($("#scmodal")).show();
       initialize_page();
-      (opts.onOpen || function () { })(res);
+      (opts.onOpen || function () {})(res);
       $("#scmodal").on("hidden.bs.modal", function (e) {
-        (opts.onClose || function () { })(res);
+        (opts.onClose || function () {})(res);
         $("body").css("overflow", "");
       });
     },
@@ -278,7 +298,7 @@ function ajax_modal(url, opts = {}) {
 
 function saveAndContinue(e, k) {
   var form = $(e).closest("form");
-  const valres = form[0].reportValidity()
+  const valres = form[0].reportValidity();
   if (!valres) return;
   submitWithEmptyAction(form[0]);
   var url = form.attr("action");
@@ -323,7 +343,7 @@ function applyViewConfig(e, url, k) {
       "CSRF-Token": _sc_globalCsrf,
     },
     data: JSON.stringify(cfg),
-    error: function (request) { },
+    error: function (request) {},
     success: function (res) {
       k && k(res);
       !k && updateViewPreview();
@@ -344,10 +364,14 @@ function updateViewPreview() {
         "CSRF-Token": _sc_globalCsrf,
       },
 
-      error: function (request) { },
+      error: function (request) {},
       success: function (res) {
         $preview.css({ opacity: 1.0 });
 
+        //disable functions preview migght try to call
+        set_state_field = () => {};
+        set_state_fields = () => {};
+
         //disable elements in preview
         $preview.html(res);
         $preview.find("a").attr("href", "#");
@@ -357,11 +381,6 @@ function updateViewPreview() {
 
         $preview.find("textarea").attr("disabled", true);
         $preview.find("input").attr("readonly", true);
-
-        //disable functions preview migght try to call
-        set_state_field = () => { }
-        set_state_fields = () => { }
-
       },
     });
   }
@@ -596,15 +615,13 @@ function build_mobile_app(button) {
       localStorage.setItem("sidebarClosed", `${closed}`);
     });
   }
-})()
-
-
+})() +
   /*
   https://github.com/jeffdavidgreen/bootstrap-html5-history-tabs/blob/master/bootstrap-history-tabs.js
   Copyright (c) 2015 Jeff Green
   */
 
-  + (function ($) {
+  (function ($) {
     "use strict";
     $.fn.historyTabs = function () {
       var that = this;
@@ -619,21 +636,24 @@ function build_mobile_app(button) {
         $(element).on("show.bs.tab", function () {
           var stateObject = { url: $(this).attr("href") };
 
-          if (window.location.hash && stateObject.url !== window.location.hash) {
+          if (
+            window.location.hash &&
+            stateObject.url !== window.location.hash
+          ) {
             window.history.pushState(
               stateObject,
               document.title,
               window.location.pathname +
-              window.location.search +
-              $(this).attr("href")
+                window.location.search +
+                $(this).attr("href")
             );
           } else {
             window.history.replaceState(
               stateObject,
               document.title,
               window.location.pathname +
-              window.location.search +
-              $(this).attr("href")
+                window.location.search +
+                $(this).attr("href")
             );
           }
         });
@@ -649,4 +669,33 @@ function build_mobile_app(button) {
 
 // Copyright (c) 2011 Marcus Ekwall, http://writeless.se/
 // https://github.com/mekwall/jquery-throttle
-(function (a) { var b = a.jQuery || a.me || (a.me = {}), i = function (e, f, g, h, c, a) { f || (f = 100); var d = !1, j = !1, i = typeof g === "function", l = function (a, b) { d = setTimeout(function () { d = !1; if (h || c) e.apply(a, b), c && (j = +new Date); i && g.apply(a, b) }, f) }, k = function () { if (!d || a) { if (!d && !h && (!c || +new Date - j > f)) e.apply(this, arguments), c && (j = +new Date); (a || !c) && clearTimeout(d); l(this, arguments) } }; if (b.guid) k.guid = e.guid = e.guid || b.guid++; return k }; b.throttle = i; b.debounce = function (a, b, g, h, c) { return i(a, b, g, h, c, !0) } })(this);
+(function (a) {
+  var b = a.jQuery || a.me || (a.me = {}),
+    i = function (e, f, g, h, c, a) {
+      f || (f = 100);
+      var d = !1,
+        j = !1,
+        i = typeof g === "function",
+        l = function (a, b) {
+          d = setTimeout(function () {
+            d = !1;
+            if (h || c) e.apply(a, b), c && (j = +new Date());
+            i && g.apply(a, b);
+          }, f);
+        },
+        k = function () {
+          if (!d || a) {
+            if (!d && !h && (!c || +new Date() - j > f))
+              e.apply(this, arguments), c && (j = +new Date());
+            (a || !c) && clearTimeout(d);
+            l(this, arguments);
+          }
+        };
+      if (b.guid) k.guid = e.guid = e.guid || b.guid++;
+      return k;
+    };
+  b.throttle = i;
+  b.debounce = function (a, b, g, h, c) {
+    return i(a, b, g, h, c, !0);
+  };
+})(this);

package/routes/actions.js

@@ -401,7 +401,7 @@ router.get(
         sub2_page: "Configure",
         contents: {
           type: "card",
-          title: req.__("Configure trigger"),
+          title: req.__("Configure trigger %s", trigger.name),
           contents: {
             widths: [8, 4],
             besides: [
@@ -456,6 +456,8 @@ router.get(
       // create form
       const form = new Form({
         action: addOnDoneRedirect(`/actions/configure/${id}`, req),
+        onChange: "saveAndContinue(this)",
+        submitLabel: req.__("Done"),
         fields: cfgFields,
       });
       // populate form values
@@ -468,7 +470,7 @@ router.get(
         sub2_page: "Configure",
         contents: {
           type: "card",
-          title: req.__("Configure trigger"),
+          title: req.__("Configure trigger %s", trigger.name),
           contents: renderForm(form, req.csrfToken()),
         },
       });
@@ -512,6 +514,10 @@ router.post(
       });
     } else {
       await Trigger.update(trigger.id, { configuration: form.values });
+      if (req.xhr) {
+        res.json({ success: "ok" });
+        return;
+      }
       req.flash("success", "Action configuration saved");
       res.redirect(
         req.query.on_done_redirect

package/routes/admin.js

@@ -59,6 +59,7 @@ const {
   getState,
   restart_tenant,
   getTenant,
+  getRootState,
   //get_other_domain_tenant,
   get_process_init_time,
 } = require("@saltcorn/data/db/state");
@@ -1820,9 +1821,22 @@ router.post(
  * @returns {Promise<Form>} form
  */
 const dev_form = async (req) => {
+  const role_to_create_tenant = +getRootState().getConfig(
+    "role_to_create_tenant"
+  );
+  const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
+
   return await config_fields_form({
     req,
-    field_names: ["development_mode", "log_sql", "log_level"],
+    field_names: [
+      "development_mode",
+      "log_sql",
+      "log_client_errors",
+      "log_level",
+      ...(isRoot || role_to_create_tenant < 10
+        ? ["npm_available_js_code"]
+        : []),
+    ],
     action: "/admin/dev",
   });
 };

package/routes/api.js

@@ -381,10 +381,7 @@ router.post(
             res.status(400).json({ error: errors.join(", ") });
             return;
           }
-          const ins_res = await table.tryInsertRow(
-            row,
-            req.user ? +req.user.id : undefined
-          );
+          const ins_res = await table.tryInsertRow(row, req.user);
           if (ins_res.error) res.status(400).json(ins_res);
           else res.json(ins_res);
         } else {
@@ -439,11 +436,7 @@ router.post(
             res.status(400).json({ error: errors.join(", ") });
             return;
           }
-          const ins_res = await table.tryUpdateRow(
-            row,
-            id,
-            req.user ? +req.user.id : undefined
-          );
+          const ins_res = await table.tryUpdateRow(row, id, req.user);
 
           if (ins_res.error) res.status(400).json(ins_res);
           else res.json(ins_res);

package/routes/fields.js

@@ -28,11 +28,13 @@ const expressionBlurb = require("../markup/expression_blurb");
 const {
   readState,
   add_free_variables_to_joinfields,
+  calcfldViewConfig,
 } = require("@saltcorn/data/plugin-helper");
 const { wizardCardTitle } = require("../markup/forms.js");
 const FieldRepeat = require("@saltcorn/data/models/fieldrepeat");
 const { applyAsync } = require("@saltcorn/data/utils");
 const { text } = require("@saltcorn/markup/tags");
+const { mkFormContentNoLayout } = require("@saltcorn/markup/form");
 
 /**
  * @type {object}
@@ -903,3 +905,45 @@ router.post(
     res.send("");
   })
 );
+
+router.post(
+  "/fieldviewcfgform/:tableName",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { tableName } = req.params;
+    const {
+      field_name,
+      fieldview,
+      type,
+      join_field,
+      join_fieldview,
+      _columndef,
+    } = req.body;
+    const table = await Table.findOne({ name: tableName });
+    const fieldName = type == "Field" ? field_name : join_field;
+    const fv_name = type == "Field" ? fieldview : join_fieldview;
+    if (!fieldName) {
+      res.send("");
+      return;
+    }
+
+    const field = await table.getField(fieldName);
+
+    const fieldViewConfigForms = await calcfldViewConfig([field], false, 0);
+    const formFields = fieldViewConfigForms[field.name][fv_name];
+    if (!formFields) {
+      res.send("");
+      return;
+    }
+    formFields.forEach((ff) => {
+      ff.class = ff.class ? `${ff.class} item-menu` : "item-menu";
+    });
+
+    const form = new Form({
+      formStyle: "vert",
+      fields: formFields,
+    });
+    if (_columndef) form.values = JSON.parse(_columndef);
+    res.send(mkFormContentNoLayout(form));
+  })
+);

package/routes/tenant.js

@@ -21,6 +21,7 @@ const {
   renderForm,
   link,
   post_delete_btn,
+  localeDateTime,
   mkTable,
 } = require("@saltcorn/markup");
 const {
@@ -384,7 +385,7 @@ router.get(
               },
               {
                 label: req.__("Created"),
-                key: (r) => text(r.created),
+                key: (r) => (r.created ? localeDateTime(r.created) : ""),
               },
               {
                 label: req.__("Information"),

package/routes/view.js

@@ -9,7 +9,7 @@ const Router = require("express-promise-router");
 const View = require("@saltcorn/data/models/view");
 const Table = require("@saltcorn/data/models/table");
 
-const { text } = require("@saltcorn/markup/tags");
+const { text, style } = require("@saltcorn/markup/tags");
 const {
   isAdmin,
   error_catcher,
@@ -62,8 +62,20 @@ router.get(
       res.redirect("/");
       return;
     }
+    const isModal = req.headers?.saltcornmodalrequest;
+
     const contents = await view.run_possibly_on_page(query, req, res);
-    const title = scan_for_page_title(contents, view.name);
+    const title =
+      isModal && view.attributes?.popup_title
+        ? view.attributes?.popup_title
+        : scan_for_page_title(contents, view.name);
+    if (isModal && view.attributes?.popup_width)
+      res.set(
+        "SaltcornModalWidth",
+        `${view.attributes?.popup_width}${
+          view.attributes?.popup_width_units || "px"
+        }`
+      );
     res.sendWrap(
       title,
       add_edit_bar({

package/routes/viewedit.js

@@ -134,6 +134,7 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
     action: addOnDoneRedirect("/viewedit/save", req),
     submitLabel: req.__("Configure") + " »",
     blurb: req.__("First, please give some basic information about the view."),
+    tabs: { tabsStyle: "Accordion" },
     fields: [
       new Field({
         label: req.__("View name"),
@@ -191,6 +192,7 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
           "Requests to render this view directly will instead show the chosen page, if any. The chosen page should embed this view. Use this to decorate the view with additional elements."
         ),
         input_type: "select",
+        tab: "View settings",
         options: [
           { value: "", label: "" },
           ...pages.map((p) => ({ value: p.name, label: p.name })),
@@ -201,6 +203,7 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
         label: req.__("Slug"),
         sublabel: req.__("Field that can be used for a prettier URL structure"),
         type: "String",
+        tab: "View settings",
         attributes: {
           calcOptions: [
             "table_name",
@@ -209,6 +212,33 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
         },
         showIf: { viewtemplate: hasTable },
       }),
+      new Field({
+        name: "popup_title",
+        label: req.__("Title"),
+        type: "String",
+        parent_field: "attributes",
+        tab: "Popup settings",
+      }),
+      {
+        name: "popup_width",
+        label: req.__("Column width"),
+        type: "Integer",
+        tab: "Popup settings",
+        parent_field: "attributes",
+        attributes: { asideNext: true },
+      },
+      {
+        name: "popup_width_units",
+        label: req.__("Units"),
+        type: "String",
+        tab: "Popup settings",
+        fieldview: "radio_group",
+        parent_field: "attributes",
+        attributes: {
+          inline: true,
+          options: ["px", "%", "vw", "em", "rem"],
+        },
+      },
       ...(isEdit
         ? [
             new Field({
@@ -396,6 +426,7 @@ router.post(
           const vt = getState().viewtemplates[v.viewtemplate];
           if (vt.initial_config) v.configuration = await vt.initial_config(v);
           else v.configuration = {};
+          //console.log(v);
           await View.create(v);
         }
         res.redirect(
@@ -503,6 +534,9 @@ router.get(
       res.redirect("/viewedit");
       return;
     }
+    (view.configuration?.columns || []).forEach((c) => {
+      c._columndef = JSON.stringify(c);
+    });
     const configFlow = await view.get_config_flow(req);
     const hasConfig =
       view.configuration && Object.keys(view.configuration).length > 0;
@@ -644,6 +678,7 @@ router.post(
 
     if (viewname && req.body) {
       const view = await View.findOne({ name: viewname });
+      req.staticFieldViewConfig = true;
       const configFlow = await view.get_config_flow(req);
       const step = await configFlow.singleStepForm(req.body, req);
       if (step?.renderForm) {

package/s3storage.js

@@ -46,7 +46,8 @@ module.exports = {
       s3upload(req, res, next);
     } else {
       // Use regular file upload https://www.npmjs.com/package/express-fileupload
-      const fileSizeLimit = getState().getConfig("file_upload_limit", 0);
+      const fileSizeLimit =
+        1024 * +getState().getConfig("file_upload_limit", 0);
       fileUpload({
         useTempFiles: true,
         createParentPath: true,
@@ -58,9 +59,11 @@ module.exports = {
         defCharset: "utf8",
         defParamCharset: "utf8",
         // 0 - means no upload limit check
-        limits: {
-          fileSize: fileSizeLimit,
-        },
+        limits: fileSizeLimit
+          ? {
+              fileSize: fileSizeLimit,
+            }
+          : {},
         abortOnLimit: fileSizeLimit !== 0,
         // 0 - means no upload limit check
         uploadTimeout: getState().getConfig("file_upload_timeout", 0),

package/tests/fields.test.js

@@ -367,3 +367,26 @@ describe("Field Endpoints", () => {
       .expect((r) => +r.body > 1);
   });
 });
+
+describe("Fieldview config", () => {
+  //itShouldRedirectUnauthToLogin("/field/2");
+  it("should return fieldview options", async () => {
+    const loginCookie = await getAdminLoginCookie();
+
+    const app = await getApp({ disableCsrf: true });
+
+    await request(app)
+      .post("/field/fieldviewcfgform/books")
+      .set("Cookie", loginCookie)
+      .send({
+        type: "Field",
+        field_name: "pages",
+        fieldview: "progress_bar",
+      })
+      .expect(
+        toInclude(
+          `<div class="form-group"><div><label for="inputmax">max</label></div><div><input type="number" class="form-control  item-menu" data-fieldname="max" name="max" id="inputmax" step="1" required></div></div><div class="form-group"><div><label for="inputbar_color">Bar color</label></div><div><input type="color" class="form-control  item-menu" data-fieldname="bar_color" name="bar_color" id="inputbar_color"></div></div><div class="form-group"><div><label for="inputbg_color">Background color</label></div><div><input type="color" class="form-control  item-menu" data-fieldname="bg_color" name="bg_color" id="inputbg_color"></div></div><div class="form-group"><div><label for="inputpx_height">Height in px</label></div><div><input type="number" class="form-control  item-menu" data-fieldname="px_height" name="px_height" id="inputpx_height" step="1"></div></div>`
+        )
+      );
+  });
+});

package/wrapper.js

@@ -203,6 +203,8 @@ const get_headers = (req, version_tag, description, extras = []) => {
     from_cfg.push({ style: state.getConfig("page_custom_css", "") });
   if (state.getConfig("page_custom_html", ""))
     from_cfg.push({ headerTag: state.getConfig("page_custom_html", "") });
+  if (state.getConfig("log_client_errors", false))
+    from_cfg.push({ scriptBody: `enable_error_catcher()` });
   const state_headers = [];
   for (const hs of Object.values(state.headers)) {
     state_headers.push(...hs);