Merge branch 'develop' into feature/tracking

server/routers/contentstack/contentPage/output.ts

@@ -39,6 +39,18 @@ import {
   joinLoyaltyContactRefsSchema,
   joinLoyaltyContactSchema,
 } from "../schemas/sidebar/joinLoyaltyContact"
+import {
+  quickLinksRefschema,
+  quickLinksSchema,
+} from "../schemas/sidebar/quickLinks"
+import {
+  scriptedCardRefschema,
+  scriptedCardsSchema,
+} from "../schemas/sidebar/scriptedCard"
+import {
+  teaserCardRefschema,
+  teaserCardsSchema,
+} from "../schemas/sidebar/teaserCard"
 import { systemSchema } from "../schemas/system"
 
 import { ContentPageEnum } from "@/types/enums/contentPage"
@@ -122,10 +134,31 @@ export const contentPageJoinLoyaltyContact = z
   })
   .merge(joinLoyaltyContactSchema)
 
+export const contentPageSidebarScriptedCard = z
+  .object({
+    __typename: z.literal(ContentPageEnum.ContentStack.sidebar.ScriptedCard),
+  })
+  .merge(scriptedCardsSchema)
+
+export const contentPageSidebarTeaserCard = z
+  .object({
+    __typename: z.literal(ContentPageEnum.ContentStack.sidebar.TeaserCard),
+  })
+  .merge(teaserCardsSchema)
+
+export const contentPageSidebarQuicklinks = z
+  .object({
+    __typename: z.literal(ContentPageEnum.ContentStack.sidebar.QuickLinks),
+  })
+  .merge(quickLinksSchema)
+
 export const sidebarSchema = z.discriminatedUnion("__typename", [
   contentPageSidebarContent,
   contentPageSidebarDynamicContent,
   contentPageJoinLoyaltyContact,
+  contentPageSidebarScriptedCard,
+  contentPageSidebarTeaserCard,
+  contentPageSidebarQuicklinks,
 ])
 
 const navigationLinksSchema = z
@@ -241,9 +274,30 @@ const contentPageSidebarJoinLoyaltyContactRef = z
   })
   .merge(joinLoyaltyContactRefsSchema)
 
+const contentPageSidebarScriptedCardRef = z
+  .object({
+    __typename: z.literal(ContentPageEnum.ContentStack.sidebar.ScriptedCard),
+  })
+  .merge(scriptedCardRefschema)
+
+const contentPageSidebarTeaserCardRef = z
+  .object({
+    __typename: z.literal(ContentPageEnum.ContentStack.sidebar.TeaserCard),
+  })
+  .merge(teaserCardRefschema)
+
+const contentPageSidebarQuickLinksRef = z
+  .object({
+    __typename: z.literal(ContentPageEnum.ContentStack.sidebar.QuickLinks),
+  })
+  .merge(quickLinksRefschema)
+
 const contentPageSidebarRefsItem = z.discriminatedUnion("__typename", [
   contentPageSidebarContentRef,
   contentPageSidebarJoinLoyaltyContactRef,
+  contentPageSidebarScriptedCardRef,
+  contentPageSidebarTeaserCardRef,
+  contentPageSidebarQuickLinksRef,
 ])
 
 const contentPageHeaderRefs = z.object({

server/routers/contentstack/contentPage/utils.ts

@@ -1,7 +1,10 @@
 import { metrics } from "@opentelemetry/api"
 
 import { Lang } from "@/constants/languages"
-import { GetContentPageRefs } from "@/lib/graphql/Query/ContentPage/ContentPage.graphql"
+import {
+  GetContentPageBlocksRefs,
+  GetContentPageRefs,
+} from "@/lib/graphql/Query/ContentPage/ContentPage.graphql"
 import { request } from "@/lib/graphql/request"
 import { notFound } from "@/server/errors/trpc"
 
@@ -41,18 +44,30 @@ export async function fetchContentPageRefs(lang: Lang, uid: string) {
       query: { lang, uid },
     })
   )
-  const refsResponse = await request<GetContentPageRefsSchema>(
-    GetContentPageRefs,
-    { locale: lang, uid },
-    {
-      cache: "force-cache",
-      next: {
-        tags: [generateTag(lang, uid)],
-      },
-    }
-  )
-  if (!refsResponse.data) {
-    const notFoundError = notFound(refsResponse)
+  const [mainRefsResponse, blockRefsResponse] = await Promise.all([
+    request<GetContentPageRefsSchema>(
+      GetContentPageRefs,
+      { locale: lang, uid },
+      {
+        cache: "force-cache",
+        next: {
+          tags: [generateTag(lang, uid)],
+        },
+      }
+    ),
+    request<GetContentPageRefsSchema>(
+      GetContentPageBlocksRefs,
+      { locale: lang, uid },
+      {
+        cache: "force-cache",
+        next: {
+          tags: [generateTag(lang, uid)],
+        },
+      }
+    ),
+  ])
+  if (!mainRefsResponse.data) {
+    const notFoundError = notFound(mainRefsResponse)
     getContentPageRefsFailCounter.add(1, {
       lang,
       uid,
@@ -73,8 +88,14 @@ export async function fetchContentPageRefs(lang: Lang, uid: string) {
     )
     throw notFoundError
   }
-
-  return refsResponse.data
+  const responseData = {
+    ...mainRefsResponse.data,
+    content_page: {
+      ...mainRefsResponse.data.content_page,
+      blocks: blockRefsResponse.data.content_page.blocks,
+    },
+  }
+  return responseData
 }
 
 export function validateContentPageRefs(
@@ -171,17 +192,30 @@ export function getConnections({ content_page }: ContentPageRefs) {
             connections.push(...block.content)
           }
           break
-
         case ContentPageEnum.ContentStack.sidebar.JoinLoyaltyContact:
           if (block.join_loyalty_contact?.button) {
             connections.push(block.join_loyalty_contact.button)
           }
           break
+        case ContentPageEnum.ContentStack.sidebar.ScriptedCard:
+          if (block.scripted_card?.length) {
+            connections.push(...block.scripted_card)
+          }
+          break
+        case ContentPageEnum.ContentStack.sidebar.TeaserCard:
+          if (block.teaser_card?.length) {
+            connections.push(...block.teaser_card)
+          }
+          break
+        case ContentPageEnum.ContentStack.sidebar.QuickLinks:
+          if (block.shortcuts.shortcuts.length) {
+            connections.push(...block.shortcuts.shortcuts)
+          }
+          break
         default:
           break
       }
     })
   }
-
   return connections
 }