@saltcorn/server 1.1.0-beta.9 → 1.1.0

package/public/saltcorn-common.js

@@ -40,6 +40,19 @@ $(window).resize(() => {
   setScreenInfoCookie();
 });
 
+function get_current_state_url(e) {
+  const localizer = e ? $(e).closest("[data-sc-local-state]") : [];
+  let $modal = $("#scmodal");
+  if (localizer.length) {
+    const localState = localizer.attr("data-sc-local-state") || "";
+    return localState;
+  } else if ($modal.length === 0 || !$modal.hasClass("show"))
+    return getIsNode()
+      ? window.location.href
+      : parent.saltcorn.mobileApp.navigation.currentUrl();
+  else return $modal.prop("data-modal-state");
+}
+
 //avoids hiding in overflow:hidden
 function init_bs5_dropdowns() {
   $("body").on(
@@ -704,7 +717,7 @@ function doMobileTransforms() {
     href: [
       {
         web: "javascript:history.back()",
-        mobile: "javascript:parent.goBack()",
+        mobile: "javascript:parent.saltcorn.mobileApp.navigation.goBack()",
       },
       {
         web: "javascript:ajax_modal",
@@ -714,7 +727,7 @@ function doMobileTransforms() {
     onclick: [
       {
         web: "history.back()",
-        mobile: "parent.goBack()",
+        mobile: "parent.saltcorn.mobileApp.navigation.goBack()",
       },
       {
         web: "ajax_modal",
@@ -727,6 +740,34 @@ function doMobileTransforms() {
     ],
   };
 
+  // change /plugins or plugins to sc_plugins
+  // capacitor reserves the plugins prefix for cordova plugins
+  const normalisePluginsPrefix = (path) => {
+    if (path.startsWith("/plugins/") || path.startsWith("plugins/"))
+      return path.replace(/\/?plugins\//, "sc_plugins/");
+    return null;
+  };
+  $("link").each(function () {
+    const path = $(this).attr("href");
+    if (path) {
+      const newPath = normalisePluginsPrefix(path);
+      if (newPath) {
+        $(this).attr("href", newPath);
+        console.log("transformed link", path, newPath);
+      }
+    }
+  });
+  $("script").each(function () {
+    const path = $(this).attr("src");
+    if (path) {
+      const newPath = normalisePluginsPrefix(path);
+      if (newPath) {
+        $(this).attr("src", newPath);
+        console.log("transformed script", path, newPath);
+      }
+    }
+  });
+
   $("a").each(function () {
     let path = $(this).attr("href") || "";
     if (path.startsWith("http")) {
@@ -807,48 +848,46 @@ function doMobileTransforms() {
   });
 
   $("[mobile-img-path]").each(async function () {
-    if (parent.loadEncodedFile) {
-      const fileId = $(this).attr("mobile-img-path");
-      const base64Encoded = await parent.loadEncodedFile(fileId);
-      this.src = base64Encoded;
-    }
+    const fileId = $(this).attr("mobile-img-path");
+    const base64Encoded =
+      await parent.saltcorn.mobileApp.common.loadEncodedFile(fileId);
+    this.src = base64Encoded;
   });
 
   $("[mobile-bg-img-path]").each(async function () {
-    if (parent.loadEncodedFile) {
-      const fileId = $(this).attr("mobile-bg-img-path");
-      if (fileId) {
-        const base64Encoded = await parent.loadEncodedFile(fileId);
-        this.style.backgroundImage = `url("${base64Encoded}")`;
-      }
+    const fileId = $(this).attr("mobile-bg-img-path");
+    if (fileId) {
+      const base64Encoded =
+        await parent.saltcorn.mobileApp.common.loadEncodedFile(fileId);
+      this.style.backgroundImage = `url("${base64Encoded}")`;
     }
   });
 
   $("img:not([mobile-img-path]):not([mobile-bg-img-path])").each(
     async function () {
-      if (parent.loadEncodedFile) {
-        const jThis = $(this);
-        const src = jThis.attr("src");
-        if (src?.includes("/files/serve/")) {
-          const tokens = src.split("/files/serve/");
-          if (tokens.length > 1) {
-            const fileId = tokens[1];
-            const base64Encoded = await parent.loadEncodedFile(fileId);
-            this.src = base64Encoded;
-          }
-        } else if (src?.includes("/files/resize/")) {
-          const tokens = src.split("/files/resize/");
-          if (tokens.length > 1) {
-            const idAndDims = tokens[1].split("/");
-            const width = idAndDims[0];
-            const height = idAndDims.length > 2 ? idAndDims[1] : undefined;
-            const fileId = idAndDims[idAndDims.length - 1];
-            const style = { width: `${width || 50}px` };
-            if (height > 0) style.height = `${height}px`;
-            const base64Encoded = await parent.loadEncodedFile(fileId);
-            this.src = base64Encoded;
-            jThis.css(style);
-          }
+      const jThis = $(this);
+      const src = jThis.attr("src");
+      if (src?.includes("/files/serve/")) {
+        const tokens = src.split("/files/serve/");
+        if (tokens.length > 1) {
+          const fileId = tokens[1];
+          const base64Encoded =
+            await parent.saltcorn.mobileApp.common.loadEncodedFile(fileId);
+          this.src = base64Encoded;
+        }
+      } else if (src?.includes("/files/resize/")) {
+        const tokens = src.split("/files/resize/");
+        if (tokens.length > 1) {
+          const idAndDims = tokens[1].split("/");
+          const width = idAndDims[0];
+          const height = idAndDims.length > 2 ? idAndDims[1] : undefined;
+          const fileId = idAndDims[idAndDims.length - 1];
+          const style = { width: `${width || 50}px` };
+          if (height > 0) style.height = `${height}px`;
+          const base64Encoded =
+            await parent.saltcorn.mobileApp.common.loadEncodedFile(fileId);
+          this.src = base64Encoded;
+          jThis.css(style);
         }
       }
     }
@@ -1031,7 +1070,11 @@ function initialize_page() {
       </form>`
       );
   });
-  if (!isNode) doMobileTransforms();
+  if (!isNode) {
+    doMobileTransforms();
+    const anchor = parent.saltcorn.mobileApp.navigation.getAnchor();
+    if (anchor) $(`[href="#${anchor}"][data-bs-toggle="tab"]`).tab("show");
+  }
   function setExplainer(that) {
     var id = $(that).attr("id") + "_explainer";
 
@@ -1064,11 +1107,12 @@ function initialize_page() {
         codes.forEach((el) => {
           //console.log($(el).attr("mode"), el);
           if ($(el).hasClass("codemirror-enabled")) return;
-
-          const cm = CodeMirror.fromTextArea(el, {
+          const cmOpts = {
             lineNumbers: true,
             mode: $(el).attr("mode"),
-          });
+          };
+          if (_sc_lightmode === "dark") cmOpts.theme = "blackboard";
+          const cm = CodeMirror.fromTextArea(el, cmOpts);
           $(el).addClass("codemirror-enabled");
           cm.on(
             "change",
@@ -1139,11 +1183,13 @@ function initialize_page() {
       }
     }
   }
+
   setTimeout(() => {
     $("#toasts-area")
       .find(".show[rendered='server-side'][type='success']")
       .removeClass("show");
   }, 5000);
+
   $(".lazy-accoordion").on("show.bs.collapse", function (e) {
     const $e = $(e.target).find("[data-sc-view-source]");
     if ($.trim($e.html()) == "") {
@@ -1171,7 +1217,6 @@ function initialize_page() {
 $(initialize_page);
 
 function cancel_inline_edit(e, opts1) {
-  const isNode = getIsNode();
   var opts = JSON.parse(decodeURIComponent(opts1 || "") || "{}");
   var form = $(e.target).closest("form");
   form.replaceWith(opts.resetHtml);
@@ -1550,14 +1595,15 @@ async function common_done(res, viewnameOrElem, isWeb = true) {
     });
   }
   if (res.eval_js) await handle(res.eval_js, eval_it);
-  else if (res.goto) {
+  /// TODO got and resume_workflow - use localStorage
+  if (res.goto) {
     if (!isWeb) {
       const next = new URL(res.goto, "http://localhost");
       const pathname = next.pathname;
       if (pathname.startsWith("/view/") || pathname.startsWith("/page/")) {
         const route = `get${pathname}${next.search ? "?" + next.search : ""}`;
-        await parent.handleRoute(route);
-      } else parent.cordova.InAppBrowser.open(res.goto, "_system");
+        await parent.saltcorn.mobileApp.navigation.handleRoute(route);
+      } else parent.cordova.InAppBrowser.open(res.goto, "_system"); // TODO
     } else if (res.target === "_blank") window.open(res.goto, "_blank").focus();
     else {
       const prev = new URL(window.location.href);
@@ -1572,6 +1618,9 @@ async function common_done(res, viewnameOrElem, isWeb = true) {
         location.reload();
     }
   }
+  if (res.resume_workflow) {
+    ajax_post_json(`/actions/resume-workflow/${res.resume_workflow}`, {});
+  }
   if (res.reload_page) {
     (isWeb ? location : parent).reload(); //TODO notify to cookie if reload or goto
   }

package/public/saltcorn.css

@@ -85,18 +85,15 @@ div[data-inline-edit-dest-url]:hover .editicon {
   border-left: none;
   border-color: #95a5a6;
   padding-left: 0.3rem;
-  background-color: #ffffff;
 }
 
 .search-bar input[type="search"] {
   border-color: #95a5a6;
   padding-left: 0.3rem;
-  background-color: #ffffff;
 }
 
 .search-bar button.search-bar {
   border-color: #95a5a6;
-  background-color: #ffffff;
   border-left: 1px solid #95a5a6 !important;
   border-top: 1px solid #95a5a6 !important;
   border-bottom: 1px solid #95a5a6 !important;
@@ -358,7 +355,7 @@ table.table-inner-grid td {
 }
 
 .w-unset {
-  width: unset;
+  width: unset !important;
 }
 
 .preview-text {
@@ -610,4 +607,14 @@ button.monospace-copy-btn {
 
 i[class^="unicode-"], i[class*=" unicode-"] {
   font-style: normal;
+}
+
+.tabulator.table-dark:not(.thead-light) .tabulator-footer, .tabulator.table-dark:not(.thead-light) .tabulator-footer .tabulator-col {
+  background-color: #212529;
+  border-color: #32383e;
+  color: #fff;
+}
+
+.mobile-toast-margin {
+  margin-bottom: 1.0rem
 }

package/public/saltcorn.js

@@ -84,17 +84,6 @@ function removeQueryStringParameter(uri1, key) {
   return uri + hash;
 }
 
-function get_current_state_url(e) {
-  const localizer = e ? $(e).closest("[data-sc-local-state]") : [];
-  let $modal = $("#scmodal");
-  if (localizer.length) {
-    const localState = localizer.attr("data-sc-local-state") || "";
-    return localState;
-  } else if ($modal.length === 0 || !$modal.hasClass("show"))
-    return window.location.href;
-  else return $modal.prop("data-modal-state");
-}
-
 function select_id(id, e) {
   pjax_to(updateQueryStringParameter(get_current_state_url(e), "id", id), e);
 }
@@ -423,6 +412,27 @@ function saveAndContinueAsync(e) {
   });
 }
 
+function saveAndContinueIfValid(e, k, event) {
+  //wait for applyShowIf
+  setTimeout(() => {
+    if (
+      event &&
+      event.target &&
+      event.target.classList &&
+      event.target.classList.contains("no-form-change")
+    )
+      return;
+    var form = $(e).closest("form");
+
+    if (form[0].checkValidity?.() === false) {
+      form[0].reportValidity();
+      return;
+    }
+
+    saveAndContinue(e, k, event);
+  });
+}
+
 function saveAndContinue(e, k, event) {
   if (
     event &&
@@ -432,6 +442,7 @@ function saveAndContinue(e, k, event) {
   )
     return;
   var form = $(e).closest("form");
+
   let focusedEl = null;
   if (!event || !event.srcElement) {
     const el = form.find("select[sc-received-focus]")[0];
@@ -460,6 +471,7 @@ function saveAndContinue(e, k, event) {
     data: form_data,
     success: function (res) {
       ajax_indicator(false);
+      form.removeAttr("data-unsaved-changes");
       form.parent().find(".full-form-error").text("");
       if (res.id && form.find("input[name=id")) {
         form.append(
@@ -576,9 +588,10 @@ function updateViewPreview() {
   }
 }
 
-function ajaxSubmitForm(e, force_no_reload) {
+function ajaxSubmitForm(e, force_no_reload, event) {
   var form = $(e).closest("form");
   var url = form.attr("action");
+  if(event) event.preventDefault();
   $.ajax(url, {
     type: "POST",
     headers: {
@@ -890,9 +903,9 @@ function build_mobile_app(button) {
 
   if (
     params.useDocker &&
-    !window.cordovaBuilderAvailable &&
+    !window.capacitorBuilderAvailable &&
     !confirm(
-      "Docker is selected but the Cordova builder seems not to be installed. " +
+      "Docker is selected but the Capacitor builder seems not to be installed. " +
         "Do you really want to continue?"
     )
   ) {
@@ -935,11 +948,11 @@ function build_mobile_app(button) {
   });
 }
 
-function pull_cordova_builder() {
-  ajax_post("/admin/mobile-app/pull-cordova-builder", {
+function pull_capacitor_builder() {
+  ajax_post("/admin/mobile-app/pull-capacitor-builder", {
     success: () => {
       notifyAlert(
-        "Pulling the the cordova-builder. " +
+        "Pulling the the capacitor-builder. " +
           "To see the progress, open the logs viewer with the System logging verbosity set to 'All'."
       );
     },
@@ -989,12 +1002,12 @@ function check_xcodebuild() {
   });
 }
 
-function check_cordova_builder() {
-  $.ajax("/admin/mobile-app/check-cordova-builder", {
+function check_capacitor_builder() {
+  $.ajax("/admin/mobile-app/check-capacitor-builder", {
     type: "GET",
     success: function (res) {
-      window.cordovaBuilderAvailable = !!res.installed;
-      if (window.cordovaBuilderAvailable) {
+      window.capacitorBuilderAvailable = !!res.installed;
+      if (window.capacitorBuilderAvailable) {
         $("#dockerBuilderStatusId").html(
           `<span>
             installed<i class="ps-2 fas fa-check text-success"></i>
@@ -1088,7 +1101,7 @@ function toggle_tbl_sync() {
 function toggle_android_platform() {
   if ($("#androidCheckboxId")[0].checked === true) {
     $("#dockerCheckboxId").attr("hidden", false);
-    $("#dockerCheckboxId").attr("checked", window.cordovaBuilderAvailable);
+    $("#dockerCheckboxId").attr("checked", window.capacitorBuilderAvailable);
     $("#dockerLabelId").removeClass("d-none");
   } else {
     $("#dockerCheckboxId").attr("hidden", true);
@@ -1189,6 +1202,31 @@ function installPWA() {
   }
 }
 
+function check_unsaved_form(event, script_tag) {
+  const form = $(script_tag).parent().find("form");
+  if (form.attr("data-unsaved-changes")) {
+    event.preventDefault();
+    event.returnValue = true;
+  }
+}
+function check_delete_unsaved(tablename, script_tag) {
+  const form = $(script_tag).parent().find("form");
+  if (form.length && !form.attr("data-form-changed")) {
+    //delete row
+    const rec = get_form_record(form);
+    if (navigator.sendBeacon) {
+      navigator.sendBeacon(`/api/${tablename}/delete/${rec.id}`);
+    } else
+      $.ajax({
+        url: `/api/${tablename}/${rec.id}`,
+        type: "DELETE",
+        headers: {
+          "CSRF-Token": _sc_globalCsrf,
+        },
+      });
+  }
+}
+
 (() => {
   const e = document.querySelector("[data-sidebar-toggler]");
   let closed = localStorage.getItem("sidebarClosed") === "true";