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

package/src/routing/routes/view.js

@@ -39,7 +39,7 @@ export const postView = async (context) => {
   const mobileCfg = state.mobileConfig;
   if (
     mobileCfg.user.role_id > view.min_role &&
-    !(await view.authorise_post({ body, req, ...view }))
+    !(await view.authorize(mobileCfg.user, { action: "post", req, body }))
   ) {
     throw new saltcorn.data.utils.NotAuthorized(req.__("Not authorized"));
   }
@@ -150,7 +150,11 @@ export const getView = async (context) => {
   if (!view) throw new Error(req.__("No such view: %s", viewname));
   if (
     state.mobileConfig.user.role_id > view.min_role &&
-    !(await view.authorise_get({ query, req, ...view }))
+    !(await view.authorize(state.mobileConfig.user, {
+      action: "get",
+      req,
+      state: query,
+    }))
   ) {
     const additionalInfos = `: your role: ${state.mobileConfig.user.role_id}, view min_role: ${view.min_role}`;
     throw new saltcorn.data.utils.NotAuthorized(
@@ -161,7 +165,9 @@ export const getView = async (context) => {
   if (!view.renderLocally()) {
     const response = await apiCall({
       method: "GET",
-      path: `/view/${encodeURIComponent(viewname)}${context.query ? `?${context.query}` : ""}`,
+      path: `/view/${encodeURIComponent(viewname)}${
+        context.query ? `?${context.query}` : ""
+      }`,
     });
     const data = response.data;
     contents0 = data;

package/src/routing/utils.js

@@ -24,7 +24,7 @@ export const getHeaders = () => {
     from_cfg.push({ style: state.getConfig("page_custom_css", "") });
   if (state.getConfig("page_custom_html", ""))
     from_cfg.push({ headerTag: state.getConfig("page_custom_html", "") });
-  return [...stdHeaders, ...config.pluginHeaders, ...from_cfg];
+  return [...stdHeaders, ...(config.pluginHeaders || []), ...from_cfg];
 };
 
 export const parseQuery = (queryStr) => {

package/www/js/iframe_view_utils.js

@@ -1,5 +1,20 @@
 /*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.
+document.addEventListener("click", function (event) {
+  const link =
+    event.target.closest && event.target.closest("a[href^='javascript:']");
+  if (!link) return;
+  event.preventDefault();
+  const code = link.getAttribute("href").slice("javascript:".length);
+  try {
+    (0, eval)(code);
+  } catch (error) {
+    console.error("Error executing javascript: link:", error);
+  }
+});
 
 function combineFormAndQuery(form, query) {
   let paramsList = [];
@@ -87,7 +102,10 @@ async function formSubmit(e, urlSuffix, viewname, noSubmitCb, matchingState) {
     const urlParams = new URLSearchParams();
     const data = matchingState ? {} : null;
     for (const entry of new FormData(e).entries()) {
-      if (entry[1] instanceof File) files[entry[0]] = entry[1];
+      // cordova-plugin-file replaces window.File with its own class, so a
+      // real picked file no longer passes "instanceof File" - Blob still
+      // works, since every File is also a Blob.
+      if (entry[1] instanceof Blob) files[entry[0]] = entry[1];
       else {
         // is there a hidden input with a filename?
         const domEl = $(e).find(
@@ -209,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();
@@ -227,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();
@@ -431,22 +514,50 @@ async function pjax_to(href, query, e) {
     await parent.saltcorn.mobileApp.navigation.handleRoute(safeHref, query);
   else
     try {
-      const headers = {
-        pjaxpageload: "true",
-      };
-      if (localizer.length) headers.localizedstate = "true";
-      const result = await parent.saltcorn.mobileApp.api.apiCall({
-        path: path,
-        method: "GET",
-        additionalHeaders: headers,
-      });
+      const { isOfflineMode } =
+        parent.saltcorn.data.state.getState().mobileConfig;
+      let content;
+      if (isOfflineMode) {
+        const page = await parent.saltcorn.mobileApp.navigation.router.resolve(
+          {
+            pathname: `get${safeHref}`,
+            query: query,
+          }
+        );
+        if (page.redirect) {
+          const { path: redirectPath, query: redirectQuery } =
+            parent.saltcorn.mobileApp.navigation.splitPathQuery(
+              page.redirect
+            );
+          await parent.saltcorn.mobileApp.navigation.handleRoute(
+            redirectPath.startsWith("/") && redirectPath.length > 1
+              ? `get${redirectPath}`
+              : redirectPath,
+            redirectQuery
+          );
+          return;
+        }
+        content = typeof page === "string" ? page : page.content;
+      } else {
+        const headers = {
+          pjaxpageload: "true",
+        };
+        if (localizer.length) headers.localizedstate = "true";
+        const result = await parent.saltcorn.mobileApp.api.apiCall({
+          path: path,
+          method: "GET",
+          additionalHeaders: headers,
+          responseType: "text",
+        });
+        content = result.data;
+      }
       if (!inModal && !localizer.length) {
         // not sure for mobile
         // window.history.pushState({ url: href }, "", href);
       }
       if (inModal && !localizer.length)
         $(".sc-modal-linkout").attr("href", path);
-      $dest.html(result.data);
+      $dest.html(content);
       if (localizer.length) localizer.attr("data-sc-local-state", path);
       initialize_page();
     } catch (error) {
@@ -675,17 +786,16 @@ async function make_unique_field(
   }
 }
 
-function openFile(fileId) {
+async function openFile(fileId) {
   const config = parent.saltcorn.data.state.getState().mobileConfig;
   const serverPath = config.server_path;
-  const token = config.jwt;
-  const url = `${serverPath}/files/serve/${encodeURIComponent(
-    fileId
-  )}?jwt=${token}`;
+  const url = `${serverPath}/files/serve/${encodeURIComponent(fileId)}`;
   parent.cordova.InAppBrowser.open(
     url,
     "_blank",
-    "clearcache=yes,clearsessioncache=yes,location=no,toolbar=yes,toolbarposition=top"
+    // No clearcache - it clears cookies app-wide (Android's cookie store
+    // isn't scoped per tab), which would log the main app out too.
+    "location=no,toolbar=yes,toolbarposition=top"
   );
 }
 
@@ -695,7 +805,9 @@ function openInAppBrowser(url, domId) {
     const ref = parent.cordova.InAppBrowser.open(
       url,
       "_blank",
-      "clearcache=yes,clearsessioncache=yes,location=no,toolbar=yes,toolbarposition=top"
+      // No clearcache - it clears cookies app-wide (Android's cookie store
+      // isn't scoped per tab), which would log the main app out too.
+      "location=no,toolbar=yes,toolbarposition=top"
     );
     ref.addEventListener("exit", function () {
       $(`#${domId}`).find(".spinner-border").addClass("d-none");