Merge branch 'develop' into feature/tracking

server/routers/contentstack/contentPage/query.ts

@@ -1,5 +1,8 @@
 import { Lang } from "@/constants/languages"
-import { GetContentPage } from "@/lib/graphql/Query/ContentPage/ContentPage.graphql"
+import {
+  GetContentPage,
+  GetContentPageBlocks,
+} from "@/lib/graphql/Query/ContentPage/ContentPage.graphql"
 import { request } from "@/lib/graphql/request"
 import { contentstackExtendedProcedureUID, router } from "@/server/trpc"
 
@@ -40,18 +43,38 @@ export const contentPageQueryRouter = router({
       })
     )
 
-    const response = await request<GetContentPageSchema>(
-      GetContentPage,
-      { locale: lang, uid },
-      {
-        cache: "force-cache",
-        next: {
-          tags,
-        },
-      }
-    )
+    const [mainResponse, blocksResponse] = await Promise.all([
+      request<GetContentPageSchema>(
+        GetContentPage,
+        { locale: lang, uid },
+        {
+          cache: "force-cache",
+          next: {
+            tags,
+          },
+        }
+      ),
+      request<GetContentPageSchema>(
+        GetContentPageBlocks,
+        { locale: lang, uid },
+        {
+          cache: "force-cache",
+          next: {
+            tags,
+          },
+        }
+      ),
+    ])
 
-    const contentPage = contentPageSchema.safeParse(response.data)
+    const responseData = {
+      ...mainResponse.data,
+      content_page: {
+        ...mainResponse.data.content_page,
+        blocks: blocksResponse.data.content_page.blocks,
+      },
+    }
+
+    const contentPage = contentPageSchema.safeParse(responseData)
 
     if (!contentPage.success) {
       console.error(