Merged in feature/tier-matching-component (pull request #1175)

SAS Tier matching comparison block (SW-921)

Approved-by: Joakim Jäderberg
Approved-by: Matilda Landström

server/routers/contentstack/contentPage/output.ts

@@ -18,6 +18,7 @@ import {
   dynamicContentRefsSchema,
   dynamicContentSchema as blockDynamicContentSchema,
 } from "../schemas/blocks/dynamicContent"
+import { sasTierComparisonSchema } from "../schemas/blocks/sasTierComparison"
 import { hotelListingSchema } from "../schemas/blocks/hotelListing"
 import {
   shortcutsRefsSchema,
@@ -104,6 +105,13 @@ export const contentPageAccordion = z
   })
   .merge(accordionSchema)
 
+export const contentPageLoyaltyTierComparison = z
+  .object({
+    __typename: z.literal(
+      ContentPageEnum.ContentStack.blocks.SasTierComparison
+    ),
+  })
+  .merge(sasTierComparisonSchema)
 export const contentPageHotelListing = z
   .object({
     __typename: z.literal(ContentPageEnum.ContentStack.blocks.HotelListing),
@@ -119,6 +127,7 @@ export const blocksSchema = z.discriminatedUnion("__typename", [
   contentPageTable,
   contentPageTextCols,
   contentPageUspGrid,
+  contentPageLoyaltyTierComparison,
   contentPageHotelListing,
 ])
 

server/routers/contentstack/contentPage/query.ts

@@ -3,6 +3,7 @@ import {
   GetContentPage,
   GetContentPageBlocksBatch1,
   GetContentPageBlocksBatch2,
+  GetContentPageBlocksBatch3,
 } from "@/lib/graphql/Query/ContentPage/ContentPage.graphql"
 import { contentstackExtendedProcedureUID, router } from "@/server/trpc"
 
@@ -72,6 +73,17 @@ export const contentPageQueryRouter = router({
           },
         },
       },
+
+      {
+        document: GetContentPageBlocksBatch3,
+        variables: { locale: lang, uid },
+        options: {
+          cache: "force-cache",
+          next: {
+            tags,
+          },
+        },
+      },
     ])
 
     const contentPage = contentPageSchema.safeParse(contentPageRequest.data)

server/routers/contentstack/schemas/blocks/sasTierComparison.ts

@@ -0,0 +1,64 @@
+import { z } from "zod"
+
+import { MembershipLevelEnum } from "@/constants/membershipLevels"
+
+import { BlocksEnums } from "@/types/enums/blocks"
+
+const link = z.object({
+  href: z.string(),
+  title: z.string(),
+})
+
+export const sasTierComparisonSchema = z.object({
+  typename: z
+    .literal(BlocksEnums.block.SasTierComparison)
+    .optional()
+    .default(BlocksEnums.block.SasTierComparison),
+  sas_tier_comparison: z
+    .object({
+      comparisonConnection: z.object({
+        edges: z.array(
+          z.object({
+            node: z.object({
+              title: z.string(),
+              preamble: z.string().optional(),
+              scandic_friends: z.object({
+                title: z.string(),
+                label: z.string(),
+                tiers: z.array(
+                  z.object({
+                    tier_code: z.nativeEnum(MembershipLevelEnum),
+                    tier_label: z.string(),
+                  })
+                ),
+                read_more_link: link.optional(),
+              }),
+              sas_eb: z.object({
+                title: z.string(),
+                label: z.string(),
+                tiers: z.array(
+                  z.object({
+                    tier_code: z.enum([
+                      "Basic",
+                      "Silver",
+                      "Gold",
+                      "Diamond",
+                      "Pandion",
+                    ]),
+                    tier_label: z.string(),
+                  })
+                ),
+                read_more_link: link.optional(),
+              }),
+              cta: link.optional(),
+            }),
+          })
+        ),
+      }),
+    })
+    .transform((data) => {
+      return {
+        sasTierComparison: data.comparisonConnection.edges.at(0)?.node ?? null,
+      }
+    }),
+})