@saltcorn/mobile-app 0.9.0 → 0.9.1-beta.0

package/package.json

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

package/www/js/routes/page.js

@@ -3,9 +3,10 @@
 // post/page/:pagename/action/:rndid
 const postPageAction = async (context) => {
   const state = saltcorn.data.state.getState();
+  const req = new MobileRequest({ xhr: context.xhr });
   const { page_name, rndid } = context.params;
   const page = await saltcorn.data.models.Page.findOne({ name: page_name });
-  const req = new MobileRequest({ xhr: context.xhr });
+  if (!page) throw new Error(req.__("Page %s not found", page_name));
   if (state.mobileConfig.role_id > page.min_role) {
     throw new saltcorn.data.utils.NotAuthorized(req.__("Not authorized"));
   }
@@ -26,9 +27,10 @@ const postPageAction = async (context) => {
 // get/page/pagename
 const getPage = async (context) => {
   const state = saltcorn.data.state.getState();
+  const req = new MobileRequest({ xhr: context.xhr });
   const { page_name } = context.params;
   const page = await saltcorn.data.models.Page.findOne({ name: page_name });
-  const req = new MobileRequest({ xhr: context.xhr });
+  if (!page) throw new Error(req.__("Page %s not found", page_name));
   if (state.mobileConfig.role_id > page.min_role) {
     throw new saltcorn.data.utils.NotAuthorized(req.__("Not authorized"));
   }

package/www/js/routes/view.js

@@ -12,9 +12,6 @@ const postView = async (context) => {
     body[k] = v;
     if (k === "redirect") redirect = v;
   }
-  const view = await saltcorn.data.models.View.findOne({
-    name: context.params.viewname,
-  });
   const refererRoute =
     routingHistory?.length > 1
       ? routingHistory[routingHistory.length - 2]
@@ -24,6 +21,11 @@ const postView = async (context) => {
     files: context.files,
     refererRoute,
   });
+  const view = await saltcorn.data.models.View.findOne({
+    name: context.params.viewname,
+  });
+  if (!view)
+    throw new Error(req.__("No such view: %s", context.params.viewname));
   const res = new MobileResponse();
   const state = saltcorn.data.state.getState();
   const mobileCfg = state.mobileConfig;
@@ -44,7 +46,18 @@ const postView = async (context) => {
     view.isRemoteTable()
   );
   if (mobileCfg.isOfflineMode) await offlineHelper.setHasOfflineData(true);
-  return res.getJson();
+  const wrapped = res.getWrapHtml();
+  if (wrapped) {
+    return wrapContents(
+      wrapped,
+      res.getWrapViewName() || "viewname",
+      context,
+      req
+    );
+  }
+  const json = res.getJson();
+  if (json) return json;
+  throw new Error(req.__("%s finished without a result", `POST ${view.name}`));
 };
 
 /**
@@ -52,9 +65,6 @@ const postView = async (context) => {
  * @param {*} context
  */
 const postViewRoute = async (context) => {
-  const view = await saltcorn.data.models.View.findOne({
-    name: context.params.viewname,
-  });
   const query = context.query ? parseQuery(context.query) : {};
   const refererRoute =
     routingHistory?.length > 1
@@ -65,6 +75,11 @@ const postViewRoute = async (context) => {
     query,
     refererRoute,
   });
+  const view = await saltcorn.data.models.View.findOne({
+    name: context.params.viewname,
+  });
+  if (!view)
+    throw new Error(req.__("No such view: %s", context.params.viewname));
   const res = new MobileResponse();
   const state = saltcorn.data.state.getState();
   const { role_id, isOfflineMode } = state.mobileConfig;
@@ -86,7 +101,14 @@ const postViewRoute = async (context) => {
       context,
       req
     );
-  else return res.getJson();
+  const json = res.getJson();
+  if (json) return json;
+  throw new Error(
+    req.__(
+      "%s finished without a result",
+      `POST ${view.name}: ${context.params.route}`
+    )
+  );
 };
 
 /**
@@ -97,13 +119,14 @@ const postViewRoute = async (context) => {
 const getView = async (context) => {
   const state = saltcorn.data.state.getState();
   const query = context.query ? parseQuery(context.query) : {};
-  const { viewname } = context.params;
-  const view = saltcorn.data.models.View.findOne({ name: viewname });
   const refererRoute =
     routingHistory?.length > 1
       ? routingHistory[routingHistory.length - 2]
       : undefined;
   const req = new MobileRequest({ xhr: context.xhr, query, refererRoute });
+  const { viewname } = context.params;
+  const view = saltcorn.data.models.View.findOne({ name: viewname });
+  if (!view) throw new Error(req.__("No such view: %s", viewname));
   const res = new MobileResponse();
   if (
     state.mobileConfig.role_id > view.min_role &&

package/www/js/utils/global_utils.js

@@ -1,4 +1,4 @@
-/*global window, $, offlineHelper, axios, write, cordova, router, getDirEntry, saltcorn, document, FileReader, navigator, splashConfig*/
+/*global window, $, offlineHelper, axios, write, cordova, router, getDirEntry, saltcorn, document, FileReader, navigator, splashConfig, i18next*/
 
 let routingHistory = [];
 
@@ -271,13 +271,26 @@ async function handleRoute(route, query, files, data) {
       } else if (page.content) {
         if (!page.replaceIframe) await replaceIframeInnerContent(page.content);
         else await replaceIframe(page.content);
+      } else {
+        showAlerts([
+          {
+            type: "warning",
+            msg: i18next.t("%s finished without a result", {
+              postProcess: "sprintf",
+              sprintf: [safeRoute],
+            }),
+          },
+        ]);
       }
     }
   } catch (error) {
     showAlerts([
       {
         type: "error",
-        msg: error.message ? error.message : "An error occured.",
+        msg: `${i18next.t("In %s", {
+          postProcess: "sprintf",
+          sprintf: [route],
+        })}: ${error.message ? error.message : i18next.t("An error occurred")}`,
       },
     ]);
   }