@saltcorn/server 1.0.0-beta.9 → 1.0.0-rc.1

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.0.0-beta.9",
+  "version": "1.0.0-rc.1",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
     "@aws-sdk/client-s3": "^3.451.0",
-    "@saltcorn/base-plugin": "1.0.0-beta.9",
-    "@saltcorn/builder": "1.0.0-beta.9",
-    "@saltcorn/data": "1.0.0-beta.9",
-    "@saltcorn/admin-models": "1.0.0-beta.9",
-    "@saltcorn/filemanager": "1.0.0-beta.9",
-    "@saltcorn/markup": "1.0.0-beta.9",
-    "@saltcorn/plugins-loader": "1.0.0-beta.9",
-    "@saltcorn/sbadmin2": "1.0.0-beta.9",
+    "@saltcorn/base-plugin": "1.0.0-rc.1",
+    "@saltcorn/builder": "1.0.0-rc.1",
+    "@saltcorn/data": "1.0.0-rc.1",
+    "@saltcorn/admin-models": "1.0.0-rc.1",
+    "@saltcorn/filemanager": "1.0.0-rc.1",
+    "@saltcorn/markup": "1.0.0-rc.1",
+    "@saltcorn/plugins-loader": "1.0.0-rc.1",
+    "@saltcorn/sbadmin2": "1.0.0-rc.1",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",
@@ -46,7 +46,7 @@
     "node-fetch": "2.6.9",
     "node-watch": "^0.7.2",
     "notp": "2.0.3",
-    "npm-registry-fetch": "16.0.0",
+    "npm-registry-fetch": "17.1.0",
     "passport": "^0.6.0",
     "passport-custom": "^1.1.1",
     "passport-http-bearer": "^1.0.1",
@@ -55,7 +55,7 @@
     "pg": "^8.2.1",
     "pluralize": "^8.0.0",
     "qrcode": "1.5.1",
-    "resize-with-sharp-or-jimp": "0.1.7",
+    "resize-with-sharp-or-jimp": "0.1.8",
     "semver": "^7.6.0",
     "socket.io": "4.6.0",
     "systeminformation": "^5.21.7",

package/public/saltcorn-common.js

