@saltcorn/server 0.9.0-beta.0 → 0.9.0-beta.10

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.0-beta.0",
+  "version": "0.9.0-beta.10",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.9.0-beta.0",
-    "@saltcorn/builder": "0.9.0-beta.0",
-    "@saltcorn/data": "0.9.0-beta.0",
-    "@saltcorn/admin-models": "0.9.0-beta.0",
-    "@saltcorn/filemanager": "0.9.0-beta.0",
-    "@saltcorn/markup": "0.9.0-beta.0",
-    "@saltcorn/sbadmin2": "0.9.0-beta.0",
+    "@saltcorn/base-plugin": "0.9.0-beta.10",
+    "@saltcorn/builder": "0.9.0-beta.10",
+    "@saltcorn/data": "0.9.0-beta.10",
+    "@saltcorn/admin-models": "0.9.0-beta.10",
+    "@saltcorn/filemanager": "0.9.0-beta.10",
+    "@saltcorn/markup": "0.9.0-beta.10",
+    "@saltcorn/sbadmin2": "0.9.0-beta.10",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",
@@ -45,6 +45,7 @@
     "node-fetch": "2.6.9",
     "node-watch": "^0.7.2",
     "notp": "2.0.3",
+    "npm-registry-fetch": "16.0.0",
     "passport": "^0.6.0",
     "passport-custom": "^1.1.1",
     "passport-http-bearer": "^1.0.1",
@@ -55,7 +56,7 @@
     "qrcode": "1.5.1",
     "resize-with-sharp-or-jimp": "0.1.6",
     "socket.io": "4.6.0",
-    "systeminformation": "^5.11.12",
+    "systeminformation": "^5.21.7",
     "thirty-two": "1.0.2",
     "tmp-promise": "^3.0.2",
     "uuid": "^8.2.0",

package/public/saltcorn-builder.css

@@ -446,3 +446,7 @@ Copyright (c) 2017 Taha Paksu
   padding: 5px 9px;
   z-index: 1;
 }
+
+div.builder-config-field {
+  margin-top: 0.5rem;
+}

package/public/saltcorn-common.js

