Merged in r2-2598-pn-action (pull request #6536)

R2-2598: Going to application when push notification clicked
primeroIMS · Oct 11, 2023 · e1f031f · e1f031f
2 parents c08cc00 + fc946e6
commit e1f031f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 29 deletions.
diff --git a/app/javascript/worker.js b/app/javascript/worker.js
@@ -19,10 +19,6 @@ const METHODS = {
   DELETE: "DELETE"
 };
 
-const ACTIONS = {
-  GOTO: "goto"
-};
-
 const isNav = event => event.request.mode === "navigate";
 
 // TODO: This pr would allow passing strategies to workbox way of handling navigation routes
@@ -104,38 +100,31 @@ self.addEventListener("push", event => {
       body: message.body,
       image,
       icon: image,
-      data: { url: message.link },
-      actions: [{ action: ACTIONS.GOTO, title: message.action_label }]
+      data: { url: message.link }
     })
   );
 });
 
 self.addEventListener(
   "notificationclick",
-  async event => {
+  event => {
     event.notification.close();
 
-    if (event.action === ACTIONS.GOTO) {
-      event.waitUntil(
-        self.clients
-          .matchAll({
-            type: "window"
-          })
-          .then(clientList => {
-            const link = `${self.location.protocol}//${event.notification.data.url}`;
-
-            for (let clientCounter = 0; clientCounter < clientList.length; clientCounter += 1) {
-              const client = clientList[clientCounter];
-
-              if (client.url === link && "focus" in client) {
-                return client.focus();
-              }
-            }
-
-            return self.clients.openWindow(link);
-          })
-      );
-    }
+    event.waitUntil(
+      self.clients.matchAll().then(clientList => {
+        const link = `${self.location.protocol}//${event.notification.data.url}`;
+
+        for (let clientCounter = 0; clientCounter < clientList.length; clientCounter += 1) {
+          const client = clientList[clientCounter];
+
+          if (client.url === link && "focus" in client) {
+            return client.focus();
+          }
+        }
+
+        return self.clients.openWindow(link);
+      })
+    );
   },
   false
 );
diff --git a/public/manifest.json b/public/manifest.json
@@ -4,7 +4,7 @@
   "description": "Primero is an open source software platform that helps social services, humanitarian and development workers manage protection-related data, with tools that facilitate case management, incident monitoring and family tracing and reunification.",
   "start_url": "v2/",
   "background_color": "#ffffff",
-  "display": "fullscreen",
+  "display": "standalone",
   "theme_color": "#0093ba",
   "icons": [
     {