@@ -18,7 +18,7 @@ function monospace_block_click(e) {
 function copy_monospace_block(e) {
   let e1 = $(e).next("pre");
   let e2 = $(e1).next("pre");
-  if (!e2.length) return navigator.clipboard.writeText($(el).text());
+  if (!e2.length) return navigator.clipboard.writeText($(e1).text());
   const e1t = e1.text();
   const e2t = e2.text();
   if (e1t.length > e2t.length) return navigator.clipboard.writeText(e1t);
@@ -63,14 +63,20 @@ function reset_nearest_form(that) {
 
 function add_repeater(nm) {
   var es = $("div.form-repeat.repeat-" + nm);
-  var e = es.first();
+  const ncopy = es.length - 1;
+  var e = es.last();
   var newix = es.length;
   var newe = $(e).clone();
   newe.find("[name]").each(function (ix, element) {
     if ($(element).hasClass("omit-repeater-clone")) $(element).remove();
-    var newnm = (element.name || "").replace("_0", "_" + newix);
-    var newid = (element.id || "").replace("_0", "_" + newix);
+    const oldnm = element.name || "";
+    var newnm = (element.name || "").replace("_" + ncopy, "_" + newix);
+    var newid = (element.id || "").replace("_" + ncopy, "_" + newix);
     $(element).attr("name", newnm).attr("id", newid);
+    if (element.tagName === "SELECT") {
+      const original = document.getElementsByName(oldnm)[0];
+      if (original) element.selectedIndex = original.selectedIndex;
+    }
   });
   newe.appendTo($("div.repeats-" + nm));
   newe.find("[data-on-cloned]").each(function (ix, element) {
@@ -80,6 +86,27 @@ function add_repeater(nm) {
   });
 }
 
+function rep_del(e) {
+  var myrep = $(e).closest(".form-repeat");
+  var ix = myrep.index();
+  var parent = myrep.parent();
+  myrep.remove();
+  parent.children().each(function (childix, element) {
+    if (childix > ix) {
+      reindex(element, childix, childix - 1);
+    }
+  });
+}
+
+function reindex(element, oldix, newix) {
+  $(element).html(
+    $(element)
+      .html()
+      .split("_" + oldix + '"')
+      .join("_" + newix + '"')
+  );
+}
+
 const _apply_showif_plugins = [];
 
 const add_apply_showif_plugin = (p) => {
@@ -115,16 +142,18 @@ function apply_showif() {
       }
       if (!e.data("data-closest-form-ns"))
         e.data("data-closest-form-ns", e.closest(".form-namespace"));
-      if (to_show(e))
-        e.show()
-          .find("input, textarea, button, select, [data-show-if]")
-          .prop("disabled", e.attr("data-disabled") || false);
-      else
-        e.hide()
-          .find(
-            "input:enabled, textarea:enabled, button:enabled, select:enabled, [data-show-if]:not([disabled])"
-          )
-          .prop("disabled", true);
+      if (to_show(e)) {
+        e.find("input, textarea, button, select, [data-show-if]").prop(
+          "disabled",
+          e.attr("data-disabled") || false
+        );
+        element.style.display = "";
+      } else {
+        e.find(
+          "input:enabled, textarea:enabled, button:enabled, select:enabled, [data-show-if]:not([disabled])"
+        ).prop("disabled", true);
+        element.style.setProperty("display", "none", "important");
+      }
     } catch (e) {
       console.error(e);
     }
@@ -155,8 +184,21 @@ function apply_showif() {
     var current = e.attr("data-selected") || e.val();
     //console.log({ field: e.attr("name"), target: data[0], val, current });
     e.empty();
+    //TODO clean repetition in following cose
     (options || []).forEach((o) => {
-      if (
+      if (o && o.optgroup) {
+        const opts = o.options
+          .map(
+            (innero) =>
+              `<option ${
+                `${current}` === `${innero.value || innero}` ? "selected " : ""
+              }value="${innero.value || innero}">${
+                innero.label || innero
+              }</option>`
+          )
+          .join("");
+        e.append($(`<optgroup label="${o.label}">` + opts + "</optgroup>"));
+      } else if (
         !(o && typeof o.label !== "undefined" && typeof o.value !== "undefined")
       ) {
         if (`${current}` === `${o}`)
@@ -303,25 +345,27 @@ function apply_showif() {
         ...cache,
         [qs]: "fetching",
       });
-      $.ajax(`/api/${dynwhere.table}?${qs}`).then((resp) => {
-        if (resp.success) {
-          if (window._sc_loglevel > 4)
-            console.log("dynwhere fetch", 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,
-          });
-        } else {
-          const cacheNow = e.prop("data-fetch-options-cache") || {};
-          e.prop("data-fetch-options-cache", {
-            ...cacheNow,
-            [qs]: undefined,
-          });
-        }
-      });
+      $.ajax(`/api/${dynwhere.table}?${qs}`)
+        .then((resp) => {
+          if (resp.success) {
+            if (window._sc_loglevel > 4)
+              console.log("dynwhere fetch", 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,
+            });
+          } else {
+            const cacheNow = e.prop("data-fetch-options-cache") || {};
+            e.prop("data-fetch-options-cache", {
+              ...cacheNow,
+              [qs]: undefined,
+            });
+          }
+        })
+        .fail(checkNetworkError);
     }
   });
   $("[data-filter-table]").each(function (ix, element) {
@@ -530,6 +574,7 @@ function get_form_record(e_in, select_labels) {
             $(e_in).prop("data-join-values", jvs);
             apply_showif();
           },
+          error: checkNetworkError,
         });
       }
       $(e_in).prop("data-join-key-values", keyVals);
@@ -558,27 +603,6 @@ function showIfFormulaInputs(e, fml) {
   }
 }
 
-function rep_del(e) {
-  var myrep = $(e).closest(".form-repeat");
-  var ix = myrep.index();
-  var parent = myrep.parent();
-  parent.children().each(function (childix, element) {
-    if (childix > ix) {
-      reindex(element, childix, childix - 1);
-    }
-  });
-  myrep.remove();
-}
-
-function reindex(element, oldix, newix) {
-  $(element).html(
-    $(element)
-      .html()
-      .split("_" + oldix)
-      .join("_" + newix)
-  );
-}
-
 function get_form_subset_record(e) {
   const rec = {};
   e.find("input[name],select[name]").each(function () {
@@ -740,6 +764,42 @@ function doMobileTransforms() {
     }
   });
 
+  $("[mobile-youtube-video]").each(function () {
+    const jThis = $(this);
+    const src = jThis.attr("src");
+    if (src) {
+      const rndid = `m-video-${Math.floor(Math.random() * 16777215).toString(
+        16
+      )}`;
+      const url = new URL(src);
+      const path = url.pathname;
+      const imageId = path.split("/").pop();
+      const thumbnailContainer = document.createElement("div");
+      thumbnailContainer.className = "mobile-thumbnail-container";
+      thumbnailContainer.id = rndid;
+      const img = document.createElement("img");
+      img.src = `https://img.youtube.com/vi/${imageId}/0.jpg`;
+      img.style = "width: 100%; max-width: 600px;";
+      img.id = rndid;
+      img.setAttribute(
+        "onclick",
+        `openInAppBrowser('${src.replace(
+          "com/embed",
+          "com/watch"
+        )}', '${rndid}')`
+      );
+      thumbnailContainer.appendChild(img);
+      const spinner = document.createElement("div");
+      spinner.className = "mobile-thumbnail-spinner-overlay";
+      const spinnerInner = document.createElement("div");
+      spinnerInner.className = "d-none spinner-border text-light";
+      spinnerInner.setAttribute("role", "status");
+      spinner.appendChild(spinnerInner);
+      thumbnailContainer.appendChild(spinner);
+      jThis.replaceWith(thumbnailContainer);
+    }
+  });
+
   $("button").each(function () {
     for (const [k, v] of Object.entries({ onclick: replacers.onclick })) {
       for ({ web, mobile } of v) replaceAttr(this, k, v.web, v.mobile);
@@ -894,31 +954,33 @@ function initialize_page() {
       })
     );
     const doAjaxOptionsFetch = (tblName, target) => {
-      $.ajax(`/api/${tblName}`).then((resp) => {
-        if (resp.success) {
-          resp.success.sort((a, b) =>
-            a[target]?.toLowerCase?.() > b[target]?.toLowerCase?.() ? 1 : -1
-          );
-
-          const selopts = resp.success.map(
-            (r) =>
-              `<option ${current == r.id ? `selected ` : ``}value="${
-                r.id
-              }">${escapeHtml(r[target])}</option>`
-          );
-          $(this).replaceWith(
-            `<form method="post" action="${url}" ${
-              ajax ? `onsubmit="inline_ajax_submit(event, '${opts}')"` : ""
-            }>
+      $.ajax(`/api/${tblName}`)
+        .then((resp) => {
+          if (resp.success) {
+            resp.success.sort((a, b) =>
+              a[target]?.toLowerCase?.() > b[target]?.toLowerCase?.() ? 1 : -1
+            );
+
+            const selopts = resp.success.map(
+              (r) =>
+                `<option ${current == r.id ? `selected ` : ``}value="${
+                  r.id
+                }">${escapeHtml(r[target])}</option>`
+            );
+            $(this).replaceWith(
+              `<form method="post" action="${url}" ${
+                ajax ? `onsubmit="inline_ajax_submit(event, '${opts}')"` : ""
+              }>
           <input type="hidden" name="_csrf" value="${_sc_globalCsrf}">
           <select name="${key}" value="${current}">${selopts}
           </select>
           <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>`
-          );
-        }
-      });
+            );
+          }
+        })
+        .fail(checkNetworkError);
     };
     if (type === "JSON" && schema && schema.type.startsWith("Key to ")) {
       const tblName = schema.type.replace("Key to ", "");
@@ -1097,7 +1159,8 @@ function initialize_page() {
           initialize_page();
         },
         error: function (res) {
-          notifyAlert({ type: "danger", text: res.responseText });
+          if (!checkNetworkError(res))
+            notifyAlert({ type: "danger", text: res.responseText });
           if ($e.html() === "Loading...") $e.html("");
         },
       });
