@saltcorn/mobile-app 0.7.2-beta.9 → 0.7.2

package/package.json

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

package/www/index.html

@@ -7,68 +7,110 @@
     <script src="js/mocks/response.js"></script>
     <script src="js/mocks/request.js"></script>
     <script src="npm_packages/jwt-decode.js"></script>
-    <script src="https://unpkg.com/universal-router/universal-router.min.js"></script>
-    <script src="https://unpkg.com/axios/dist/axios.min.js"></script>
+    <script src="npm_packages/universal-router.min.js"></script>
+    <script src="npm_packages/axios.min.js"></script>
     <script type="module">
       import { initRoutes } from "./js/routes/init.js";
       import { renderLoginForm } from "./js/utils/login_form.js";
       import {
-        updateDbIfNecessary,
+        updateDb,
         getTableIds,
+        dbUpdateNeeded,
+        updateScPlugins,
       } from "./js/utils/table_utils.js";
       import { readJSON } from "./js/utils/file_helpers.js";
 
       const staticPlugins = ["base", "sbadmin2"];
 
-      async function addScript(path) {
+      async function addScript(scriptObj) {
+        let waited = 0;
+        const maxWait = 3000;
+
+        const moduleAvailable = () =>
+          window.saltcorn && window.saltcorn[scriptObj.name];
+
         return new Promise((resolve, reject) => {
           let script = document.createElement("script");
           document.head.appendChild(script);
+
+          const waitForModule = () => {
+            waited += 100;
+            if (waited >= maxWait)
+              return reject(`unable to load '${scriptObj.name}'`);
+            console.log("waiting for " + scriptObj.name);
+            setTimeout(function () {
+              if (moduleAvailable()) return resolve();
+              else waitForModule();
+            }, 100);
+          };
+
           script.onload = () => {
-            resolve();
+            if (!scriptObj.name || moduleAvailable()) return resolve();
+            waitForModule();
           };
-          // TODO reject after some seconds
-          script.src = path;
+          script.src = scriptObj.src;
         });
       }
 
       async function loadPlugin(plugin) {
-        return addScript(`js/bundles/${plugin.name}.bundle.js`);
+        await addScript({
+          src: `js/bundles/${plugin.name}.bundle.js`,
+          name: plugin.name,
+        });
       }
 
       async function loadPlugins(state) {
-        let plugins = (await saltcorn.data.models.Plugin.find()).filter(
+        const plugins = (await saltcorn.data.models.Plugin.find()).filter(
           (plugin) => !staticPlugins.includes(plugin.name)
         );
         for (const plugin of plugins) {
           await loadPlugin(plugin);
-          state.registerPlugin(plugin.name, saltcorn[plugin.name]);
+          state.registerPlugin(
+            plugin.name,
+            saltcorn[plugin.name],
+            plugin.configuration
+          );
         }
         return plugins;
       }
 
       async function addScripts(version_tag) {
         const scripts = [
-          `static_assets/${version_tag}/jquery-3.6.0.min.js`,
-          "js/bundles/common_chunks.bundle.js",
-          "js/bundles/markup.bundle.js",
-          "js/bundles/data.bundle.js",
-          "js/bundles/base_plugin.bundle.js",
-          "js/bundles/sbadmin2.bundle.js",
+          { src: `static_assets/${version_tag}/jquery-3.6.0.min.js` },
+          { src: "js/bundles/common_chunks.bundle.js" },
+          { src: "js/bundles/markup.bundle.js", name: "markup" },
+          { src: "js/bundles/data.bundle.js", name: "data" },
+          { src: "js/bundles/base_plugin.bundle.js", name: "base_plugin" },
+          { src: "js/bundles/sbadmin2.bundle.js", name: "sbadmin2" },
         ];
         for (const script of scripts) {
           await addScript(script);
         }
       }
 
-      const addPluginScriptTagsToCfg = (pluginRows) => {
+      /*
+        A plugin exports headers either as array, as key values object, or
+        as a function with a configuration parameter that returns an Array.
+       */
+      const collectPluginHeaders = (pluginRows) => {
         window.config.pluginHeaders = [];
         for (const row of pluginRows) {
           const pluginHeaders = saltcorn[row.name].headers;
           if (pluginHeaders) {
-            for (const header of pluginHeaders) {
-              window.config.pluginHeaders.push(header);
-            }
+            if (Array.isArray(pluginHeaders))
+              for (const header of pluginHeaders) {
+                window.config.pluginHeaders.push(header);
+              }
+            else if (typeof pluginHeaders === "function") {
+              const headerResult = pluginHeaders(row.configuration);
+              if (Array.isArray(headerResult)) {
+                for (const header of headerResult)
+                  window.config.pluginHeaders.push(header);
+              }
+            } else
+              for (const [key, value] of Object.entries(pluginHeaders)) {
+                window.config.pluginHeaders.push(value);
+              }
           }
         }
       };
@@ -83,13 +125,24 @@
           "config",
           `${cordova.file.applicationDirectory}www`
         );
+        const tablesJSON = await readJSON(
+          "tables.json",
+          `${cordova.file.applicationDirectory}${"www"}`
+        );
         await addScripts(config.version_tag);
         await saltcorn.data.db.init();
+        const updateNeeded = await dbUpdateNeeded(tablesJSON);
+        if (updateNeeded) {
+          // update '_sc_plugins' first because of loadPlugins()
+          await updateScPlugins(tablesJSON);
+        }
         const state = saltcorn.data.state.getState();
         state.registerPlugin("base", saltcorn.base_plugin);
         state.registerPlugin("sbadmin2", saltcorn.sbadmin2);
-        addPluginScriptTagsToCfg(await loadPlugins(state));
-        await updateDbIfNecessary();
+        collectPluginHeaders(await loadPlugins(state));
+        if (updateNeeded) {
+          await updateDb(tablesJSON);
+        }
         await state.refresh_tables();
         await state.refresh_views();
         await state.refresh_pages();

package/www/js/utils/table_utils.js

@@ -1,8 +1,11 @@
 import { fileExists, readJSON, writeJSON } from "./file_helpers.js";
 
-async function updateScTables(tablesJSON) {
+const historyFile = "update_history";
+
+async function updateScTables(tablesJSON, skipScPlugins = true) {
   saltcorn.data.db.query("PRAGMA foreign_keys = OFF;");
   for (const { table, rows } of tablesJSON.sc_tables) {
+    if (skipScPlugins && table === "_sc_plugins") continue;
     await saltcorn.data.db.deleteWhere(table);
     for (const row of rows) {
       await saltcorn.data.db.insert(table, row);
@@ -11,6 +14,16 @@ async function updateScTables(tablesJSON) {
   saltcorn.data.db.query("PRAGMA foreign_keys = ON;");
 }
 
+export async function updateScPlugins(tablesJSON) {
+  const { table, rows } = tablesJSON.sc_tables.find(
+    ({ table }) => table === "_sc_plugins"
+  );
+  await saltcorn.data.db.deleteWhere(table);
+  for (const row of rows) {
+    await saltcorn.data.db.insert(table, row);
+  }
+}
+
 async function handleUserDefinedTables() {
   const tables = await saltcorn.data.models.Table.find();
   const existingTables = await saltcorn.data.db.listUserDefinedTables();
@@ -35,23 +48,20 @@ async function tablesUptodate(tables, historyFile) {
   return tables.created_at.valueOf() < history.updated_at.valueOf();
 }
 
-export async function updateDbIfNecessary() {
-  const historyFile = "update_history";
-  const tablesJSON = await readJSON(
-    "tables.json",
-    `${cordova.file.applicationDirectory}${"www"}`
-  );
-  if (
+export async function dbUpdateNeeded(tablesJSON) {
+  return (
     !(await fileExists(`${cordova.file.dataDirectory}${historyFile}`)) ||
     !(await tablesUptodate(tablesJSON, historyFile))
-  ) {
-    await updateScTables(tablesJSON);
-    await saltcorn.data.state.getState().refresh_tables();
-    await handleUserDefinedTables();
-    await writeJSON(historyFile, cordova.file.dataDirectory, {
-      updated_at: new Date(),
-    });
-  }
+  );
+}
+
+export async function updateDb(tablesJSON) {
+  await updateScTables(tablesJSON);
+  await saltcorn.data.state.getState().refresh_tables();
+  await handleUserDefinedTables();
+  await writeJSON(historyFile, cordova.file.dataDirectory, {
+    updated_at: new Date(),
+  });
 }
 
 export async function getTableIds(tableNames) {