@saltcorn/mobile-app 0.8.7-beta.0 → 0.8.7-beta.2

package/package.json

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

package/www/index.html

@@ -177,6 +177,22 @@
         });
       };
 
+      const readSiteLogo = async (state) => {
+        try {
+          const base64 = await readText(
+            "encoded_site_logo.txt",
+            `${cordova.file.applicationDirectory}www`
+          );
+          state.mobileConfig.encodedSiteLogo = base64;
+        } catch (error) {
+          console.log(
+            `Unable to read the site logo file: ${
+              error.message ? error.message : "Unknown error"
+            }`
+          );
+        }
+      };
+
       // the app comes back from background
       const onResume = async () => {
         if (typeof saltcorn === "undefined") return;
@@ -212,6 +228,21 @@
         }
       };
 
+      const isPublicJwt = (jwt) => {
+        try {
+          if (!jwt) return false;
+          const decoded = jwt_decode(jwt);
+          return decoded.sub === "public";
+        } catch (error) {
+          console.log(
+            `Unable to inspect '${jwt}': ${
+              error.message ? error.message : "Unknown error"
+            }`
+          );
+          return false;
+        }
+      };
+
       // device is ready
       const init = async () => {
         document.addEventListener("resume", onResume, false);
@@ -252,6 +283,7 @@
         setVersionTtag();
         const entryPoint = config.entry_point;
         await initI18Next();
+        await readSiteLogo(state);
         state.mobileConfig.networkState = navigator.connection.type;
         document.addEventListener(
           "offline",
@@ -320,6 +352,20 @@
               alerts,
             });
             await replaceIframe(page.content);
