From b40ef7d5c83f4d60abae3411588858d491a6e1b2 Mon Sep 17 00:00:00 2001
From: Arvid Norlin <arvid.norlin@scandichotels.com>
Date: Fri, 9 Feb 2024 15:36:04 +0100
Subject: [PATCH 01/19] WIP: add Adobe page tracking

---
 .../(live)/current-content-page/page.tsx      |  4 +-
 app/[lang]/(live)/layout.tsx                  | 21 ++++-
 app/[lang]/(live)/not-found.tsx               | 13 ++-
 app/[lang]/Tracking.tsx                       | 83 +++++++++++++++++++
 4 files changed, 113 insertions(+), 8 deletions(-)
 create mode 100644 app/[lang]/Tracking.tsx

diff --git a/app/[lang]/(live)/current-content-page/page.tsx b/app/[lang]/(live)/current-content-page/page.tsx
index 2585f6982..cc056893b 100644
--- a/app/[lang]/(live)/current-content-page/page.tsx
+++ b/app/[lang]/(live)/current-content-page/page.tsx
@@ -1,7 +1,7 @@
 import { notFound } from "next/navigation"
 
-import { request } from "@/lib/request";
-import { GetCurrentBlockPage } from "@/lib/graphql/Query/CurrentBlockPage.graphql";
+import { request } from "@/lib/request"
+import { GetCurrentBlockPage } from "@/lib/graphql/Query/CurrentBlockPage.graphql"
 
 import ContentPage from "@/components/Current/ContentPage"
 
diff --git a/app/[lang]/(live)/layout.tsx b/app/[lang]/(live)/layout.tsx
index 797078b88..57bc88523 100644
--- a/app/[lang]/(live)/layout.tsx
+++ b/app/[lang]/(live)/layout.tsx
@@ -8,11 +8,18 @@ import SkipToMainContent from "@/components/SkipToMainContent";
 
 import type { Metadata } from "next";
 import type { LangParams, LayoutArgs } from "@/types/params";
