Merge branch 'develop' into feature/tracking

server/routers/contentstack/base/output.ts

@@ -551,10 +551,13 @@ const linkSchema = z
   })
   .transform((data) => {
     if (data.linkConnection.edges.length) {
-      const link = pageLinks.transform(data.linkConnection.edges[0].node)
-      if (link) {
-        return {
-          link,
+      const linkNode = data.linkConnection.edges[0].node
+      if (linkNode) {
+        const link = pageLinks.transform(linkNode)
+        if (link) {
+          return {
+            link,
+          }
         }
       }
     }

server/routers/contentstack/loyaltyLevel/query.ts

@@ -31,6 +31,17 @@ const getAllLoyaltyLevelFailCounter = meter.createCounter(
   "trpc.contentstack.loyaltyLevel.all-fail"
 )
 
+const getByLevelLoyaltyLevelCounter = meter.createCounter(
+  "trpc.contentstack.loyaltyLevel.byLevel"
+)
+
+const getByLevelLoyaltyLevelSuccessCounter = meter.createCounter(
+  "trpc.contentstack.loyaltyLevel.byLevel-success"
+)
+const getByLevelLoyaltyLevelFailCounter = meter.createCounter(
+  "trpc.contentstack.loyaltyLevel.byLevel-fail"
+)
+
 export async function getAllLoyaltyLevels(ctx: Context) {
   getAllLoyaltyLevelCounter.add(1)
 
@@ -87,7 +98,9 @@ export async function getAllLoyaltyLevels(ctx: Context) {
 }
 
 export async function getLoyaltyLevel(ctx: Context, level_id: MembershipLevel) {
-  getAllLoyaltyLevelCounter.add(1)
+  getByLevelLoyaltyLevelCounter.add(1, {
+    query: JSON.stringify({ lang: ctx.lang, level_id }),
+  })
 
   const loyaltyLevelsConfigResponse = await request<LoyaltyLevelsResponse>(
     GetLoyaltyLevel,
@@ -103,10 +116,10 @@ export async function getLoyaltyLevel(ctx: Context, level_id: MembershipLevel) {
     !loyaltyLevelsConfigResponse.data ||
     !loyaltyLevelsConfigResponse.data.all_loyalty_level.items.length
   ) {
-    getAllLoyaltyLevelFailCounter.add(1)
+    getByLevelLoyaltyLevelFailCounter.add(1)
     const notFoundError = notFound(loyaltyLevelsConfigResponse)
     console.error(
-      "contentstack.loyaltyLevels not found error",
+      "contentstack.loyaltyLevel not found error",
       JSON.stringify({
         query: { lang: ctx.lang, level_id },
         error: { code: notFoundError.code },
@@ -119,10 +132,10 @@ export async function getLoyaltyLevel(ctx: Context, level_id: MembershipLevel) {
     loyaltyLevelsConfigResponse.data
   )
   if (!validatedLoyaltyLevels.success) {
-    getAllLoyaltyLevelFailCounter.add(1)
+    getByLevelLoyaltyLevelFailCounter.add(1)
     console.error(validatedLoyaltyLevels.error)
     console.error(
-      "contentstack.rewards validation error",
+      "contentstack.loyaltyLevel validation error",
       JSON.stringify({
         query: { lang: ctx.lang, level_id },
         error: validatedLoyaltyLevels.error,
@@ -131,7 +144,7 @@ export async function getLoyaltyLevel(ctx: Context, level_id: MembershipLevel) {
     return null
   }
 
-  getAllLoyaltyLevelSuccessCounter.add(1)
+  getByLevelLoyaltyLevelSuccessCounter.add(1)
   return validatedLoyaltyLevels.data[0]
 }
 

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

@@ -47,13 +47,13 @@ export const activitiesCard = z.object({
         }
       }
       return {
-        background_image: data.background_image,
-        body_text: data.body_text,
+        backgroundImage: data.background_image,
+        bodyText: data.body_text,
         contentPage,
-        cta_text: data.cta_text,
+        ctaText: data.cta_text,
         heading: data.heading,
-        open_in_new_tab: !!data.open_in_new_tab,
-        scripted_title: data.scripted_title,
+        openInNewTab: !!data.open_in_new_tab,
+        scriptedTopTitle: data.scripted_title,
       }
     }),
 })

server/routers/contentstack/schemas/linkConnection.ts

@@ -25,10 +25,13 @@ export const linkConnectionSchema = z
   })
   .transform((data) => {
     if (data.linkConnection.edges.length) {
-      const link = pageLinks.transform(data.linkConnection.edges[0].node)
-      if (link) {
-        return {
-          link,
+      const linkNode = data.linkConnection.edges[0].node
+      if (linkNode) {
+        const link = pageLinks.transform(linkNode)
+        if (link) {
+          return {
+            link,
+          }
         }
       }
     }
@@ -54,17 +57,20 @@ export const linkConnectionRefs = z
     linkConnection: z.object({
       edges: z.array(
         z.object({
-          node: linkRefsUnionSchema,
+          node: discriminatedUnion(linkRefsUnionSchema.options),
         })
       ),
     }),
   })
   .transform((data) => {
     if (data.linkConnection.edges.length) {
-      const link = pageLinks.transformRef(data.linkConnection.edges[0].node)
-      if (link) {
-        return {
-          link,
+      const linkNode = data.linkConnection.edges[0].node
+      if (linkNode) {
+        const link = pageLinks.transformRef(linkNode)
+        if (link) {
+          return {
+            link,
+          }
         }
       }
     }