From 0bf53dcccce4618bd299d45dced40acb4b861c6f Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Mon, 24 Aug 2020 11:30:04 -0700
Subject: [PATCH] Trying to resolve SW issues.

---
 client/src/App/App.container.jsx              |  2 -
 .../App/registerServiceWorker.component.jsx   | 76 +++++++++----------
 client/src/index.js                           |  1 +
 server.js                                     |  2 +-
 4 files changed, 37 insertions(+), 44 deletions(-)

diff --git a/client/src/App/App.container.jsx b/client/src/App/App.container.jsx
index cb880a7fa..ca114ff0e 100644
--- a/client/src/App/App.container.jsx
+++ b/client/src/App/App.container.jsx
@@ -19,7 +19,6 @@ import GlobalLoadingBar from "../components/global-loading-bar/global-loading-ba
 import { auth } from "../firebase/firebase.utils";
 import errorLink from "../graphql/apollo-error-handling";
 import App from "./App";
-import RegisterServiceWorker from "./registerServiceWorker.component";
 
 moment.locale("en-US");
 
@@ -152,7 +151,6 @@ export default function AppContainer() {
         locale={enLocale}
       >
         <GlobalLoadingBar />
-        <RegisterServiceWorker />
         <App />
       </ConfigProvider>
     </ApolloProvider>
diff --git a/client/src/App/registerServiceWorker.component.jsx b/client/src/App/registerServiceWorker.component.jsx
index 0dbeafcf5..7136574f8 100644
--- a/client/src/App/registerServiceWorker.component.jsx
+++ b/client/src/App/registerServiceWorker.component.jsx
@@ -1,48 +1,42 @@
 import { AlertOutlined } from "@ant-design/icons";
 import { Button, notification } from "antd";
 import i18n from "i18next";
-import React, { useEffect } from "react";
+import React from "react";
 import * as serviceWorker from "../serviceWorker";
 
-export default function RegisterServiceWorker() {
-  useEffect(() => {
-    console.log("SWR Use Effect Fired.");
-    const onServiceWorkerUpdate = (registration) => {
-      console.log("onServiceWorkerUpdate", registration);
+const onServiceWorkerUpdate = (registration) => {
+  console.log("[RSW] onServiceWorkerUpdate", registration);
 
-      const key = `open${Date.now()}`;
-      const btn = (
-        <Button
-          type="primary"
-          onClick={async () => {
-            if (registration && registration.waiting) {
-              await registration.unregister();
-              // Makes Workbox call skipWaiting()
-              registration.waiting.postMessage({ type: "SKIP_WAITING" });
-              // Once the service worker is unregistered, we can reload the page to let
-              // the browser download a fresh copy of our app (invalidating the cache)
-              window.location.reload();
-            }
-          }}
-        >
-          {i18n.t("general.actions.refresh")}
-        </Button>
-      );
-      notification.open({
-        icon: <AlertOutlined />,
-        message: i18n.t("general.messages.newversiontitle"),
-        description: i18n.t("general.messages.newversionmessage"),
-        duration: 0,
-        btn,
-        key,
-      });
-    };
+  const key = `open${Date.now()}`;
+  const btn = (
+    <Button
+      type="primary"
+      onClick={async () => {
+        if (registration && registration.waiting) {
+          await registration.unregister();
+          // Makes Workbox call skipWaiting()
+          registration.waiting.postMessage({ type: "SKIP_WAITING" });
+          // Once the service worker is unregistered, we can reload the page to let
+          // the browser download a fresh copy of our app (invalidating the cache)
+          window.location.reload();
+        }
+      }}
+    >
+      {i18n.t("general.actions.refresh")}
+    </Button>
+  );
+  notification.open({
+    icon: <AlertOutlined />,
+    message: i18n.t("general.messages.newversiontitle"),
+    description: i18n.t("general.messages.newversionmessage"),
+    duration: 0,
+    btn,
+    key,
+  });
+};
 
-    if (process.env.NODE_ENV === "production") {
-      console.log("SWR Registering SW...");
-      serviceWorker.register({ onUpdate: onServiceWorkerUpdate });
-    }
-  }, []);
-
-  return <div style={{ display: "none" }}>Service Worker Registration.</div>;
-}
+// if (process.env.NODE_ENV === "production") {
+//   console.log("SWR Registering SW...");
+console.log("Registering Service Worker...");
+serviceWorker.register({ onUpdate: onServiceWorkerUpdate });
+//   }
diff --git a/client/src/index.js b/client/src/index.js
index b06a3e704..34ca11d3a 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -9,6 +9,7 @@ import { store, persistor } from "./redux/store";
 import AppContainer from "./App/App.container";
 import "./index.css";
 import LoadingSpinner from "./components/loading-spinner/loading-spinner.component";
+import "./App/registerServiceWorker.component";
 
 require("dotenv").config();
 
diff --git a/server.js b/server.js
index 7d89b493f..546155738 100644
--- a/server.js
+++ b/server.js
@@ -103,7 +103,7 @@ if (process.env.NODE_ENV === "production") {
   app.use(express.static(path.join(__dirname, "admin/build")));
 
   app.get("/service-worker.js", (req, res) => {
-    res.sendFile(path.resolve(__dirname, "..", "build", "service-worker.js"));
+    res.sendFile(path.resolve(__dirname, "client/build", "service-worker.js"));
   });
 
   app.get("/admin*", function (req, res) {