Merge branch 'develop' into feature/tracking

server/routers/contentstack/contentPage/output.ts

@@ -2,6 +2,10 @@ import { z } from "zod"
 
 import { discriminatedUnionArray } from "@/lib/discriminatedUnion"
 
+import {
+  accordionRefsSchema,
+  accordionSchema,
+} from "../schemas/blocks/accordion"
 import {
   cardGridRefsSchema,
   cardsGridSchema,
@@ -81,8 +85,14 @@ export const contentPageTable = z
     __typename: z.literal(ContentPageEnum.ContentStack.blocks.Table),
   })
   .merge(tableSchema)
+export const contentPageAccordion = z
+  .object({
+    __typename: z.literal(ContentPageEnum.ContentStack.blocks.Accordion),
+  })
+  .merge(accordionSchema)
 
 export const blocksSchema = z.discriminatedUnion("__typename", [
+  contentPageAccordion,
   contentPageCards,
   contentPageContent,
   contentPageDynamicContent,
@@ -158,6 +168,12 @@ export const contentPageSchema = z.object({
   }),
 })
 
+export const contentPageSchemaBlocks = z.object({
+  content_page: z.object({
+    blocks: discriminatedUnionArray(blocksSchema.options).nullable(),
+  }),
+})
+
 /** REFS */
 const contentPageCardsRefs = z
   .object({
@@ -195,7 +211,14 @@ const contentPageUspGridRefs = z
   })
   .merge(uspGridRefsSchema)
 
+const contentPageAccordionRefs = z
+  .object({
+    __typename: z.literal(ContentPageEnum.ContentStack.blocks.Accordion),
+  })
+  .merge(accordionRefsSchema)
+
 const contentPageBlockRefsItem = z.discriminatedUnion("__typename", [
+  contentPageAccordionRefs,
   contentPageBlockContentRefs,
   contentPageShortcutsRefs,
   contentPageCardsRefs,

server/routers/contentstack/contentPage/query.ts

@@ -1,7 +1,8 @@
 import { Lang } from "@/constants/languages"
 import {
   GetContentPage,
-  GetContentPageBlocks,
+  GetContentPageBlocksBatch1,
+  GetContentPageBlocksBatch2,
 } from "@/lib/graphql/Query/ContentPage/ContentPage.graphql"
 import { request } from "@/lib/graphql/request"
 import { contentstackExtendedProcedureUID, router } from "@/server/trpc"
@@ -25,6 +26,7 @@ export const contentPageQueryRouter = router({
     const { lang, uid } = ctx
 
     const contentPageRefsData = await fetchContentPageRefs(lang, uid)
+
     const contentPageRefs = validateContentPageRefs(
       contentPageRefsData,
       lang,
@@ -33,6 +35,7 @@ export const contentPageQueryRouter = router({
     if (!contentPageRefs) {
       return null
     }
+
     const tags = generatePageTags(contentPageRefs, lang)
 
     getContentPageCounter.add(1, { lang, uid })
@@ -43,7 +46,7 @@ export const contentPageQueryRouter = router({
       })
     )
 
-    const [mainResponse, blocksResponse] = await Promise.all([
+    const [mainResponse, blocksResponse1, blocksResponse2] = await Promise.all([
       request<GetContentPageSchema>(
         GetContentPage,
         { locale: lang, uid },
@@ -55,7 +58,17 @@ export const contentPageQueryRouter = router({
         }
       ),
       request<GetContentPageSchema>(
-        GetContentPageBlocks,
+        GetContentPageBlocksBatch1,
+        { locale: lang, uid },
+        {
+          cache: "force-cache",
+          next: {
+            tags,
+          },
+        }
+      ),
+      request<GetContentPageSchema>(
+        GetContentPageBlocksBatch2,
         { locale: lang, uid },
         {
           cache: "force-cache",
@@ -70,7 +83,12 @@ export const contentPageQueryRouter = router({
       ...mainResponse.data,
       content_page: {
         ...mainResponse.data.content_page,
-        blocks: blocksResponse.data.content_page.blocks,
+        blocks: [
+          blocksResponse1.data.content_page.blocks,
+          blocksResponse2.data.content_page.blocks,
+        ]
+          .flat(2)
+          .filter((obj) => !(obj && Object.keys(obj).length < 2)), // Remove empty objects and objects with only typename
       },
     }
 

server/routers/contentstack/contentPage/utils.ts

@@ -126,6 +126,12 @@ export function getConnections({ content_page }: ContentPageRefs) {
   if (content_page.blocks) {
     content_page.blocks.forEach((block) => {
       switch (block.__typename) {
+        case ContentPageEnum.ContentStack.blocks.Accordion: {
+          if (block.accordion.length) {
+            connections.push(...block.accordion)
+          }
+          break
+        }
         case ContentPageEnum.ContentStack.blocks.Content:
           {
             if (block.content.length) {