From 7bad898d9db54555968bed3629975d385aa4e158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matilda=20Landstr=C3=B6m?= Date: Wed, 3 Sep 2025 10:58:54 +0000 Subject: [PATCH] Merged in fix/SW-2311-campaign-tracking (pull request #2753) fix(SW-2311): update campaign tracking values * fix(SW-2311): update campaign tracking values Approved-by: Erik Tiekstra --- .../ContentType/CampaignOverviewPage/index.tsx | 4 ++-- .../components/ContentType/CampaignPage/index.tsx | 4 ++-- packages/common/tracking/types.ts | 3 +-- .../routers/contentstack/campaignOverviewPage/query.ts | 10 +++++----- .../lib/routers/contentstack/campaignPage/query.ts | 10 +++++----- packages/trpc/lib/routers/types.ts | 3 +-- 6 files changed, 16 insertions(+), 18 deletions(-) diff --git a/apps/scandic-web/components/ContentType/CampaignOverviewPage/index.tsx b/apps/scandic-web/components/ContentType/CampaignOverviewPage/index.tsx index 3c56b9e61..71c3d05ae 100644 --- a/apps/scandic-web/components/ContentType/CampaignOverviewPage/index.tsx +++ b/apps/scandic-web/components/ContentType/CampaignOverviewPage/index.tsx @@ -21,8 +21,8 @@ export default async function CampaignOverviewPage() { notFound() } - const { campaignOverviewPage, tracking } = pageData - const { header, topCampaign, blocks } = campaignOverviewPage + const { campaign_overview_page, tracking } = pageData + const { header, topCampaign, blocks } = campaign_overview_page return ( <> diff --git a/apps/scandic-web/components/ContentType/CampaignPage/index.tsx b/apps/scandic-web/components/ContentType/CampaignPage/index.tsx index a011f4918..f18e4ebca 100644 --- a/apps/scandic-web/components/ContentType/CampaignPage/index.tsx +++ b/apps/scandic-web/components/ContentType/CampaignPage/index.tsx @@ -21,8 +21,8 @@ export default async function CampaignPage() { notFound() } - const { campaignPage, tracking } = pageData - const { heading, subheading, preamble, blocks, hero } = campaignPage + const { campaign_page, tracking } = pageData + const { heading, subheading, preamble, blocks, hero } = campaign_page return ( <> diff --git a/packages/common/tracking/types.ts b/packages/common/tracking/types.ts index f734791c8..5c197e487 100644 --- a/packages/common/tracking/types.ts +++ b/packages/common/tracking/types.ts @@ -8,8 +8,7 @@ export enum TrackingChannelEnum { "static-content-page" = "static-content-page", "hotelreservation" = "hotelreservation", "collection-page" = "collection-page", - "campaign-page" = "campaign-page", - "campaign-overview-page" = "campaign-overview-page", + "campaign" = "campaign", "hotels" = "hotels", "homepage" = "homepage", } diff --git a/packages/trpc/lib/routers/contentstack/campaignOverviewPage/query.ts b/packages/trpc/lib/routers/contentstack/campaignOverviewPage/query.ts index c1033b5dd..43b698b13 100644 --- a/packages/trpc/lib/routers/contentstack/campaignOverviewPage/query.ts +++ b/packages/trpc/lib/routers/contentstack/campaignOverviewPage/query.ts @@ -103,19 +103,19 @@ export const campaignOverviewPageQueryRouter = router({ return null } - const campaignOverviewPage = validatedResponse.data.campaign_overview_page + const { campaign_overview_page, trackingProps } = validatedResponse.data metricsGetCampaignOverviewPage.success() - const system = campaignOverviewPage.system - const pageName = `campaign-overview-page` + const system = campaign_overview_page.system + const pageName = trackingProps.url const tracking: TrackingPageData = { pageId: system.uid, domainLanguage: system.locale, publishDate: system.updated_at, createDate: system.created_at, - channel: "campaign-overview-page", + channel: "campaign", pageType: "campaignoverviewpage", pageName, siteSections: pageName, @@ -123,7 +123,7 @@ export const campaignOverviewPageQueryRouter = router({ } return { - campaignOverviewPage, + campaign_overview_page, tracking, } }), diff --git a/packages/trpc/lib/routers/contentstack/campaignPage/query.ts b/packages/trpc/lib/routers/contentstack/campaignPage/query.ts index 22a1818fa..fe12c872b 100644 --- a/packages/trpc/lib/routers/contentstack/campaignPage/query.ts +++ b/packages/trpc/lib/routers/contentstack/campaignPage/query.ts @@ -94,19 +94,19 @@ export const campaignPageQueryRouter = router({ return null } - const campaignPage = validatedResponse.data.campaign_page + const { campaign_page, trackingProps } = validatedResponse.data metricsGetCampaignPage.success() - const system = campaignPage.system - const pageName = `campaign-page` + const system = campaign_page.system + const pageName = trackingProps.url const tracking: TrackingPageData = { pageId: system.uid, domainLanguage: system.locale, publishDate: system.updated_at, createDate: system.created_at, - channel: "campaign-page", + channel: "campaign", pageType: "campaigncollectionpage", pageName, siteSections: pageName, @@ -114,7 +114,7 @@ export const campaignPageQueryRouter = router({ } return { - campaignPage, + campaign_page, tracking, } }), diff --git a/packages/trpc/lib/routers/types.ts b/packages/trpc/lib/routers/types.ts index 1642d7a78..0c843e1b6 100644 --- a/packages/trpc/lib/routers/types.ts +++ b/packages/trpc/lib/routers/types.ts @@ -23,10 +23,9 @@ type TrackingSDKChannel = | "static-content-page" | "hotelreservation" | "collection-page" - | "campaign-page" + | "campaign" | "hotels" | "homepage" - | "campaign-overview-page" export type TrackingUserData = | {