Merge pull request #286 from ConductionNL/feature/WOO-116/attachments

feature/WOO-116/attachments
ConductionNL · Mar 22, 2024 · 22f7ddf · 22f7ddf
2 parents 54e30b5 + 133cdbd
commit 22f7ddf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 18 deletions.
diff --git a/pwa/gatsby-ssr.js b/pwa/gatsby-ssr.js
@@ -24,21 +24,7 @@ export const wrapRootElement = ({ element }) => {
   );
 };
 
-export const onRenderBody = ({ setHeadComponents, setPostBodyComponents }) => {
-  const isBrowser = () => typeof window !== "undefined";
+export const onRenderBody = ({ setHeadComponents }) => {
   const HeadComponents = [<title key={0}>Woo Website</title>];
-  const BodyComponents = [
-    isBrowser() && window.sessionStorage.getItem("ANALYTICS_URL") ? (
-      <script
-        key={0}
-        id="analytics"
-        async
-        src={window.sessionStorage.getItem("ANALYTICS_URL")}
-      />
-    ) : (
-      <script key={0} id="analytics" />
-    ),
-  ];
   setHeadComponents(HeadComponents);
-  setPostBodyComponents(BodyComponents);
 };
diff --git a/pwa/src/hooks/useEnvironment.ts b/pwa/src/hooks/useEnvironment.ts
@@ -12,9 +12,6 @@ export const useEnvironment = () => {
 
   const updateSessionStorage = () => {
     window.dispatchEvent(new Event("sessionStorageChange"));
-    const analyticsElement = document.getElementById("analytics");
-    window.sessionStorage.getItem("ANALYTICS_URL") &&
-      analyticsElement?.setAttribute("src", window.sessionStorage.getItem("ANALYTICS_URL") ?? "");
   };
 
   React.useEffect(() => {

diff --git a/pwa/src/layout/Head.tsx b/pwa/src/layout/Head.tsx
@@ -33,6 +33,9 @@ export const Head: React.FC = () => {
         getPageTitle(translatedCrumbs, gatsbyContext.location) ?? "Error"
       }`}</title>
       <link rel="icon" type="svg" href={window.sessionStorage.getItem("FAVICON_URL") ?? ""} />
+      {window.sessionStorage.getItem("ANALYTICS_URL") || (
+        <script async src={window.sessionStorage.getItem("ANALYTICS_URL") ?? ""} />
+      )}
     </Helmet>
   );
 };