@saltcorn/mobile-app 1.1.0-beta.13 → 1.1.0-beta.15

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@saltcorn/mobile-app",
   "displayName": "Saltcorn mobile app",
-  "version": "1.1.0-beta.13",
+  "version": "1.1.0-beta.15",
   "description": "Apache Cordova application with @saltcorn/markup",
   "main": "index.js",
   "scripts": {

package/src/helpers/api.js

@@ -9,6 +9,7 @@ export async function apiCall({
   body,
   responseType,
   timeout,
+  additionalHeaders,
 }) {
   const config =
     typeof saltcorn !== "undefined"
@@ -19,6 +20,7 @@ export async function apiCall({
   const headers = {
     "X-Requested-With": "XMLHttpRequest",
     "X-Saltcorn-Client": "mobile-app",
+    ...(additionalHeaders || {}),
   };
   if (config.tenantAppName) headers["X-Saltcorn-App"] = config.tenantAppName;
   const token = config.jwt;

package/src/helpers/navigation.js

@@ -16,6 +16,12 @@ export function currentLocation() {
   return routingHistory[index].route;
 }
 
+export function currentUrl() {
+  const query = currentQuery();
+  const safeQuery = query ? (query.startsWith("?") ? query : `?${query}`) : "";
+  return `${currentLocation()}${safeQuery}`;
+}
+
 export function currentQuery(skipPosts = false) {
   if (routingHistory.length == 0) return undefined;
   let index = routingHistory.length - 1;

package/www/index.html

@@ -5,8 +5,6 @@
       name="viewport"
       content="width=device-width, initial-scale=1, maximum-scale=1"
     />
-    <script src="cordova.js"></script>
-
     <script src="data/tables.js"></script>
     <script src="data/tables_created_at.js"></script>
     <script src="data/config.js"></script>

package/www/js/iframe_view_utils.js

@@ -1,5 +1,5 @@
 /*eslint-env browser*/
-/*global $, KTDrawer, submitWithEmptyAction, is_paging_param, bootstrap, common_done, unique_field_from_rows, inline_submit_success*/
+/*global $, KTDrawer, submitWithEmptyAction, is_paging_param, bootstrap, common_done, unique_field_from_rows, inline_submit_success, get_current_state_url, initialize_page */
 
 function combineFormAndQuery(form, query) {
   let paramsList = [];
@@ -32,8 +32,11 @@ async function execLink(url, linkSrc) {
       else {
         const { path, query } =
           parent.saltcorn.mobileApp.navigation.splitPathQuery(url);
+        const safePath = path.startsWith("http")
+          ? new URL(path).pathname
+          : path;
         await parent.saltcorn.mobileApp.navigation.handleRoute(
-          `get${path}`,
+          `get${safePath}`,
           query
         );
       }
@@ -300,11 +303,14 @@ function invalidate_pagings(currentQuery) {
   return newQuery;
 }
 
-async function set_state_fields(kvs, href) {
+async function set_state_fields(kvs, disablePjax, e) {
   try {
     showLoadSpinner();
+    let newhref = get_current_state_url(e);
     let queryParams = [];
-    let currentQuery = parent.saltcorn.mobileApp.navigation.currentQuery();
+    const { path, query } =
+      parent.saltcorn.mobileApp.navigation.splitPathQuery(newhref);
+    let currentQuery = query || {};
     if (Object.keys(kvs).some((k) => !is_paging_param(k))) {
       currentQuery = invalidate_pagings(currentQuery);
     }
@@ -318,15 +324,53 @@ async function set_state_fields(kvs, href) {
     for (const [k, v] of new URLSearchParams(currentQuery).entries()) {
       queryParams.push(`${k}=${v}`);
     }
-    await parent.saltcorn.mobileApp.navigation.handleRoute(
-      href,
-      queryParams.join("&")
-    );
+    const queryStr = queryParams.join("&");
+    if (disablePjax)
+      await parent.saltcorn.mobileApp.navigation.handleRoute(path, queryStr);
+    else await pjax_to(path, queryStr, e);
   } finally {
     removeLoadSpinner();
   }
 }
 
+async function pjax_to(href, query, e) {
+  const safeHref = href.startsWith("get") ? href.substring(3) : href;
+  const path = `${safeHref}?${query}`;
+  let $modal = $("#scmodal");
+  const inModal = $modal.length && $modal.hasClass("show");
+  const localizer = e ? $(e).closest("[data-sc-local-state]") : [];
+  let $dest = localizer.length
+    ? localizer
+    : inModal
+    ? $("#scmodal .modal-body")
+    : $("#page-inner-content");
+  if (!$dest.length)
+    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,
+      });
+      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);
+      if (localizer.length) localizer.attr("data-sc-local-state", path);
+      initialize_page();
+    } catch (error) {
+      parent.saltcorn.mobileApp.common.errorAlert(error);
+    }
+}
+
 async function set_state_field(key, value) {
   try {
     showLoadSpinner();
@@ -358,24 +402,26 @@ async function unset_state_field(key) {
   }
 }
 
-async function sortby(k, desc, viewIdentifier) {
+async function sortby(k, desc, viewIdentifier, e) {
   await set_state_fields(
     {
       [`_${viewIdentifier}_sortby`]: k,
       [`_${viewIdentifier}_sortdesc`]: desc ? "on" : { unset: true },
     },
-    parent.saltcorn.mobileApp.navigation.currentLocation()
+    false,
+    e
   );
 }
 
-async function gopage(n, pagesize, viewIdentifier, extra) {
+async function gopage(n, pagesize, viewIdentifier, extra, e) {
   await set_state_fields(
     {
       ...extra,
       [`_${viewIdentifier}_page`]: n,
       [`_${viewIdentifier}_pagesize`]: pagesize,
     },
-    parent.saltcorn.mobileApp.navigation.currentLocation()
+    false,
+    e
   );
 }