@saltcorn/mobile-app 1.1.1-beta.5 → 1.1.1-beta.7

package/package.json

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

package/src/helpers/common.js

@@ -189,33 +189,15 @@ export async function getScreenOrientation() {
   return await ScreenOrientation.orientation();
 }
 
-export async function sendIntentCallback() {
-  console.log("sendIntentCallback");
+export async function finishShareIntent() {
+  SendIntent.finish();
+}
+
+export async function checkSendIntentReceived() {
   try {
-    const received = await SendIntent.checkSendIntentReceived();
-    console.log("received: ", received);
-    if (received) {
-      const response = await apiCall({
-        method: "POST",
-        path: "/notifications/share-handler",
-        body: received,
-      });
-      console.log("Share data sent to server.");
-      console.log(response);
-      if (response.data.error) {
-        errorAlert(response.data.error);
-      } else {
-        showAlerts([
-          {
-            type: "success",
-            msg:
-              "Shared: " +
-              (received.title || received.text || received.url || ""),
-          },
-        ]);
-      }
-    }
+    return await SendIntent.checkSendIntentReceived();
   } catch (error) {
-    console.log("Error in sendIntentCallback: ", error);
+    console.log("Error in checkSendIntentReceived: ", error);
+    return null;
   }
 }

package/src/init.js

@@ -1,4 +1,4 @@
-/*global saltcorn */
+/*global saltcorn, Capacitor */
 
 import {
   startOfflineMode,
@@ -22,7 +22,7 @@ import {
   gotoEntryView,
   addRoute,
 } from "./helpers/navigation.js";
-import { sendIntentCallback } from "./helpers/common.js";
+import { checkSendIntentReceived } from "./helpers/common.js";
 
 import i18next from "i18next";
 import i18nextSprintfPostProcessor from "i18next-sprintf-postprocessor";
@@ -275,6 +275,22 @@ const takeLastLocation = () => {
   return result;
 };
 
+const notEmpty = (shareData) => {
+  for (const value of Object.values(shareData)) {
+    if (typeof value === "string" && value.trim() !== "") return true;
+  }
+};
+
+const postShare = async (shareData) => {
+  const page = await router.resolve({
+    pathname: "post/notifications/share",
+    shareData,
+    fullWrap: true,
+    isSendIntentActivity: true,
+  });
+  return await replaceIframe(page.content);
+};
+
 // device is ready
 export async function init({
   mobileConfig,
@@ -317,8 +333,18 @@ export async function init({
     const entryPoint = mobileConfig.entry_point;
     await initI18Next(translations);
     state.mobileConfig.encodedSiteLogo = siteLogo;
-
-    state.mobileConfig.networkState = await Network.getStatus();
+    state.mobileConfig.networkState = (
+      await Network.getStatus()
+    ).connectionType;
+    if (Capacitor.platform === "android") {
+      const shareData = await checkSendIntentReceived();
+      if (shareData) return await postShare(shareData);
+    } else if (Capacitor.platform === "ios") {
+      window.addEventListener("sendIntentReceived", async () => {
+        const shareData = await checkSendIntentReceived();
+        if (shareData && notEmpty(shareData)) return await postShare(shareData);
+      });
+    }
     Network.addListener("networkStatusChange", networkChangeCallback);
 
     const networkDisabled = state.mobileConfig.networkState === "none";
@@ -367,11 +393,11 @@ export async function init({
           });
         }
       }
-      if (state.mobileConfig.allowOfflineMode) {
-        await sendIntentCallback();
-        window.addEventListener("sendIntentReceived", sendIntentCallback);
-      }
 
+      if (Capacitor.platform === "ios") {
+        const shareData = await checkSendIntentReceived();
+        if (shareData && notEmpty(shareData)) return await postShare(shareData);
+      }
       let page = null;
       if (!lastLocation) {
         addRoute({ route: entryPoint, query: undefined });

package/src/routing/index.js

@@ -12,8 +12,8 @@ import {
   getAskDeleteOfflineData,
   getAskUploadNotEnded,
 } from "./routes/sync";
-
 import { postView, postViewRoute, getView } from "./routes/view";
+import { postShare } from "./routes/notifications";
 
 const routes = [
   // api
@@ -80,6 +80,11 @@ const routes = [
     path: "get/sync/ask_delete_offline_data",
     action: getAskDeleteOfflineData,
   },
+  // notifications
+  {
+    path: "post/notifications/share",
+    action: postShare,
+  },
   // view
   {
     path: "post/view/:viewname",

package/src/routing/routes/notifications.js

@@ -0,0 +1,59 @@
+/*global saltcorn, Capacitor */
+
+import { wrapContents } from "../utils";
+import { MobileRequest } from "../mocks/request";
+
+import { checkJWT } from "../../helpers/auth.js";
+import { apiCall } from "../../helpers/api";
+
+const buildErrMsg = (msg) => {
+  return saltcorn.markup.tags.span(
+    msg,
+    saltcorn.markup.tags.i({
+      class: "ps-2 fas fa-times text-danger",
+    })
+  );
+};
+
+const buildSuccessMsg = (msg) => {
+  return saltcorn.markup.tags.span(
+    msg,
+    saltcorn.markup.tags.i({
+      class: "ps-2 fas fa-check text-success",
+    })
+  );
+};
+
+export const postShare = async (context) => {
+  let content = "";
+  const mobileCfg = saltcorn.data.state.getState().mobileConfig;
+  if (mobileCfg.networkState === "none")
+    content = buildErrMsg("No network connection");
+  else if (!(await checkJWT(mobileCfg.jwt)))
+    content = buildErrMsg("Not authenticated");
+  else {
+    const response = await apiCall({
+      method: "POST",
+      path: "/notifications/share-handler",
+      body: context.shareData,
+    });
+    if (response.error) content = buildErrMsg(response.error);
+    else content = buildSuccessMsg("Shared successfully");
+  }
+  return await wrapContents(
+    saltcorn.markup.tags.div(
+      content,
+      saltcorn.markup.tags.script(`
+      setTimeout(() => {
+        ${
+          Capacitor.platform === "android"
+            ? "parent.saltcorn.mobileApp.common.finishShareIntent();"
+            : "parent.saltcorn.mobileApp.navigation.gotoEntryView();"
+        } 
+      }, 4000);`)
+    ),
+    "Share",
+    context,
+    new MobileRequest()
+  );
+};

package/src/routing/utils.js

@@ -152,7 +152,7 @@ export const wrapContents = async (contents, title, context, req) => {
         body,
         alerts: prepareAlerts(context, req),
         role: state.mobileConfig.user.role_id || 100,
-        menu: getMenu(req),
+        menu: context.isSendIntentActivity ? [] : getMenu(req),
         req,
         headers: getHeaders(),
         brand: {

package/webpack.config.js

@@ -20,7 +20,18 @@ module.exports = {
         use: {
           loader: "babel-loader",
           options: {
-            presets: ["@babel/preset-env"],
+            presets: [
+              [
+                "@babel/preset-env",
+                {
+                  targets: {
+                    esmodules: true,
+                    browsers: ["last 2 Chrome versions", "not dead"],
+                  },
+                  exclude: ["@babel/plugin-transform-async-to-generator"],
+                },
+              ],
+            ],
           },
         },
       },