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

package/package.json

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

package/www/index.html

@@ -335,6 +335,7 @@
           await state.refresh_views();
           await state.refresh_pages();
           await state.refresh_page_groups();
+          await state.refresh_triggers();
           state.mobileConfig.localTableIds = await getTableIds(
             config.localUserTables
           );

package/www/js/routes/view.js

@@ -138,9 +138,9 @@ const getView = async (context) => {
     );
   }
   state.queriesCache = {};
-  let contents = null;
+  let contents0 = null;
   try {
-    contents = await view.run_possibly_on_page(
+    contents0 = await view.run_possibly_on_page(
       query,
       req,
       res,
@@ -157,5 +157,25 @@ const getView = async (context) => {
       context,
       req
     );
-  else return wrapContents(contents, viewname, context, req);
+  else {
+    const contents =
+      typeof contents0 === "string"
+        ? saltcorn.markup.div(
+            {
+              class: "d-inline",
+              "data-sc-embed-viewname": view.name,
+              "data-sc-view-source": `/view/${context.params.viewname}${
+                context.query
+                  ? context.query.startsWith("?")
+                    ? context.query
+                    : `?${context.query}`
+                  : ""
+              }`,
+            },
+            contents0
+          )
+        : contents0;
+
+    return wrapContents(contents, viewname, context, req);
+  }
 };

package/www/js/utils/global_utils.js

@@ -260,6 +260,15 @@ async function replaceIframeInnerContent(content) {
   iframe.contentWindow.initialize_page();
 }
 
+function clearContentDiv() {
+  const iframe = document.getElementById("content-iframe");
+  if (iframe) {
+    const iframeDocument = iframe.contentWindow.document;
+    const innerContentDiv = iframeDocument.getElementById("page-inner-content");
+    if (innerContentDiv) innerContentDiv.innerHTML = "";
+  }
+}
+
 async function gotoEntryView() {
   const mobileConfig = saltcorn.data.state.getState().mobileConfig;
   try {
@@ -309,6 +318,7 @@ async function handleRoute(route, query, files, data) {
   const mobileConfig = saltcorn.data.state.getState().mobileConfig;
   let routeAdded = false;
   try {
+    clearContentDiv();
     if (
       mobileConfig.networkState === "none" &&
       mobileConfig.allowOfflineMode &&

package/www/js/utils/iframe_view_utils.js

@@ -26,6 +26,7 @@ async function execLink(url, linkSrc) {
     parent.cordova.InAppBrowser.open(url, "_system");
   } else
     try {
+      if (document.getElementById("scspinner")) return;
       showLoadSpinner();
       if (url.startsWith("javascript:")) eval(url.substring(11));
       else {
@@ -47,6 +48,7 @@ async function runUrl(url, method = "get") {
 }
 
 async function execNavbarLink(url) {
+  if (document.getElementById("scspinner")) return;
   $(".navbar-toggler").click();
   if (typeof KTDrawer === "function") {
     const aside = $("#kt_aside")[0];
@@ -572,7 +574,7 @@ async function local_post(url, args) {
       data: args,
     });
     if (result.redirect) await parent.handleRoute(result.redirect);
-    else common_done(result, "", false);
+    else await common_done(result, "", false);
   } catch (error) {
     parent.errorAlert(error);
   } finally {
@@ -590,7 +592,7 @@ async function local_post_json(url, data, cb) {
     });
     if (result.server_eval) await evalServerCode(url);
     if (result.redirect) await parent.handleRoute(result.redirect);
-    else common_done(result, "", false);
+    else await common_done(result, "", false);
     if (cb?.success) cb.success(result);
   } catch (error) {
     parent.errorAlert(error);
@@ -700,7 +702,13 @@ async function clear_state() {
   }
 }
 
-async function view_post(viewname, route, data, onDone, sendState) {
+async function view_post(viewnameOrElem, route, data, onDone, sendState) {
+  const viewname =
+    typeof viewnameOrElem === "string"
+      ? viewnameOrElem
+      : $(viewnameOrElem)
+          .closest("[data-sc-embed-viewname]")
+          .attr("data-sc-embed-viewname");
   const buildQuery = () => {
     const query = parent.currentQuery();
     return query ? `?${query}` : "";
@@ -731,8 +739,8 @@ async function view_post(viewname, route, data, onDone, sendState) {
 
     if (!respData)
       throw new Error(`The response of '${viewname}/${route}' is ${respData}`);
-    if (onDone) onDone(respData);
-    common_done(respData, viewname, false);
+    if (onDone) await onDone(respData);
+    await common_done(respData, viewname, false);
   } catch (error) {
     parent.errorAlert(error);
   } finally {
@@ -892,43 +900,57 @@ async function deleteOfflineData(noFeedback) {
 }
 
 function showLoadSpinner() {
-  if (!parent.isHtmlFile() && $("#scspinner").length === 0) {
-    $("body").append(`
-    <div 
-      id="scspinner" 
-      style="position: fixed;
-        top: 50%;
-        left: 50%;
-        transform: translate(-50%, -50%);
-        z-index: 9999;"
-    >
+  if (!parent.isHtmlFile()) {
+    const spinner = $("#scspinner");
+    if (spinner.length === 0) {
+      $("body").append(`
       <div 
-        style="position: absolute;
-          left: 50%;
+        id="scspinner" 
+        style="position: fixed;
           top: 50%;
-          height: 60px;
-          width: 250px;
-          margin: 0px auto;"
+          left: 50%;
+          transform: translate(-50%, -50%);
+          z-index: 9999;"
+        spinner-count="1"
       >
-        <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"
+        <div 
+          style="position: absolute;
+            left: 50%;
+            top: 50%;
+            height: 60px;
+            width: 250px;
+            margin: 0px auto;"
         >
-        </span>
-      </div>
-    </div>`);
+          <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>`);
+    } else {
+      const count = parseInt(spinner.attr("spinner-count")) + 1;
+      spinner.attr("spinner-count", count);
+    }
   }
 }
 
 function removeLoadSpinner() {
-  if (!parent.isHtmlFile()) $("#scspinner").remove();
+  if (!parent.isHtmlFile()) {
+    const spinner = $("#scspinner");
+    if (spinner.length > 0) {
+      const count = parseInt(spinner.attr("spinner-count")) - 1;
+      if (count === 0) spinner.remove();
+      else spinner.attr("spinner-count", count);
+    }
+  }
 }
 
 /**