@saltcorn/mobile-app 1.1.2-beta.9 → 1.1.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@saltcorn/mobile-app",
   "displayName": "Saltcorn mobile app",
-  "version": "1.1.2-beta.9",
+  "version": "1.1.2",
   "description": "Saltcorn mobile app for Android and iOS",
   "main": "index.js",
   "scripts": {

package/src/helpers/db_schema.js

@@ -51,7 +51,12 @@ export async function safeRows(table, rows) {
 export async function updateScTables(tablesJSON, skipScPlugins = true) {
   await saltcorn.data.db.query("PRAGMA foreign_keys = OFF;");
   for (const { table, rows } of tablesJSON.sc_tables) {
-    if (skipScPlugins && table === "_sc_plugins") continue;
+    if (
+      (skipScPlugins && table === "_sc_plugins") ||
+      table === "_sc_workflow_runs" ||
+      table === "_sc_workflow_trace"
+    )
+      continue;
     if (table === "_sc_tables") await dropDeletedTables(rows);
     await saltcorn.data.db.deleteWhere(table);
     await saltcorn.data.db.insertRows(table, await safeRows(table, rows));

package/src/helpers/file_system.js

@@ -56,6 +56,35 @@ function getDirEntryCordova(directory) {
   });
 }
 
+export async function readJSONCordova(fileName, dirName) {
+  const text = await readTextCordova(fileName, dirName);
+  return JSON.parse(text);
+}
+
+export async function readTextCordova(fileName, dirName) {
+  const dirEntry = await getDirEntryCordova(dirName);
+  return new Promise((resolve, reject) => {
+    dirEntry.getFile(
+      fileName,
+      { create: false, exclusive: false },
+      function (fileEntry) {
+        fileEntry.file(function (file) {
+          let reader = new FileReader();
+          reader.onloadend = function (e) {
+            resolve(this.result);
+          };
+          reader.readAsText(file);
+        });
+      },
+      function (err) {
+        console.log(`unable to read  ${fileName}`);
+        console.log(err);
+        reject(err);
+      }
+    );
+  });
+}
+
 export async function readBinaryCordova(fileName, dirName) {
   const dirEntry = await getDirEntryCordova(dirName);
   return new Promise((resolve, reject) => {

package/src/init.js

@@ -1,4 +1,4 @@
-/*global saltcorn, Capacitor */
+/*global saltcorn, Capacitor, cordova */
 
 import {
   startOfflineMode,
@@ -23,6 +23,7 @@ import {
   addRoute,
 } from "./helpers/navigation.js";
 import { checkSendIntentReceived } from "./helpers/common.js";
+import { readJSONCordova, readTextCordova } from "./helpers/file_system.js";
 
 import i18next from "i18next";
 import i18nextSprintfPostProcessor from "i18next-sprintf-postprocessor";
@@ -156,10 +157,22 @@ const initJwt = async () => {
   }
 };
 
-const initI18Next = async (allLanguages) => {
+const initI18Next = async () => {
+  const resources = {};
+  for (const key of Object.keys(
+    saltcorn.data.models.config.available_languages
+  )) {
+    const localeFile = await readJSONCordova(
+      `${key}.json`,
+      `${cordova.file.applicationDirectory}public/data/locales`
+    );
+    resources[key] = {
+      translation: localeFile,
+    };
+  }
   await i18next.use(i18nextSprintfPostProcessor).init({
     lng: "en",
-    allLanguages,
+    resources,
   });
 };
 
@@ -291,26 +304,52 @@ const postShare = async (shareData) => {
   return await replaceIframe(page.content);
 };
 
+const readSchemaIfNeeded = async () => {
+  let tablesJSON = null;
+  const { created_at } = await readJSONCordova(
+    "tables_created_at.json",
+    `${cordova.file.applicationDirectory}${"public"}/data`
+  );
+  const updateNeeded = await dbUpdateNeeded(created_at);
+  if (updateNeeded) {
+    tablesJSON = await readJSONCordova(
+      "tables.json",
+      `${cordova.file.applicationDirectory}${"public"}/data`
+    );
+  }
+  return { updateNeeded, tablesJSON };
+};
+
+const readSiteLogo = async (state) => {
+  try {
+    const base64 = await readTextCordova(
+      "encoded_site_logo.txt",
+      `${cordova.file.applicationDirectory}public/data`
+    );
+    return base64;
+  } catch (error) {
+    console.log(
+      `Unable to read the site logo file: ${
+        error.message ? error.message : "Unknown error"
+      }`
+    );
+    return "";
+  }
+};
+
 // device is ready
-export async function init({
-  mobileConfig,
-  tablesSchema,
-  schemaCreatedAt,
-  translations,
-  siteLogo,
-}) {
+export async function init(mobileConfig) {
   try {
     const lastLocation = takeLastLocation();
     document.addEventListener("resume", onResume, false);
-    const { created_at } = schemaCreatedAt;
     await addScripts(mobileConfig.version_tag);
     saltcorn.data.db.connectObj.version_tag = mobileConfig.version_tag;
 
     await saltcorn.data.db.init();
-    const updateNeeded = await dbUpdateNeeded(created_at);
+    const { updateNeeded, tablesJSON } = await readSchemaIfNeeded();
     if (updateNeeded) {
       // update '_sc_plugins' first because of loadPlugins()
-      await updateScPlugins(tablesSchema);
+      await updateScPlugins(tablesJSON);
     }
     const state = saltcorn.data.state.getState();
     state.mobileConfig = mobileConfig;
@@ -318,7 +357,9 @@ export async function init({
     state.registerPlugin("base", saltcorn.base_plugin);
     state.registerPlugin("sbadmin2", saltcorn.sbadmin2);
     collectPluginHeaders(await loadPlugins(state));
-    if (updateNeeded) await updateDb(tablesSchema);
+    if (updateNeeded) {
+      await updateDb(tablesJSON);
+    }
     await createSyncInfoTables(mobileConfig.synchedTables);
     await initJwt();
     await state.refresh_tables();
@@ -331,8 +372,8 @@ export async function init({
     );
     await state.setConfig("base_url", mobileConfig.server_path);
     const entryPoint = mobileConfig.entry_point;
-    await initI18Next(translations);
-    state.mobileConfig.encodedSiteLogo = siteLogo;
+    await initI18Next();
+    state.mobileConfig.encodedSiteLogo = await readSiteLogo();
     state.mobileConfig.networkState = (
       await Network.getStatus()
     ).connectionType;

package/src/routing/index.js

@@ -14,6 +14,11 @@ import {
 } from "./routes/sync";
 import { postView, postViewRoute, getView } from "./routes/view";
 import { postShare } from "./routes/notifications";
+import {
+  postResumeWorkflow,
+  getFillWorkflowForm,
+  postFillWorkflowForm,
+} from "./routes/actions";
 
 const routes = [
   // api
@@ -98,6 +103,19 @@ const routes = [
     path: "get/view/:viewname",
     action: getView,
   },
+  // actions
+  {
+    path: "post/actions/resume-workflow/:id",
+    action: postResumeWorkflow,
+  },
+  {
+    path: "get/actions/fill-workflow-form/:id",
+    action: getFillWorkflowForm,
+  },
+  {
+    path: "post/actions/fill-workflow-form/:id",
+    action: postFillWorkflowForm,
+  },
 ];
 
 export const router = new UniversalRouter(routes);

package/src/routing/routes/actions.js

@@ -0,0 +1,111 @@
+/*global saltcorn */
+
+import { MobileRequest } from "../mocks/request";
+import { apiCall } from "../../helpers/api";
+
+export const postResumeWorkflow = async (context) => {
+  const { id } = context.params;
+  const { isOfflineMode } = saltcorn.data.state.getState().mobileConfig;
+  if (isOfflineMode) {
+    const req = new MobileRequest(context);
+    const run = await saltcorn.data.models.WorkflowRun.findOne({ id });
+    if (run.started_by !== req.user?.id)
+      throw new saltcorn.data.utils.NotAuthorized(req.__("Not authorized"));
+    const trigger = await saltcorn.data.models.Trigger.findOne({
+      id: run.trigger_id,
+    });
+    const runResult = await run.run({
+      user: req.user,
+      interactive: true,
+      trace: trigger.configuration?.save_traces,
+    });
+    if (
+      runResult &&
+      typeof runResult === "object" &&
+      Object.keys(runResult).length
+    )
+      return { success: "ok", ...runResult };
+    const retDirs = await run.popReturnDirectives();
+    return { success: "ok", ...retDirs };
+  } else {
+    const response = await apiCall({
+      method: "POST",
+      path: `/actions/resume-workflow/${id}`,
+    });
+    return response.data;
+  }
+};
+
+export const getFillWorkflowForm = async (context) => {
+  const { id } = context.params;
+  const { isOfflineMode } = saltcorn.data.state.getState().mobileConfig;
+  if (isOfflineMode) {
+    const req = new MobileRequest();
+    const run = await saltcorn.data.models.WorkflowRun.findOne({ id });
+    if (!run.user_allowed_to_fill_form(req.user))
+      throw new saltcorn.data.utils.NotAuthorized(req.__("Not authorized"));
+    const trigger = await saltcorn.data.models.Trigger.findOne({
+      id: run.trigger_id,
+    });
+    const step = await saltcorn.data.models.WorkflowStep.findOne({
+      trigger_id: trigger.id,
+      name: run.current_step_name,
+    });
+    const form = await saltcorn.data.web_mobile_commons.getWorkflowStepUserForm(
+      run,
+      trigger,
+      step,
+      req
+    );
+    return saltcorn.markup.renderForm(form, false);
+  } else {
+    const response = await apiCall({
+      method: "GET",
+      path: `/actions/fill-workflow-form/${id}`,
+    });
+    return response.data;
+  }
+};
+
+export const postFillWorkflowForm = async (context) => {
+  const { id } = context.params;
+  const { isOfflineMode } = saltcorn.data.state.getState().mobileConfig;
+  if (isOfflineMode) {
+    const req = new MobileRequest(context);
+    const run = await saltcorn.data.models.WorkflowRun.findOne({ id });
+    if (!run.user_allowed_to_fill_form(req.user))
+      throw new saltcorn.data.utils.NotAuthorized(req.__("Not authorized"));
+    const trigger = await saltcorn.data.models.Trigger.findOne({
+      id: run.trigger_id,
+    });
+    const step = await saltcorn.data.models.WorkflowStep.findOne({
+      trigger_id: trigger.id,
+      name: run.current_step_name,
+    });
+    const form = await saltcorn.data.web_mobile_commons.getWorkflowStepUserForm(
+      run,
+      trigger,
+      step,
+      req
+    );
+    form.validate(req.body);
+    if (form.hasErrors) {
+      return { error: req.__("Errors in form") }; // TODO not sure
+    } else {
+      await run.provide_form_input(form.values);
+      const runres = await run.run({
+        user: req.user,
+        trace: trigger.configuration?.save_traces,
+        interactive: true,
+      });
+      const retDirs = await run.popReturnDirectives();
+      return { success: "ok", ...runres, ...retDirs };
+    }
+  } else {
+    const response = await apiCall({
+      method: "POST",
+      path: `/actions/fill-workflow-form/${id}`,
+    });
+    return response.data;
+  }
+};

package/src/routing/routes/page.js

@@ -4,10 +4,11 @@ import { MobileRequest } from "../mocks/request";
 import { MobileResponse } from "../mocks/response";
 import { parseQuery, wrapContents } from "../utils";
 import { loadFileAsText } from "../../helpers/common";
+import { apiCall } from "../../helpers/api";
 
 // post/page/:pagename/action/:rndid
 export const postPageAction = async (context) => {
-  const { user } = saltcorn.data.state.getState().mobileConfig;
+  const { user, isOfflineMode } = 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 });
@@ -21,12 +22,21 @@ export const postPageAction = async (context) => {
       if (segment.rndid === rndid) col = segment;
     },
   });
-  const result = await saltcorn.data.plugin_helper.run_action_column({
-    col,
-    referrer: "",
-    req,
-  });
-  return result || {};
+
+  if (isOfflineMode) {
+    const result = await saltcorn.data.plugin_helper.run_action_column({
+      col,
+      referrer: "",
+      req,
+    });
+    return result || {};
+  } else {
+    const response = await apiCall({
+      method: "POST",
+      path: `/page/${page_name}/action/${rndid}`,
+    });
+    return response.data || {};
+  }
 };
 
 const findPageOrGroup = (pagename) => {

package/src/routing/routes/view.js

@@ -5,6 +5,8 @@ import { MobileResponse } from "../mocks/response";
 import { parseQuery, wrapContents } from "../utils";
 import { setHasOfflineData } from "../../helpers/offline_mode";
 import { routingHistory } from "../../helpers/navigation";
+import { apiCall } from "../../helpers/api";
+
 /**
  *
  * @param {*} context
@@ -90,13 +92,25 @@ export const postViewRoute = async (context) => {
   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,
-    context.data,
-    res,
-    { req, res },
-    view.isRemoteTable()
-  );
+
+  if (!isOfflineMode && view.viewtemplateObj?.name === "WorkflowRoom") {
+    const response = await apiCall({
+      method: "POST",
+      path: `/view/${encodeURIComponent(view.name)}/${encodeURIComponent(
+        context.params.route
+      )}`,
+      body: context.data,
+    });
+    if (response.data.success === "ok") return response.data;
+    else throw new Error(`Unable to run route ${context.params.route}`);
+  } else
+    await view.runRoute(
+      context.params.route,
+      context.data,
+      res,
+      { req, res },
+      view.isRemoteTable()
+    );
   if (isOfflineMode) await setHasOfflineData(true);
   const wrapped = res.getWrapHtml();
   if (wrapped)

package/www/index.html

@@ -5,11 +5,7 @@
       name="viewport"
       content="width=device-width, initial-scale=1, maximum-scale=1"
     />
-    <script src="data/tables.js"></script>
-    <script src="data/tables_created_at.js"></script>
     <script src="data/config.js"></script>
-    <script src="data/translations.js"></script>
-    <script src="data/encoded_site_logo.js"></script>
     <script type="module" src="./dist/bundle.js"></script>
     <script src="js/iframe_view_utils.js"></script>
 
@@ -18,15 +14,9 @@
       if (window.saltcorn) window.saltcorn.mobileApp = mobileApp;
       else window.saltcorn = { mobileApp };
 
-      document.addEventListener("deviceready", () =>
-        saltcorn.mobileApp.init({
-          mobileConfig: _sc_mobile_config,
-          tablesSchema: _sc_tables,
-          schemaCreatedAt: _sc_tables_created_at,
-          translations: _sc_translations,
-          siteLogo: _sc_site_logo,
-        })
-      );
+      document.addEventListener("deviceready", () => {
+        saltcorn.mobileApp.init(_sc_mobile_config);
+      });
       document.addEventListener("backbutton", async () => {
         await saltcorn.mobileApp.navigation.goBack(1, true);
       });

package/www/js/iframe_view_utils.js

@@ -1,5 +1,5 @@
 /*eslint-env browser*/
-/*global $, KTDrawer, submitWithEmptyAction, is_paging_param, bootstrap, common_done, unique_field_from_rows, inline_submit_success, get_current_state_url, initialize_page */
+/*global $, KTDrawer, reload_embedded_view, submitWithEmptyAction, is_paging_param, bootstrap, common_done, unique_field_from_rows, inline_submit_success, get_current_state_url, initialize_page */
 
 function combineFormAndQuery(form, query) {
   let paramsList = [];
@@ -124,6 +124,55 @@ async function formSubmit(e, urlSuffix, viewname, noSubmitCb, matchingState) {
   }
 }
 
+async function ajaxSubmitForm(e, force_no_reload, event) {
+  const form = $(e).closest("form");
+  const action = form.attr("action");
+  if (event) event.preventDefault();
+  try {
+    const { isOfflineMode } =
+      parent.saltcorn.data.state.getState().mobileConfig;
+    let responseData = null;
+    if (isOfflineMode) {
+      const { path, query } =
+        parent.saltcorn.mobileApp.navigation.splitPathQuery(action);
+      const formData = new FormData(form[0]);
+      const data = {};
+      for (const [k, v] of formData.entries()) data[k] = v;
+      responseData = await parent.saltcorn.mobileApp.navigation.router.resolve({
+        pathname: `post${path}`,
+        query: query,
+        body: data,
+      });
+    } else {
+      const response = await parent.saltcorn.mobileApp.api.apiCall({
+        path: action,
+        method: "POST",
+        body: new FormData(form[0]),
+      });
+      responseData = response.data;
+    }
+    var no_reload = $("#scmodal").hasClass("no-submit-reload");
+    const on_close_reload_view = $("#scmodal").attr(
+      "data-on-close-reload-view"
+    );
+    $("#scmodal").modal("hide");
+    if (on_close_reload_view) {
+      const viewE = $(`[data-sc-embed-viewname="${on_close_reload_view}"]`);
+      if (viewE.length) reload_embedded_view(on_close_reload_view);
+      else if (!force_no_reload)
+        await parent.saltcorn.mobileApp.navigation.reload();
+    } else if (!force_no_reload && !no_reload)
+      await parent.saltcorn.mobileApp.navigation.reload();
+    else common_done(responseData, form.attr("data-viewname"));
+  } catch (error) {
+    // var title = request.getResponseHeader("Page-Title");
+    // if (title) $("#scmodal .modal-title").html(decodeURIComponent(title));
+    // var body = request.responseText;
+    // if (body) $("#scmodal .modal-body").html(body);
+    parent.saltcorn.mobileApp.common.errorAlert(error);
+  }
+}
+
 async function inline_local_submit(e, opts1) {
   try {
     e.preventDefault();
@@ -481,7 +530,7 @@ async function mobile_modal(url, opts = {}) {
         query: query,
         alerts: [],
       });
-      const modalContent = page.content;
+      const modalContent = typeof page === "string" ? page : page.content;
       const title = page.title;
       if (title) $("#scmodal .modal-title").html(title);
       $("#scmodal .modal-body").html(modalContent);
@@ -502,6 +551,10 @@ function closeModal() {
   $("#scmodal").modal("toggle");
 }
 
+async function ajax_post(url, args) {
+  await local_post(url, args);
+}
+
 async function local_post(url, args) {
   try {
     showLoadSpinner();
@@ -519,6 +572,10 @@ async function local_post(url, args) {
   }
 }
 
+async function ajax_post_json(url, data, cb) {
+  await local_post_json(url, data, cb);
+}
+
 async function local_post_json(url, data, cb) {
   try {
     showLoadSpinner();
@@ -679,6 +736,8 @@ async function clear_state(omit_fields_str, e) {
   }
 }
 
+let last_route_viewname;
+
 async function view_post(viewnameOrElem, route, data, onDone, sendState) {
   const viewname =
     typeof viewnameOrElem === "string"
@@ -686,6 +745,7 @@ async function view_post(viewnameOrElem, route, data, onDone, sendState) {
       : $(viewnameOrElem)
           .closest("[data-sc-embed-viewname]")
           .attr("data-sc-embed-viewname");
+  last_route_viewname = viewname;
   const buildQuery = () => {
     const query = parent.saltcorn.mobileApp.navigation.currentQuery();
     return query ? `?${query}` : "";

package/www/data/encoded_site_logo.js

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