From c3279ec2543544a3f0c9cf61eaf11815f88c8ae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matilda=20Landstr=C3=B6m?= Date: Fri, 4 Jul 2025 07:38:18 +0000 Subject: [PATCH] Merged in feat/SW-1577-activity-card (pull request #2517) feat(SW-1577): activity card: add linking to collection page * feat(SW-1577): add linking to collection page Approved-by: Erik Tiekstra --- .../graphql/Query/HotelPage/HotelPage.graphql | 8 ++++++++ .../schemas/blocks/activitiesCard.ts | 17 +++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/packages/trpc/lib/graphql/Query/HotelPage/HotelPage.graphql b/packages/trpc/lib/graphql/Query/HotelPage/HotelPage.graphql index 331aa260e..28810535d 100644 --- a/packages/trpc/lib/graphql/Query/HotelPage/HotelPage.graphql +++ b/packages/trpc/lib/graphql/Query/HotelPage/HotelPage.graphql @@ -3,6 +3,7 @@ #import "../../Fragments/AccountPage/Ref.graphql" #import "../../Fragments/CollectionPage/Ref.graphql" +#import "../../Fragments/ContentPage/Ref.graphql" #import "../../Fragments/Blocks/Accordion.graphql" #import "../../Fragments/Blocks/Refs/Accordion.graphql" @@ -59,6 +60,12 @@ query GetHotelPage($locale: String!, $uid: String!) { preamble } } + ... on CollectionPage { + ...CollectionPageLink + header { + preamble + } + } } } } @@ -108,6 +115,7 @@ query GetHotelPageRefs($locale: String!, $uid: String!) { edges { node { __typename + ...CollectionPageRef ...ContentPageRef } } diff --git a/packages/trpc/lib/routers/contentstack/schemas/blocks/activitiesCard.ts b/packages/trpc/lib/routers/contentstack/schemas/blocks/activitiesCard.ts index 321558319..312abbe3f 100644 --- a/packages/trpc/lib/routers/contentstack/schemas/blocks/activitiesCard.ts +++ b/packages/trpc/lib/routers/contentstack/schemas/blocks/activitiesCard.ts @@ -4,7 +4,12 @@ import { removeMultipleSlashes } from "@scandic-hotels/common/utils/url" import { HotelPageEnum } from "../../../../types/hotelPageEnum" import { tempImageVaultAssetSchema } from "../imageVault" -import { contentPageRefSchema, contentPageSchema } from "../pageLinks" +import { + collectionPageRefSchema, + collectionPageSchema, + contentPageRefSchema, + contentPageSchema, +} from "../pageLinks" export const activitiesCardSchema = z.object({ typename: z @@ -29,6 +34,11 @@ export const activitiesCardSchema = z.object({ preamble: z.string(), }), }), + collectionPageSchema.extend({ + header: z.object({ + preamble: z.string(), + }), + }), ]), }) ), @@ -67,7 +77,10 @@ export const activitiesCardRefSchema = z.object({ hotel_page_activities_content_pageConnection: z.object({ edges: z.array( z.object({ - node: z.discriminatedUnion("__typename", [contentPageRefSchema]), + node: z.discriminatedUnion("__typename", [ + contentPageRefSchema, + collectionPageRefSchema, + ]), }) ), }),