@saltcorn/mobile-app 1.3.1-beta.8 → 1.3.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@saltcorn/mobile-app",
   "displayName": "Saltcorn mobile app",
-  "version": "1.3.1-beta.8",
+  "version": "1.3.1",
   "description": "Saltcorn mobile app for Android and iOS",
   "main": "index.js",
   "scripts": {
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "universal-router": "9.2.1",
-    "axios": "^1.7.7",
+    "axios": "^0.29.0",
     "jwt-decode": "4.0.0",
     "i18next": "24.2.2",
     "i18next-sprintf-postprocessor": "0.2.2",

package/src/helpers/auth.js

@@ -19,27 +19,27 @@ async function loginRequest({ email, password, isSignup, isPublic }) {
         path: "/auth/login-with/jwt",
       }
     : isSignup
-    ? {
-        method: "POST",
-        path: "/auth/signup",
-        body: {
-          email,
-          password,
-        },
-      }
-    : {
-        method: "GET",
-        path: "/auth/login-with/jwt",
-        params: {
-          email,
-          password,
-        },
-      };
+      ? {
+          method: "POST",
+          path: "/auth/signup",
+          body: {
+            email,
+            password,
+          },
+        }
+      : {
+          method: "GET",
+          path: "/auth/login-with/jwt",
+          params: {
+            email,
+            password,
+          },
+        };
   const response = await apiCall(opts);
   return response.data;
 }
 
-export async function login({ email, password, entryPoint, isSignup }) {
+export async function login({ email, password, isSignup }) {
   const loginResult = await loginRequest({
     email,
     password,
@@ -48,7 +48,8 @@ export async function login({ email, password, entryPoint, isSignup }) {
   if (typeof loginResult === "string") {
     // use it as a token
     const decodedJwt = jwtDecode(loginResult);
-    const config = saltcorn.data.state.getState().mobileConfig;
+    const state = saltcorn.data.state.getState();
+    const config = state.mobileConfig;
     config.user = decodedJwt.user;
     config.isPublicUser = false;
     config.isOfflineMode = false;
@@ -86,6 +87,16 @@ export async function login({ email, password, entryPoint, isSignup }) {
         sprintf: [config.user.email],
       }),
     });
+
+    let entryPoint = null;
+    if (config.entryPointType === "byrole") {
+      const homepageByRole = state.getConfig("home_page_by_role", {})[
+        config.user.role_id
+      ];
+      if (homepageByRole) entryPoint = `get/page/${homepageByRole}`;
+      else throw new Error("No homepage defined for this role.");
+    } else entryPoint = config.entry_point;
+
     addRoute({ route: entryPoint, query: undefined });
     const page = await router.resolve({
       pathname: entryPoint,

package/src/helpers/offline_mode.js

@@ -224,8 +224,8 @@ const loadOfflineChanges = async (synchedTbls) => {
          from "${saltcorn.data.db.sqlsanitize(
            synchedTbl
          )}_sync_info" as info_tbl left join "${saltcorn.data.db.sqlsanitize(
-        synchedTbl
-      )}" as data_tbl
+           synchedTbl
+         )}" as data_tbl
          on info_tbl.ref = data_tbl."${saltcorn.data.db.sqlsanitize(pkName)}"
          where info_tbl.modified_local = true`
     );
@@ -562,7 +562,7 @@ export async function clearLocalData(inTransaction) {
     const { synchedTables } = saltcorn.data.state.getState().mobileConfig;
     for (const tblName of synchedTables) {
       const table = saltcorn.data.models.Table.findOne({ name: tblName });
-      await table.deleteRows();
+      await table.deleteRows({});
       await saltcorn.data.db.deleteWhere(`${table.name}_sync_info`, {});
     }
     if (!inTransaction) await saltcorn.data.db.query("COMMIT");

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";
 
@@ -59,7 +60,7 @@ async function addScript(scriptObj) {
       if (!scriptObj.name || moduleAvailable()) return resolve();
       waitForModule();
     };
-    script.src = scriptObj.src;
+    script.src = scriptObj.src || scriptObj.script;
   });
 }
 
@@ -117,27 +118,33 @@ const prepareHeader = (header) => {
 /*
   A plugin exports headers either as array, as key values object, or
   as a function with a configuration parameter that returns an Array.
+
+  If mobile_top_scope is set, the script is added to the index.html <head>
+  otherwise it will be added to the iframe headers
 */
-const collectPluginHeaders = (pluginRows) => {
+const handlePluginHeaders = async (plugins) => {
   const config = saltcorn.data.state.getState().mobileConfig;
   config.pluginHeaders = [];
-  for (const row of pluginRows) {
-    const pluginHeaders = saltcorn[row.name].headers;
+
+  const handler = async (header) => {
+    if (header.mobile_top_scope) await addScript(prepareHeader(header));
+    else config.pluginHeaders.push(prepareHeader(header));
+  };
+
+  for (const plugin of plugins) {
+    const pluginHeaders = saltcorn[plugin.name].headers;
     if (pluginHeaders) {
-      if (Array.isArray(pluginHeaders))
-        for (const header of pluginHeaders) {
-          config.pluginHeaders.push(prepareHeader(header));
-        }
-      else if (typeof pluginHeaders === "function") {
-        const headerResult = pluginHeaders(row.configuration || {});
+      if (Array.isArray(pluginHeaders)) {
+        for (const header of pluginHeaders) await handler(header);
+      } else if (typeof pluginHeaders === "function") {
+        const headerResult = pluginHeaders(plugin.configuration || {});
         if (Array.isArray(headerResult)) {
-          for (const header of headerResult)
-            config.pluginHeaders.push(prepareHeader(header));
-        }
-      } else
-        for (const value of Object.values(pluginHeaders)) {
-          config.pluginHeaders.push(prepareHeader(value));
+          for (const header of headerResult) await handler(header);
         }
+      } else {
+        for (const header of Object.values(pluginHeaders))
+          await handler(header);
+      }
     }
   }
 };
@@ -357,6 +364,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);
@@ -373,7 +385,7 @@ export async function init(mobileConfig) {
     state.mobileConfig.user = {};
     state.registerPlugin("base", saltcorn.base_plugin);
     state.registerPlugin("sbadmin2", saltcorn.sbadmin2);
-    collectPluginHeaders(await loadPlugins(state));
+    await handlePluginHeaders(await loadPlugins(state));
     if (updateNeeded) {
       await updateDb(tablesJSON);
     }

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);
       }