@saltcorn/mobile-app 1.5.0-beta.14 → 1.5.0-beta.15

package/package.json

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

package/src/helpers/auth.js

@@ -69,7 +69,7 @@ const initialSync = async (config) => {
   const alerts = [];
   const { offlineUser, hasOfflineData } = (await getLastOfflineSession()) || {};
   if (!offlineUser || offlineUser === config.user.email) {
-    await sync();
+    await sync(false, alerts);
   } else {
     if (hasOfflineData)
       alerts.push({
@@ -78,7 +78,7 @@ const initialSync = async (config) => {
       });
     else {
       await deleteOfflineData(true);
-      await sync();
+      await sync(false, alerts);
     }
   }
   return alerts;

package/src/helpers/offline_mode.js

@@ -318,6 +318,27 @@ const handleUniqueConflicts = async (uniqueConflicts, translatedIds) => {
   }
 };
 
+const handleUpdateConflicts = async (dataConflicts, alerts) => {
+  let hasConflicts = false;
+  for (const [tblName, updates] of Object.entries(dataConflicts)) {
+    const table = saltcorn.data.models.Table.findOne({ name: tblName });
+    const pkName = table.pk_name || "id";
+    for (const update of updates) {
+      const { [pkName]: _sc_pkValue, ...rest } = update;
+      await table.updateRow(rest, _sc_pkValue);
+      hasConflicts = true;
+    }
+  }
+  if (hasConflicts) {
+    alerts.push({
+      type: "info",
+      msg:
+        "Some of your changes could not be applied because the data has changed on the server. " +
+        "Your local data has been updated accordingly.",
+    });
+  }
+};
+
 const updateSyncInfos = async (
   offlineChanges,
   allTranslations,
@@ -357,7 +378,7 @@ const updateSyncInfos = async (
   }
 };
 
-const syncOfflineData = async (synchedTables, syncTimestamp) => {
+const syncOfflineData = async (synchedTables, syncTimestamp, alerts) => {
   const offlineChanges = await loadOfflineChanges(synchedTables);
   if (Object.keys(offlineChanges).length === 0) return null;
   const uploadResp = await apiCall({
@@ -365,7 +386,8 @@ const syncOfflineData = async (synchedTables, syncTimestamp) => {
     path: "/sync/offline_changes",
     body: {
       changes: offlineChanges,
-      syncTimestamp,
+      oldSyncTimestamp: await getLocalSyncTimestamp(),
+      newSyncTimestamp: syncTimestamp,
     },
   });
   const { syncDir } = uploadResp.data;
@@ -377,10 +399,12 @@ const syncOfflineData = async (synchedTables, syncTimestamp) => {
       path: `/sync/upload_finished?dir_name=${encodeURIComponent(syncDir)}`,
     });
     pollCount++;
-    const { finished, translatedIds, uniqueConflicts, error } = pollResp.data;
+    const { finished, translatedIds, uniqueConflicts, dataConflicts, error } =
+      pollResp.data;
     if (finished) {
       if (error) throw new Error(error.message);
       else {
+        await handleUpdateConflicts(dataConflicts, alerts);
         await handleUniqueConflicts(uniqueConflicts, translatedIds);
         await handleTranslatedIds(uniqueConflicts, translatedIds);
         await updateSyncInfos(offlineChanges, translatedIds, syncTimestamp);
@@ -425,7 +449,7 @@ const checkCleanSync = async (uploadStarted, uploadStartTime, userName) => {
   return false;
 };
 
-const getSyncTimestamp = async () => {
+const getServerTime = async () => {
   const resp = await apiCall({
     method: "GET",
     path: `/sync/sync_timestamp`,
@@ -433,6 +457,16 @@ const getSyncTimestamp = async () => {
   return resp.data.syncTimestamp;
 };
 
+const setLocalSyncTimestamp = async (syncTimestamp) => {
+  const state = saltcorn.data.state.getState();
+  await state.setConfig("mobile_sync_timestamp", syncTimestamp);
+};
+
+const getLocalSyncTimestamp = async () => {
+  const state = saltcorn.data.state.getState();
+  return await state.getConfig("mobile_sync_timestamp");
+};
+
 const setSpinnerText = () => {
   const iframeWindow = $("#content-iframe")[0].contentWindow;
   if (iframeWindow) {
@@ -451,7 +485,7 @@ export async function isSyncInProgress() {
   return syncInProgress;
 }
 
-export async function sync(background = false) {
+export async function sync(background = false, alerts = []) {
   if (syncInProgress)
     throw new Error("A synchronization is already in progress.");
 
@@ -472,7 +506,7 @@ export async function sync(background = false) {
         uploadStartTime,
         user.email
       );
-      const syncTimestamp = await getSyncTimestamp();
+      const syncTimestamp = await getServerTime();
       await setUploadStarted(true, syncTimestamp);
       let lock = null;
       if (!background) {
@@ -492,8 +526,9 @@ export async function sync(background = false) {
         if (cleanSync) await clearLocalData(true);
         const { synchedTables, syncInfos } = await prepare();
         await syncRemoteDeletes(syncInfos, syncTimestamp);
-        syncDir = await syncOfflineData(synchedTables, syncTimestamp);
+        syncDir = await syncOfflineData(synchedTables, syncTimestamp, alerts);
         await syncRemoteData(syncInfos, syncTimestamp);
+        await setLocalSyncTimestamp(syncTimestamp);
         if (!background) await endOfflineMode(true);
         await setUploadStarted(false);
         await saltcorn.data.db.query("COMMIT");
@@ -663,8 +698,10 @@ export function addPushSyncHandler() {
   const state = saltcorn.data.state.getState();
   state.mobile_push_handler["push_sync"] = async (notification) => {
     console.log("Push sync received:", notification);
+    const alerts = [];
     try {
-      await sync(true);
+      await sync(true, alerts);
+      if (alerts.length > 0) showAlerts(alerts);
     } catch (error) {
       console.log("Error during push sync:", error);
     }

package/src/init.js

@@ -472,7 +472,7 @@ export async function init(mobileConfig) {
             }
         } else if (offlineUser) {
           if (offlineUser === mobileConfig.user.email) {
-            await sync();
+            await sync(false, alerts);
             alerts.push({
               type: "info",
               msg: "Synchronized your offline data.",
@@ -483,7 +483,7 @@ export async function init(mobileConfig) {
               msg: `'${offlineUser}' has not yet uploaded offline data.`,
             });
         } else {
-          await sync();
+          await sync(false, alerts);
           alerts.push({
             type: "info",
             msg: "Synchronized your offline data.",
@@ -555,7 +555,7 @@ export async function init(mobileConfig) {
             "Please go online and reload, the public login is not yet supported."
         );
       await publicLogin(getEntryPoint(100, state, state.mobileConfig));
-     } else {
+    } else {
       // open login page
       await showLogin(alerts);
     }

package/www/js/iframe_view_utils.js

@@ -892,15 +892,15 @@ async function callSync() {
     } else {
       const wasOffline = mobileConfig.isOfflineMode;
       showLoadSpinner();
-      await parent.saltcorn.mobileApp.offlineMode.sync();
+      const alerts = [];
+      await parent.saltcorn.mobileApp.offlineMode.sync(false, alerts);
       parent.saltcorn.mobileApp.common.clearAlerts();
       if (!wasOffline) {
-        parent.saltcorn.mobileApp.common.showAlerts([
-          {
-            type: "info",
-            msg: "Synchronized your offline data.",
-          },
-        ]);
+        alerts.push({
+          type: "info",
+          msg: "Synchronized your offline data.",
+        });
+        parent.saltcorn.mobileApp.common.showAlerts(alerts);
       } else {
         setNetworSwitcherOn();
         parent.saltcorn.mobileApp.navigation.clearHistory();
@@ -908,12 +908,11 @@ async function callSync() {
         parent.saltcorn.mobileApp.navigation.addRoute({
           route: "get/sync/sync_settings",
         });
-        parent.saltcorn.mobileApp.common.showAlerts([
-          {
-            type: "info",
-            msg: "Synchronized your offline data, you are online again.",
-          },
-        ]);
+        alerts.push({
+          type: "info",
+          msg: "Synchronized your offline data, you are online again.",
+        });
+        parent.saltcorn.mobileApp.common.showAlerts(alerts);
         parent.saltcorn.mobileApp.common.clearTopAlerts();
       }
     }