@saltcorn/mobile-app 0.9.0-beta.3 → 0.9.0-beta.4

package/package.json

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

package/www/js/utils/iframe_view_utils.js

@@ -853,16 +853,25 @@ function showLoadSpinner() {
         z-index: 9999;"
     >
       <div 
-        class="spinner-border"
-        role="status"
         style="position: absolute;
           left: 50%;
           top: 50%;
-          height:60px;
-          width:60px;
-          margin:0px auto;"
+          height: 60px;
+          width: 250px;
+          margin: 0px auto;"
       >
-        <span class="visually-hidden">Loading...</span>
+        <span 
+          class="spinner-border d-block"
+          role="status"
+        >
+          <span class="visually-hidden">Loading...</span>
+        </span>
+        <span 
+          style="margin-left: -125px"
+          id="scspinner-text-id"
+          class="d-none fs-5 fw-bold bg-secondary text-white p-1 rounded"
+        >
+        </span>
       </div>
     </div>`);
   }

package/www/js/utils/offline_mode_helper.js

@@ -400,8 +400,21 @@ var offlineHelper = (() => {
     return resp.data.syncTimestamp;
   };
 
+  const setSpinnerText = () => {
+    const iframeWindow = $("#content-iframe")[0].contentWindow;
+    if (iframeWindow) {
+      const spinnerText =
+        iframeWindow.document.getElementById("scspinner-text-id");
+      if (spinnerText) {
+        spinnerText.innerHTML = "Syncing, please don't turn off";
+        spinnerText.classList.remove("d-none");
+      }
+    }
+  };
+
   return {
     sync: async () => {
+      setSpinnerText();
       const state = saltcorn.data.state.getState();
       const mobileConfig = state.mobileConfig;
       const { offlineUser, hasOfflineData, uploadStarted, uploadStartTime } =
@@ -425,10 +438,17 @@ var offlineHelper = (() => {
         await setUploadStarted(true, syncTimestamp);
         let lock = null;
         try {
-          if (window.navigator.wakeLock?.request)
+          if (window.navigator?.wakeLock?.request)
             lock = await window.navigator.wakeLock.request();
+        } catch (error) {
+          console.log("wakeLock not available");
+          console.log(error);
+        }
+        let transactionOpen = false;
+        try {
           await saltcorn.data.db.query("PRAGMA foreign_keys = OFF;");
           await saltcorn.data.db.query("BEGIN");
+          transactionOpen = true;
           if (cleanSync) await offlineHelper.clearLocalData(true);
           const { synchedTables, syncInfos } = await prepare();
           await syncRemoteDeletes(syncInfos, syncTimestamp);
@@ -437,9 +457,10 @@ var offlineHelper = (() => {
           await offlineHelper.endOfflineMode(true);
           await setUploadStarted(false);
           await saltcorn.data.db.query("COMMIT");
+          transactionOpen = false;
           await saltcorn.data.db.query("PRAGMA foreign_keys = ON;");
         } catch (error) {
-          await saltcorn.data.db.query("ROLLBACK");
+          if (transactionOpen) await saltcorn.data.db.query("ROLLBACK");
           await saltcorn.data.db.query("PRAGMA foreign_keys = ON;");
           console.log(error);
           throw error;