fix(SW-190): added imageVaultAsset schema

server/routers/contentstack/loyaltyPage/output.ts

@@ -2,7 +2,9 @@ import { z } from "zod"
 
 import { Lang } from "@/constants/languages"
 
-import { ImageVaultAsset } from "@/types/components/imageVaultImage"
+import { imageVaultAssetSchema } from "../schemas/imageVault"
+
+import { ImageVaultAsset } from "@/types/components/imageVault"
 import {
   JoinLoyaltyContactTypenameEnum,
   LoyaltyBlocksTypenameEnum,
@@ -192,7 +194,7 @@ const loyaltyPageSidebarItem = z.discriminatedUnion("__typename", [
 export const validateLoyaltyPageSchema = z.object({
   heading: z.string().nullable(),
   preamble: z.string().nullable(),
-  hero_image: z.any().nullable(),
+  hero_image: imageVaultAssetSchema.nullable().optional(),
   blocks: z.array(loyaltyPageBlockItem).nullable(),
   sidebar: z.array(loyaltyPageSidebarItem).nullable(),
   system: z.object({
@@ -264,7 +266,7 @@ export type LoyaltyPage = Omit<
   LoyaltyPageDataRaw,
   "blocks" | "sidebar" | "hero_image"
 > & {
-  hero_image?: ImageVaultAsset
+  heroImage?: ImageVaultAsset
   blocks: Block[]
   sidebar: Sidebar[]
 }

server/routers/contentstack/loyaltyPage/query.ts

@@ -85,6 +85,18 @@ export const loyaltyPageQueryRouter = router({
       throw notFound(response)
     }
 
+    const validatedLoyaltyPage = validateLoyaltyPageSchema.safeParse(
+      response.data.loyalty_page
+    )
+
+    if (!validatedLoyaltyPage.success) {
+      console.error(
+        `Failed to validate Loyaltypage Data - (lang: ${lang}, uid: ${uid})`
+      )
+      console.error(validatedLoyaltyPage.error)
+      return null
+    }
+
     const blocks = response.data.loyalty_page.blocks
       ? response.data.loyalty_page.blocks.map((block: any) => {
           switch (block.__typename) {
@@ -178,26 +190,17 @@ export const loyaltyPageQueryRouter = router({
         })
       : null
 
-    const loyaltyPage = {
+    console.log({ HERO_IMAGE: response.data.loyalty_page.hero_image })
+
+    const loyaltyPage: LoyaltyPage = {
       heading: response.data.loyalty_page.heading,
       preamble: response.data.loyalty_page.preamble,
-      hero_image: makeImageVaultImage(response.data.loyalty_page.hero_image),
+      heroImage: makeImageVaultImage(response.data.loyalty_page.hero_image),
       system: response.data.loyalty_page.system,
       blocks,
       sidebar,
     }
 
-    const validatedLoyaltyPage =
-      validateLoyaltyPageSchema.safeParse(loyaltyPage)
-
-    if (!validatedLoyaltyPage.success) {
-      console.error(
-        `Failed to validate Loyaltypage Data - (lang: ${lang}, uid: ${uid})`
-      )
-      console.error(validatedLoyaltyPage.error)
-      return null
-    }
-
     const loyaltyTrackingData: TrackingSDKPageData = {
       pageId: response.data.loyalty_page.system.uid,
       lang: response.data.loyalty_page.system.locale as Lang,
@@ -209,7 +212,7 @@ export const loyaltyPageQueryRouter = router({
 
     // Assert LoyaltyPage type to get correct typings for RTE fields
     return {
-      loyaltyPage: validatedLoyaltyPage.data as LoyaltyPage,
+      loyaltyPage,
       tracking: loyaltyTrackingData,
     }
   }),