diff --git a/.env.local.example b/.env.local.example
index 0592f3b4a..99fe71286 100644
--- a/.env.local.example
+++ b/.env.local.example
@@ -3,4 +3,5 @@ CMS_API_KEY=""
CMS_ENVIRONMENT="development"
CMS_URL="https://eu-graphql.contentstack.com/stacks/${CMS_API_KEY}?environment=${CMS_ENVIRONMENT}"
CMS_PREVIEW_URL="https://graphql-preview.contentstack.com/stacks/${CMS_API_KEY}?environment=${CMS_ENVIRONMENT}";
-CMS_PREVIEW_TOKEN=""
\ No newline at end of file
+CMS_PREVIEW_TOKEN=""
+ADOBE_SCRIPT_SRC="https://mocked-url.se/tracking-script.js"
\ No newline at end of file
diff --git a/app/[lang]/(live-current)/current-content-page/page.tsx b/app/[lang]/(live-current)/current-content-page/page.tsx
index f94f93c7e..e014119e5 100644
--- a/app/[lang]/(live-current)/current-content-page/page.tsx
+++ b/app/[lang]/(live-current)/current-content-page/page.tsx
@@ -38,8 +38,6 @@ export default async function CurrentContentPage({
}
const pageData = response.data.all_current_blocks_page.items[0]
const trackingData = {
- pageName: pageData.title,
- pageType: pageData.__typename,
publishedDate: pageData.system.updated_at,
createdDate: pageData.system.created_at,
pageId: pageData.system.uid,
diff --git a/app/[lang]/(live-current)/layout.tsx b/app/[lang]/(live-current)/layout.tsx
index 2f601ff6c..cb435ed90 100644
--- a/app/[lang]/(live-current)/layout.tsx
+++ b/app/[lang]/(live-current)/layout.tsx
@@ -63,6 +63,10 @@ export default function RootLayout({
src="/Static/dist/js/main-ng.js?336b801d6b38eff10884"
strategy="lazyOnload"
/> */}
+
diff --git a/components/Current/AdobeScript.tsx b/components/Current/AdobeScript.tsx
index b52508b2d..949cdb567 100644
--- a/components/Current/AdobeScript.tsx
+++ b/components/Current/AdobeScript.tsx
@@ -2,22 +2,6 @@ import { env } from "@/env/server"
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 (
- <>
-
-
-
- )
+ return env.ADOBE_SCRIPT_SRC ? : null
}
diff --git a/components/Current/Tracking.tsx b/components/Current/Tracking.tsx
index b7ec2c22f..074c7e203 100644
--- a/components/Current/Tracking.tsx
+++ b/components/Current/Tracking.tsx
@@ -40,19 +40,19 @@ function createPageObject(trackingData: TrackingData) {
return sitesections
}
const sitesections = getSiteSections(segments)
- const { host: domain, href: pageurl } = window.location
-
+ const { host: domain, href: fullurl, origin } = window.location
const page_obj = {
- pagename: trackingData.pageName,
- pagetype: trackingData.pageType,
- pageurl, // is window.location.href viable?
+ pagename: segments.join('|'),
+ pagetype: 'contentpage',
+ pageurl: origin + trackingData.pathName,
+ fullurl,
createDate: trackingData.createdDate,
publishDate: trackingData.publishedDate,
- domain, // is window.location.host viable?
+ domain,
errorcode: null, // handle
querystring: trackingData.queryString || "",
pageid: trackingData.pageId,
- sessionid: "", // base on what?
+ // sessionid: "", // base on what?
domainlanguage: lang,
hotelbrand: "scandic",
siteversion: "new-web",
@@ -70,15 +70,6 @@ export default function Tracking({ pageData }: TrackingProps) {
const pageObject = createPageObject(trackingData)
window.datalayer.page = pageObject
-
- // NOTE: Is this irrelevant för drop 1?
- // var user_obj = {
- // loginstatus: "",
- // memberid: "",
- // memberlevel: "",
- // }
-
- // datalayer.user = user_obj;
}, [pathName, queryString, pageData])
return null
diff --git a/env/server.ts b/env/server.ts
index c6c658b80..72f166c6c 100644
--- a/env/server.ts
+++ b/env/server.ts
@@ -12,6 +12,7 @@ export const env = createEnv({
NODE_ENV: z.enum(["development", "test", "production"]),
PRINT_QUERY: z.boolean().default(false),
REVALIDATE_SECRET: z.string(),
+ ADOBE_SCRIPT_SRC: z.string().optional(),
},
emptyStringAsUndefined: true,
runtimeEnv: {
@@ -24,5 +25,6 @@ export const env = createEnv({
NODE_ENV: process.env.NODE_ENV,
PRINT_QUERY: process.env.PRINT_QUERY,
REVALIDATE_SECRET: process.env.REVALIDATE_SECRET,
+ ADOBE_SCRIPT_SRC: process.env.ADOBE_SCRIPT_SRC,
},
})
diff --git a/lib/graphql/Query/CurrentBlockPage.graphql b/lib/graphql/Query/CurrentBlockPage.graphql
index 0a5315f78..b275b328f 100644
--- a/lib/graphql/Query/CurrentBlockPage.graphql
+++ b/lib/graphql/Query/CurrentBlockPage.graphql
@@ -10,7 +10,6 @@
query GetCurrentBlockPage($locale: String!, $url: String!) {
all_current_blocks_page(limit: 1, locale: $locale, where: { url: $url }) {
items {
- __typename
aside {
__typename
...ContactAside
diff --git a/types/components/tracking.ts b/types/components/tracking.ts
index e717a55f3..8c2f3ccbd 100644
--- a/types/components/tracking.ts
+++ b/types/components/tracking.ts
@@ -3,8 +3,6 @@ export type TrackingProps = {
pageId: string
createdDate: string
publishedDate: string
- pageName: string
- pageType: string
}
}
@@ -12,8 +10,6 @@ export type TrackingData = {
pathName: string
queryString: string
pageId: string
- pageName: string
- pageType: string
publishedDate: string
createdDate: string
}
diff --git a/types/requests/currentBlockPage.ts b/types/requests/currentBlockPage.ts
index 3611485a6..2cf493f75 100644
--- a/types/requests/currentBlockPage.ts
+++ b/types/requests/currentBlockPage.ts
@@ -11,7 +11,6 @@ import type { AllRequestResponse } from "./utils/all"
import type {
AsideTypenameEnum,
Typename,
- PagesTypenameEnum,
} from "./utils/typename"
export type Asides =
@@ -34,7 +33,6 @@ export type Breadcrumbs = {
}
export type BlockPage = {
- __typename: PagesTypenameEnum.CurrentBlocksPage
aside: Asides[]
blocks: Blocks[]
breadcrumbs: Breadcrumbs
diff --git a/types/requests/utils/typename.ts b/types/requests/utils/typename.ts
index 6781408c7..5c59848bf 100644
--- a/types/requests/utils/typename.ts
+++ b/types/requests/utils/typename.ts
@@ -11,10 +11,6 @@ export enum BlocksTypenameEnum {
CurrentBlocksPageBlocksText = "CurrentBlocksPageBlocksText",
}
-export enum PagesTypenameEnum {
- CurrentBlocksPage = "CurrentBlocksPage",
-}
-
export type BlocksTypename = keyof typeof BlocksTypenameEnum
export type Typename = T & {