@saltcorn/mobile-app 1.3.0-beta.1 → 1.3.0-beta.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@saltcorn/mobile-app",
   "displayName": "Saltcorn mobile app",
-  "version": "1.3.0-beta.1",
+  "version": "1.3.0-beta.3",
   "description": "Saltcorn mobile app for Android and iOS",
   "main": "index.js",
   "scripts": {
@@ -21,7 +21,10 @@
     "axios": "^1.7.7",
     "jwt-decode": "4.0.0",
     "i18next": "24.2.2",
-    "i18next-sprintf-postprocessor": "0.2.2"
+    "i18next-sprintf-postprocessor": "0.2.2",
+    "crypto-browserify": "3.12.1",
+    "vm-browserify": "1.1.2",
+    "stream-browserify": "3.0.0"
   },
   "devDependencies": {
     "xml2js": "0.6.2",

package/src/helpers/navigation.js

@@ -333,6 +333,7 @@ export async function replaceIframeInnerContent(content) {
   }
   iframe.contentWindow.scrollTo(0, 0);
   iframe.contentWindow.initialize_page();
+  iframeDocument.dispatchEvent(new Event("mobile-loaded"));
 }
 
 export function splitPathQuery(url) {

package/src/init.js

@@ -1,4 +1,4 @@
-/*global saltcorn, Capacitor, cordova */
+/*global saltcorn, Capacitor, cordova, _test_schema_ */
 
 import {
   startOfflineMode,
@@ -31,6 +31,8 @@ import { jwtDecode } from "jwt-decode";
 
 import { Network } from "@capacitor/network";
 
+import { defineCustomElements } from "jeep-sqlite/loader";
+
 async function addScript(scriptObj) {
   let waited = 0;
   const maxWait = 3000;
@@ -162,13 +164,15 @@ const initI18Next = async () => {
   for (const key of Object.keys(
     saltcorn.data.models.config.available_languages
   )) {
-    const localeFile = await readJSONCordova(
-      `${key}.json`,
-      `${cordova.file.applicationDirectory}public/data/locales`
-    );
-    resources[key] = {
-      translation: localeFile,
-    };
+    if (Capacitor.platform !== "web") {
+      const localeFile = await readJSONCordova(
+        `${key}.json`,
+        `${cordova.file.applicationDirectory}public/data/locales`
+      );
+      resources[key] = {
+        translation: localeFile,
+      };
+    }
   }
   await i18next.use(i18nextSprintfPostProcessor).init({
     lng: "en",
@@ -305,22 +309,28 @@ const postShare = async (shareData) => {
 };
 
 const readSchemaIfNeeded = async () => {
-  let tablesJSON = null;
-  const { created_at } = await readJSONCordova(
-    "tables_created_at.json",
-    `${cordova.file.applicationDirectory}${"public"}/data`
-  );
-  const updateNeeded = await dbUpdateNeeded(created_at);
-  if (updateNeeded) {
-    tablesJSON = await readJSONCordova(
-      "tables.json",
+  if (Capacitor.platform !== "web") {
+    let tablesJSON = null;
+    const { created_at } = await readJSONCordova(
+      "tables_created_at.json",
       `${cordova.file.applicationDirectory}${"public"}/data`
     );
+    const updateNeeded = await dbUpdateNeeded(created_at);
+    if (updateNeeded) {
+      tablesJSON = await readJSONCordova(
+        "tables.json",
+        `${cordova.file.applicationDirectory}${"public"}/data`
+      );
+    }
+    return { updateNeeded, tablesJSON };
+  } else {
+    // test environment
+    return { updateNeeded: true, tablesJSON: _test_schema_ };
   }
-  return { updateNeeded, tablesJSON };
 };
 
 const readSiteLogo = async (state) => {
+  if (Capacitor.platform === "web") return "";
   try {
     const base64 = await readTextCordova(
       "encoded_site_logo.txt",
@@ -340,6 +350,13 @@ const readSiteLogo = async (state) => {
 // device is ready
 export async function init(mobileConfig) {
   try {
+    if (Capacitor.platform === "web") {
+      defineCustomElements(window);
+      await customElements.whenDefined("jeep-sqlite");
+      const jeepSqlite = document.createElement("jeep-sqlite");
+      document.body.appendChild(jeepSqlite);
+      await jeepSqlite.componentOnReady();
+    }
     const lastLocation = takeLastLocation();
     document.addEventListener("resume", onResume, false);
     await addScripts(mobileConfig.version_tag);

package/src/routing/index.js

@@ -1,6 +1,11 @@
 import UniversalRouter from "universal-router";
 
-import { updateTableRow, insertTableRow } from "./routes/api";
+import {
+  runAction,
+  loadTableRows,
+  updateTableRow,
+  insertTableRow,
+} from "./routes/api";
 import { getLoginView, logoutAction, getSignupView } from "./routes/auth";
 import { deleteRows } from "./routes/delete";
 import { postToggleField } from "./routes/edit";
@@ -22,14 +27,28 @@ import {
 
 const routes = [
   // api
+  {
+    path: "post/api/action/:action",
+    action: runAction,
+  },
+  {
+    path: "get/api/:tableName",
+    action: loadTableRows,
+  },
   {
     path: "post/api/:tableName/:id",
     action: updateTableRow,
   },
+
   {
     path: "post/api/:tableName/",
     action: insertTableRow,
   },
+  {
+    path: "post/api/:tableName",
+    action: insertTableRow,
+  },
+
   // auth
   {
     path: "get/auth/login",
@@ -44,10 +63,16 @@ const routes = [
     action: getSignupView,
   },
   // delete
+  
+  {
+    path: "post/delete/:tableName/:id", // legacy
+    action: deleteRows,
+  },
   {
-    path: "post/delete/:name/:id",
+    path: "delete/api/:tableName/:id",
     action: deleteRows,
   },
+  
   // edit
   {
     path: "post/edit/toggle/:name/:id/:field_name",

package/src/routing/routes/api.js

@@ -1,7 +1,36 @@
-/*global saltcorn */
+/* global saltcorn */
 
 import { apiCall } from "../../helpers/api";
 import { setHasOfflineData } from "../../helpers/offline_mode";
+import { parseQuery } from "../utils";
+import { MobileRequest } from "../mocks/request";
+
+// get/api/:tableName
+export const loadTableRows = async (context) => {
+  const { tableName } = context.params;
+  const queryString = context.query;
+  const query = queryString ? parseQuery(queryString) : {};
+
+  const mobileConfig = saltcorn.data.state.getState().mobileConfig;
+  const table = saltcorn.data.models.Table.findOne({ name: tableName });
+  if (!table) throw new Error(`The table '${tableName}' does not exist.`);
+  if (
+    mobileConfig.isOfflineMode ||
+    mobileConfig.localTableIds.indexOf(table.id) >= 0
+  ) {
+    const rows = await table.getRows(query, {
+      orderBy: table.pk_name,
+      forUser: mobileConfig.user,
+    });
+    return { success: rows };
+  } else {
+    const response = await apiCall({
+      method: "GET",
+      path: `/api/${tableName}${queryString ? `?${queryString}` : ""}`,
+    });
+    return response.data;
+  }
+};
 
 // post/api/:tableName/:id
 export const updateTableRow = async (context) => {
@@ -32,7 +61,7 @@ export const updateTableRow = async (context) => {
     const response = await apiCall({
       method: "POST",
       path: `/api/${tableName}/${id}`,
-      body: context.query,
+      body: context.body || context.query,
     });
     return response.data;
   }
@@ -67,8 +96,43 @@ export const insertTableRow = async (context) => {
     const response = await apiCall({
       method: "POST",
       path: `/api/${tableName}`,
-      body: context.query,
+      body: context.body || context.query,
+    });
+    return response.data;
+  }
+};
+
+// post/api/:action
+export const runAction = async (context) => {
+  const { action } = context.params;
+  const mobileConfig = saltcorn.data.state.getState().mobileConfig;
+  if (mobileConfig.isOfflineMode) {
+    const req = new MobileRequest();
+    const trigger = saltcorn.data.models.Trigger.findOne({
+      name: action,
+    });
+    if (!trigger) throw new Error(`Action '${action}' does not exist.`);
+    const actionObj = saltcorn.data.state.getState().actions[trigger.action];
+    const resp = await actionObj.run({
+      configuration: trigger.configuration,
+      body: context.body || {},
+      row: context.body || {},
+      req,
+      user: req.user,
     });
+    if (resp?.error) {
+      const { error, ...rest } = resp;
+      return { success: false, error, data: rest };
+    } else return { success: true, data: resp };
+  } else {
+    const response = await apiCall({
+      method: "POST",
+      path: `/api/action/${action}`,
+      body: context.body,
+    });
+    if (response.success === false) {
+      throw new Error(`Action '${action}' failed: ${response.error}`);
+    }
     return response.data;
   }
 };

package/src/routing/routes/delete.js

@@ -5,8 +5,8 @@ import i18next from "i18next";
 
 // post/delete/:name/:id
 export const deleteRows = async (context) => {
-  const { name, id } = context.params;
-  const table = await saltcorn.data.models.Table.findOne({ name });
+  const { tableName, id } = context.params;
+  const table = await saltcorn.data.models.Table.findOne({ name: tableName });
   const { isOfflineMode, localTableIds, user } =
     saltcorn.data.state.getState().mobileConfig;
   if (isOfflineMode || localTableIds.indexOf(table.id) >= 0) {
@@ -21,7 +21,7 @@ export const deleteRows = async (context) => {
     //   await offlineHelper.setOfflineSession(null);
     // }
   } else {
-    await apiCall({ method: "POST", path: `/delete/${name}/${id}` });
+    await apiCall({ method: "POST", path: `/delete/${tableName}/${id}` });
   }
   const redirect = context.data?.after_delete_url
     ? context.data.after_delete_url === "/"

package/webpack.config.js

@@ -37,6 +37,14 @@ module.exports = {
       },
     ],
   },
+  resolve: {
+    fallback: {
+      "crypto": require.resolve("crypto-browserify"),
+      vm: require.resolve("vm-browserify"),
+      stream: require.resolve("stream-browserify"),
+
+    }
+  },
   target: "web", // Use web target for browser compatibility
   mode: "development",
 };

package/www/index.html

@@ -6,6 +6,8 @@
       content="width=device-width, initial-scale=1, maximum-scale=1"
     />
     <script src="data/config.js"></script>
+    <!-- only set in test mode -->
+    <script src="data/test_schema.js"></script>
     <script type="module" src="./dist/bundle.js"></script>
     <script src="js/iframe_view_utils.js"></script>
 
@@ -14,12 +16,16 @@
       if (window.saltcorn) window.saltcorn.mobileApp = mobileApp;
       else window.saltcorn = { mobileApp };
 
-      document.addEventListener("deviceready", () => {
+      if (Capacitor.platform !== "web") {
+        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);
-      });
-      document.addEventListener("backbutton", async () => {
-        await saltcorn.mobileApp.navigation.goBack(1, true);
-      });
+      }
     </script>
   </head>