+          } else if (isPublicJwt(jwt)) {
+            const config = state.mobileConfig;
+            config.role_id = 100;
+            config.user_name = "public";
+            config.language = "en";
+            config.isPublicUser = true;
+            i18next.changeLanguage(config.language);
+            addRoute({ route: entryPoint, query: undefined });
+            const page = await router.resolve({
+              pathname: entryPoint,
+              fullWrap: true,
+              alerts,
+            });
+            await replaceIframe(page.content);
           } else {
             const page = await router.resolve({
               pathname: "get/auth/login",

package/www/js/mocks/response.js

@@ -19,7 +19,7 @@ function MobileResponse() {
   }
 
   function getSendData() {
-    return getSendData;
+    return sendData;
   }
 
   return {

package/www/js/routes/api.js

@@ -1,4 +1,4 @@
-/*global saltcorn, apiCall*/
+/*global saltcorn, apiCall, MobileRequest, offlineHelper*/
 
 // post/api/:tableName/:id
 const updateTableRow = async (context) => {
@@ -26,8 +26,15 @@ const updateTableRow = async (context) => {
     if (errors.length > 0) throw new Error(errors.join(", "));
     const ins_res = await table.tryUpdateRow(row, id, user);
     if (ins_res.error)
-      throw new Error(`Update ${table.name} error: ${ins_res.error}`);
-    return { ins_res };
+      throw new Error(`Update '${table.name}' error: ${ins_res.error}`);
+    if (
+      mobileConfig.isOfflineMode &&
+      !(await offlineHelper.getLastOfflineSession())
+    )
+      await offlineHelper.setOfflineSession({
+        offlineUser: mobileConfig.user_name,
+      });
+    return ins_res;
   } else {
     const response = await apiCall({
       method: "POST",
@@ -37,3 +44,48 @@ const updateTableRow = async (context) => {
     return response.data;
   }
 };
+
+// post/api/:tableName
+const insertTableRow = async (context) => {
+  const { tableName } = context.params;
+  const table = saltcorn.data.models.Table.findOne({ name: tableName });
+  const mobileConfig = saltcorn.data.state.getState().mobileConfig;
+  const user = {
+    id: mobileConfig.user_id,
+    role_id: mobileConfig.role_id || 100,
+  };
+  if (!table) throw new Error(`The table '${tableName}' does not exist.`);
+  if (
+    mobileConfig.isOfflineMode ||
+    mobileConfig.localTableIds.indexOf(table.id) >= 0
+  ) {
+    const row = {};
+    for (const [k, v] of new URLSearchParams(context.query).entries()) {
+      row[k] = v;
+    }
+    const errors = await saltcorn.data.web_mobile_commons.prepare_insert_row(
+      row,
+      table.getFields()
+    );
+    if (errors.length > 0) throw new Error(errors.join(", "));
+    const ins_res = await table.tryInsertRow(row, user);
+    if (ins_res.error) {
+      throw new Error(`Insert '${table.name}' error: ${ins_res.error}`);
+    }
+    if (
+      mobileConfig.isOfflineMode &&
+      !(await offlineHelper.getLastOfflineSession())
+    )
+      await offlineHelper.setOfflineSession({
+        offlineUser: mobileConfig.user_name,
+      });
+    return ins_res;
+  } else {
+    const response = await apiCall({
+      method: "POST",
+      path: `/api/${tableName}`,
+      body: context.query,
+    });
+    return response.data;
+  }
+};

package/www/js/routes/common.js

@@ -131,8 +131,10 @@ const wrapContents = (contents, title, context, req) => {
         role: state.mobileConfig.role_id,
         menu: getMenu(req),
         headers: getHeaders(),
-        // TODO logo as BASE 64 image
-        brand: { name: state.getConfig("site_name") || "Saltcorn" },
+        brand: {
+          name: state.getConfig("site_name") || "Saltcorn",
+          logo: state.mobileConfig.encodedSiteLogo,
+        },
         bodyClass: "",
         currentUrl: "",
       })

package/www/js/routes/init.js

@@ -1,4 +1,4 @@
-/*global postView, postViewRoute, getView, postToggleField, deleteRows, postPageAction, getPage, getLoginView, logoutAction, getSignupView, getErrorView, window, getSyncSettingsView, getAskDeleteOfflineData, getAskUploadNotEnded, updateTableRow */
+/*global postView, postViewRoute, getView, postToggleField, deleteRows, postPageAction, getPage, getLoginView, logoutAction, getSignupView, getErrorView, window, getSyncSettingsView, getAskDeleteOfflineData, getAskUploadNotEnded, updateTableRow, insertTableRow */
 // TODO module namespacese
 
 const initRoutes = async () => {
@@ -19,6 +19,10 @@ const initRoutes = async () => {
       path: "post/api/:tableName/:id",
       action: updateTableRow,
     },
+    {
+      path: "post/api/:tableName/",
+      action: insertTableRow,
+    },
     {
       path: "post/edit/toggle/:name/:id/:field_name",
       action: postToggleField,

package/www/js/utils/file_helpers.js

@@ -24,6 +24,11 @@ function getDirEntry(directory) {
 }
 
 async function readJSON(fileName, dirName) {
+  const text = await readText(fileName, dirName);
+  return JSON.parse(text);
+}
+
+async function readText(fileName, dirName) {
   const dirEntry = await getDirEntry(dirName);
   return new Promise((resolve, reject) => {
     dirEntry.getFile(
@@ -33,7 +38,7 @@ async function readJSON(fileName, dirName) {
         fileEntry.file(function (file) {
           let reader = new FileReader();
           reader.onloadend = function (e) {
-            resolve(JSON.parse(this.result));
+            resolve(this.result);
           };
           reader.readAsText(file);
         });

package/www/js/utils/global_utils.js

@@ -201,7 +201,7 @@ async function handleRoute(route, query, files) {
       clearHistory();
       await gotoEntryView();
     } else {
-      if (route === "/") return await gotoEntryView();
+      if (route === "/" || route === "get") return await gotoEntryView();
       const safeRoute = route ? route : currentLocation();
       addRoute({ route: safeRoute, query });
       const page = await router.resolve({

package/www/js/utils/iframe_view_utils.js

@@ -213,6 +213,7 @@ async function publicLogin(entryPoint) {
       await parent.setJwt(loginResult);
       config.jwt = loginResult;
       parent.i18next.changeLanguage(config.language);
+      parent.addRoute({ route: entryPoint, query: undefined });
       const page = await parent.router.resolve({
         pathname: entryPoint,
         fullWrap: true,
@@ -530,19 +531,6 @@ async function make_unique_field(
   }
 }
 
-async function buildEncodedImage(fileId, elementId) {
-  const base64Encoded = await parent.loadEncodedFile(fileId);
-  document.getElementById(elementId).src = base64Encoded;
-}
-
-async function buildEncodedBgImage(fileId, elementId) {
-  const base64Encoded = await parent.loadEncodedFile(fileId);
-  // ensure that not unique IDs work, but should not happen
-  $(`#${elementId}`).each(function () {
-    $(this).prev()[0].style.backgroundImage = `url("${base64Encoded}")`;
-  });
-}
-
 function openFile(fileId) {
   // TODO fileIds with whitespaces do not work
   const config = parent.saltcorn.data.state.getState().mobileConfig;
@@ -574,14 +562,31 @@ async function clear_state() {
 }
 
 async function view_post(viewname, route, data, onDone) {
+  const mobileConfig = parent.saltcorn.data.state.getState().mobileConfig;
+  const view = parent.saltcorn.data.models.View.findOne({ name: viewname });
   try {
-    const response = await parent.apiCall({
-      method: "POST",
-      path: "/view/" + viewname + "/" + route,
-      body: data,
-    });
-    if (onDone) onDone(response.data);
-    common_done(response.data);
+    let respData = undefined;
+    if (
+      mobileConfig.isOfflineMode ||
+      (view?.table_id && mobileConfig.localTableIds.indexOf(view.table_id) >= 0)
+    ) {
+      respData = await parent.router.resolve({
+        pathname: `post/view/${viewname}/${route}`,
+        data,
+      });
+    } else {
+      const response = await parent.apiCall({
+        method: "POST",
+        path: "/view/" + viewname + "/" + route,
+        body: data,
+      });
+      if (response) respData = response.data;
+    }
+
+    if (!respData)
+      throw new Error(`The response of '${viewname}/${route}' is ${respData}`);
+    if (onDone) onDone(respData);
+    common_done(respData);
   } catch (error) {
     parent.errorAlert(error);
   }