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

package/package.json

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

package/www/index.html

@@ -300,6 +300,7 @@
         if (updateNeeded) {
           await updateDb(tablesJSON);
         }
+        await createSyncInfoTables(config.synchedTables);
         await initJwt();
         await state.refresh_tables();
         await state.refresh_views();
@@ -340,7 +341,7 @@
             mobileConfig.isPublicUser = false;
             await i18next.changeLanguage(mobileConfig.language);
             if (mobileConfig.allowOfflineMode) {
-              const { offlineUser, upload_started_at, upload_ended_at } =
+              const { offlineUser } =
                 (await offlineHelper.getLastOfflineSession()) || {};
               if (networkDisabled) {
                 if (offlineUser && offlineUser !== mobileConfig.user_name)
@@ -356,22 +357,22 @@
                 }
               } else if (offlineUser) {
                 if (offlineUser === mobileConfig.user_name) {
-                  if (upload_started_at && !upload_ended_at) {
-                    alerts.push({
-                      type: "warning",
-                      msg: "Please check if your offline data is already online. An upload was started but did not finish.",
-                    });
-                  } else {
-                    alerts.push({
-                      type: "info",
-                      msg: "You have offline data, to handle it open the Network menu.",
-                    });
-                  }
+                  await offlineHelper.sync();
+                  alerts.push({
+                    type: "info",
+                    msg: "Synchronized your offline data.",
+                  });
                 } else
                   alerts.push({
                     type: "warning",
                     msg: `'${offlineUser}' has not yet uploaded offline data.`,
                   });
+              } else {
+                await offlineHelper.sync();
+                alerts.push({
+                  type: "info",
+                  msg: "Synchronized your offline data.",
+                });
               }
             }
             addRoute({ route: entryPoint, query: undefined });

package/www/js/mocks/request.js