-
+import { env } from "@/env/server.mjs"
 export const metadata: Metadata = {
   description: "New web",
   title: "Scandic Hotels New Web",
-};
+}
+
+const adobeSrcs = {
+  development: "",
+  test: "https://assets.adobedtm.com/c1bd08b1e4e7/d64a7c1f5f17/launch-84c70d82a50c-staging.min.js",
+  production:
+    "https://assets.adobedtm.com/c1bd08b1e4e7/d64a7c1f5f17/launch-e56085bbe998.min.js",
+}
 
 export default function RootLayout({
   children,
@@ -56,6 +63,16 @@ export default function RootLayout({
           data-cookieconsent="ignore"
           src="/Static/dist/js/ng/main.js?1705409330990"
         />
+        {/* <Script id="datalayer-init">
+          {`
+            console.log('create datalayer 🚀')
+            var datalayer = datalayer || {}
+            
+            console.log('datalayer: ', datalayer)
+          `}
+        </Script> */}
+        {/* TODO: Ensure order (datalayer created before script is executed!) */}
+        <Script src={adobeSrcs[env.NODE_ENV]} />
         {/* <Script
           data-cookieconsent="ignore"
           src="/Static/dist/js/main-ng.js?336b801d6b38eff10884"
diff --git a/app/[lang]/(live)/not-found.tsx b/app/[lang]/(live)/not-found.tsx
index 1a6cc1ce6..56fdd344c 100644
--- a/app/[lang]/(live)/not-found.tsx
+++ b/app/[lang]/(live)/not-found.tsx
@@ -1,8 +1,13 @@
+import Tracking from "./Tracking"
+
 export default function NotFound() {
   return (
-    <main>
-      <h2>Not Found</h2>
-      <p>Could not find requested resource</p>
-    </main>
+    <>
+      <main>
+        <h2>Not Found</h2>
+        <p>Could not find requested resource</p>
+      </main>
+      <Tracking />
+    </>
   )
 }
diff --git a/app/[lang]/Tracking.tsx b/app/[lang]/Tracking.tsx
new file mode 100644
index 000000000..4d6c08d0f
--- /dev/null
+++ b/app/[lang]/Tracking.tsx
@@ -0,0 +1,83 @@
+"use client"
+
+import { usePathname, useSearchParams } from "next/navigation"
+import Script from "next/script"
+
+type WindowWithDataLayer = Window & {
+  datalayer: { [key: string]: any }
+}
+
+declare const window: WindowWithDataLayer
+
+function createPageObject(pathName: string, queryString?: string) {
+  const [lang, ...segments] = pathName.split("/").filter((v: string) => v)
+
+  // implement more solid approach for lang ⬆️
+
+  function getSiteSections(segments: string[]) {
+    const sitesections: { [key: string]: string } = {}
+
+    for (let i = 0; i < 6; i++) {
+      const key = "value" + (i + 1)
+      sitesections[key] = segments.slice(0, i + 1).join("|")
+      if (i > 0 && !segments[i]) {
+        sitesections[key] = sitesections[key].concat(
+          "|".repeat(i + 1 - segments.length)
+        )
+      }
+    }
+    return sitesections
+  }
+  const sitesections = getSiteSections(segments)
+
+  const page_obj = {
+    pagename: "<a unique name of the page>",
+    pagetype: "<the type of page or content group>",
+    pageurl: "urlObject.href",
+    ...sitesections,
+    createDate: "< the date when page is created>",
+    publishDate: "< the date when page is published>",
+    domain: "", // is window.location.host viable?
+    errorcode: null, // handle
+    querystring: queryString || "",
+    pageid: "<unique id of the page>",
+    sessionid: "<unique identifier of session>", // base on what?
+    domainlanguage: lang,
+    hotelbrand: "<scandic or scandicgo)>", // what is this based on?
+    siteversion: "new-web", // good enough?
+  }
+  return page_obj
+}
+
+export default function Tracking() {
+  console.log("create datalayer 🚀")
+
+  if (!window.datalayer) {
+    window.datalayer = {}
+  }
+
+  const pathName = usePathname()
+  const queryString = useSearchParams().toString()
+
+  const pageObject = createPageObject(pathName, queryString)
+
+  if (window.datalayer) {
+    window.datalayer.page = pageObject
+
+    // NOTE: Is this irrelevant för drop 1?
+    // var user_obj = {
+    //   loginstatus: "<if the user is logged in or not>",
+    //   memberid: "<unique meeting package membership id for the user>",
+    //   memberlevel: "<member level of user>",
+    // }
+
+    // datalayer.user = user_obj;
+  }
+  return (
+    <>
+      <Script id="page-tracking">{`
+      console.log('hello')
+      `}</Script>
+    </>
+  )
+}

From 666e62c85103cf0c673c2c44f415f263eb5c8c7e Mon Sep 17 00:00:00 2001
From: Arvid Norlin <arvid.norlin@scandichotels.com>
Date: Mon, 12 Feb 2024 13:16:05 +0100
Subject: [PATCH 02/19] fix: ensure window.datalayer access in client only

---
 app/[lang]/(live)/layout.tsx | 26 +++++++++++++++++---------
 app/[lang]/Tracking.tsx      | 29 +++++++++++++++--------------
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/app/[lang]/(live)/layout.tsx b/app/[lang]/(live)/layout.tsx
index 57bc88523..e2c59e1a8 100644
--- a/app/[lang]/(live)/layout.tsx
+++ b/app/[lang]/(live)/layout.tsx
@@ -1,13 +1,13 @@
-import "../../core.css";
-import "../../scandic.css";
+import "../../core.css"
+import "../../scandic.css"
 
-import Footer from "@/components/Current/Footer";
-import LangPopup from "@/components/Current/LangPopup";
-import Script from "next/script";
-import SkipToMainContent from "@/components/SkipToMainContent";
+import Footer from "@/components/Current/Footer"
+import LangPopup from "@/components/Current/LangPopup"
+import Script from "next/script"
+import SkipToMainContent from "@/components/SkipToMainContent"
 
-import type { Metadata } from "next";
-import type { LangParams, LayoutArgs } from "@/types/params";
+import type { Metadata } from "next"
+import type { LangParams, LayoutArgs } from "@/types/params"
 import { env } from "@/env/server.mjs"
 export const metadata: Metadata = {
   description: "New web",
@@ -15,6 +15,7 @@ export const metadata: Metadata = {
 }
 
 const adobeSrcs = {
+  // TODO: decide on naming and environments
   development: "",
   test: "https://assets.adobedtm.com/c1bd08b1e4e7/d64a7c1f5f17/launch-84c70d82a50c-staging.min.js",
   production:
@@ -72,7 +73,14 @@ export default function RootLayout({
           `}
         </Script> */}
         {/* TODO: Ensure order (datalayer created before script is executed!) */}
+        {/* Should this be moved to an app/layout instead? */}
+        <Script id={"before"}>{`
+        console.log('before script load')
+        `}</Script>
         <Script src={adobeSrcs[env.NODE_ENV]} />
+        <Script id="after">{`
+        console.log('after script load')
+        `}</Script>
         {/* <Script
           data-cookieconsent="ignore"
           src="/Static/dist/js/main-ng.js?336b801d6b38eff10884"
@@ -86,5 +94,5 @@ export default function RootLayout({
         <Footer lang={params.lang} />
       </body>
     </html>
-  );
+  )
 }
diff --git a/app/[lang]/Tracking.tsx b/app/[lang]/Tracking.tsx
index 4d6c08d0f..80cb0cdbb 100644
--- a/app/[lang]/Tracking.tsx
+++ b/app/[lang]/Tracking.tsx
@@ -1,7 +1,6 @@
 "use client"
 
 import { usePathname, useSearchParams } from "next/navigation"
-import Script from "next/script"
 
 type WindowWithDataLayer = Window & {
   datalayer: { [key: string]: any }
@@ -50,15 +49,17 @@ function createPageObject(pathName: string, queryString?: string) {
 }
 
 export default function Tracking() {
-  console.log("create datalayer 🚀")
-
-  if (!window.datalayer) {
-    window.datalayer = {}
-  }
-
   const pathName = usePathname()
   const queryString = useSearchParams().toString()
 
+  if (typeof window === "undefined") {
+    return null
+  }
+  if (!window.datalayer) {
+    console.log("creating datalayer 🧑‍🔧")
+    window.datalayer = {}
+  }
+
   const pageObject = createPageObject(pathName, queryString)
 
   if (window.datalayer) {
@@ -72,12 +73,12 @@ export default function Tracking() {
     // }
 
     // datalayer.user = user_obj;
+    console.log("🤖 datalayer: ", window.datalayer)
   }
-  return (
-    <>
-      <Script id="page-tracking">{`
-      console.log('hello')
-      `}</Script>
-    </>
-  )
+  return null
+  // <>
+  //   <Script id="page-tracking">{`
+  //   console.log('hello')
+  //   `}</Script>
+  // </>
 }

From 5ccb6166c307ab46f203f6991d6da4314cce3897 Mon Sep 17 00:00:00 2001
From: Arvid Norlin <arvid.norlin@scandichotels.com>
Date: Mon, 12 Feb 2024 13:50:58 +0100
Subject: [PATCH 03/19] WIP: tracking

---
 app/[lang]/(live)/layout.tsx    | 13 ++-----
 app/[lang]/(live)/not-found.tsx | 13 ++-----
 app/[lang]/Tracking.tsx         | 66 ++++++++++++++++-----------------
 3 files changed, 39 insertions(+), 53 deletions(-)

diff --git a/app/[lang]/(live)/layout.tsx b/app/[lang]/(live)/layout.tsx
index e2c59e1a8..697955bd3 100644
--- a/app/[lang]/(live)/layout.tsx
+++ b/app/[lang]/(live)/layout.tsx
@@ -64,15 +64,6 @@ export default function RootLayout({
           data-cookieconsent="ignore"
           src="/Static/dist/js/ng/main.js?1705409330990"
         />
-        {/* <Script id="datalayer-init">
-          {`
-            console.log('create datalayer 🚀')
-            var datalayer = datalayer || {}
-            
-            console.log('datalayer: ', datalayer)
-          `}
-        </Script> */}
-        {/* TODO: Ensure order (datalayer created before script is executed!) */}
         {/* Should this be moved to an app/layout instead? */}
         <Script id={"before"}>{`
         console.log('before script load')
@@ -92,6 +83,10 @@ export default function RootLayout({
         <SkipToMainContent lang={params.lang} />
         {children}
         <Footer lang={params.lang} />
+        <Script id="page-tracking">{`
+          console.log('🛰️.pageBottom')
+          typeof _satellite !== "undefined" && _satellite.pageBottom();
+        `}</Script>
       </body>
     </html>
   )
diff --git a/app/[lang]/(live)/not-found.tsx b/app/[lang]/(live)/not-found.tsx
index 56fdd344c..1a6cc1ce6 100644
--- a/app/[lang]/(live)/not-found.tsx
+++ b/app/[lang]/(live)/not-found.tsx
@@ -1,13 +1,8 @@
-import Tracking from "./Tracking"
-
 export default function NotFound() {
   return (
-    <>
-      <main>
-        <h2>Not Found</h2>
-        <p>Could not find requested resource</p>
-      </main>
-      <Tracking />
-    </>
+    <main>
+      <h2>Not Found</h2>
+      <p>Could not find requested resource</p>
+    </main>
   )
 }
diff --git a/app/[lang]/Tracking.tsx b/app/[lang]/Tracking.tsx
index 80cb0cdbb..8714ed9c7 100644
--- a/app/[lang]/Tracking.tsx
+++ b/app/[lang]/Tracking.tsx
@@ -1,6 +1,8 @@
 "use client"
+import "client-only"
 
-import { usePathname, useSearchParams } from "next/navigation"
+import { useParams, usePathname, useSearchParams } from "next/navigation"
+import { useEffect } from "react"
 
 type WindowWithDataLayer = Window & {
   datalayer: { [key: string]: any }
@@ -11,11 +13,11 @@ declare const window: WindowWithDataLayer
 function createPageObject(pathName: string, queryString?: string) {
   const [lang, ...segments] = pathName.split("/").filter((v: string) => v)
 
-  // implement more solid approach for lang ⬆️
+  // Better to get lang from useParams() instead?? ⬆️
 
   function getSiteSections(segments: string[]) {
     const sitesections: { [key: string]: string } = {}
-
+    // Adobe expects the properties sitesection1 - sitessection6, hence the for-loop below
     for (let i = 0; i < 6; i++) {
       const key = "value" + (i + 1)
       sitesections[key] = segments.slice(0, i + 1).join("|")
@@ -28,21 +30,22 @@ function createPageObject(pathName: string, queryString?: string) {
     return sitesections
   }
   const sitesections = getSiteSections(segments)
+  const { host: domain, href: pageurl } = window.location
 
   const page_obj = {
-    pagename: "<a unique name of the page>",
-    pagetype: "<the type of page or content group>",
-    pageurl: "urlObject.href",
+    pagename: "<a unique name of the page>", // CMS
+    pagetype: "<the type of page or content group>", // CMS
+    pageurl, // is window.location.href viable?
     ...sitesections,
-    createDate: "< the date when page is created>",
-    publishDate: "< the date when page is published>",
-    domain: "", // is window.location.host viable?
+    createDate: "< the date when page is created>", // CMS
+    publishDate: "< the date when page is published>", // CMS
+    domain, // is window.location.host viable?
     errorcode: null, // handle
     querystring: queryString || "",
-    pageid: "<unique id of the page>",
+    pageid: "<unique id of the page>", // CMS
     sessionid: "<unique identifier of session>", // base on what?
     domainlanguage: lang,
-    hotelbrand: "<scandic or scandicgo)>", // what is this based on?
+    hotelbrand: "scandic", // "<scandic or scandicgo)>", what is this based on?
     siteversion: "new-web", // good enough?
   }
   return page_obj
@@ -52,33 +55,26 @@ export default function Tracking() {
   const pathName = usePathname()
   const queryString = useSearchParams().toString()
 
-  if (typeof window === "undefined") {
-    return null
-  }
-  if (!window.datalayer) {
-    console.log("creating datalayer 🧑‍🔧")
-    window.datalayer = {}
-  }
+  useEffect(() => {
+    if (!window.datalayer) {
+      console.log("creating datalayer 🧑‍🔧")
+      window.datalayer = {}
+    } else {
+      const pageObject = createPageObject(pathName, queryString)
 
-  const pageObject = createPageObject(pathName, queryString)
+      window.datalayer.page = pageObject
 
-  if (window.datalayer) {
-    window.datalayer.page = pageObject
+      // NOTE: Is this irrelevant för drop 1?
+      // var user_obj = {
+      //   loginstatus: "<if the user is logged in or not>",
+      //   memberid: "<unique meeting package membership id for the user>",
+      //   memberlevel: "<member level of user>",
+      // }
 
-    // NOTE: Is this irrelevant för drop 1?
-    // var user_obj = {
-    //   loginstatus: "<if the user is logged in or not>",
-    //   memberid: "<unique meeting package membership id for the user>",
-    //   memberlevel: "<member level of user>",
-    // }
+      // datalayer.user = user_obj;
+      console.log("🤖 datalayer: ", window.datalayer)
+    }
+  }, [pathName, queryString])
 
-    // datalayer.user = user_obj;
-    console.log("🤖 datalayer: ", window.datalayer)
-  }
   return null
-  // <>
-  //   <Script id="page-tracking">{`
-  //   console.log('hello')
-  //   `}</Script>
-  // </>
 }

From 5bd162da10eaf4ce95afcb9f8fbcf9029c18b2c3 Mon Sep 17 00:00:00 2001
From: Arvid Norlin <arvid.norlin@scandichotels.com>
Date: Tue, 13 Feb 2024 15:18:44 +0100
Subject: [PATCH 04/19] feat: align Tracking component props with CMS data

---
 app/[lang]/Tracking.tsx      | 31 +++++++++++++++++--------------
 types/components/tracking.ts | 19 +++++++++++++++++++
 2 files changed, 36 insertions(+), 14 deletions(-)
 create mode 100644 types/components/tracking.ts

diff --git a/app/[lang]/Tracking.tsx b/app/[lang]/Tracking.tsx
index 8714ed9c7..7984032f5 100644
--- a/app/[lang]/Tracking.tsx
+++ b/app/[lang]/Tracking.tsx
@@ -1,7 +1,8 @@
 "use client"
-import "client-only"
+import "client-only" // NEEDED?
 
-import { useParams, usePathname, useSearchParams } from "next/navigation"
+import { TrackingData, TrackingProps } from "@/types/components/tracking"
+import { usePathname, useSearchParams } from "next/navigation"
 import { useEffect } from "react"
 
 type WindowWithDataLayer = Window & {
@@ -10,8 +11,10 @@ type WindowWithDataLayer = Window & {
 
 declare const window: WindowWithDataLayer
 
-function createPageObject(pathName: string, queryString?: string) {
-  const [lang, ...segments] = pathName.split("/").filter((v: string) => v)
+function createPageObject(trackingData: TrackingData) {
+  const [lang, ...segments] = trackingData.pathName
+    .split("/")
+    .filter((v: string) => v)
 
   // Better to get lang from useParams() instead?? ⬆️
 
@@ -33,16 +36,16 @@ function createPageObject(pathName: string, queryString?: string) {
   const { host: domain, href: pageurl } = window.location
 
   const page_obj = {
-    pagename: "<a unique name of the page>", // CMS
-    pagetype: "<the type of page or content group>", // CMS
+    pagename: trackingData.pageName,
+    pagetype: trackingData.pageType,
     pageurl, // is window.location.href viable?
     ...sitesections,
-    createDate: "< the date when page is created>", // CMS
-    publishDate: "< the date when page is published>", // CMS
+    createDate: trackingData.createdDate,
+    publishDate: trackingData.publishedDate,
     domain, // is window.location.host viable?
     errorcode: null, // handle
-    querystring: queryString || "",
-    pageid: "<unique id of the page>", // CMS
+    querystring: trackingData.queryString || "",
+    pageid: trackingData.pageId,
     sessionid: "<unique identifier of session>", // base on what?
     domainlanguage: lang,
     hotelbrand: "scandic", // "<scandic or scandicgo)>", what is this based on?
@@ -51,16 +54,16 @@ function createPageObject(pathName: string, queryString?: string) {
   return page_obj
 }
 
-export default function Tracking() {
+export default function Tracking({ pageData }: TrackingProps) {
   const pathName = usePathname()
   const queryString = useSearchParams().toString()
-
   useEffect(() => {
     if (!window.datalayer) {
       console.log("creating datalayer 🧑‍🔧")
       window.datalayer = {}
     } else {
-      const pageObject = createPageObject(pathName, queryString)
+      const trackingData = { ...pageData, pathName, queryString }
+      const pageObject = createPageObject(trackingData)
 
       window.datalayer.page = pageObject
 
@@ -74,7 +77,7 @@ export default function Tracking() {
       // datalayer.user = user_obj;
       console.log("🤖 datalayer: ", window.datalayer)
     }
-  }, [pathName, queryString])
+  }, [pathName, queryString, pageData])
 
   return null
 }
diff --git a/types/components/tracking.ts b/types/components/tracking.ts
new file mode 100644
index 000000000..00afb55e3
--- /dev/null
+++ b/types/components/tracking.ts
@@ -0,0 +1,19 @@
+export type TrackingProps = {
+  pageData: {
+    pageId: string
+    createdDate: string
+    publishedDate: string
+    pageName: string
+    pageType: string
+  }
+}
+
+export type TrackingData = {
+  pathName: string
+  queryString: string
+  pageId: string
+  pageName: string
+  pageType: string
+  publishedDate: string
+  createdDate: string
+}

From 5b3b47b568177bea620db66da2aeb636ad515efa Mon Sep 17 00:00:00 2001
From: Arvid Norlin <arvid.norlin@scandichotels.com>
Date: Tue, 13 Feb 2024 15:53:26 +0100
Subject: [PATCH 05/19] WIP: map CMS data to Tracking

---
 .../(live)/current-content-page/page.tsx      | 22 ++++++++++++++-----
 lib/graphql/Query/CurrentBlockPage.graphql    |  2 ++
 types/requests/currentBlockPage.ts            |  6 +++++
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/app/[lang]/(live)/current-content-page/page.tsx b/app/[lang]/(live)/current-content-page/page.tsx
index cc056893b..c3ed2654a 100644
--- a/app/[lang]/(live)/current-content-page/page.tsx
+++ b/app/[lang]/(live)/current-content-page/page.tsx
@@ -7,6 +7,7 @@ import ContentPage from "@/components/Current/ContentPage"
 
 import type { PageArgs, LangParams, UriParams } from "@/types/params"
 import type { GetCurrentBlockPageData } from "@/types/requests/currentBlockPage"
+import Tracking from "../../Tracking"
 
 export default async function CurrentContentPage({
   params,
@@ -31,13 +32,24 @@ export default async function CurrentContentPage({
       console.log("SearchParams URI: ", searchParams.uri)
       throw new Error("Not found")
     }
+    const pageData = response.data.all_current_blocks_page.items[0]
+    const trackingData = {
+      pageName: pageData.title,
+      pageType: pageData.system.content_type_uid,
+      publishedDate: pageData.system.updated_at,
+      createdDate: pageData.system.created_at,
+      pageId: pageData.system.uid,
+    }
 
     return (
-      <ContentPage
-        data={response.data}
-        uri={searchParams.uri}
-        lang={params.lang}
-      />
+      <>
+        <ContentPage
+          data={response.data}
+          uri={searchParams.uri}
+          lang={params.lang}
+        />
+        <Tracking pageData={trackingData} />
+      </>
     )
   } catch (err) {
     return notFound()
diff --git a/lib/graphql/Query/CurrentBlockPage.graphql b/lib/graphql/Query/CurrentBlockPage.graphql
index dfc087b35..06f6968d4 100644
--- a/lib/graphql/Query/CurrentBlockPage.graphql
+++ b/lib/graphql/Query/CurrentBlockPage.graphql
@@ -31,6 +31,8 @@ query GetCurrentBlockPage($locale: String!, $url: String!) {
       system {
         uid
         content_type_uid
+        created_at
+        updated_at
       }
     }
     total
diff --git a/types/requests/currentBlockPage.ts b/types/requests/currentBlockPage.ts
index 251d29753..a4007f708 100644
--- a/types/requests/currentBlockPage.ts
+++ b/types/requests/currentBlockPage.ts
@@ -48,6 +48,12 @@ export type BlockPage = {
   preamble: Preamble
   title: string
   url: string
+  system: {
+    uid: string
+    content_type_uid: string // should this be locked down to the specific enum?
+    created_at: string
+    updated_at: string
+  }
 }
 
 export type GetCurrentBlockPageData = {

From 0556b509bc38a985b48931c5da39de058626b3bc Mon Sep 17 00:00:00 2001
From: Arvid Norlin <arvid.norlin@scandichotels.com>
Date: Wed, 14 Feb 2024 11:15:52 +0100
Subject: [PATCH 06/19] fix: replace content_type_id with __typename

---
 app/[lang]/(live)/current-content-page/page.tsx | 2 +-
 lib/graphql/Query/CurrentBlockPage.graphql      | 2 +-
 types/requests/currentBlockPage.ts              | 8 ++++++--
 types/requests/utils/typename.ts                | 4 ++++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/[lang]/(live)/current-content-page/page.tsx b/app/[lang]/(live)/current-content-page/page.tsx
index c3ed2654a..de9faf0e1 100644
--- a/app/[lang]/(live)/current-content-page/page.tsx
+++ b/app/[lang]/(live)/current-content-page/page.tsx
@@ -35,7 +35,7 @@ export default async function CurrentContentPage({
     const pageData = response.data.all_current_blocks_page.items[0]
     const trackingData = {
       pageName: pageData.title,
-      pageType: pageData.system.content_type_uid,
+      pageType: pageData.__typename,
       publishedDate: pageData.system.updated_at,
       createdDate: pageData.system.created_at,
       pageId: pageData.system.uid,
diff --git a/lib/graphql/Query/CurrentBlockPage.graphql b/lib/graphql/Query/CurrentBlockPage.graphql
index 06f6968d4..8eebebb7a 100644
--- a/lib/graphql/Query/CurrentBlockPage.graphql
+++ b/lib/graphql/Query/CurrentBlockPage.graphql
@@ -10,6 +10,7 @@
 query GetCurrentBlockPage($locale: String!, $url: String!) {
   all_current_blocks_page(limit: 1, locale: $locale, where: { url: $url }) {
     items {
+      __typename
       aside {
         __typename
         ...ContactAside
@@ -30,7 +31,6 @@ query GetCurrentBlockPage($locale: String!, $url: String!) {
       url
       system {
         uid
-        content_type_uid
         created_at
         updated_at
       }
diff --git a/types/requests/currentBlockPage.ts b/types/requests/currentBlockPage.ts
index a4007f708..52a096880 100644
--- a/types/requests/currentBlockPage.ts
+++ b/types/requests/currentBlockPage.ts
@@ -8,7 +8,11 @@ import type { PuffBlock } from "./blocks/puff"
 import type { Preamble } from "./preamble"
 import type { Text } from "./blocks/text"
 import type { AllRequestResponse } from "./utils/all"
-import type { AsideTypenameEnum, Typename } from "./utils/typename"
+import type {
+  AsideTypenameEnum,
+  Typename,
+  PagesTypenameEnum,
+} from "./utils/typename"
 import type { EmbedEnum } from "./utils/embeds"
 import type { Edges } from "./utils/edges"
 
@@ -41,6 +45,7 @@ export type Breadcrumbs = {
 }
 
 export type BlockPage = {
+  __typename: PagesTypenameEnum.CurrentBlocksPage
   aside: Asides[]
   blocks: Blocks[]
   breadcrumbs: Breadcrumbs
@@ -50,7 +55,6 @@ export type BlockPage = {
   url: string
   system: {
     uid: string
-    content_type_uid: string // should this be locked down to the specific enum?
     created_at: string
     updated_at: string
   }
diff --git a/types/requests/utils/typename.ts b/types/requests/utils/typename.ts
index ea9d03e94..2e9aaf74f 100644
--- a/types/requests/utils/typename.ts
+++ b/types/requests/utils/typename.ts
@@ -12,6 +12,10 @@ export enum BlocksTypenameEnum {
   CurrentBlocksPageBlocksText = "CurrentBlocksPageBlocksText",
 }
 
+export enum PagesTypenameEnum {
+  CurrentBlocksPage = "CurrentBlocksPage",
+}
+
 export type BlocksTypename = keyof typeof BlocksTypenameEnum
 
 export type Typename<T, K> = T & {

From c5e20e969a2af690b7c014ddf23651f4a64c7138 Mon Sep 17 00:00:00 2001
From: Arvid Norlin <arvid.norlin@scandichotels.com>
Date: Wed, 14 Feb 2024 11:42:31 +0100
Subject: [PATCH 07/19] chore: remove redundant import

---
 app/[lang]/Tracking.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/[lang]/Tracking.tsx b/app/[lang]/Tracking.tsx
index 7984032f5..741332b55 100644
--- a/app/[lang]/Tracking.tsx
+++ b/app/[lang]/Tracking.tsx
@@ -1,5 +1,4 @@
 "use client"
-import "client-only" // NEEDED?
 
 import { TrackingData, TrackingProps } from "@/types/components/tracking"
 import { usePathname, useSearchParams } from "next/navigation"

From 0973103c0ee4eb6ed5fa7e54831444673fa7b744 Mon Sep 17 00:00:00 2001
From: Arvid Norlin <arvid.norlin@scandichotels.com>
Date: Wed, 14 Feb 2024 11:44:22 +0100
Subject: [PATCH 08/19] chore: move type

---
 app/[lang]/Tracking.tsx      | 10 +++++-----
 types/components/tracking.ts |  4 ++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/[lang]/Tracking.tsx b/app/[lang]/Tracking.tsx
index 741332b55..e4498b511 100644
--- a/app/[lang]/Tracking.tsx
+++ b/app/[lang]/Tracking.tsx
@@ -1,13 +1,13 @@
 "use client"
 
-import { TrackingData, TrackingProps } from "@/types/components/tracking"
+import {
+  TrackingData,
+  TrackingProps,
+  WindowWithDataLayer,
+} from "@/types/components/tracking"
 import { usePathname, useSearchParams } from "next/navigation"
 import { useEffect } from "react"
 
-type WindowWithDataLayer = Window & {
-  datalayer: { [key: string]: any }
-}
-
 declare const window: WindowWithDataLayer
 
 function createPageObject(trackingData: TrackingData) {
diff --git a/types/components/tracking.ts b/types/components/tracking.ts
index 00afb55e3..e8436e38d 100644
--- a/types/components/tracking.ts
+++ b/types/components/tracking.ts
@@ -1,3 +1,7 @@
+export type WindowWithDataLayer = Window & {
+  datalayer: { [key: string]: any }
+}
+
 export type TrackingProps = {
   pageData: {
     pageId: string

From 778f456f4efd3670569906bc3f2d170d7fba101c Mon Sep 17 00:00:00 2001
From: Arvid Norlin <arvid.norlin@scandichotels.com>
Date: Wed, 14 Feb 2024 11:47:51 +0100
Subject: [PATCH 09/19] chore: remove console statements

---
 app/[lang]/(live)/layout.tsx | 6 ------
 app/[lang]/Tracking.tsx      | 1 -
 2 files changed, 7 deletions(-)

diff --git a/app/[lang]/(live)/layout.tsx b/app/[lang]/(live)/layout.tsx
index 697955bd3..fdfa24b8a 100644
--- a/app/[lang]/(live)/layout.tsx
+++ b/app/[lang]/(live)/layout.tsx
@@ -65,13 +65,7 @@ export default function RootLayout({
           src="/Static/dist/js/ng/main.js?1705409330990"
         />
         {/* Should this be moved to an app/layout instead? */}
-        <Script id={"before"}>{`
-        console.log('before script load')
-        `}</Script>
         <Script src={adobeSrcs[env.NODE_ENV]} />
-        <Script id="after">{`
-        console.log('after script load')
-        `}</Script>
         {/* <Script
           data-cookieconsent="ignore"
           src="/Static/dist/js/main-ng.js?336b801d6b38eff10884"
diff --git a/app/[lang]/Tracking.tsx b/app/[lang]/Tracking.tsx
index e4498b511..4fb60af9e 100644
--- a/app/[lang]/Tracking.tsx
+++ b/app/[lang]/Tracking.tsx
@@ -74,7 +74,6 @@ export default function Tracking({ pageData }: TrackingProps) {
       // }
 
       // datalayer.user = user_obj;
-      console.log("🤖 datalayer: ", window.datalayer)
     }
   }, [pathName, queryString, pageData])
 

From 4c4540f51b1bcc5fd9867b954b71ef3082527cf2 Mon Sep 17 00:00:00 2001
From: Arvid Norlin <arvid.norlin@scandichotels.com>
Date: Wed, 14 Feb 2024 11:58:20 +0100
Subject: [PATCH 10/19] refactor: extract AdobeScript component

---
 app/[lang]/(live)/layout.tsx | 13 +++----------
 app/[lang]/AdobeScript.tsx   | 13 +++++++++++++
 2 files changed, 16 insertions(+), 10 deletions(-)
 create mode 100644 app/[lang]/AdobeScript.tsx

diff --git a/app/[lang]/(live)/layout.tsx b/app/[lang]/(live)/layout.tsx
index fdfa24b8a..cab540a33 100644
--- a/app/[lang]/(live)/layout.tsx
+++ b/app/[lang]/(live)/layout.tsx
@@ -8,20 +8,13 @@ import SkipToMainContent from "@/components/SkipToMainContent"
 
 import type { Metadata } from "next"
 import type { LangParams, LayoutArgs } from "@/types/params"
-import { env } from "@/env/server.mjs"
+import AdobeScript from "../AdobeScript"
+
 export const metadata: Metadata = {
   description: "New web",
   title: "Scandic Hotels New Web",
 }
 
-const adobeSrcs = {
-  // TODO: decide on naming and environments
-  development: "",
-  test: "https://assets.adobedtm.com/c1bd08b1e4e7/d64a7c1f5f17/launch-84c70d82a50c-staging.min.js",
-  production:
-    "https://assets.adobedtm.com/c1bd08b1e4e7/d64a7c1f5f17/launch-e56085bbe998.min.js",
-}
-
 export default function RootLayout({
   children,
   params,
@@ -65,7 +58,7 @@ export default function RootLayout({
           src="/Static/dist/js/ng/main.js?1705409330990"
         />
         {/* Should this be moved to an app/layout instead? */}
-        <Script src={adobeSrcs[env.NODE_ENV]} />
+        <AdobeScript />
         {/* <Script
           data-cookieconsent="ignore"
           src="/Static/dist/js/main-ng.js?336b801d6b38eff10884"
diff --git a/app/[lang]/AdobeScript.tsx b/app/[lang]/AdobeScript.tsx
new file mode 100644
index 000000000..dcae26a33
--- /dev/null
+++ b/app/[lang]/AdobeScript.tsx
@@ -0,0 +1,13 @@
+import Script from "next/script"
+
+const scriptScrs = {
+  // TODO: decide on naming and environments (development vs. test vs. staging etc)
+  development: "",
+  test: "https://assets.adobedtm.com/c1bd08b1e4e7/d64a7c1f5f17/launch-84c70d82a50c-staging.min.js",
+  production:
+    "https://assets.adobedtm.com/c1bd08b1e4e7/d64a7c1f5f17/launch-e56085bbe998.min.js",
+}
+
+export default function AdobeScript() {
+  return <Script src={scriptScrs[process.env.NODE_ENV]} />
+}

From 744ac6f49b72ce722e902268b6b28393bc72a5ad Mon Sep 17 00:00:00 2001
From: Arvid Norlin <arvid.norlin@scandichotels.com>
Date: Wed, 14 Feb 2024 11:59:53 +0100
Subject: [PATCH 11/19] chore: remove console.log

---
 app/[lang]/(live)/layout.tsx | 1 -
 app/[lang]/Tracking.tsx      | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/[lang]/(live)/layout.tsx b/app/[lang]/(live)/layout.tsx
index cab540a33..b60730084 100644
--- a/app/[lang]/(live)/layout.tsx
+++ b/app/[lang]/(live)/layout.tsx
@@ -71,7 +71,6 @@ export default function RootLayout({
         {children}
         <Footer lang={params.lang} />
         <Script id="page-tracking">{`
-          console.log('🛰️.pageBottom')
           typeof _satellite !== "undefined" && _satellite.pageBottom();
         `}</Script>
       </body>
diff --git a/app/[lang]/Tracking.tsx b/app/[lang]/Tracking.tsx
index 4fb60af9e..3cfcc7d6e 100644
--- a/app/[lang]/Tracking.tsx
+++ b/app/[lang]/Tracking.tsx
@@ -58,7 +58,6 @@ export default function Tracking({ pageData }: TrackingProps) {
   const queryString = useSearchParams().toString()
   useEffect(() => {
     if (!window.datalayer) {
-      console.log("creating datalayer 🧑‍🔧")
       window.datalayer = {}
     } else {
       const trackingData = { ...pageData, pathName, queryString }

From b938295ea2bea26e94d5361465fa97ce97678919 Mon Sep 17 00:00:00 2001
From: Arvid Norlin <arvid.norlin@scandichotels.com>
Date: Wed, 14 Feb 2024 14:17:47 +0100
Subject: [PATCH 12/19] chore: remove comment

---
 app/[lang]/(live)/layout.tsx | 1 -
 app/[lang]/Tracking.tsx      | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/[lang]/(live)/layout.tsx b/app/[lang]/(live)/layout.tsx
index b60730084..af65e4b02 100644
--- a/app/[lang]/(live)/layout.tsx
+++ b/app/[lang]/(live)/layout.tsx
@@ -57,7 +57,6 @@ export default function RootLayout({
           data-cookieconsent="ignore"
           src="/Static/dist/js/ng/main.js?1705409330990"
         />
-        {/* Should this be moved to an app/layout instead? */}
         <AdobeScript />
         {/* <Script
           data-cookieconsent="ignore"
diff --git a/app/[lang]/Tracking.tsx b/app/[lang]/Tracking.tsx
index 3cfcc7d6e..0d1c15bbc 100644
--- a/app/[lang]/Tracking.tsx
+++ b/app/[lang]/Tracking.tsx
@@ -38,7 +38,6 @@ function createPageObject(trackingData: TrackingData) {
     pagename: trackingData.pageName,
     pagetype: trackingData.pageType,
     pageurl, // is window.location.href viable?
-    ...sitesections,
     createDate: trackingData.createdDate,
     publishDate: trackingData.publishedDate,
     domain, // is window.location.host viable?
@@ -47,8 +46,9 @@ function createPageObject(trackingData: TrackingData) {
     pageid: trackingData.pageId,
     sessionid: "<unique identifier of session>", // base on what?
     domainlanguage: lang,
-    hotelbrand: "scandic", // "<scandic or scandicgo)>", what is this based on?
-    siteversion: "new-web", // good enough?
+    hotelbrand: "scandic",
+    siteversion: "new-web",
+    ...sitesections,
   }
   return page_obj
 }

From b7c439fc6b778d8ecbcc53b8c994b63be73762c6 Mon Sep 17 00:00:00 2001
From: Arvid Norlin <arvid.norlin@scandichotels.com>
Date: Thu, 15 Feb 2024 14:29:17 +0100
Subject: [PATCH 13/19] fix: replace process with env

---
 app/[lang]/AdobeScript.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/[lang]/AdobeScript.tsx b/app/[lang]/AdobeScript.tsx
index dcae26a33..887de3bd0 100644
--- a/app/[lang]/AdobeScript.tsx
+++ b/app/[lang]/AdobeScript.tsx
@@ -1,3 +1,5 @@
+import { env } from "@/env/server.mjs"
+
 import Script from "next/script"
 
 const scriptScrs = {
@@ -9,5 +11,5 @@ const scriptScrs = {
 }
 
 export default function AdobeScript() {
-  return <Script src={scriptScrs[process.env.NODE_ENV]} />
+  return <Script src={scriptScrs[env.NODE_ENV]} />
 }

From 4beb8da0b9af0e72236ab4c93a43b2ebd9afcd9f Mon Sep 17 00:00:00 2001
From: Arvid Norlin <arvid.norlin@scandichotels.com>
Date: Thu, 15 Feb 2024 14:43:17 +0100
Subject: [PATCH 14/19] chore: clarify with comment

---
 app/[lang]/Tracking.tsx | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/[lang]/Tracking.tsx b/app/[lang]/Tracking.tsx
index 0d1c15bbc..9062e63e1 100644
--- a/app/[lang]/Tracking.tsx
+++ b/app/[lang]/Tracking.tsx
@@ -15,13 +15,22 @@ function createPageObject(trackingData: TrackingData) {
     .split("/")
     .filter((v: string) => v)
 
-  // Better to get lang from useParams() instead?? ⬆️
-
   function getSiteSections(segments: string[]) {
     const sitesections: { [key: string]: string } = {}
-    // Adobe expects the properties sitesection1 - sitessection6, hence the for-loop below
+    /* 
+      Adobe expects the properties sitesection1 - sitessection6, hence the for-loop below
+      The segments ['explore-scandic', 'wifi'] should result in:
+      {
+        sitesection1: "explore-scandic",
+        sitesection2: "explore-scandic|wifi",
+        sitesection3: "explore-scandic|wifi|",
+        sitesection4: "explore-scandic|wifi||",
+        sitesection5: "explore-scandic|wifi|||",
+        sitesection6: "explore-scandic|wifi||||",
+      } 
+    */
     for (let i = 0; i < 6; i++) {
-      const key = "value" + (i + 1)
+      const key = "sitesection" + (i + 1)
       sitesections[key] = segments.slice(0, i + 1).join("|")
       if (i > 0 && !segments[i]) {
         sitesections[key] = sitesections[key].concat(

From 09b28edb486bfb0b84e9176027e9bf9e1d104503 Mon Sep 17 00:00:00 2001
From: Arvid Norlin <arvid.norlin@scandichotels.com>
Date: Thu, 15 Feb 2024 16:22:44 +0100
Subject: [PATCH 15/19] fix: improve typings

---
 app/[lang]/Tracking.tsx      | 11 +++++------
 types/components/tracking.ts | 13 +++++++++----
 types/window.d.ts            |  3 +++
 3 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 types/window.d.ts

diff --git a/app/[lang]/Tracking.tsx b/app/[lang]/Tracking.tsx
index 9062e63e1..6eab35ed7 100644
--- a/app/[lang]/Tracking.tsx
+++ b/app/[lang]/Tracking.tsx
@@ -1,22 +1,19 @@
 "use client"
 
 import {
+  SiteSectionObject,
   TrackingData,
   TrackingProps,
-  WindowWithDataLayer,
 } from "@/types/components/tracking"
 import { usePathname, useSearchParams } from "next/navigation"
 import { useEffect } from "react"
 
-declare const window: WindowWithDataLayer
-
 function createPageObject(trackingData: TrackingData) {
   const [lang, ...segments] = trackingData.pathName
     .split("/")
     .filter((v: string) => v)
 
-  function getSiteSections(segments: string[]) {
-    const sitesections: { [key: string]: string } = {}
+  function getSiteSections(segments: string[]): SiteSectionObject {
     /* 
       Adobe expects the properties sitesection1 - sitessection6, hence the for-loop below
       The segments ['explore-scandic', 'wifi'] should result in:
@@ -29,8 +26,10 @@ function createPageObject(trackingData: TrackingData) {
         sitesection6: "explore-scandic|wifi||||",
       } 
     */
+    const sitesections = {} as SiteSectionObject
     for (let i = 0; i < 6; i++) {
-      const key = "sitesection" + (i + 1)
+      const key = ("sitesection" + (i + 1)) as keyof SiteSectionObject
+      
       sitesections[key] = segments.slice(0, i + 1).join("|")
       if (i > 0 && !segments[i]) {
         sitesections[key] = sitesections[key].concat(
diff --git a/types/components/tracking.ts b/types/components/tracking.ts
index e8436e38d..e717a55f3 100644
--- a/types/components/tracking.ts
+++ b/types/components/tracking.ts
@@ -1,7 +1,3 @@
-export type WindowWithDataLayer = Window & {
-  datalayer: { [key: string]: any }
-}
-
 export type TrackingProps = {
   pageData: {
     pageId: string
@@ -21,3 +17,12 @@ export type TrackingData = {
   publishedDate: string
   createdDate: string
 }
+
+export type SiteSectionObject = {
+  sitesection1: string
+  sitesection2: string
+  sitesection3: string
+  sitesection4: string
+  sitesection5: string
+  sitesection6: string
+}
diff --git a/types/window.d.ts b/types/window.d.ts
new file mode 100644
index 000000000..8e2462b1f
--- /dev/null
+++ b/types/window.d.ts
@@ -0,0 +1,3 @@
+interface Window {
+  datalayer: { [key: string]: any }
+}

From f97756bafe1ebb20cef74fea7f3dbb04a7207cf4 Mon Sep 17 00:00:00 2001
From: Arvid Norlin <arvid.norlin@scandichotels.com>
Date: Thu, 15 Feb 2024 18:58:06 +0100
Subject: [PATCH 16/19] debug: add log statements

---
 app/[lang]/Tracking.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/[lang]/Tracking.tsx b/app/[lang]/Tracking.tsx
index 6eab35ed7..f4b29de94 100644
--- a/app/[lang]/Tracking.tsx
+++ b/app/[lang]/Tracking.tsx
@@ -65,9 +65,12 @@ export default function Tracking({ pageData }: TrackingProps) {
   const pathName = usePathname()
   const queryString = useSearchParams().toString()
   useEffect(() => {
+    console.log("EFFECT")
     if (!window.datalayer) {
+      console.log(" if effect")
       window.datalayer = {}
     } else {
+      console.log("else effect")
       const trackingData = { ...pageData, pathName, queryString }
       const pageObject = createPageObject(trackingData)
 

From effaec11e6ef1ca6074517619b06767e6fd48b44 Mon Sep 17 00:00:00 2001
From: Arvid Norlin <arvid.norlin@scandichotels.com>
Date: Thu, 15 Feb 2024 19:52:27 +0100
Subject: [PATCH 17/19] fix: add datalayerExists check to Tracking useEffect

---
 app/[lang]/Tracking.tsx | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/[lang]/Tracking.tsx b/app/[lang]/Tracking.tsx
index f4b29de94..7401bb3fa 100644
--- a/app/[lang]/Tracking.tsx
+++ b/app/[lang]/Tracking.tsx
@@ -6,7 +6,7 @@ import {
   TrackingProps,
 } from "@/types/components/tracking"
 import { usePathname, useSearchParams } from "next/navigation"
-import { useEffect } from "react"
+import { useEffect, useState } from "react"
 
 function createPageObject(trackingData: TrackingData) {
   const [lang, ...segments] = trackingData.pathName
@@ -29,7 +29,7 @@ function createPageObject(trackingData: TrackingData) {
     const sitesections = {} as SiteSectionObject
     for (let i = 0; i < 6; i++) {
       const key = ("sitesection" + (i + 1)) as keyof SiteSectionObject
-      
+
       sitesections[key] = segments.slice(0, i + 1).join("|")
       if (i > 0 && !segments[i]) {
         sitesections[key] = sitesections[key].concat(
@@ -64,11 +64,12 @@ function createPageObject(trackingData: TrackingData) {
 export default function Tracking({ pageData }: TrackingProps) {
   const pathName = usePathname()
   const queryString = useSearchParams().toString()
+  const [datalayerExists, setDataLayerExists] = useState(false)
   useEffect(() => {
-    console.log("EFFECT")
-    if (!window.datalayer) {
+    if (!datalayerExists) {
       console.log(" if effect")
       window.datalayer = {}
+      setDataLayerExists(true)
     } else {
       console.log("else effect")
       const trackingData = { ...pageData, pathName, queryString }
@@ -85,7 +86,7 @@ export default function Tracking({ pageData }: TrackingProps) {
 
       // datalayer.user = user_obj;
     }
-  }, [pathName, queryString, pageData])
+  }, [pathName, queryString, pageData, datalayerExists])
 
   return null
 }

From 8b87267eda9d388f27678161e68d68132f21ac1d Mon Sep 17 00:00:00 2001
From: Arvid Norlin <arvid.norlin@scandichotels.com>
Date: Thu, 15 Feb 2024 19:56:59 +0100
Subject: [PATCH 18/19] chore: remove console statements

---
 app/[lang]/Tracking.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/[lang]/Tracking.tsx b/app/[lang]/Tracking.tsx
index 7401bb3fa..5b48fd3ee 100644
--- a/app/[lang]/Tracking.tsx
+++ b/app/[lang]/Tracking.tsx
@@ -64,14 +64,15 @@ function createPageObject(trackingData: TrackingData) {
 export default function Tracking({ pageData }: TrackingProps) {
   const pathName = usePathname()
   const queryString = useSearchParams().toString()
-  const [datalayerExists, setDataLayerExists] = useState(false)
+  const [datalayerExists, setDataLayerExists] = useState(
+    typeof window !== "undefined" && !!window.datalayer
+  )
+
   useEffect(() => {
     if (!datalayerExists) {
-      console.log(" if effect")
       window.datalayer = {}
       setDataLayerExists(true)
     } else {
-      console.log("else effect")
       const trackingData = { ...pageData, pathName, queryString }
       const pageObject = createPageObject(trackingData)
 

From 60e2c8ae45476114af17641fccfaa3b6c2fa2a1f Mon Sep 17 00:00:00 2001
From: Arvid Norlin <arvid.norlin@scandichotels.com>
Date: Fri, 16 Feb 2024 15:14:16 +0100
Subject: [PATCH 19/19] fix: adjust datalayer behavior

---
 app/[lang]/(live)/layout.tsx |  2 +-
 app/[lang]/AdobeScript.tsx   | 10 +++++++++-
 app/[lang]/Tracking.tsx      | 32 ++++++++++++--------------------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/app/[lang]/(live)/layout.tsx b/app/[lang]/(live)/layout.tsx
index af65e4b02..c168eeb3e 100644
--- a/app/[lang]/(live)/layout.tsx
+++ b/app/[lang]/(live)/layout.tsx
@@ -57,12 +57,12 @@ export default function RootLayout({
           data-cookieconsent="ignore"
           src="/Static/dist/js/ng/main.js?1705409330990"
         />
-        <AdobeScript />
         {/* <Script
           data-cookieconsent="ignore"
           src="/Static/dist/js/main-ng.js?336b801d6b38eff10884"
           strategy="lazyOnload"
         /> */}
+        <AdobeScript />
       </head>
       <body>
         <LangPopup lang={params.lang} />
diff --git a/app/[lang]/AdobeScript.tsx b/app/[lang]/AdobeScript.tsx
index 887de3bd0..61893a713 100644
--- a/app/[lang]/AdobeScript.tsx
+++ b/app/[lang]/AdobeScript.tsx
@@ -11,5 +11,13 @@ const scriptScrs = {
 }
 
 export default function AdobeScript() {
-  return <Script src={scriptScrs[env.NODE_ENV]} />
+  return (
+    <>
+      <Script
+        strategy="beforeInteractive"
+        id="ensure-datalayer"
+      >{`window.datalayer = window.datalayer || {}`}</Script>
+      <Script src={scriptScrs[env.NODE_ENV]} />
+    </>
+  )
 }
diff --git a/app/[lang]/Tracking.tsx b/app/[lang]/Tracking.tsx
index 5b48fd3ee..b7ec2c22f 100644
--- a/app/[lang]/Tracking.tsx
+++ b/app/[lang]/Tracking.tsx
@@ -6,7 +6,7 @@ import {
   TrackingProps,
 } from "@/types/components/tracking"
 import { usePathname, useSearchParams } from "next/navigation"
-import { useEffect, useState } from "react"
+import { useEffect } from "react"
 
 function createPageObject(trackingData: TrackingData) {
   const [lang, ...segments] = trackingData.pathName
@@ -64,30 +64,22 @@ function createPageObject(trackingData: TrackingData) {
 export default function Tracking({ pageData }: TrackingProps) {
   const pathName = usePathname()
   const queryString = useSearchParams().toString()
-  const [datalayerExists, setDataLayerExists] = useState(
-    typeof window !== "undefined" && !!window.datalayer
-  )
 
   useEffect(() => {
-    if (!datalayerExists) {
-      window.datalayer = {}
-      setDataLayerExists(true)
-    } else {
-      const trackingData = { ...pageData, pathName, queryString }
-      const pageObject = createPageObject(trackingData)
+    const trackingData = { ...pageData, pathName, queryString }
+    const pageObject = createPageObject(trackingData)
 
-      window.datalayer.page = pageObject
+    window.datalayer.page = pageObject
 
-      // NOTE: Is this irrelevant för drop 1?
-      // var user_obj = {
-      //   loginstatus: "<if the user is logged in or not>",
-      //   memberid: "<unique meeting package membership id for the user>",
-      //   memberlevel: "<member level of user>",
-      // }
+    // NOTE: Is this irrelevant för drop 1?
+    // var user_obj = {
+    //   loginstatus: "<if the user is logged in or not>",
+    //   memberid: "<unique meeting package membership id for the user>",
+    //   memberlevel: "<member level of user>",
+    // }
 
-      // datalayer.user = user_obj;
-    }
-  }, [pathName, queryString, pageData, datalayerExists])
+    // datalayer.user = user_obj;
+  }, [pathName, queryString, pageData])
 
   return null
 }