@@ -1172,9 +1235,10 @@ function inline_ajax_submit(e, opts1) {
       inline_submit_success(e, form, opts);
     },
     error: function (e) {
-      ajax_done(
-        e.responseJSON || { error: "Unknown error: " + e.responseText }
-      );
+      if (!checkNetworkError(e))
+        ajax_done(
+          e.responseJSON || { error: "Unknown error: " + e.responseText }
+        );
     },
   });
 }
@@ -1217,6 +1281,7 @@ function enable_codemirror(f) {
     dataType: "script",
     cache: true,
     success: f,
+    error: checkNetworkError,
   });
 }
 function tristateClick(e, required) {
@@ -1336,10 +1401,14 @@ function notifyAlert(note, spin) {
   if (typeof note == "string") {
     txt = note;
     type = "info";
-  } else {
+  } else if (note.text) {
     txt = note.text;
-    type = note.type;
+    type = note.type || "info";
+  } else {
+    type = "info";
+    txt = JSON.stringify(note, null, 2);
   }
+
   const { id, html } = buildToast(txt, type, spin);
   let $modal = $("#scmodal");
   if ($modal.length && $modal.hasClass("show"))
@@ -1524,7 +1593,8 @@ function reloadEmbeddedEditOwnViews(form, id) {
         initialize_page();
       },
       error: function (res) {
-        notifyAlert({ type: "danger", text: res.responseText });
+        if (!checkNetworkError(res))
+          notifyAlert({ type: "danger", text: res.responseText });
       },
     });
   });
