@saltcorn/mobile-app 1.7.0-alpha.1 → 1.7.0-beta.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@saltcorn/mobile-app",
   "displayName": "Saltcorn mobile app",
-  "version": "1.7.0-alpha.1",
+  "version": "1.7.0-beta.1",
   "description": "Saltcorn mobile app for Android and iOS",
   "main": "index.js",
   "scripts": {

package/www/js/iframe_view_utils.js

@@ -1,5 +1,5 @@
 /*eslint-env browser*/
-/*global $, KTDrawer, reload_embedded_view, submitWithEmptyAction, is_paging_param, bootstrap, common_done, unique_field_from_rows, inline_submit_success, get_current_state_url, initialize_page, reset_spinners */
+/*global $, KTDrawer, reload_embedded_view, submitWithEmptyAction, is_paging_param, bootstrap, common_done, unique_field_from_rows, inline_submit_success, get_current_state_url, initialize_page, reset_spinners, apply_showif_fetching_urls */
 
 // Tapping a javascript: link silently does nothing on iOS, so we run the
 // code ourselves instead of relying on the link to do it.
@@ -227,6 +227,37 @@ function saveAndContinueAsync(e, action) {
   });
 }
 
+// not currently generated by any server markup, kept for parity with web
+function saveAndContinueIfValid(e, action, event) {
+  setTimeout(() => {
+    if (
+      event &&
+      event.target &&
+      event.target.classList &&
+      event.target.classList.contains("no-form-change")
+    )
+      return;
+    const form = $(e).closest("form");
+    if (form[0].checkValidity?.() === false) {
+      form[0].reportValidity();
+      return;
+    }
+    saveAndContinue(e, action);
+  });
+}
+
+// auto_save's onChange - was undefined on mobile, silently dropping every edit
+function saveAndContinueDelayed(e, action, event, retries = 1) {
+  setTimeout(() => {
+    if (apply_showif_fetching_urls.size > 0 && retries < 5) {
+      setTimeout(() => {
+        saveAndContinueDelayed(e, action, event, retries + 1);
+      }, 200);
+    } else saveAndContinue(e, action);
+  });
+  return false;
+}
+
 async function saveAndContinue(e, action, k) {
   try {
     showLoadSpinner();
@@ -245,11 +276,45 @@ async function saveAndContinue(e, action, k) {
     }
     if (k) await k();
     // TODO ch error (request.responseText?)
+    return res;
   } finally {
     removeLoadSpinner();
   }
 }
 
+// SubmitWithAjax - undefined on mobile; follows the redirect saveAndContinue skips
+async function submitWithAjax(e) {
+  try {
+    const form = $(e).closest("form");
+    // action attr is always void(0) on mobile - use data-viewname instead
+    const res = await saveAndContinue(e, `/view/${form.attr("data-viewname")}`);
+    if (res?.error)
+      parent.saltcorn.mobileApp.common.showToasts([
+        { type: "error", msg: res.error },
+      ]);
+    const dest = res?.url_when_done || res?.redirect;
+    if (dest) {
+      const { path, query } =
+        parent.saltcorn.mobileApp.navigation.splitPathQuery(dest);
+      // "Back to referer" round-trips a get/... route through the server's
+      // sanitizer, which adds a leading "/" - strip it, don't double the prefix
+      const stripped = path.replace(/^\//, "");
+      const route =
+        stripped.startsWith("get/") || stripped.startsWith("post/")
+          ? stripped
+          : path.length > 1
+            ? `get${path}`
+            : path;
+      await parent.saltcorn.mobileApp.navigation.handleRoute(
+        route,
+        query
+      );
+    }
+  } catch (error) {
+    parent.saltcorn.mobileApp.common.errorAlert(error);
+  }
+}
+
 async function login(e, entryPoint, isSignup) {
   try {
     showLoadSpinner();