@@ -51,6 +51,7 @@ const nubBy = (prop, xs) => {
   });
 };
 function apply_showif() {
+  const isNode = typeof parent?.saltcorn?.data?.state === "undefined";
   $("[data-show-if]").each(function (ix, element) {
     var e = $(element);
     try {
@@ -78,6 +79,15 @@ function apply_showif() {
       console.error(e);
     }
   });
+  $("[data-dyn-href]").each(function (ix, element) {
+    const e = $(element);
+    const rec = get_form_record(e);
+    const href = new Function(
+      `{${Object.keys(rec).join(",")}}`,
+      "return " + e.attr("data-dyn-href")
+    )(rec);
+    e.attr("href", href);
+  });
   $("[data-calc-options]").each(function (ix, element) {
     var e = $(element);
     var data = JSON.parse(decodeURIComponent(e.attr("data-calc-options")));
@@ -263,10 +273,12 @@ function apply_showif() {
 
     if (typeof cache[recS] !== "undefined") {
       e.html(cache[recS]);
+      e.prop("data-source-url-current", recS);
       activate_onchange_coldef();
       return;
     }
-    ajax_post_json(e.attr("data-source-url"), rec, {
+
+    const cb = {
       success: (data) => {
         e.html(data);
         const cacheNow = e.prop("data-source-url-cache") || {};
@@ -286,7 +298,11 @@ function apply_showif() {
         });
         e.html("");
       },
-    });
+    };
+    if (isNode) ajax_post_json(e.attr("data-source-url"), rec, cb);
+    else {
+      local_post_json(e.attr("data-source-url"), rec, cb);
+    }
   });
   const locale =
     navigator.userLanguage ||
@@ -335,18 +351,21 @@ function splitTargetMatch(elemValue, target, keySpec) {
   return elemValueShort === target;
 }
 
-function get_form_record(e, select_labels) {
+function get_form_record(e_in, select_labels) {
   const rec = {};
-  e.closest(".form-namespace")
-    .find("input[name],select[name]")
-    .each(function () {
-      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")
-        rec[name] = $(this).prop("checked");
-      else rec[name] = $(this).val();
-    });
+
+  const e = e_in.viewname
+    ? $(`form[data-viewname=${e_in.viewname}]`)
+    : e_in.closest(".form-namespace");
+
+  e.find("input[name],select[name],textarea[name]").each(function () {
+    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")
+      rec[name] = $(this).prop("checked");
+    else rec[name] = $(this).val();
+  });
   return rec;
 }
 function showIfFormulaInputs(e, fml) {
@@ -506,6 +525,11 @@ function initialize_page() {
   });
 
   $("form").change(apply_showif);
+  // also change if we select same
+  $("form select").on("blur", (e) => {
+    if (!e || !e.target) return;
+    $(e.target).closest("form").trigger("change");
+  });
   apply_showif();
   apply_showif();
   $("[data-inline-edit-dest-url]").each(function () {
@@ -527,6 +551,7 @@ function initialize_page() {
     var ajax = !!$(this).attr("data-inline-edit-ajax");
     var type = $(this).attr("data-inline-edit-type");
     var schema = $(this).attr("data-inline-edit-schema");
+    var decimalPlaces = $(this).attr("data-inline-edit-decimal-places");
     if (schema) {
       schema = JSON.parse(decodeURIComponent(schema));
     }
@@ -549,6 +574,7 @@ function initialize_page() {
         type,
         is_key,
         schema,
+        ...(decimalPlaces ? { decimalPlaces } : {}),
       })
     );
     const doAjaxOptionsFetch = (tblName, target) => {
@@ -601,7 +627,17 @@ function initialize_page() {
         }
         <input type="${
           type === "Integer" || type === "Float" ? "number" : "text"
-        }" name="${key}" value="${escapeHtml(current)}">
+        }" ${
+          type === "Float"
+            ? `step="${
+                decimalPlaces
+                  ? Math.round(
+                      Math.pow(10, -decimalPlaces) * Math.pow(10, decimalPlaces)
+                    ) / Math.pow(10, decimalPlaces)
+                  : "any"
+              }"`
+            : ""
+        } name="${key}" value="${escapeHtml(current)}">
       <button type="submit" class="btn btn-sm btn-primary">OK</button>
       <button onclick="cancel_inline_edit(event, '${opts}')" type="button" class="btn btn-sm btn-danger"><i class="fas fa-times"></i></button>
       </form>`
@@ -654,10 +690,13 @@ function initialize_page() {
       setTimeout(() => {
         codes.forEach((el) => {
           //console.log($(el).attr("mode"), el);
+          if ($(el).hasClass("codemirror-enabled")) return;
+
           const cm = CodeMirror.fromTextArea(el, {
             lineNumbers: true,
             mode: $(el).attr("mode"),
           });
+          $(el).addClass("codemirror-enabled");
           cm.on(
             "change",
             $.debounce(() => {
@@ -768,6 +807,11 @@ function inline_submit_success(e, form, opts) {
       : ""
   }
   ${opts.current_label ? `data-inline-edit-current-label="${val}"` : ""}
+  ${
+    opts.decimalPlaces
+      ? `data-inline-edit-decimal-places="${opts.decimalPlaces}"`
+      : ""
+  }
   data-inline-edit-dest-url="${opts.url}">
     <span class="current">${val}</span>
     <i class="editicon ${!isNode ? "visible" : ""} fas fa-edit ms-1"></i>
@@ -945,15 +989,26 @@ function emptyAlerts() {
   $("#toasts-area").html("");
 }
 
-function press_store_button(clicked) {
+function press_store_button(clicked, keepOld) {
   let btn = clicked;
   if ($(clicked).is("form")) btn = $(clicked).find("button[type=submit]");
-
+  if (keepOld) {
+    const oldText = $(btn).html();
+    $(btn).data("old-text", oldText);
+  }
   const width = $(btn).width();
   $(btn).html('<i class="fas fa-spinner fa-spin"></i>').width(width);
 }
 
-function common_done(res, isWeb = true) {
+function restore_old_button(btnId) {
+  const btn = $(`#${btnId}`);
+  const oldText = $(btn).data("old-text");
+  btn.html(oldText);
+  btn.css({ width: "" });
+  btn.removeData("old-text");
+}
+
+function common_done(res, viewname, isWeb = true) {
   const handle = (element, fn) => {
     if (Array.isArray(element)) for (const current of element) fn(current);
     else fn(element);
@@ -982,6 +1037,18 @@ function common_done(res, isWeb = true) {
         });
     });
   }
