@saltcorn/mobile-app 0.9.0-beta.6 → 0.9.0-beta.7

package/package.json

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

package/www/index.html

@@ -22,6 +22,7 @@
     <script src="js/routes/error.js"></script>
     <script src="js/routes/page.js"></script>
     <script src="js/routes/view.js"></script>
+    <script src="js/routes/fields.js"></script>
     <script src="js/routes/sync.js"></script>
     <script src="js/routes/init.js"></script>
 

package/www/js/mocks/request.js

@@ -4,6 +4,7 @@ function MobileRequest({
   xhr = false,
   files = undefined,
   query = undefined,
+  body = undefined,
   refererRoute = undefined,
 } = {}) {
   const cfg = saltcorn.data.state.getState().mobileConfig;
@@ -54,6 +55,7 @@ function MobileRequest({
     xhr,
     files,
     query,
+    body,
     headers: {
       referer: referer,
     },

package/www/js/mocks/response.js

@@ -40,6 +40,7 @@ function MobileResponse() {
 
   function status(value) {
     resStatus = value;
+    return this;
   }
 
   function getStatus() {

package/www/js/routes/fields.js

@@ -0,0 +1,31 @@
+/*global saltcorn, apiCall, MobileRequest, MobileResponse, offlineHelper, parseQuery */
+
+const postShowCalculated = async (context) => {
+  const { tableName, fieldName, fieldview } = context.params;
+  const mobileConfig = saltcorn.data.state.getState().mobileConfig;
+  const table = saltcorn.data.models.Table.findOne({ name: tableName });
+  if (!table) throw new Error(`The table '${tableName}' does not exist.`);
+  if (
+    mobileConfig.isOfflineMode ||
+    mobileConfig.localTableIds.indexOf(table.id) >= 0
+  ) {
+    const req = new MobileRequest({
+      query: context.query ? parseQuery(context.query) : {},
+      body: context.data || {},
+    });
+    const res = new MobileResponse();
+    await saltcorn.data.web_mobile_commons.show_calculated_fieldview(req, res, {
+      tableName,
+      fieldName,
+      fieldview,
+    });
+    return res.getSendData();
+  } else {
+    const response = await apiCall({
+      method: "POST",
+      path: `/field/show-calculated/${tableName}/${fieldName}/${fieldview}`,
+      body: context.data || {},
+    });
+    return response.data;
+  }
+};

package/www/js/routes/init.js

@@ -1,4 +1,4 @@
-/*global postView, postViewRoute, getView, postToggleField, deleteRows, postPageAction, getPage, getLoginView, logoutAction, getSignupView, getErrorView, window, getSyncSettingsView, getAskDeleteOfflineData, getAskUploadNotEnded, updateTableRow, insertTableRow */
+/*global postView, postViewRoute, getView, postToggleField, deleteRows, postPageAction, getPage, getLoginView, logoutAction, getSignupView, getErrorView, window, getSyncSettingsView, getAskDeleteOfflineData, getAskUploadNotEnded, updateTableRow, insertTableRow, postShowCalculated */
 // TODO module namespacese
 
 const initRoutes = async () => {
@@ -67,6 +67,10 @@ const initRoutes = async () => {
       path: "get/sync/ask_delete_offline_data",
       action: getAskDeleteOfflineData,
     },
+    {
+      path: "post/field/show-calculated/:tableName/:fieldName/:fieldview",
+      action: postShowCalculated,
+    },
   ];
   window.router = new window.UniversalRouter(routes);
 };

package/www/js/utils/global_utils.js

@@ -4,7 +4,11 @@ let routingHistory = [];
 
 function currentLocation() {
   if (routingHistory.length == 0) return undefined;
-  return routingHistory[routingHistory.length - 1].route;
+  let index = routingHistory.length - 1;
+  while (index > 0 && routingHistory[index].route.startsWith("post/")) {
+    index--;
+  }
+  return routingHistory[index].route;
 }
 
 function currentQuery() {
@@ -210,12 +214,15 @@ async function gotoEntryView() {
 }
 
 function handleOpenModal() {
+  const result = { moddalWasOpen: false, noSubmitReload: false };
   const iframe = document.getElementById("content-iframe");
-  if (!iframe) return false;
+  if (!iframe) return result;
   const openModal = iframe.contentWindow.$("#scmodal.modal.show");
-  if (openModal.length === 0) return;
+  if (openModal.length === 0) return result;
+  result.moddalWasOpen = true;
   iframe.contentWindow.bootstrap.Modal.getInstance(openModal[0]).hide();
-  return true;
+  result.noSubmitReload = openModal[0].classList.contains("no-submit-reload");
+  return result;
 }
 
 async function handleRoute(route, query, files, data) {
@@ -242,7 +249,11 @@ async function handleRoute(route, query, files, data) {
         alerts: [],
       });
       if (page.redirect) {
-        if (handleOpenModal()) return;
+        const { moddalWasOpen, noSubmitReload } = handleOpenModal();
+        if (moddalWasOpen) {
+          if (noSubmitReload) return;
+          else return await reload();
+        }
         if (
           page.redirect.startsWith("http://localhost") ||
           page.redirect === "undefined"

package/www/js/utils/iframe_view_utils.js

@@ -479,9 +479,10 @@ async function mobile_modal(url, opts = {}) {
     var modal = bootstrap.Modal.getInstance(myModalEl);
     modal.dispose();
   }
+  if (opts.submitReload === false) $("#scmodal").addClass("no-submit-reload");
+  else $("#scmodal").removeClass("no-submit-reload");
   try {
     const { path, query } = parent.splitPathQuery(url);
-    // submitReload ?
     const mobileConfig = parent.saltcorn.data.state.getState().mobileConfig;
     if (
       mobileConfig.networkState === "none" &&
@@ -534,17 +535,21 @@ async function local_post(url, args) {
   }
 }
 
-async function local_post_json(url) {
+async function local_post_json(url, data, cb) {
   try {
     showLoadSpinner();
     const result = await parent.router.resolve({
       pathname: `post${url}`,
+      data: data,
+      query: parent.currentQuery(),
     });
     if (result.server_eval) await evalServerCode(url);
     if (result.redirect) await parent.handleRoute(result.redirect);
     else common_done(result, "", false);
+    if (cb?.success) cb.success(result);
   } catch (error) {
     parent.errorAlert(error);
+    if (cb?.error) cb.error(error);
   } finally {
     removeLoadSpinner();
   }