@saltcorn/mobile-app 0.8.7 → 0.8.8-beta.1

package/package.json

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

package/www/js/mocks/request.js

@@ -1,15 +1,23 @@
-/*global i18next, saltcorn*/
+/*global i18next, saltcorn, currentLocation*/
 
 function MobileRequest({
   xhr = false,
   files = undefined,
   query = undefined,
+  refererRoute = undefined,
 } = {}) {
   const cfg = saltcorn.data.state.getState().mobileConfig;
   const roleId = cfg.role_id ? cfg.role_id : 100;
   const userId = cfg.user_id ? cfg.user_id : undefined;
   const flashMessages = [];
-
+  const refererPath = refererRoute ? refererRoute.route : undefined;
+  const referQuery =
+    refererPath && refererRoute.query
+      ? refererRoute.query.startsWith("?")
+        ? refererRoute.query
+        : `?${refererRoute.query}`
+      : "";
+  const referer = refererPath ? `${refererPath}${referQuery}` : undefined;
   return {
     __: (s, ...params) =>
       i18next.t(s, {
@@ -41,5 +49,8 @@ function MobileRequest({
     xhr,
     files,
     query,
+    headers: {
+      referer: referer,
+    },
   };
 }

package/www/js/routes/common.js

@@ -6,6 +6,7 @@ const getHeaders = () => {
   const stdHeaders = [
     { css: `static_assets/${versionTag}/saltcorn.css` },
     { script: `static_assets/${versionTag}/saltcorn-common.js` },
+    { script: `static_assets/${versionTag}/dayjs.min.js` },
     { script: "js/utils/iframe_view_utils.js" },
   ];
   return [...stdHeaders, ...config.pluginHeaders];

package/www/js/routes/edit.js

@@ -10,7 +10,7 @@ const postToggleField = async (context) => {
   if (isOfflineMode || localTableIds.indexOf(table.id) >= 0) {
     if (role_id > table.min_role_write)
       throw new saltcorn.data.utils.NotAuthorized(i18next.t("Not authorized"));
-    await table.toggleBool(+id, field_name);
+    await table.toggleBool(+id, field_name); //TODO call with user
     if (isOfflineMode && !(await offlineHelper.getLastOfflineSession()))
       await offlineHelper.setOfflineSession({ offlineUser: user_name });
   } else {

package/www/js/routes/view.js

@@ -1,4 +1,4 @@
-/*global MobileRequest, MobileResponse, parseQuery, wrapContents, saltcorn, offlineHelper*/
+/*global MobileRequest, MobileResponse, parseQuery, wrapContents, saltcorn, offlineHelper, routingHistory*/
 
 /**
  *
@@ -76,7 +76,11 @@ const getView = async (context) => {
   const query = parseQuery(context.query);
   const { viewname } = context.params;
   const view = saltcorn.data.models.View.findOne({ name: viewname });
-  const req = new MobileRequest({ xhr: context.xhr, query });
+  const refererRoute =
+    routingHistory?.length > 1
+      ? routingHistory[routingHistory.length - 2]
+      : undefined;
+  const req = new MobileRequest({ xhr: context.xhr, query, refererRoute });
   if (
     state.mobileConfig.role_id > view.min_role &&
     !(await view.authorise_get({ query, req, ...view }))

package/www/js/utils/global_utils.js

@@ -189,6 +189,15 @@ async function gotoEntryView() {
   }
 }
 
+function handleOpenModal() {
+  const iframe = document.getElementById("content-iframe");
+  if (!iframe) return false;
+  const openModal = iframe.contentWindow.$("#scmodal.modal.show");
+  if (openModal.length === 0) return;
+  iframe.contentWindow.bootstrap.Modal.getInstance(openModal[0]).hide();
+  return true;
+}
+
 async function handleRoute(route, query, files) {
   const mobileConfig = saltcorn.data.state.getState().mobileConfig;
   try {
@@ -201,7 +210,8 @@ async function handleRoute(route, query, files) {
       clearHistory();
       await gotoEntryView();
     } else {
-      if (route === "/" || route === "get") return await gotoEntryView();
+      if (route === "/" || route === "get" || route === "get/")
+        return await gotoEntryView();
       const safeRoute = route ? route : currentLocation();
       addRoute({ route: safeRoute, query });
       const page = await router.resolve({
@@ -218,6 +228,7 @@ async function handleRoute(route, query, files) {
           : [],
       });
       if (page.redirect) {
+        if (handleOpenModal()) return;
         if (
           page.redirect.startsWith("http://localhost") ||
           page.redirect === "undefined"

package/www/js/utils/iframe_view_utils.js

@@ -20,8 +20,13 @@ function combineFormAndQuery(form, query) {
  * @param {*} url
  */
 async function execLink(url) {
-  const { path, query } = parent.splitPathQuery(url);
-  await parent.handleRoute(`get${path}`, query);
+  try {
+    showLoadSpinner();
+    const { path, query } = parent.splitPathQuery(url);
+    await parent.handleRoute(`get${path}`, query);
+  } finally {
+    removeLoadSpinner();
+  }
 }
 
 async function execNavbarLink(url) {
@@ -36,33 +41,39 @@ async function execNavbarLink(url) {
  * @returns
  */
 async function formSubmit(e, urlSuffix, viewname, noSubmitCb) {
-  if (!noSubmitCb) e.submit();
-  const files = {};
-  const urlParams = new URLSearchParams();
-  for (const entry of new FormData(e).entries()) {
-    if (entry[1] instanceof File) files[entry[0]] = entry[1];
-    else {
-      // is there a hidden input with a filename?
-      const domEl = $(e).find(
-        `[name='${entry[0]}'][mobile-camera-input='true']`
-      );
-      if (domEl.length > 0) {
-        const tokens = entry[1].split("/");
-        const fileName = tokens[tokens.length - 1];
-        const directory = tokens.splice(0, tokens.length - 1).join("/");
-        // read and add file to submit
-        const binary = await parent.readBinary(fileName, directory);
-        files[entry[0]] = new File([binary], fileName);
-      } else urlParams.append(entry[0], entry[1]);
+  try {
+    showLoadSpinner();
+    if (!noSubmitCb) e.submit();
+    const files = {};
+    const urlParams = new URLSearchParams();
+    for (const entry of new FormData(e).entries()) {
+      if (entry[1] instanceof File) files[entry[0]] = entry[1];
+      else {
+        // is there a hidden input with a filename?
+        const domEl = $(e).find(
+          `[name='${entry[0]}'][mobile-camera-input='true']`
+        );
+        if (domEl.length > 0) {
+          const tokens = entry[1].split("/");
+          const fileName = tokens[tokens.length - 1];
+          const directory = tokens.splice(0, tokens.length - 1).join("/");
+          // read and add file to submit
+          const binary = await parent.readBinary(fileName, directory);
+          files[entry[0]] = new File([binary], fileName);
+        } else urlParams.append(entry[0], entry[1]);
+      }
     }
+    const queryStr = urlParams.toString();
+    await parent.handleRoute(`post${urlSuffix}${viewname}`, queryStr, files);
+  } finally {
+    removeLoadSpinner();
   }
-  const queryStr = urlParams.toString();
-  await parent.handleRoute(`post${urlSuffix}${viewname}`, queryStr, files);
 }
 
 async function inline_local_submit(e, opts1) {
   try {
     e.preventDefault();
+    showLoadSpinner();
     const opts = JSON.parse(decodeURIComponent(opts1 || "") || "{}");
     const form = $(e.target).closest("form");
     const urlParams = new URLSearchParams();
@@ -82,25 +93,32 @@ async function inline_local_submit(e, opts1) {
         msg: error.message ? error.message : "An error occured.",
       },
     ]);
+  } finally {
+    removeLoadSpinner();
   }
 }
 
 async function saveAndContinue(e, action, k) {
-  const form = $(e).closest("form");
-  submitWithEmptyAction(form[0]);
-  const queryStr = new URLSearchParams(new FormData(form[0])).toString();
-  const res = await parent.router.resolve({
-    pathname: `post${action}`,
-    query: queryStr,
-    xhr: true,
-  });
-  if (res.id && form.find("input[name=id")) {
-    form.append(
-      `<input type="hidden" class="form-control  " name="id" value="${res.id}">`
-    );
+  try {
+    showLoadSpinner();
+    const form = $(e).closest("form");
+    submitWithEmptyAction(form[0]);
+    const queryStr = new URLSearchParams(new FormData(form[0])).toString();
+    const res = await parent.router.resolve({
+      pathname: `post${action}`,
+      query: queryStr,
+      xhr: true,
+    });
+    if (res.id && form.find("input[name=id")) {
+      form.append(
+        `<input type="hidden" class="form-control  " name="id" value="${res.id}">`
+      );
+    }
+    if (k) await k();
+    // TODO ch error (request.responseText?)
+  } finally {
+    removeLoadSpinner();
   }
-  if (k) await k();
-  // TODO ch error (request.responseText?)
 }
 
 async function loginRequest({ email, password, isSignup, isPublic }) {
@@ -131,78 +149,84 @@ async function loginRequest({ email, password, isSignup, isPublic }) {
 }
 
 async function login(e, entryPoint, isSignup) {
-  const formData = new FormData(e);
-  const loginResult = await loginRequest({
-    email: formData.get("email"),
-    password: formData.get("password"),
-    isSignup,
-  });
-  if (typeof loginResult === "string") {
-    // use it as a token
-    const decodedJwt = parent.jwt_decode(loginResult);
-    const state = parent.saltcorn.data.state.getState();
-    const config = state.mobileConfig;
-    config.role_id = decodedJwt.user.role_id ? decodedJwt.user.role_id : 100;
-    config.user_name = decodedJwt.user.email;
-    config.user_id = decodedJwt.user.id;
-    config.language = decodedJwt.user.language;
-    config.isPublicUser = false;
-    config.isOfflineMode = false;
-    await parent.insertUser({
-      id: config.user_id,
-      email: config.user_name,
-      role_id: config.role_id,
-      language: config.language,
+  try {
+    showLoadSpinner();
+    const formData = new FormData(e);
+    const loginResult = await loginRequest({
+      email: formData.get("email"),
+      password: formData.get("password"),
+      isSignup,
     });
-    await parent.setJwt(loginResult);
-    config.jwt = loginResult;
-    await parent.i18next.changeLanguage(config.language);
-    const alerts = [];
-    if (config.allowOfflineMode) {
-      const { offlineUser, upload_started_at, upload_ended_at } =
-        (await parent.offlineHelper.getLastOfflineSession()) || {};
-      if (offlineUser === config.user_name) {
-        if (upload_started_at && !upload_ended_at) {
+    if (typeof loginResult === "string") {
+      // use it as a token
+      const decodedJwt = parent.jwt_decode(loginResult);
+      const state = parent.saltcorn.data.state.getState();
+      const config = state.mobileConfig;
+      config.role_id = decodedJwt.user.role_id ? decodedJwt.user.role_id : 100;
+      config.user_name = decodedJwt.user.email;
+      config.user_id = decodedJwt.user.id;
+      config.language = decodedJwt.user.language;
+      config.isPublicUser = false;
+      config.isOfflineMode = false;
+      await parent.insertUser({
+        id: config.user_id,
+        email: config.user_name,
+        role_id: config.role_id,
+        language: config.language,
+      });
+      await parent.setJwt(loginResult);
+      config.jwt = loginResult;
+      await parent.i18next.changeLanguage(config.language);
+      const alerts = [];
+      if (config.allowOfflineMode) {
+        const { offlineUser, upload_started_at, upload_ended_at } =
+          (await parent.offlineHelper.getLastOfflineSession()) || {};
+        if (offlineUser === config.user_name) {
+          if (upload_started_at && !upload_ended_at) {
+            alerts.push({
+              type: "warning",
+              msg: "Please check if your offline data is already online. An upload was started but did not finish.",
+            });
+          } else {
+            alerts.push({
+              type: "info",
+              msg: "You have offline data, to handle it open the Network menu.",
+            });
+          }
+        } else if (offlineUser) {
           alerts.push({
             type: "warning",
-            msg: "Please check if your offline data is already online. An upload was started but did not finish.",
-          });
-        } else {
-          alerts.push({
-            type: "info",
-            msg: "You have offline data, to handle it open the Network menu.",
+            msg: `'${offlineUser}' has not yet uploaded offline data.`,
           });
         }
-      } else if (offlineUser) {
-        alerts.push({
-          type: "warning",
-          msg: `'${offlineUser}' has not yet uploaded offline data.`,
-        });
       }
+      alerts.push({
+        type: "success",
+        msg: parent.i18next.t("Welcome, %s!", {
+          postProcess: "sprintf",
+          sprintf: [config.user_name],
+        }),
+      });
+      parent.addRoute({ route: entryPoint, query: undefined });
+      const page = await parent.router.resolve({
+        pathname: entryPoint,
+        fullWrap: true,
+        alerts,
+      });
+      await parent.replaceIframe(page.content);
+    } else if (loginResult?.alerts) {
+      parent.showAlerts(loginResult?.alerts);
+    } else {
+      throw new Error("The login failed.");
     }
-    alerts.push({
-      type: "success",
-      msg: parent.i18next.t("Welcome, %s!", {
-        postProcess: "sprintf",
-        sprintf: [config.user_name],
-      }),
-    });
-    parent.addRoute({ route: entryPoint, query: undefined });
-    const page = await parent.router.resolve({
-      pathname: entryPoint,
-      fullWrap: true,
-      alerts,
-    });
-    await parent.replaceIframe(page.content);
-  } else if (loginResult?.alerts) {
-    parent.showAlerts(loginResult?.alerts);
-  } else {
-    throw new Error("The login failed.");
+  } finally {
+    removeLoadSpinner();
   }
 }
 
 async function publicLogin(entryPoint) {
   try {
+    showLoadSpinner();
     const loginResult = await loginRequest({ isPublic: true });
     if (typeof loginResult === "string") {
       const config = parent.saltcorn.data.state.getState().mobileConfig;
@@ -237,12 +261,15 @@ async function publicLogin(entryPoint) {
         msg: error.message ? error.message : "An error occured.",
       },
     ]);
+  } finally {
+    removeLoadSpinner();
   }
 }
 
 async function logout() {
   const config = parent.saltcorn.data.state.getState().mobileConfig;
   try {
+    showLoadSpinner();
     const page = await parent.router.resolve({
       pathname: "get/auth/logout",
       entryView: config.entry_point,
@@ -256,6 +283,8 @@ async function logout() {
         msg: error.message ? error.message : "An error occured.",
       },
     ]);
+  } finally {
+    removeLoadSpinner();
   }
 }
 
@@ -276,14 +305,19 @@ async function loginFormSubmit(e, entryView) {
 }
 
 async function local_post_btn(e) {
-  const form = $(e).closest("form");
-  const url = form.attr("action");
-  const method = form.attr("method");
-  const { path, query } = parent.splitPathQuery(url);
-  await parent.handleRoute(
-    `${method}${path}`,
-    combineFormAndQuery(form, query)
-  );
+  try {
+    showLoadSpinner();
+    const form = $(e).closest("form");
+    const url = form.attr("action");
+    const method = form.attr("method");
+    const { path, query } = parent.splitPathQuery(url);
+    await parent.handleRoute(
+      `${method}${path}`,
+      combineFormAndQuery(form, query)
+    );
+  } finally {
+    removeLoadSpinner();
+  }
 }
 
 /**
@@ -292,8 +326,13 @@ async function local_post_btn(e) {
  * @param {*} path
  */
 async function stateFormSubmit(e, path) {
-  const formQuery = new URLSearchParams(new FormData(e)).toString();
-  await parent.handleRoute(path, formQuery);
+  try {
+    showLoadSpinner();
+    const formQuery = new URLSearchParams(new FormData(e)).toString();
+    await parent.handleRoute(path, formQuery);
+  } finally {
+    removeLoadSpinner();
+  }
 }
 
 function removeQueryStringParameter(queryStr, key) {
@@ -337,33 +376,48 @@ function invalidate_pagings(currentQuery) {
 }
 
 async function set_state_fields(kvs, href) {
-  let queryParams = [];
-  let currentQuery = parent.currentQuery();
-  if (Object.keys(kvs).some((k) => !is_paging_param(k))) {
-    currentQuery = invalidate_pagings(currentQuery);
-  }
-  Object.entries(kvs).forEach((kv) => {
-    if (kv[1].unset && kv[1].unset === true) {
-      currentQuery = removeQueryStringParameter(currentQuery, kv[0]);
-    } else {
-      currentQuery = updateQueryStringParameter(currentQuery, kv[0], kv[1]);
+  try {
+    showLoadSpinner();
+    let queryParams = [];
+    let currentQuery = parent.currentQuery();
+    if (Object.keys(kvs).some((k) => !is_paging_param(k))) {
+      currentQuery = invalidate_pagings(currentQuery);
     }
-  });
-  for (const [k, v] of new URLSearchParams(currentQuery).entries()) {
-    queryParams.push(`${k}=${v}`);
+    Object.entries(kvs).forEach((kv) => {
+      if (kv[1].unset && kv[1].unset === true) {
+        currentQuery = removeQueryStringParameter(currentQuery, kv[0]);
+      } else {
+        currentQuery = updateQueryStringParameter(currentQuery, kv[0], kv[1]);
+      }
+    });
+    for (const [k, v] of new URLSearchParams(currentQuery).entries()) {
+      queryParams.push(`${k}=${v}`);
+    }
+    await parent.handleRoute(href, queryParams.join("&"));
+  } finally {
+    removeLoadSpinner();
   }
-  await parent.handleRoute(href, queryParams.join("&"));
 }
 
 async function set_state_field(key, value) {
-  const query = updateQueryStringParameter(parent.currentQuery(), key, value);
-  await parent.handleRoute(parent.currentLocation(), query);
+  try {
+    showLoadSpinner();
+    const query = updateQueryStringParameter(parent.currentQuery(), key, value);
+    await parent.handleRoute(parent.currentLocation(), query);
+  } finally {
+    removeLoadSpinner();
+  }
 }
 
 async function unset_state_field(key) {
-  const href = parent.currentLocation();
-  const query = removeQueryStringParameter(parent.currentLocation(), key);
-  await parent.handleRoute(href, query);
+  try {
+    showLoadSpinner();
+    const href = parent.currentLocation();
+    const query = removeQueryStringParameter(parent.currentLocation(), key);
+    await parent.handleRoute(href, query);
+  } finally {
+    removeLoadSpinner();
+  }
 }
 
 async function sortby(k, desc, viewIdentifier) {
@@ -456,6 +510,7 @@ function closeModal() {
 
 async function local_post(url, args) {
   try {
+    showLoadSpinner();
     const result = await parent.router.resolve({
       pathname: `post${url}`,
       data: args,
@@ -464,11 +519,14 @@ async function local_post(url, args) {
     else common_done(result);
   } catch (error) {
     parent.errorAlert(error);
+  } finally {
+    removeLoadSpinner();
   }
 }
 
 async function local_post_json(url) {
   try {
+    showLoadSpinner();
     const result = await parent.router.resolve({
       pathname: `post${url}`,
     });
@@ -477,6 +535,8 @@ async function local_post_json(url) {
     else common_done(result);
   } catch (error) {
     parent.errorAlert(error);
+  } finally {
+    removeLoadSpinner();
   }
 }
 
@@ -545,26 +605,46 @@ function openFile(fileId) {
 }
 
 async function select_id(id) {
-  const newQuery = updateQueryStringParameter(parent.currentQuery(), "id", id);
-  await parent.handleRoute(parent.currentLocation(), newQuery);
+  try {
+    showLoadSpinner();
+    const newQuery = updateQueryStringParameter(
+      parent.currentQuery(),
+      "id",
+      id
+    );
+    await parent.handleRoute(parent.currentLocation(), newQuery);
+  } finally {
+    removeLoadSpinner();
+  }
 }
 
 async function check_state_field(that) {
-  const name = that.name;
-  const newQuery = that.checked
-    ? updateQueryStringParameter(parent.currentQuery(), name, that.value)
-    : removeQueryStringParameter(name);
-  await parent.handleRoute(parent.currentLocation(), newQuery);
+  try {
+    showLoadSpinner();
+    const name = that.name;
+    const newQuery = that.checked
+      ? updateQueryStringParameter(parent.currentQuery(), name, that.value)
+      : removeQueryStringParameter(name);
+    await parent.handleRoute(parent.currentLocation(), newQuery);
+  } finally {
+    removeLoadSpinner();
+  }
 }
 
 async function clear_state() {
-  await parent.handleRoute(parent.currentLocation(), undefined);
+  try {
+    showLoadSpinner();
+    await parent.handleRoute(parent.currentLocation(), undefined);
+  } finally {
+    removeLoadSpinner();
+  }
 }
 
 async function view_post(viewname, route, data, onDone) {
   const mobileConfig = parent.saltcorn.data.state.getState().mobileConfig;
   const view = parent.saltcorn.data.models.View.findOne({ name: viewname });
   try {
+    showLoadSpinner();
     let respData = undefined;
     if (
       mobileConfig.isOfflineMode ||
@@ -589,6 +669,8 @@ async function view_post(viewname, route, data, onDone) {
     common_done(respData);
   } catch (error) {
     parent.errorAlert(error);
+  } finally {
+    removeLoadSpinner();
   }
 }