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

package/config.xml

@@ -3,6 +3,7 @@
   <name>SaltcornMobileApp</name>
   <description>Apache Cordova application with @saltcorn/markup</description>
   <platform name="android">
+    <preference name="AndroidWindowSplashScreenAnimatedIcon" value="res/screen/android/splash-icon.png"/>
     <icon density="ldpi" foreground="res/icon/android/icon.png" background="res/icon/android/icon.png" />
     <edit-config file="app/src/main/AndroidManifest.xml" target="/manifest/application" mode="merge">
       <application android:usesCleartextTraffic="true"/>
@@ -17,6 +18,7 @@
   </platform>
   <platform name="ios">
     <preference name="deployment-target" value="12.0"/>
+    <splash src="res/screen/ios/Default@2x~universal~anyany.png" />
   </platform>
   <content src="index.html"/>
   <access origin="*"/>

package/package.json

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

package/www/index.html

@@ -292,70 +292,70 @@
 
       // device is ready
       const init = async () => {
-        document.addEventListener("resume", onResume, false);
-        const config = await readJSON(
-          "config",
-          `${cordova.file.applicationDirectory}www`
-        );
-        const { created_at } = await readJSON(
-          "tables_created_at.json",
-          `${cordova.file.applicationDirectory}${"www"}`
-        );
-        let tablesJSON = null;
-        await addScripts(config.version_tag);
-        saltcorn.data.db.connectObj.version_tag = config.version_tag;
-        await saltcorn.data.db.init();
-        const updateNeeded = await dbUpdateNeeded(created_at);
-        if (updateNeeded) {
-          tablesJSON = await readJSON(
-            "tables.json",
+        try {
+          document.addEventListener("resume", onResume, false);
+          const config = await readJSON(
+            "config",
+            `${cordova.file.applicationDirectory}www`
+          );
+          const { created_at } = await readJSON(
+            "tables_created_at.json",
             `${cordova.file.applicationDirectory}${"www"}`
           );
-          // update '_sc_plugins' first because of loadPlugins()
-          await updateScPlugins(tablesJSON);
-        }
-        saltcorn.data.state.features.version_plugin_serve_path = false;
-        const state = saltcorn.data.state.getState();
-        state.mobileConfig = config;
-        state.registerPlugin("base", saltcorn.base_plugin);
-        state.registerPlugin("sbadmin2", saltcorn.sbadmin2);
-        collectPluginHeaders(await loadPlugins(state));
-        if (updateNeeded) {
-          if (!tablesJSON)
+          let tablesJSON = null;
+          await addScripts(config.version_tag);
+          saltcorn.data.db.connectObj.version_tag = config.version_tag;
+          await saltcorn.data.db.init();
+          const updateNeeded = await dbUpdateNeeded(created_at);
+          if (updateNeeded) {
             tablesJSON = await readJSON(
               "tables.json",
               `${cordova.file.applicationDirectory}${"www"}`
             );
-          await updateDb(tablesJSON);
-        }
-        await createSyncInfoTables(config.synchedTables);
-        await initJwt();
-        await state.refresh_tables();
-        await state.refresh_views();
-        await state.refresh_pages();
-        await state.refresh_page_groups();
-        state.mobileConfig.localTableIds = await getTableIds(
-          config.localUserTables
-        );
-        await state.setConfig("base_url", config.server_path);
-        await initRoutes();
-        const entryPoint = config.entry_point;
-        await initI18Next();
-        await readSiteLogo(state);
-        state.mobileConfig.networkState = navigator.connection.type;
-        document.addEventListener(
-          "offline",
-          offlineHelper.offlineCallback,
-          false
-        );
-        document.addEventListener(
-          "online",
-          offlineHelper.onlineCallback,
-          false
-        );
-        const networkDisabled = state.mobileConfig.networkState === "none";
-        const jwt = state.mobileConfig.jwt;
-        try {
+            // update '_sc_plugins' first because of loadPlugins()
+            await updateScPlugins(tablesJSON);
+          }
+          saltcorn.data.state.features.version_plugin_serve_path = false;
+          const state = saltcorn.data.state.getState();
+          state.mobileConfig = config;
+          state.registerPlugin("base", saltcorn.base_plugin);
+          state.registerPlugin("sbadmin2", saltcorn.sbadmin2);
+          collectPluginHeaders(await loadPlugins(state));
+          if (updateNeeded) {
+            if (!tablesJSON)
+              tablesJSON = await readJSON(
+                "tables.json",
+                `${cordova.file.applicationDirectory}${"www"}`
+              );
+            await updateDb(tablesJSON);
+          }
+          await createSyncInfoTables(config.synchedTables);
+          await initJwt();
+          await state.refresh_tables();
+          await state.refresh_views();
+          await state.refresh_pages();
+          await state.refresh_page_groups();
+          state.mobileConfig.localTableIds = await getTableIds(
+            config.localUserTables
+          );
+          await state.setConfig("base_url", config.server_path);
+          await initRoutes();
+          const entryPoint = config.entry_point;
+          await initI18Next();
+          await readSiteLogo(state);
+          state.mobileConfig.networkState = navigator.connection.type;
+          document.addEventListener(
+            "offline",
+            offlineHelper.offlineCallback,
+            false
+          );
+          document.addEventListener(
+            "online",
+            offlineHelper.onlineCallback,
+            false
+          );
+          const networkDisabled = state.mobileConfig.networkState === "none";
+          const jwt = state.mobileConfig.jwt;
           const alerts = [];
           if ((networkDisabled && jwt) || (await checkJWT(jwt))) {
             const mobileConfig = state.mobileConfig;
@@ -445,8 +445,19 @@
             await publicLogin(entryPoint);
           } else await showLogin(alerts);
         } catch (error) {
-          if (error.httpCode === 401) await showLogin([]);
-          else await showErrorPage(error);
+          if (
+            typeof saltcorn === "undefined" ||
+            typeof router === "undefined"
+          ) {
+            const msg = `An error occured: ${
+              error.message ? error.message : "Unknown error"
+            }`;
+            console.log(msg);
+            alert(msg);
+          } else {
+            if (error.httpCode === 401) await showLogin([]);
+            else await showErrorPage(error);
+          }
         }
       };
 

package/www/js/utils/table_utils.js

@@ -21,28 +21,37 @@ async function dropDeletedTables(incomingTables) {
   }
 }
 
+/**
+ * pick fields that really exist
+ * @param {*} table
+ * @param {*} rows
+ * @returns
+ */
+async function safeRows(table, rows) {
+  const existingFields = (
+    await saltcorn.data.db.query(
+      `PRAGMA table_info('${saltcorn.data.db.sqlsanitize(table)}')`
+    )
+  ).rows.map((row) => row.name);
+  return rows.map((row) => {
+    const insertRow = {};
+    for (const safeField of existingFields) {
+      const fromRow = row[safeField];
+      if (fromRow !== null && fromRow !== undefined) {
+        insertRow[safeField] = fromRow;
+      }
+    }
+    return insertRow;
+  });
+}
+
 async function updateScTables(tablesJSON, skipScPlugins = true) {
   await saltcorn.data.db.query("PRAGMA foreign_keys = OFF;");
   for (const { table, rows } of tablesJSON.sc_tables) {
     if (skipScPlugins && table === "_sc_plugins") continue;
     if (table === "_sc_tables") await dropDeletedTables(rows);
     await saltcorn.data.db.deleteWhere(table);
-    const existingFields = (
-      await saltcorn.data.db.query(
-        `PRAGMA table_info('${saltcorn.data.db.sqlsanitize(table)}')`
-      )
-    ).rows.map((row) => row.name);
-    for (const row of rows) {
-      // pick fields that really exist
-      const insertRow = {};
-      for (const safeField of existingFields) {
-        const fromRow = row[safeField];
-        if (fromRow !== null && fromRow !== undefined) {
-          insertRow[safeField] = fromRow;
-        }
-      }
-      await saltcorn.data.db.insert(table, insertRow);
-    }
+    await saltcorn.data.db.insertRows(table, await safeRows(table, rows));
   }
   await saltcorn.data.db.query("PRAGMA foreign_keys = ON;");
 }
@@ -66,18 +75,18 @@ async function updateUserDefinedTables() {
       table.name !== "users" &&
       !existingTables.find((row) => row.name === sanitized)
     ) {
-      // CREATE TABLE without inserting into _sc_tables
-      await saltcorn.data.models.Table.create(table.name, {}, table.id);
-    }
-    const existingFields = (
-      await saltcorn.data.db.query(`PRAGMA table_info('${sanitized}')`)
-    ).rows.map((row) => row.name);
-    for (const field of table.getFields()) {
-      if (
-        existingFields.indexOf(saltcorn.data.db.sqlsanitize(field.name)) < 0
-      ) {
-        // field is new
-        await saltcorn.data.models.Field.create(field, false, field.id);
+      await saltcorn.data.models.Table.createInDb(table);
+    } else {
+      const existingFields = (
+        await saltcorn.data.db.query(`PRAGMA table_info('${sanitized}')`)
+      ).rows.map((row) => row.name);
+      for (const field of table.getFields()) {
+        if (
+          existingFields.indexOf(saltcorn.data.db.sqlsanitize(field.name)) < 0
+        ) {
+          // field is new
+          await saltcorn.data.models.Field.create(field, false, field.id);
+        }
       }
     }
   }