@@ -1757,24 +1827,26 @@ function is_paging_param(key) {
   return key.endsWith("_page") || key.endsWith("_pagesize");
 }
 function check_saltcorn_notifications() {
-  $.ajax(`/notifications/count-unread`).then((resp) => {
-    if (resp.success) {
-      const n = resp.success;
-      const menu_item = $(`a.notify-menu-item`);
-
-      menu_item.html(
-        `<i class="fa-fw mr-05 fas fa-bell"></i>Notifications (${n})`
-      );
-      $(".user-nav-section").html(
-        `<i class="fa-fw mr-05 fas fa-user"></i>User (${n})`
-      );
-      $(".user-nav-section-with-span").html(
-        `<i class="fa-fw mr-05 fas fa-user"></i><span>User (${n})</span>`
-      );
-      window.update_theme_notification_count &&
-        window.update_theme_notification_count(n);
-    }
-  });
+  $.ajax(`/notifications/count-unread`)
+    .then((resp) => {
+      if (resp.success) {
+        const n = resp.success;
+        const menu_item = $(`a.notify-menu-item`);
+
+        menu_item.html(
+          `<i class="fa-fw mr-05 fas fa-bell"></i>Notifications (${n})`
+        );
+        $(".user-nav-section").html(
+          `<i class="fa-fw mr-05 fas fa-user"></i>User (${n})`
+        );
+        $(".user-nav-section-with-span").html(
+          `<i class="fa-fw mr-05 fas fa-user"></i><span>User (${n})</span>`
+        );
+        window.update_theme_notification_count &&
+          window.update_theme_notification_count(n);
+      }
+    })
+    .fail(checkNetworkError);
 }
 
 function disable_inactive_tab_inputs(id) {
@@ -1834,6 +1906,8 @@ function close_saltcorn_modal() {
   }
 }
 
+let _sc_currently_reloading;
+
 function reload_embedded_view(viewname, new_query_string) {
   const isNode = getIsNode();
   const updater = ($e, res) => {
@@ -1861,16 +1935,21 @@ function reload_embedded_view(viewname, new_query_string) {
       url = url.split("?")[0] + "?" + new_query_string;
     }
     if (isNode) {
+      if (url === _sc_currently_reloading) return;
+      _sc_currently_reloading = url;
       $.ajax(url, {
         headers: {
           pjaxpageload: "true",
           localizedstate: "true", //no admin bar
         },
         success: function (res, textStatus, request) {
+          _sc_currently_reloading = null;
           updater($e, res);
         },
         error: function (res) {
-          notifyAlert({ type: "danger", text: res.responseText });
+          _sc_currently_reloading = null;
+          if (!checkNetworkError(res))
+            notifyAlert({ type: "danger", text: res.responseText });
         },
       });
     } else {
@@ -1880,3 +1959,19 @@ function reload_embedded_view(viewname, new_query_string) {
     }
   });
 }
+
+function update_time_of_week(nm) {
+  return function () {
+    const day = $(`#input${nm}__day`).val();
+    const flat = document.querySelector(`#input${nm}__time`)._flatpickr;
+
+    const time = flat.selectedDates?.[0];
+    let s;
+    if (time) {
+      const m = time.getMinutes();
+
+      s = `${day} ${time.getHours()} ${m < 10 ? `0${m}` : m}`;
+    } else s = day;
+    $(`#inputh${nm}`).val(s).trigger("change");
+  };
+}

package/public/saltcorn.css

@@ -590,3 +590,20 @@ button.monospace-copy-btn {
 .custom-file-label {
   margin-left: 10px;
 }
+
+.mobile-thumbnail-container {
+  position: relative;
+  display: inline-block;
+}
+
+.mobile-thumbnail-spinner-overlay {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 10;
+}
+
+.mobile-thumbnail-container img {
+  display: block;
+}