@saltcorn/mobile-app 0.8.6-beta.4 → 0.8.6-beta.6

package/package.json

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

package/www/index.html

@@ -18,6 +18,7 @@
     <script src="js/routes/auth.js"></script>
     <script src="js/routes/delete.js"></script>
     <script src="js/routes/edit.js"></script>
+    <script src="js/routes/api.js"></script>
     <script src="js/routes/error.js"></script>
     <script src="js/routes/page.js"></script>
     <script src="js/routes/view.js"></script>
@@ -180,7 +181,7 @@
       const onResume = async () => {
         const state = saltcorn.data.state.getState();
         const mobileConfig = state.mobileConfig;
-        if (mobileConfig.allowOfflineMode) {
+        if (mobileConfig?.allowOfflineMode) {
           mobileConfig.networkState = navigator.connection.type;
           if (
             mobileConfig.networkState === "none" &&

package/www/js/routes/api.js

@@ -0,0 +1,39 @@
+/*global saltcorn, apiCall*/
+
+// post/api/:tableName/:id
+const updateTableRow = async (context) => {
+  const { tableName, id } = context.params;
+  const mobileConfig = saltcorn.data.state.getState().mobileConfig;
+  const user = {
+    id: mobileConfig.user_id,
+    role_id: mobileConfig.role_id || 100,
+  };
+  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 row = {};
+    for (const [k, v] of new URLSearchParams(context.query).entries()) {
+      row[k] = v;
+    }
+    const errors = await saltcorn.data.web_mobile_commons.prepare_update_row(
+      table,
+      row,
+      id
+    );
+    if (errors.length > 0) throw new Error(errors.join(", "));
+    const ins_res = await table.tryUpdateRow(row, id, user);
+    if (ins_res.error)
+      throw new Error(`Update ${table.name} error: ${ins_res.error}`);
+    return { ins_res };
+  } else {
+    const response = await apiCall({
+      method: "POST",
+      path: `/api/${tableName}/${id}`,
+      body: context.query,
+    });
+    return response.data;
+  }
+};

package/www/js/routes/common.js

@@ -64,13 +64,13 @@ const getMenu = (req) => {
     const authItems = mobileCfg.isPublicUser
       ? [
           {
-            link: "javascript:execLink('/auth/login')",
+            link: "javascript:execNavbarLink('/auth/login')",
             label: req.__("Login"),
           },
           ...(allowSignup
             ? [
                 {
-                  link: "javascript:execLink('/auth/signup')",
+                  link: "javascript:execNavbarLink('/auth/signup')",
                   label: req.__("Sign up"),
                 },
               ]
@@ -107,7 +107,7 @@ const getMenu = (req) => {
         section: "Network",
         items: [
           {
-            link: "javascript:execLink('/sync/sync_settings')",
+            link: "javascript:execNavbarLink('/sync/sync_settings')",
             icon: "fas fa-sync",
             label: "Network",
           },

package/www/js/routes/delete.js

@@ -9,14 +9,11 @@ const deleteRows = async (context) => {
   if (isOfflineMode || localTableIds.indexOf(table.id) >= 0) {
     if (role_id <= table.min_role_write) {
       await table.deleteRows({ id });
-    }
+      // TODO 'table.is_owner' check?
+    } else throw new Error(i18next.t("Not authorized"));
     if (isOfflineMode && !(await offlineHelper.hasOfflineRows())) {
       await offlineHelper.setOfflineSession(null);
     }
-    // TODO 'table.is_owner' check?
-    else {
-      throw new Error(i18next.t("Not authorized"));
-    }
   } else {
     await apiCall({ method: "POST", path: `/delete/${name}/${id}` });
   }

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 */
+/*global postView, postViewRoute, getView, postToggleField, deleteRows, postPageAction, getPage, getLoginView, logoutAction, getSignupView, getErrorView, window, getSyncSettingsView, getAskDeleteOfflineData, getAskUploadNotEnded, updateTableRow */
 // TODO module namespacese
 
 const initRoutes = async () => {
@@ -15,6 +15,10 @@ const initRoutes = async () => {
       path: "get/view/:viewname",
       action: getView,
     },
+    {
+      path: "post/api/:tableName/:id",
+      action: updateTableRow,
+    },
     {
       path: "post/edit/toggle/:name/:id/:field_name",
       action: postToggleField,

package/www/js/utils/global_utils.js

@@ -209,11 +209,17 @@ async function handleRoute(route, query, files) {
           : [],
       });
       if (page.redirect) {
-        if (page.redirect.startsWith("http://localhost")) {
+        if (
+          page.redirect.startsWith("http://localhost") ||
+          page.redirect === "undefined"
+        ) {
           await gotoEntryView();
         } else {
           const { path, query } = splitPathQuery(page.redirect);
-          await handleRoute(path, query);
+          await handleRoute(
+            path.startsWith("/") && path.length > 1 ? `get${path}` : path,
+            query
+          );
         }
       } else if (page.content) {
         if (!page.replaceIframe) await replaceIframeInnerContent(page.content);

package/www/js/utils/iframe_view_utils.js

@@ -1,5 +1,5 @@
 /*eslint-env browser*/
-/*global $, submitWithEmptyAction, is_paging_param, bootstrap, common_done, unique_field_from_rows*/
+/*global $, submitWithEmptyAction, is_paging_param, bootstrap, common_done, unique_field_from_rows, inline_submit_success*/
 
 function combineFormAndQuery(form, query) {
   let paramsList = [];
@@ -24,6 +24,11 @@ async function execLink(url) {
   await parent.handleRoute(`get${path}`, query);
 }
 
+async function execNavbarLink(url) {
+  $(".navbar-toggler").click();
+  execLink(url);
+}
+
 /**
  *
  * @param {*} e
@@ -42,6 +47,31 @@ async function formSubmit(e, urlSuffix, viewname) {
   await parent.handleRoute(`post${urlSuffix}${viewname}`, queryStr, files);
 }
 
+async function inline_local_submit(e, opts1) {
+  try {
+    e.preventDefault();
+    const opts = JSON.parse(decodeURIComponent(opts1 || "") || "{}");
+    const form = $(e.target).closest("form");
+    const urlParams = new URLSearchParams();
+    for (const entry of new FormData(form[0]).entries()) {
+      urlParams.append(entry[0], entry[1]);
+    }
+    const url = form.attr("action");
+    await parent.router.resolve({
+      pathname: `post${url}`,
+      query: urlParams.toString(),
+    });
+    inline_submit_success(e, form, opts);
+  } catch (error) {
+    parent.showAlerts([
+      {
+        type: "error",
+        msg: error.message ? error.message : "An error occured.",
+      },
+    ]);
+  }
+}
+
 async function saveAndContinue(e, action, k) {
   const form = $(e).closest("form");
   submitWithEmptyAction(form[0]);
@@ -105,6 +135,12 @@ async function login(e, entryPoint, isSignup) {
     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);

package/www/js/utils/table_utils.js

@@ -114,3 +114,11 @@ async function setJwt(jwt) {
   await removeJwt();
   await saltcorn.data.db.insert(jwtTableName, { jwt: jwt });
 }
+
+async function insertUser({ id, email, role_id, language }) {
+  await saltcorn.data.db.insert(
+    "users",
+    { id, email, role_id, language },
+    { ignoreExisting: true }
+  );
+}