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

package/public/saltcorn-common.js

@@ -86,8 +86,7 @@ function apply_showif() {
       } else {
         e.append(
           $(
-            `<option ${
-              `${current}` === `${o.value}` ? "selected" : ""
+            `<option ${`${current}` === `${o.value}` ? "selected" : ""
             } value="${o.value}">${o.label}</option>`
           )
         );
@@ -118,15 +117,13 @@ function apply_showif() {
         resp.success.forEach((r) => {
           e.append(
             $(
-              `<option ${
-                `${current}` === `${r[dynwhere.refname]}` ? "selected" : ""
-              } value="${r[dynwhere.refname]}">${
-                dynwhere.label_formula
-                  ? new Function(
-                      `{${Object.keys(r).join(",")}}`,
-                      "return " + dynwhere.label_formula
-                    )(r)
-                  : r[dynwhere.summary_field]
+              `<option ${`${current}` === `${r[dynwhere.refname]}` ? "selected" : ""
+              } value="${r[dynwhere.refname]}">${dynwhere.label_formula
+                ? new Function(
+                  `{${Object.keys(r).join(",")}}`,
+                  "return " + dynwhere.label_formula
+                )(r)
+                : r[dynwhere.summary_field]
               }</option>`
             )
           );
@@ -466,16 +463,14 @@ 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>`);
 }
 
@@ -492,9 +487,8 @@ 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) => {
@@ -515,6 +509,9 @@ function common_done(res, isWeb = true) {
     if (res.target === "_blank") window.open(res.goto, "_blank").focus();
     else window.location.href = res.goto;
   }
+  if (res.popup) {
+    ajax_modal(res.popup)
+  }
 }
 
 const repeaterCopyValuesToForm = (form, editor, noTriggerChange) => {
@@ -523,10 +520,11 @@ const repeaterCopyValuesToForm = (form, editor, noTriggerChange) => {
   const setVal = (k, ix, v) => {
     const $e = form.find(`input[name="${k}_${ix}"]`);
     if ($e.length) $e.val(v);
-    else
-      form.append(
-        `<input type="hidden" data-repeater-ix="${ix}" name="${k}_${ix}" value="${v}"></input>`
-      );
+    else {
+      const $ne = $(`<input type="hidden" data-repeater-ix="${ix}" name="${k}_${ix}"></input>`);
+      $ne.val(v);
+      form.append($ne);
+    }
   };
   vs.forEach((v, ix) => {
     Object.entries(v).forEach(([k, v]) => {
@@ -649,9 +647,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]);

package/public/saltcorn.css

@@ -323,4 +323,27 @@ table.table-inner-grid, table.table-inner-grid th, table.table-inner-grid td {
 
 .CodeMirror {
   resize: vertical;
-}
+}
+
+/* copied from bootstrap and adjusted to show the arrow on the left */
+.card .card-header-left-collapse[data-bs-toggle=collapse] {
+  text-decoration: none;
+  position: relative;
+  padding: 0.75rem 3.25rem 0.75rem 1.25rem;
+}
+.card .card-header-left-collapse[data-bs-toggle=collapse]::before {
+  position: absolute;
+  left: 0;
+  top: 0;
+  line-height: 51px;
+  font-weight: 900;
+  content: "\f107";
+  font-family: "Font Awesome 5 Free";
+  color: #d1d3e2;
+}
+.card .card-header-left-collapse[data-bs-toggle=collapse].collapsed {
+  border-radius: 0.35rem;
+}
+.card .card-header-left-collapse[data-bs-toggle=collapse].collapsed::before {
+  content: "\f105";
+}

package/public/saltcorn.js

@@ -51,12 +51,19 @@ function removeQueryStringParameter(uri1, key) {
   return uri + hash;
 }
 
+function get_current_state_url() {
+  let $modal = $("#scmodal");
+  if ($modal.length === 0 || !$modal.hasClass("show"))
+    return window.location.href;
+  else return $modal.prop("data-modal-state");
+}
+
 function select_id(id) {
-  pjax_to(updateQueryStringParameter(window.location.href, "id", id));
+  pjax_to(updateQueryStringParameter(get_current_state_url(), "id", id));
 }
 
 function set_state_field(key, value) {
-  pjax_to(updateQueryStringParameter(window.location.href, key, value));
+  pjax_to(updateQueryStringParameter(get_current_state_url(), key, value));
 }
 
 function check_state_field(that) {
@@ -65,13 +72,13 @@ function check_state_field(that) {
   const value = that.value;
   var separator = window.location.href.indexOf("?") !== -1 ? "&" : "?";
   let dest;
-  if (checked) dest = window.location.href + `${separator}${name}=${value}`;
-  else dest = window.location.href.replace(`${name}=${value}`, "");
+  if (checked) dest = get_current_state_url() + `${separator}${name}=${value}`;
+  else dest = get_current_state_url().replace(`${name}=${value}`, "");
   pjax_to(dest.replace("&&", "&").replace("?&", "?"));
 }
 
 function set_state_fields(kvs) {
-  var newhref = window.location.href;
+  var newhref = get_current_state_url();
   Object.entries(kvs).forEach((kv) => {
     if (kv[1].unset && kv[1].unset === true)
       newhref = removeQueryStringParameter(newhref, kv[0]);
@@ -80,7 +87,7 @@ function set_state_fields(kvs) {
   pjax_to(newhref.replace("&&", "&").replace("?&", "?"));
 }
 function unset_state_field(key) {
-  pjax_to(removeQueryStringParameter(window.location.href, key));
+  pjax_to(removeQueryStringParameter(get_current_state_url(), key));
 }
 
 let loadPage = true;
@@ -93,7 +100,11 @@ $(function () {
 });
 
 function pjax_to(href) {
-  if (!$("#page-inner-content").length) window.location.href = href;
+  let $modal = $("#scmodal");
+  const inModal = $modal.length && $modal.hasClass("show")
+  let $dest = inModal ? $("#scmodal .modal-body") : $("#page-inner-content");
+
+  if (!$dest.length) window.location.href = href;
   else {
     loadPage = false;
     $.ajax(href, {
@@ -101,18 +112,21 @@ function pjax_to(href) {
         pjaxpageload: "true",
       },
       success: function (res, textStatus, request) {
-        window.history.pushState({ url: href }, "", href);
+        if (!inModal) window.history.pushState({ url: href }, "", href);
         setTimeout(() => {
           loadPage = true;
         }, 0);
-        if (res.includes("<!--SCPT:")) {
+        if (!inModal && res.includes("<!--SCPT:")) {
           const start = res.indexOf("<!--SCPT:");
           const end = res.indexOf("-->", start);
           document.title = res.substring(start + 9, end);
         }
-        $("#page-inner-content").html(res);
+        $dest.html(res);
         initialize_page();
       },
+      error: function (res) {
+        notifyAlert({ type: "danger", text: res.responseText });
+      }
     });
   }
 }
@@ -120,8 +134,24 @@ function pjax_to(href) {
 function href_to(href) {
   window.location.href = href;
 }
-function clear_state() {
-  pjax_to(window.location.href.split("?")[0]);
+function clear_state(omit_fields_str) {
+  let newUrl = get_current_state_url().split("?")[0]
+  const hash = get_current_state_url().split("#")[1]
+  if (omit_fields_str) {
+    const omit_fields = omit_fields_str.split(',').map(s => s.trim())
+    let qs = (get_current_state_url().split("?")[1] || "").split("#")[0]
+    let params = new URLSearchParams(qs);
+    newUrl = newUrl + '?'
+    omit_fields.forEach(f => {
+      if (params.get(f))
+        newUrl = updateQueryStringParameter(newUrl, f, params.get(f));
+    })
+
+  }
+  if (hash)
+    newUrl += '#' + hash;
+
+  pjax_to(newUrl);
 }
 
 function ajax_done(res) {
@@ -143,6 +173,8 @@ function view_post(viewname, route, data, onDone) {
   }).done(function (res) {
     if (onDone) onDone(res);
     ajax_done(res);
+  }).fail(function (res) {
+    notifyAlert({ type: "danger", text: res.responseText });
   });
 }
 var logged_errors = [];
@@ -208,11 +240,12 @@ function ajax_modal(url, opts = {}) {
       var title = request.getResponseHeader("Page-Title");
       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", "");
       });
     },
@@ -264,7 +297,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);
     },
@@ -444,16 +477,16 @@ Copyright (c) 2015 Jeff Green
             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")
           );
         }
       });
@@ -466,3 +499,7 @@ Copyright (c) 2015 Jeff Green
     });
   };
 })(jQuery);
+
+// 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);

package/routes/actions.js

@@ -8,6 +8,7 @@ const Router = require("express-promise-router");
 const { isAdmin, error_catcher, get_base_url } = require("./utils.js");
 const { getState } = require("@saltcorn/data/db/state");
 const Trigger = require("@saltcorn/data/models/trigger");
+const { getTriggerList } = require("./common_lists");
 
 /**
  * @type {object}
@@ -97,45 +98,7 @@ router.get(
             type: "card",
             title: req.__("Triggers"),
             contents: div(
-              mkTable(
-                [
-                  { label: req.__("Name"), key: "name" },
-                  { label: req.__("Action"), key: "action" },
-                  {
-                    label: req.__("Table or Channel"),
-                    key: (r) => r.table_name || r.channel,
-                  },
-                  {
-                    label: req.__("When"),
-                    key: (a) =>
-                      a.when_trigger === "API call"
-                        ? `API: ${base_url}api/action/${a.name}`
-                        : a.when_trigger,
-                  },
-                  {
-                    label: req.__("Test run"),
-                    key: (r) =>
-                      r.table_id
-                        ? ""
-                        : link(`/actions/testrun/${r.id}`, req.__("Test run")),
-                  },
-                  {
-                    label: req.__("Edit"),
-                    key: (r) => link(`/actions/edit/${r.id}`, req.__("Edit")),
-                  },
-                  {
-                    label: req.__("Configure"),
-                    key: (r) =>
-                      link(`/actions/configure/${r.id}`, req.__("Configure")),
-                  },
-                  {
-                    label: req.__("Delete"),
-                    key: (r) => post_delete_btn(`/actions/delete/${r.id}`, req),
-                  },
-                ],
-                triggers,
-                { hover: true }
-              ),
+              getTriggerList(triggers, req),
               link("/actions/new", req.__("Add trigger"))
             ),
           },

package/routes/admin.js

@@ -390,7 +390,7 @@ router.get(
                 renderForm(backupForm, req.csrfToken()),
                 a(
                   { href: "/admin/auto-backup-list" },
-                  "Restore/download automated backups »"
+                  req.__("Restore/download automated backups »")
                 ),
                 script(
                   domReady(
@@ -406,13 +406,13 @@ router.get(
             contents: div(
               p(
                 i(
-                  "Snapshots store your application structure and definition, without the table data. Individual views and pages can be restored from snapshots from the <a href='/viewedit'>view</a> or <a href='/pageedit'>pages</a> overviews (\"Restore\" from individual page or view dropdowns)."
+                  req.__("Snapshots store your application structure and definition, without the table data. Individual views and pages can be restored from snapshots from the <a href='/viewedit'>view</a> or <a href='/pageedit'>pages</a> overviews (\"Restore\" from individual page or view dropdowns).")
                 )
               ),
               renderForm(aSnapshotForm, req.csrfToken()),
               a(
                 { href: "/admin/snapshot-list" },
-                "List/download snapshots &raquo;"
+                req.__("List/download snapshots &raquo;")
               )
             ),
           },
@@ -472,16 +472,16 @@ router.get(
             title: req.__("Restoring automated backup"),
             contents: div(
               ol(
-                li("Download one of the backups above"),
+                li(req.__("Download one of the backups above")),
                 li(
-                  a({ href: "/admin/clear-all" }, "Clear this application"),
+                  a({ href: "/admin/clear-all" }, req.__("Clear this application")),
                   " ",
-                  "(tick all boxes)"
+                    req.__("(tick all boxes)")
                 ),
                 li(
-                  "When prompted to create the first user, click the link to restore a backup"
+                    req.__("When prompted to create the first user, click the link to restore a backup")
                 ),
-                li("Select the downloaded backup file")
+                li(req.__("Select the downloaded backup file"))
               )
             ),
           },
@@ -551,7 +551,7 @@ router.get(
       mkTable(
         [
           {
-            label: "When",
+            label: req.__("When"),
             key: (r) =>
               `${localeDateTime(r.created)} (${moment(r.created).fromNow()})`,
           },
@@ -618,7 +618,7 @@ const autoBackupForm = (req) =>
     noSubmitButton: true,
     additionalButtons: [
       {
-        label: "Backup now",
+        label: req.__("Backup now"),
         id: "btnBackupNow",
         class: "btn btn-outline-secondary",
         onclick: "ajax_post('/admin/auto-backup-now')",
@@ -671,7 +671,7 @@ const snapshotForm = (req) =>
     noSubmitButton: true,
     additionalButtons: [
       {
-        label: "Snapshot now",
+        label: req.__("Snapshot now"),
         id: "btnSnapNow",
         class: "btn btn-outline-secondary",
         onclick: "ajax_post('/admin/snapshot-now')",
@@ -808,7 +808,6 @@ router.get(
                 " ",
                 req.__("Configuration check")
               ),
-
               hr(),
 
               a(
@@ -945,7 +944,7 @@ router.post(
       });
       child.on("exit", function (code, signal) {
         res.end(
-          `Upgrade done (if it was available) with code ${code}.\n\nPress the BACK button in your browser, then RELOAD the page.`
+          req.__(`Upgrade done (if it was available) with code ${code}.\n\nPress the BACK button in your browser, then RELOAD the page.`)
         );
         setTimeout(() => {
           if (process.send) process.send("RestartServer");
@@ -1193,7 +1192,7 @@ router.get(
   })
 );
 /**
- * /confiuration-check
+ * /configuration-check
  */
 router.get(
   "/configuration-check",
@@ -1576,7 +1575,7 @@ router.post(
             {
               type: "card",
               title: req.__("Build Result"),
-              contents: div("The build was successfully"),
+              contents: div(req.__("The build was successfully")),
             },
             files.length > 0 ? app_files_table(files, req) : "",
           ],
@@ -1588,7 +1587,7 @@ router.post(
               type: "card",
               title: req.__("Build Result"),
               contents: div(
-                "Unable to build the app:",
+                req.__("Unable to build the app:"),
                 pre(code(childOutputs.join("<br/>")))
               ),
             },
@@ -1604,7 +1603,7 @@ router.post(
             type: "card",
             title: req.__("Build Result"),
             contents: div(
-              p("Unable to build the app:"),
+              p(req.__("Unable to build the app:")),
               pre(code(message)),
               pre(code(stack))
             ),

package/routes/api.js

@@ -71,8 +71,8 @@ function accessAllowedRead(req, user, table) {
     req.user && req.user.id
       ? req.user.role_id
       : user && user.role_id
-      ? user.role_id
-      : 10;
+        ? user.role_id
+        : 10;
 
   return role <= table.min_role_read;
 }
@@ -89,8 +89,8 @@ function accessAllowedWrite(req, user, table) {
     req.user && req.user.id
       ? req.user.role_id
       : user && user.role_id
-      ? user.role_id
-      : 10;
+        ? user.role_id
+        : 10;
 
   return role <= table.min_role_write;
 }
@@ -106,8 +106,8 @@ function accessAllowed(req, user, trigger) {
     req.user && req.user.id
       ? req.user.role_id
       : user && user.role_id
-      ? user.role_id
-      : 10;
+        ? user.role_id
+        : 10;
 
   return role <= trigger.min_role;
 }
@@ -247,6 +247,7 @@ router.get(
               fields: tbl_fields,
               approximate: !!approximate,
               state: req_query,
+              table
             });
             rows = await table.getRows(qstate);
           } else {