@saltcorn/server 1.1.0-beta.13 → 1.1.0-beta.15

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",
@@ -823,48 +836,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);
         }
       }
     }
@@ -1569,14 +1580,15 @@ async function common_done(res, viewnameOrElem, isWeb = true) {
     });
   }
   if (res.eval_js) await handle(res.eval_js, eval_it);
+  /// 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);
@@ -1591,6 +1603,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.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];
@@ -1197,6 +1208,21 @@ function check_unsaved_form(event, script_tag) {
     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);
+    
+    $.ajax({
+      url: `/api/${tablename}/${rec.id}`,
+      type: "DELETE",
+      headers: {
+        "CSRF-Token": _sc_globalCsrf,
+      },
+    });
+  }
+}
 
 (() => {
   const e = document.querySelector("[data-sidebar-toggler]");