@saltcorn/mobile-app 1.1.0-beta.8 → 1.1.0

package/{www/js → src/routing}/routes/edit.js

@@ -1,16 +1,19 @@
-/*global i18next, apiCall, saltcorn, offlineHelper*/
+/*global saltcorn */
+import { apiCall } from "../../helpers/api";
+import { setHasOfflineData } from "../../helpers/offline_mode";
+import i18next from "i18next";
 
 // /toggle/:name/:id/:field_name
-const postToggleField = async (context) => {
+export const postToggleField = async (context) => {
   const { name, id, field_name } = context.params;
   const table = await saltcorn.data.models.Table.findOne({ name });
   const state = saltcorn.data.state.getState();
-  const { isOfflineMode, localTableIds, role_id } = state.mobileConfig;
+  const { isOfflineMode, localTableIds, user } = state.mobileConfig;
   if (isOfflineMode || localTableIds.indexOf(table.id) >= 0) {
-    if (role_id > table.min_role_write)
+    if (user.role_id > table.min_role_write)
       throw new saltcorn.data.utils.NotAuthorized(i18next.t("Not authorized"));
-    await table.toggleBool(+id, field_name); //TODO call with user
-    if (isOfflineMode) await offlineHelper.setHasOfflineData(true);
+    await table.toggleBool(+id, field_name, user);
+    if (isOfflineMode) await setHasOfflineData(true);
   } else {
     await apiCall({
       method: "POST",

package/src/routing/routes/error.js

@@ -0,0 +1,6 @@
+import { MobileRequest } from "../mocks/request";
+import { wrapContents } from "../utils";
+
+export const getErrorView = async (context) => {
+  return await wrapContents("", "Error", context, new MobileRequest());
+};

package/{www/js → src/routing}/routes/fields.js

@@ -1,6 +1,11 @@
-/*global saltcorn, apiCall, MobileRequest, MobileResponse, offlineHelper, parseQuery */
+/*global saltcorn */
 
-const postShowCalculated = async (context) => {
+import { MobileRequest } from "../mocks/request";
+import { MobileResponse } from "../mocks/response";
+import { parseQuery } from "../utils";
+import { apiCall } from "../../helpers/api";
+
+export 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 });

package/{www/js → src/routing}/routes/page.js

@@ -1,13 +1,18 @@
-/*global window, MobileRequest, parseQuery, MobileResponse, wrapContents, saltcorn, loadFileAsText*/
+/*global saltcorn */
+
+import { MobileRequest } from "../mocks/request";
+import { MobileResponse } from "../mocks/response";
+import { parseQuery, wrapContents } from "../utils";
+import { loadFileAsText } from "../../helpers/common";
 
 // post/page/:pagename/action/:rndid
-const postPageAction = async (context) => {
-  const state = saltcorn.data.state.getState();
+export const postPageAction = async (context) => {
+  const { user } = saltcorn.data.state.getState().mobileConfig;
   const req = new MobileRequest({ xhr: context.xhr });
   const { page_name, rndid } = context.params;
   const page = await saltcorn.data.models.Page.findOne({ name: page_name });
   if (!page) throw new Error(req.__("Page %s not found", page_name));
-  if (state.mobileConfig.role_id > page.min_role) {
+  if (user.role_id > page.min_role) {
     throw new saltcorn.data.utils.NotAuthorized(req.__("Not authorized"));
   }
   let col;
@@ -37,8 +42,8 @@ const findPageOrGroup = (pagename) => {
 };
 
 const runPage = async (page, state, context, { req, res }) => {
-  if (state.mobileConfig.role_id > page.min_role) {
-    const additionalInfos = `: your role: ${state.mobileConfig.role_id}, page min_role: ${page.min_role}`;
+  if (state.mobileConfig.user.role_id > page.min_role) {
+    const additionalInfos = `: your role: ${state.mobileConfig.user.role_id}, page min_role: ${page.min_role}`;
     throw new saltcorn.data.utils.NotAuthorized(
       req.__("Not authorized") + additionalInfos
     );
@@ -65,8 +70,8 @@ const getEligiblePage = async (pageGroup, req) => {
 };
 
 const runPageGroup = async (pageGroup, state, context, { req, res }) => {
-  if (state.mobileConfig.role_id > pageGroup.min_role) {
-    const additionalInfos = `: your role: ${state.mobileConfig.role_id}, pagegroup min_role: ${pageGroup.min_role}`;
+  if (state.mobileConfig.user.role_id > pageGroup.min_role) {
+    const additionalInfos = `: your role: ${state.mobileConfig.user.role_id}, pagegroup min_role: ${pageGroup.min_role}`;
     throw new saltcorn.data.utils.NotAuthorized(
       req.__("Not authorized") + additionalInfos
     );
@@ -79,7 +84,7 @@ const runPageGroup = async (pageGroup, state, context, { req, res }) => {
 };
 
 // get/page/pagename
-const getPage = async (context) => {
+export const getPage = async (context) => {
   const state = saltcorn.data.state.getState();
   const query = context.query ? parseQuery(context.query) : {};
   const req = new MobileRequest({ xhr: context.xhr, query: query });
@@ -103,6 +108,6 @@ const getPage = async (context) => {
     return { content, title: "title", replaceIframe: true, isFile: true };
   } else {
     const title = "title"; // TODO
-    return wrapContents(contents, title, context, req);
+    return await wrapContents(contents, title, context, req);
   }
 };

package/{www/js → src/routing}/routes/sync.js

@@ -1,7 +1,10 @@
-/*global saltcorn, wrapContents, MobileRequest, */
+/*global saltcorn */
+
+import { MobileRequest } from "../mocks/request";
+import { wrapContents } from "../utils";
 
 // get/sync/sync_settings
-const getSyncSettingsView = (context) => {
+export const getSyncSettingsView = async (context) => {
   const state = saltcorn.data.state.getState();
   const { isOfflineMode } = state.mobileConfig;
   const content = saltcorn.markup.div(
@@ -95,11 +98,16 @@ const getSyncSettingsView = (context) => {
     ),
     saltcorn.markup.hr()
   );
-  return wrapContents(content, "Sync Settings", context, new MobileRequest());
+  return await wrapContents(
+    content,
+    "Sync Settings",
+    context,
+    new MobileRequest()
+  );
 };
 
 // get/sync/ask_upload_not_ended
-const getAskUploadNotEnded = (context) => {
+export const getAskUploadNotEnded = async (context) => {
   const content = saltcorn.markup.div(
     saltcorn.markup.div(
       { class: "mb-3 h6" },
@@ -123,11 +131,11 @@ const getAskUploadNotEnded = (context) => {
       "Upload anyway"
     )
   );
-  return wrapContents(content, "Warning", context, new MobileRequest());
+  return await wrapContents(content, "Warning", context, new MobileRequest());
 };
 
 // get/sync/ask_delete_offline_data
-const getAskDeleteOfflineData = (context) => {
+export const getAskDeleteOfflineData = async (context) => {
   const content = saltcorn.markup.div(
     saltcorn.markup.div(
       { class: "mb-3 h6" },
@@ -145,10 +153,11 @@ const getAskDeleteOfflineData = (context) => {
       {
         class: "btn btn-primary close",
         type: "button",
-        onClick: "closeModal(); deleteOfflineData()",
+        onClick:
+          "closeModal(); parent.saltcorn.mobileApp.offlineMode.deleteOfflineData()",
       },
       "Delete"
     )
   );
-  return wrapContents(content, "Warning", context, new MobileRequest());
+  return await wrapContents(content, "Warning", context, new MobileRequest());
 };

package/{www/js → src/routing}/routes/view.js

@@ -1,11 +1,16 @@
-/*global MobileRequest, MobileResponse, parseQuery, wrapContents, saltcorn, offlineHelper, routingHistory*/
+/*global saltcorn */
 
+import { MobileRequest } from "../mocks/request";
+import { MobileResponse } from "../mocks/response";
+import { parseQuery, wrapContents } from "../utils";
+import { setHasOfflineData } from "../../helpers/offline_mode";
+import { routingHistory } from "../../helpers/navigation";
 /**
  *
  * @param {*} context
  * @returns
  */
-const postView = async (context) => {
+export const postView = async (context) => {
   let body = {};
   let redirect = undefined;
   for (const [k, v] of new URLSearchParams(context.query).entries()) {
@@ -30,7 +35,7 @@ const postView = async (context) => {
   const state = saltcorn.data.state.getState();
   const mobileCfg = state.mobileConfig;
   if (
-    mobileCfg.role_id > view.min_role &&
+    mobileCfg.user.role_id > view.min_role &&
     !(await view.authorise_post({ body, req, ...view }))
   ) {
     throw new saltcorn.data.utils.NotAuthorized(req.__("Not authorized"));
@@ -45,10 +50,10 @@ const postView = async (context) => {
     },
     view.isRemoteTable()
   );
-  if (mobileCfg.isOfflineMode) await offlineHelper.setHasOfflineData(true);
+  if (mobileCfg.isOfflineMode) await setHasOfflineData(true);
   const wrapped = res.getWrapHtml();
   if (wrapped) {
-    return wrapContents(
+    return await wrapContents(
       wrapped,
       res.getWrapViewName() || "viewname",
       context,
@@ -64,7 +69,7 @@ const postView = async (context) => {
  *
  * @param {*} context
  */
-const postViewRoute = async (context) => {
+export const postViewRoute = async (context) => {
   const query = context.query ? parseQuery(context.query) : {};
   const refererRoute =
     routingHistory?.length > 1
@@ -82,8 +87,8 @@ const postViewRoute = async (context) => {
     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;
-  if (role_id > view.min_role)
+  const { user, isOfflineMode } = state.mobileConfig;
+  if (user.role_id > view.min_role)
     throw new saltcorn.data.utils.NotAuthorized(req.__("Not authorized"));
   await view.runRoute(
     context.params.route,
@@ -92,10 +97,10 @@ const postViewRoute = async (context) => {
     { req, res },
     view.isRemoteTable()
   );
-  if (isOfflineMode) await offlineHelper.setHasOfflineData(true);
+  if (isOfflineMode) await setHasOfflineData(true);
   const wrapped = res.getWrapHtml();
   if (wrapped)
-    return wrapContents(
+    return await wrapContents(
       wrapped,
       res.getWrapViewName() || "viewname",
       context,
@@ -116,7 +121,7 @@ const postViewRoute = async (context) => {
  * @param {*} context
  * @returns
  */
-const getView = async (context) => {
+export const getView = async (context) => {
   const state = saltcorn.data.state.getState();
   const query = context.query ? parseQuery(context.query) : {};
   const refererRoute =
@@ -129,10 +134,10 @@ const getView = async (context) => {
   if (!view) throw new Error(req.__("No such view: %s", viewname));
   const res = new MobileResponse();
   if (
-    state.mobileConfig.role_id > view.min_role &&
+    state.mobileConfig.user.role_id > view.min_role &&
     !(await view.authorise_get({ query, req, ...view }))
   ) {
-    const additionalInfos = `: your role: ${state.mobileConfig.role_id}, view min_role: ${view.min_role}`;
+    const additionalInfos = `: your role: ${state.mobileConfig.user.role_id}, view min_role: ${view.min_role}`;
     throw new saltcorn.data.utils.NotAuthorized(
       req.__("Not authorized") + additionalInfos
     );
@@ -151,7 +156,7 @@ const getView = async (context) => {
   }
   const wrapped = res.getWrapHtml();
   if (wrapped)
-    return wrapContents(
+    return await wrapContents(
       wrapped,
       res.getWrapViewName() || "viewname",
       context,
@@ -176,6 +181,6 @@ const getView = async (context) => {
           )
         : contents0;
 
-    return wrapContents(contents, viewname, context, req);
+    return await wrapContents(contents, viewname, context, req);
   }
 };

package/{www/js/routes/common.js → src/routing/utils.js}

@@ -1,6 +1,9 @@
-/*global saltcorn, offlineHelper*/
+/*global saltcorn */
 
-const getHeaders = () => {
+import { getOfflineMsg } from "../helpers/offline_mode";
+import { getScreenOrientation } from "../helpers/common";
+
+export const getHeaders = () => {
   const state = saltcorn.data.state.getState();
   const config = state.mobileConfig;
   const versionTag = config.version_tag;
@@ -8,7 +11,7 @@ const getHeaders = () => {
     { 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" },
+    { script: "js/iframe_view_utils.js" },
   ];
 
   let from_cfg = [];
@@ -19,7 +22,7 @@ const getHeaders = () => {
   return [...stdHeaders, ...config.pluginHeaders, ...from_cfg];
 };
 
-const parseQuery = (queryStr) => {
+export const parseQuery = (queryStr) => {
   let result = {};
   const parsedQuery =
     typeof queryStr === "string" ? new URLSearchParams(queryStr) : undefined;
@@ -33,17 +36,17 @@ const parseQuery = (queryStr) => {
 
 const layout = () => {
   const state = saltcorn.data.state.getState();
-  return state.getLayout({ role_id: state.mobileConfig.role_id || 100 });
+  return state.getLayout({ role_id: state.mobileConfig.user.role_id || 100 });
 };
 
-const sbAdmin2Layout = () => {
+export const sbAdmin2Layout = () => {
   return saltcorn.data.state.getState().layouts["sbadmin2"];
 };
 
 const getMenu = (req) => {
   const state = saltcorn.data.state.getState();
   const mobileCfg = state.mobileConfig;
-  const role = mobileCfg.role_id || 100;
+  const role = mobileCfg.user.role_id || 100;
   const extraMenu = saltcorn.data.web_mobile_commons.get_extra_menu(
     role,
     req.__
@@ -58,7 +61,7 @@ const getMenu = (req) => {
             section: "Reload",
             items: [
               {
-                link: `javascript:parent.gotoEntryView()`,
+                link: "javascript:parent.saltcorn.mobileApp.navigation.gotoEntryView()",
                 icon: "fas fa-sync",
                 label: "Reload",
               },
@@ -68,7 +71,7 @@ const getMenu = (req) => {
       : [];
   } else {
     const allowSignup = state.getConfig("allow_signup");
-    const userName = mobileCfg.user_name;
+    const userName = mobileCfg.user.email;
     const authItems = mobileCfg.isPublicUser
       ? [
           {
@@ -129,14 +132,15 @@ const prepareAlerts = (context, req) => {
   return [...(context.alerts || []), ...req.flashMessages()];
 };
 
-const wrapContents = (contents, title, context, req) => {
+export const wrapContents = async (contents, title, context, req) => {
+  const orientation = await getScreenOrientation();
   const state = saltcorn.data.state.getState();
   const body = {
     above: [
       saltcorn.markup.div(
         { id: "top-alert" },
         state.mobileConfig.isOfflineMode
-          ? saltcorn.markup.alert("info", offlineHelper.getOfflineMsg())
+          ? saltcorn.markup.alert("info", getOfflineMsg())
           : ""
       ),
       contents,
@@ -147,7 +151,7 @@ const wrapContents = (contents, title, context, req) => {
         title: title,
         body,
         alerts: prepareAlerts(context, req),
-        role: state.mobileConfig.role_id,
+        role: state.mobileConfig.user.role_id || 100,
         menu: getMenu(req),
         req,
         headers: getHeaders(),
@@ -157,13 +161,14 @@ const wrapContents = (contents, title, context, req) => {
         },
         bodyClass: "",
         currentUrl: "",
+        orientation: orientation?.type,
       })
     : layout().renderBody({
         title: title,
         body,
         req,
         alerts: prepareAlerts(context, req),
-        role: state.mobileConfig.role_id,
+        role: state.mobileConfig.user.role_id || 100,
       });
   return {
     content: wrappedContent,

package/webpack.config.js

@@ -0,0 +1,31 @@
+const path = require("path");
+
+module.exports = {
+  entry: "./src/index.js",
+  output: {
+    path: path.resolve(__dirname, "www/dist"),
+    filename: "bundle.js",
+    library: {
+      type: "module",
+    },
+  },
+  experiments: {
+    outputModule: true,
+  },
+  module: {
+    rules: [
+      {
+        test: /\.js$/,
+        exclude: /node_modules/,
+        use: {
+          loader: "babel-loader",
+          options: {
+            presets: ["@babel/preset-env"],
+          },
+        },
+      },
+    ],
+  },
+  target: "web", // Use web target for browser compatibility
+  mode: "development",
+};

package/www/data/encoded_site_logo.js

@@ -0,0 +1 @@
+var _sc_site_logo = "";