Merged in r2-2619-frontend-react-404-error (pull request #6514)

R2-2619 - Front react to 404 errors Approved-by: Joshua Toliver
primeroIMS · Sep 22, 2023 · 85ec523 · 85ec523
2 parents 8a851b5 + 813c125
commit 85ec523
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/app/javascript/components/push-notifications-toggle/component.jsx b/app/javascript/components/push-notifications-toggle/component.jsx
@@ -17,6 +17,7 @@ import {
   saveNotificationSubscription
 } from "../user";
 import ConditionalTooltip from "../conditional-tooltip";
+import { enqueueSnackbar } from "../notifier";
 
 import css from "./styles.css";
 
@@ -93,6 +94,11 @@ function Component() {
     if (event?.data?.type === POST_MESSAGES.DISPATCH_SAVE_SUBSCRIPTION) {
       dispatch(saveNotificationSubscription(event?.data?.endpoint));
     }
+
+    if (event?.data?.type === POST_MESSAGES.ATTEMPTS_SUBSCRIPTION_FAILED) {
+      setValue(false);
+      dispatch(enqueueSnackbar("Attempts subscription failed"));
+    }
   };
 
   useEffect(() => {

diff --git a/app/javascript/config/constants.js b/app/javascript/config/constants.js
@@ -746,5 +746,6 @@ export const POST_MESSAGES = {
   SUBSCRIBE_NOTIFICATIONS: "subscribe_notifications",
   UNSUBSCRIBE_NOTIFICATIONS: "unsubscribe_notifications",
   DISPATCH_REMOVE_SUBSCRIPTION: "dispatch_remove_subscription",
-  DISPATCH_SAVE_SUBSCRIPTION: "dispatch_save_subscription"
+  DISPATCH_SAVE_SUBSCRIPTION: "dispatch_save_subscription",
+  ATTEMPTS_SUBSCRIPTION_FAILED: "attempts_subscription_failed"
 };
diff --git a/app/javascript/libs/service-worker-utils.js b/app/javascript/libs/service-worker-utils.js
@@ -4,6 +4,8 @@ import getToken from "../middleware/utils/get-token";
 import DB, { DB_STORES } from "../db";
 
 const SERVICE_WORKER_PATH = `${window.location.origin}/worker.js`;
+const MAX_ATTEMPTS = 3;
+let attempts = 1;
 
 async function getServiceWorker() {
   return navigator.serviceWorker.ready;
@@ -63,6 +65,21 @@ async function sendSubscriptionStatusToServer(isSubscribing = true, data = {}) {
       type: POST_MESSAGES.DISPATCH_REMOVE_SUBSCRIPTION
     });
   }
+
+  if (isSubscribing && response.status === 404) {
+    if (attempts % MAX_ATTEMPTS !== 0) {
+      postMessage({
+        type: POST_MESSAGES.SUBSCRIBE_NOTIFICATIONS
+      });
+    }
+
+    if (attempts % MAX_ATTEMPTS === 0) {
+      postMessage({
+        type: POST_MESSAGES.ATTEMPTS_SUBSCRIPTION_FAILED
+      });
+    }
+    attempts += 1;
+  }
 }
 
 async function subscribe() {