@@ -1,15 +1,23 @@
-/*global i18next, saltcorn*/
+/*global i18next, saltcorn, currentLocation*/
 
 function MobileRequest({
   xhr = false,
   files = undefined,
   query = undefined,
+  refererRoute = undefined,
 } = {}) {
   const cfg = saltcorn.data.state.getState().mobileConfig;
   const roleId = cfg.role_id ? cfg.role_id : 100;
   const userId = cfg.user_id ? cfg.user_id : undefined;
   const flashMessages = [];
-
+  const refererPath = refererRoute ? refererRoute.route : undefined;
+  const referQuery =
+    refererPath && refererRoute.query
+      ? refererRoute.query.startsWith("?")
+        ? refererRoute.query
+        : `?${refererRoute.query}`
+      : "";
+  const referer = refererPath ? `${refererPath}${referQuery}` : undefined;
   return {
     __: (s, ...params) =>
       i18next.t(s, {
@@ -41,5 +49,8 @@ function MobileRequest({
     xhr,
     files,
     query,
+    headers: {
+      referer: referer,
+    },
   };
 }

package/www/js/routes/api.js

@@ -27,13 +27,7 @@ const updateTableRow = async (context) => {
     const ins_res = await table.tryUpdateRow(row, id, user);
     if (ins_res.error)
       throw new Error(`Update '${table.name}' error: ${ins_res.error}`);
-    if (
-      mobileConfig.isOfflineMode &&
-      !(await offlineHelper.getLastOfflineSession())
-    )
-      await offlineHelper.setOfflineSession({
-        offlineUser: mobileConfig.user_name,
-      });
+    if (mobileConfig.isOfflineMode) await offlineHelper.setHasOfflineData(true);
     return ins_res;
   } else {
     const response = await apiCall({
@@ -72,13 +66,7 @@ const insertTableRow = async (context) => {
     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,
-      });
+    if (mobileConfig.isOfflineMode) await offlineHelper.setHasOfflineData(true);
     return ins_res;
   } else {
     const response = await apiCall({

package/www/js/routes/common.js

@@ -6,6 +6,7 @@ const getHeaders = () => {
   const stdHeaders = [
     { css: `static_assets/${versionTag}/saltcorn.css` },
     { script: `static_assets/${versionTag}/saltcorn-common.js` },
+    { script: `static_assets/${versionTag}/dayjs.min.js` },
     { script: "js/utils/iframe_view_utils.js" },
   ];
   return [...stdHeaders, ...config.pluginHeaders];
@@ -130,6 +131,7 @@ const wrapContents = (contents, title, context, req) => {
         alerts: prepareAlerts(context, req),
         role: state.mobileConfig.role_id,
         menu: getMenu(req),
+        req,
         headers: getHeaders(),
         brand: {
           name: state.getConfig("site_name") || "Saltcorn",
@@ -141,6 +143,7 @@ const wrapContents = (contents, title, context, req) => {
     : layout().renderBody({
         title: title,
         body: { above: [contents] },
+        req,
         alerts: prepareAlerts(context, req),
         role: state.mobileConfig.role_id,
       });

package/www/js/routes/delete.js

@@ -12,9 +12,11 @@ const deleteRows = async (context) => {
       // TODO 'table.is_owner' check?
     } else
       throw new saltcorn.data.utils.NotAuthorized(i18next.t("Not authorized"));
-    if (isOfflineMode && !(await offlineHelper.hasOfflineRows())) {
-      await offlineHelper.setOfflineSession(null);
-    }
+    if (isOfflineMode && (await offlineHelper.hasOfflineRows()))
+      await offlineHelper.setHasOfflineData(true);
+    // if (isOfflineMode && !(await offlineHelper.hasOfflineRows())) {
+    //   await offlineHelper.setOfflineSession(null);
+    // }
   } else {
     await apiCall({ method: "POST", path: `/delete/${name}/${id}` });
   }

package/www/js/routes/edit.js

@@ -5,14 +5,12 @@ const postToggleField = async (context) => {
   const { name, id, field_name } = context.params;
   const table = await saltcorn.data.models.Table.findOne({ name });
   const state = saltcorn.data.state.getState();
-  const { isOfflineMode, localTableIds, user_name, role_id } =
-    state.mobileConfig;
+  const { isOfflineMode, localTableIds, role_id } = state.mobileConfig;
   if (isOfflineMode || localTableIds.indexOf(table.id) >= 0) {
     if (role_id > table.min_role_write)
       throw new saltcorn.data.utils.NotAuthorized(i18next.t("Not authorized"));
     await table.toggleBool(+id, field_name); //TODO call with user
-    if (isOfflineMode && !(await offlineHelper.getLastOfflineSession()))
-      await offlineHelper.setOfflineSession({ offlineUser: user_name });
+    if (isOfflineMode) await offlineHelper.setHasOfflineData(true);
   } else {
     await apiCall({
       method: "POST",

package/www/js/routes/sync.js

@@ -54,7 +54,7 @@ const getSyncSettingsView = (context) => {
         { class: "col-9" },
         saltcorn.markup.div(
           { class: "fs-6 fw-bold text-decoration-underline" },
-          "Upload offline data"
+          "Sync offline data"
         ),
         saltcorn.markup.div("Upload the data from your last offline session.")
       ),
@@ -64,7 +64,7 @@ const getSyncSettingsView = (context) => {
           {
             class: "btn btn-primary",
             type: "button",
-            onClick: "callUpload()",
+            onClick: "callSync()",
           },
           saltcorn.markup.i({ class: "fas fa-sync" })
         )

package/www/js/routes/view.js

@@ -1,4 +1,4 @@
-/*global MobileRequest, MobileResponse, parseQuery, wrapContents, saltcorn, offlineHelper*/
+/*global MobileRequest, MobileResponse, parseQuery, wrapContents, saltcorn, offlineHelper, routingHistory*/
 
 /**
  *
@@ -35,8 +35,7 @@ const postView = async (context) => {
     },
     view.isRemoteTable()
   );
-  if (mobileCfg.isOfflineMode && !(await offlineHelper.getLastOfflineSession()))
-    await offlineHelper.setOfflineSession({ offlineUser: mobileCfg.user_name });
+  if (mobileCfg.isOfflineMode) await offlineHelper.setHasOfflineData(true);
   return res.getJson();
 };
 
@@ -51,7 +50,7 @@ const postViewRoute = async (context) => {
   const req = new MobileRequest({ xhr: context.xhr });
   const res = new MobileResponse();
   const state = saltcorn.data.state.getState();
-  const { role_id, isOfflineMode, user_name } = state.mobileConfig;
+  const { role_id, isOfflineMode } = state.mobileConfig;
   if (role_id > view.min_role)
     throw new saltcorn.data.utils.NotAuthorized(req.__("Not authorized"));
   await view.runRoute(
@@ -61,8 +60,7 @@ const postViewRoute = async (context) => {
     { req, res },
     view.isRemoteTable()
   );
-  if (isOfflineMode && !(await offlineHelper.getLastOfflineSession()))
-    await offlineHelper.setOfflineSession({ offlineUser: user_name });
+  if (isOfflineMode) await offlineHelper.setHasOfflineData(true);
   return res.getJson();
 };
 
@@ -76,7 +74,11 @@ const getView = async (context) => {
   const query = parseQuery(context.query);
   const { viewname } = context.params;
   const view = saltcorn.data.models.View.findOne({ name: viewname });
-  const req = new MobileRequest({ xhr: context.xhr, query });
+  const refererRoute =
+    routingHistory?.length > 1
+      ? routingHistory[routingHistory.length - 2]
+      : undefined;
+  const req = new MobileRequest({ xhr: context.xhr, query, refererRoute });
   if (
     state.mobileConfig.role_id > view.min_role &&
     !(await view.authorise_get({ query, req, ...view }))

package/www/js/utils/global_utils.js

@@ -189,6 +189,15 @@ async function gotoEntryView() {
   }
 }
 
+function handleOpenModal() {
+  const iframe = document.getElementById("content-iframe");
+  if (!iframe) return false;
+  const openModal = iframe.contentWindow.$("#scmodal.modal.show");
+  if (openModal.length === 0) return;
+  iframe.contentWindow.bootstrap.Modal.getInstance(openModal[0]).hide();
+  return true;
+}
+
 async function handleRoute(route, query, files) {
   const mobileConfig = saltcorn.data.state.getState().mobileConfig;
   try {
@@ -201,7 +210,8 @@ async function handleRoute(route, query, files) {
       clearHistory();
       await gotoEntryView();
     } else {
-      if (route === "/" || route === "get") return await gotoEntryView();
+      if (route === "/" || route === "get" || route === "get/")
+        return await gotoEntryView();
       const safeRoute = route ? route : currentLocation();
       addRoute({ route: safeRoute, query });
       const page = await router.resolve({
@@ -218,6 +228,7 @@ async function handleRoute(route, query, files) {
           : [],
       });
       if (page.redirect) {
+        if (handleOpenModal()) return;
         if (
           page.redirect.startsWith("http://localhost") ||
           page.redirect === "undefined"