+  if (res.set_fields && viewname) {
+    Object.keys(res.set_fields).forEach((k) => {
+      const form = $(`form[data-viewname=${viewname}]`);
+      const input = form.find(
+        `input[name=${k}], textarea[name=${k}], select[name=${k}]`
+      );
+      if (input.attr("type") === "checkbox")
+        input.prop("checked", res.set_fields[k]);
+      else input.val(res.set_fields[k]);
+      input.trigger("set_form_field");
+    });
+  }
   if (res.goto && !isWeb)
     // TODO ch
     notifyAlert({
@@ -997,6 +1064,7 @@ function common_done(res, isWeb = true) {
       if (
         prev.origin === next.origin &&
         prev.pathname === next.pathname &&
+        prev.searchParams.toString() === next.searchParams.toString() &&
         next.hash !== prev.hash
       )
         location.reload();

package/public/saltcorn.css

@@ -472,3 +472,17 @@ div.unread-notify {
   cursor: pointer;
   text-decoration: underline;
 }
+
+table.help-md thead {
+  border-bottom: 1px solid black;
+}
+
+table.help-md {
+  margin-bottom: 1em;
+}
+
+table.help-md td:nth-child(2),
+table.help-md th:nth-child(2) {
+  padding-left: 10px;
+  padding-right: 10px;
+}

package/public/saltcorn.js

@@ -198,8 +198,8 @@ function clear_state(omit_fields_str, e) {
   pjax_to(newUrl, e);
 }
 
-function ajax_done(res) {
-  common_done(res);
+function ajax_done(res, viewname) {
+  common_done(res, viewname);
 }
 
 function view_post(viewname, route, data, onDone, sendState) {
@@ -220,7 +220,7 @@ function view_post(viewname, route, data, onDone, sendState) {
   })
     .done(function (res) {
       if (onDone) onDone(res);
-      ajax_done(res);
+      ajax_done(res, viewname);
     })
     .fail(function (res) {
       notifyAlert({ type: "danger", text: res.responseText });
@@ -340,6 +340,28 @@ function ajax_modal(url, opts = {}) {
         $("body").css("overflow", "");
       });
     },
+    ...(opts.onError
+      ? {
+          error: opts.onError,
+        }
+      : {}),
+  });
+}
+
+function selectVersionError(res, btnId) {
+  notifyAlert({
+    type: "danger",
+    text: res.responseJSON?.error || "unknown error",
+  });
+  restore_old_button(btnId);
+}
+
+function submitWithAjax(e) {
+  saveAndContinue(e, (res) => {
+    if (res && res.responseJSON && res.responseJSON.url_when_done)
+      window.location.href = res.responseJSON.url_when_done;
+    if (res && res.responseJSON && res.responseJSON.error)
+      notifyAlert({ type: "danger", text: res.responseJSON.error });
   });
 }
 
@@ -368,6 +390,9 @@ function saveAndContinue(e, k) {
       if (res.notify) {
         notifyAlert(res.notify);
       }
+      if (res.reload_page) {
+        location.reload(); //TODO notify to cookie if reload or goto
+      }
     },
     error: function (request) {
       var ct = request.getResponseHeader("content-type") || "";
@@ -388,8 +413,8 @@ function saveAndContinue(e, k) {
       }
       ajax_indicate_error(e, request);
     },
-    complete: function () {
-      if (k) k();
+    complete: function (res) {
+      if (k) k(res);
     },
   });
 
@@ -410,7 +435,8 @@ function updateMatchingRows(e, viewname) {
   }
 }
 
-function applyViewConfig(e, url, k) {
+function applyViewConfig(e, url, k, event) {
+  if (event && event.target && event.target.id === "myEditor_icon") return;
   var form = $(e).closest("form");
   var form_data = form.serializeArray();
   const cfg = {};
@@ -491,7 +517,7 @@ function ajaxSubmitForm(e) {
       var no_reload = $("#scmodal").hasClass("no-submit-reload");
       $("#scmodal").modal("hide");
       if (!no_reload) location.reload();
-      else common_done(res);
+      else common_done(res, form.attr("data-viewname"));
     },
     error: function (request) {
       var title = request.getResponseHeader("Page-Title");

package/routes/actions.js

@@ -174,8 +174,9 @@ const triggerForm = async (req, trigger) => {
         attributes: {
           explainers: {
             Often: req.__("Every 5 minutes"),
-            Never:
-              req.__("Not scheduled but can be run as an action from a button click"),
+            Never: req.__(
+              "Not scheduled but can be run as an action from a button click"
+            ),
           },
         },
       },
@@ -201,6 +202,7 @@ const triggerForm = async (req, trigger) => {
         label: req.__("Action"),
         type: "String",
         required: true,
+        help: { topic: "Actions" },
         attributes: {
           calcOptions: ["when_trigger", action_options],
         },
@@ -402,7 +404,7 @@ router.get(
       form.values = trigger.configuration;
       const events = Trigger.when_options;
       const actions = Trigger.find({
-        when_trigger: {or: ["API call", "Never"]},
+        when_trigger: { or: ["API call", "Never"] },
       });
       const tables = (await Table.find({})).map((t) => ({
         name: t.name,