@saltcorn/server 0.7.4-beta.2 → 0.7.4

package/public/saltcorn-common.js

@@ -34,7 +34,12 @@ function add_repeater(nm) {
   });
   newe.appendTo($("div.repeats-" + nm));
 }
-// "e.closest('.form-namespace').find('.coltype').val()==='Field';"
+
+const _apply_showif_plugins = []
+
+const add_apply_showif_plugin = p => {
+  _apply_showif_plugins.push(p)
+}
 function apply_showif() {
   $("[data-show-if]").each(function (ix, element) {
     var e = $(element);
@@ -86,8 +91,7 @@ function apply_showif() {
       } else {
         e.append(
           $(
-            `<option ${
-              `${current}` === `${o.value}` ? "selected" : ""
+            `<option ${`${current}` === `${o.value}` ? "selected" : ""
             } value="${o.value}">${o.label}</option>`
           )
         );
@@ -111,28 +115,54 @@ function apply_showif() {
     e.change(function (ec) {
       e.attr("data-selected", ec.target.value);
     });
-    $.ajax(`/api/${dynwhere.table}?${qs}`).then((resp) => {
-      if (resp.success) {
-        e.empty();
-        if (!dynwhere.required) e.append($(`<option></option>`));
-        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>`
-            )
-          );
-        });
+
+    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)
+      if (!dynwhere.required) e.append($(`<option></option>`));
+      let currentDataOption = undefined;
+      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]}`
+        dataOptions.push({ text: label, value });
+        if (selected) currentDataOption = value;
+        const html = `<option ${selected ? "selected" : ""
+          } value="${value}">${label}</option>`
+        e.append(
+          $(html)
+        );
+      });
+      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') || {}
+    if (cache[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 })
+        }
+      });
   });
 
   $("[data-source-url]").each(function (ix, element) {
@@ -148,7 +178,17 @@ function apply_showif() {
       },
     });
   });
+  _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]
+  return elemValueShort === target;
 }
+
 function get_form_record(e, select_labels) {
   const rec = {};
   e.closest("form")
@@ -466,16 +506,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 +530,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 +552,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 +563,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]) => {
@@ -578,6 +619,8 @@ const columnSummary = (col) => {
       return `Field ${col.field_name} ${col.fieldview || ""}`;
     case "Link":
       return `Link ${col.link_text}`;
+    case "FormulaValue":
+      return `Formula ${col.formula}`;
     case "JoinField":
       return `Join ${col.join_field}`;
     case "ViewLink":
@@ -585,7 +628,7 @@ const columnSummary = (col) => {
     case "Action":
       return `Action ${col.action_label || col.action_name}`;
     case "Aggregation":
-      return `${col.stat} ${col.agg_field} ${col.agg_relation}`;
+      return `${col.stat} ${col.agg_field.split("@")[0]} ${col.agg_relation}`;
     default:
       return "Unknown";
   }
@@ -649,9 +692,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]);
@@ -680,3 +723,23 @@ function cancel_form(form) {
   $(form).append(`<input type="hidden" name="_cancel" value="on">`);
   $(form).submit();
 }
+
+function split_paste_handler(e) {
+  e.preventDefault();
+  let clipboardData = e.clipboardData || window.clipboardData || e.originalEvent.clipboardData;
+
+  const lines = clipboardData.getData('text').split(/\r\n/g)
+
+  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) {
+      $(element).val(lines.shift())
+    }
+  })
+
+
+}

package/public/saltcorn.css

@@ -299,7 +299,9 @@ section.range-slider input[type="range"]::-moz-focus-outer {
   padding: 0.1rem 0.4rem !important;
 }
 
-table.table-inner-grid, table.table-inner-grid th, table.table-inner-grid td {
+table.table-inner-grid,
+table.table-inner-grid th,
+table.table-inner-grid td {
   border: 1px solid black;
   border-collapse: collapse;
 }
@@ -307,18 +309,18 @@ table.table-inner-grid, table.table-inner-grid th, table.table-inner-grid td {
 /* https://codepen.io/pezmotion/pen/RQERdm */
 
 .editStarRating {
-	direction: rtl;
-	unicode-bidi: bidi-override;
-	color: #ddd;
+  direction: rtl;
+  unicode-bidi: bidi-override;
+  color: #ddd;
 }
 .editStarRating input {
-	display: none;
+  display: none;
 }
 .editStarRating label:hover,
 .editStarRating label:hover ~ label,
 .editStarRating input:checked + label,
 .editStarRating input:checked + label ~ label {
-	color: #ffc107; 
+  color: #ffc107;
 }
 
 .CodeMirror {
@@ -326,12 +328,12 @@ table.table-inner-grid, table.table-inner-grid th, table.table-inner-grid td {
 }
 
 /* copied from bootstrap and adjusted to show the arrow on the left */
-.card .card-header-left-collapse[data-bs-toggle=collapse] {
+.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 {
+.card .card-header-left-collapse[data-bs-toggle="collapse"]::before {
   position: absolute;
   left: 0;
   top: 0;
@@ -341,9 +343,13 @@ table.table-inner-grid, table.table-inner-grid th, table.table-inner-grid td {
   font-family: "Font Awesome 5 Free";
   color: #d1d3e2;
 }
-.card .card-header-left-collapse[data-bs-toggle=collapse].collapsed {
+.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 {
+.card .card-header-left-collapse[data-bs-toggle="collapse"].collapsed::before {
   content: "\f105";
 }
+
+.d-inline-maybe {
+  display: inline;
+}

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) {
@@ -210,6 +240,7 @@ 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);
@@ -286,10 +317,11 @@ function ajaxSubmitForm(e) {
     data: new FormData(form[0]),
     processData: false,
     contentType: false,
-    success: function () {
+    success: function (res) {
       var no_reload = $("#scmodal").hasClass("no-submit-reload");
       $("#scmodal").modal("hide");
       if (!no_reload) location.reload();
+      else common_done(res);
     },
     error: function (request) {
       var title = request.getResponseHeader("Page-Title");
@@ -413,12 +445,17 @@ async function fill_formula_btn_click(btn, k) {
       }
     }
   }
-  const val = new Function(
-    `{${Object.keys(rec).join(",")}}`,
-    "return " + formula
-  )(rec);
-  $(btn).closest(".input-group").find("input").val(val);
-  if (k) k();
+  try {
+    const val = new Function(
+      `{${Object.keys(rec).join(",")}}`,
+      "return " + formula
+    )(rec);
+    $(btn).closest(".input-group").find("input").val(val);
+    if (k) k();
+  } catch (e) {
+    notifyAlert({ type: "danger", text: `Error evaluating fill formula: ${e.message}` })
+    console.error(e)
+  }
 }
 
 /*
@@ -468,3 +505,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

@@ -5,7 +5,12 @@
  * @subcategory routes
  */
 const Router = require("express-promise-router");
-const { isAdmin, error_catcher, get_base_url } = require("./utils.js");
+const {
+  isAdmin,
+  error_catcher,
+  get_base_url,
+  addOnDoneRedirect,
+} = require("./utils.js");
 const { getState } = require("@saltcorn/data/db/state");
 const Trigger = require("@saltcorn/data/models/trigger");
 const { getTriggerList } = require("./common_lists");
@@ -149,6 +154,7 @@ const triggerForm = async (req, trigger) => {
     id = trigger.id;
     form_action = `/actions/edit/${id}`;
   } else form_action = "/actions/new";
+  form_action = addOnDoneRedirect(form_action, req);
   const hasChannel = Object.entries(getState().eventTypes)
     .filter(([k, v]) => v.hasChannel)
     .map(([k, v]) => k);
@@ -323,7 +329,7 @@ router.post(
         const tr = await Trigger.create(form.values);
         id = tr.id;
       }
-      res.redirect(`/actions/configure/${id}`);
+      res.redirect(addOnDoneRedirect(`/actions/configure/${id}`, req));
     }
   })
 );
@@ -389,7 +395,7 @@ router.get(
     } else if (trigger.action === "blocks") {
       const locale = req.getLocale();
       const form = new Form({
-        action: `/actions/configure/${id}`,
+        action: addOnDoneRedirect(`/actions/configure/${id}`, req),
         fields: action.configFields,
         noSubmitButton: true,
         id: "blocklyForm",
@@ -464,7 +470,7 @@ router.get(
       const cfgFields = await getActionConfigFields(action, table);
       // create form
       const form = new Form({
-        action: `/actions/configure/${id}`,
+        action: addOnDoneRedirect(`/actions/configure/${id}`, req),
         fields: cfgFields,
       });
       // populate form values
@@ -522,7 +528,11 @@ router.post(
     } else {
       await Trigger.update(trigger.id, { configuration: form.values });
       req.flash("success", "Action configuration saved");
-      res.redirect(`/actions/`);
+      res.redirect(
+        req.query.on_done_redirect
+          ? `/${req.query.on_done_redirect}`
+          : "/actions/"
+      );
     }
   })
 );