@saltcorn/mobile-app 1.3.1-beta.10 → 1.3.1-beta.11

package/package.json

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

package/src/init.js

@@ -30,6 +30,7 @@ import i18nextSprintfPostProcessor from "i18next-sprintf-postprocessor";
 import { jwtDecode } from "jwt-decode";
 
 import { Network } from "@capacitor/network";
+import { App } from '@capacitor/app';
 
 import { defineCustomElements } from "jeep-sqlite/loader";
 
@@ -357,6 +358,11 @@ export async function init(mobileConfig) {
       document.body.appendChild(jeepSqlite);
       await jeepSqlite.componentOnReady();
     }
+
+    App.addListener('backButton', async ({ canGoBack }) => {
+      await saltcorn.mobileApp.navigation.goBack(1, true);
+    });
+
     const lastLocation = takeLastLocation();
     document.addEventListener("resume", onResume, false);
     await addScripts(mobileConfig.version_tag);

package/src/routing/routes/view.js

@@ -148,7 +148,6 @@ export const getView = async (context) => {
   const { viewname } = context.params;
   const view = saltcorn.data.models.View.findOne({ name: viewname });
   if (!view) throw new Error(req.__("No such view: %s", viewname));
-  const res = new MobileResponse();
   if (
     state.mobileConfig.user.role_id > view.min_role &&
     !(await view.authorise_get({ query, req, ...view }))
@@ -158,45 +157,53 @@ export const getView = async (context) => {
       req.__("Not authorized") + additionalInfos
     );
   }
-  state.queriesCache = {};
   let contents0 = null;
-  try {
-    contents0 = await view.run_possibly_on_page(
-      query,
-      req,
-      res,
-      view.isRemoteTable()
-    );
-  } finally {
-    state.queriesCache = null;
+  if (!view.renderLocally()) {
+    const response = await apiCall({
+      method: "GET",
+      path: `/view/${encodeURIComponent(viewname)}${context.query ? `?${context.query}` : ""}`,
+    });
+    const data = response.data;
+    contents0 = data;
+  } else {
+    const res = new MobileResponse();
+    state.queriesCache = {};
+    try {
+      contents0 = await view.run_possibly_on_page(
+        query,
+        req,
+        res,
+        view.isRemoteTable()
+      );
+    } finally {
+      state.queriesCache = null;
+    }
+    const wrapped = res.getWrapHtml();
+    if (wrapped)
+      return await wrapContents(
+        wrapped,
+        res.getWrapViewName() || "viewname",
+        context,
+        req
+      );
   }
-  const wrapped = res.getWrapHtml();
-  if (wrapped)
-    return await wrapContents(
-      wrapped,
-      res.getWrapViewName() || "viewname",
-      context,
-      req
-    );
-  else {
-    const contents =
-      typeof contents0 === "string"
-        ? saltcorn.markup.div(
-            {
-              class: "d-inline",
-              "data-sc-embed-viewname": view.name,
-              "data-sc-view-source": `/view/${context.params.viewname}${
-                context.query
-                  ? context.query.startsWith("?")
-                    ? context.query
-                    : `?${context.query}`
-                  : ""
-              }`,
-            },
-            contents0
-          )
-        : contents0;
+  const contents =
+    typeof contents0 === "string"
+      ? saltcorn.markup.div(
+          {
+            class: "d-inline",
+            "data-sc-embed-viewname": view.name,
+            "data-sc-view-source": `/view/${context.params.viewname}${
+              context.query
+                ? context.query.startsWith("?")
+                  ? context.query
+                  : `?${context.query}`
+                : ""
+            }`,
+          },
+          contents0
+        )
+      : contents0;
 
-    return await wrapContents(contents, viewname, context, req);
-  }
+  return await wrapContents(contents, viewname, context, req);
 };

package/www/index.html

@@ -20,9 +20,6 @@
         document.addEventListener("deviceready", () => {
           saltcorn.mobileApp.init(_sc_mobile_config);
         });
-        document.addEventListener("backbutton", async () => {
-          await saltcorn.mobileApp.navigation.goBack(1, true);
-        });
       } else {
         saltcorn.mobileApp.init(_sc_mobile_config);
       }