Merge branch 'develop' into feat/setup-hotel-api-call

server/routers/contentstack/base/output.ts

@@ -59,6 +59,7 @@ export type ContactConfig = ContactConfigData["all_contact_config"]["items"][0]
 export type ContactFields = {
   display_text: string | null
   contact_field: string
+  footnote: string | null
 }
 
 export const validateHeaderConfigSchema = z.object({

server/routers/contentstack/loyaltyPage/output.ts

@@ -2,10 +2,13 @@ import { z } from "zod"
 
 import { Lang } from "@/constants/languages"
 
+import { ImageVaultAsset } from "@/types/components/imageVaultImage"
 import {
   JoinLoyaltyContactTypenameEnum,
   LoyaltyBlocksTypenameEnum,
+  LoyaltyCardsGridEnum,
   LoyaltyComponentEnum,
+  LoyaltySidebarDynamicComponentEnum,
   SidebarTypenameEnum,
 } from "@/types/components/loyalty/enums"
 import { Embeds } from "@/types/requests/embeds"
@@ -47,6 +50,7 @@ const loyaltyPageShortcuts = z.object({
 })
 
 const cardBlock = z.object({
+  __typename: z.literal(LoyaltyCardsGridEnum.Card),
   heading: z.string().nullable(),
   body_text: z.string().nullable(),
   background_image: z.any(),
@@ -73,6 +77,30 @@ const cardBlock = z.object({
   }),
 })
 
+const loyaltyCardBlock = z.object({
+  __typename: z.literal(LoyaltyCardsGridEnum.LoyaltyCard),
+  heading: z.string().nullable(),
+  body_text: z.string().nullable(),
+  image: z.any(),
+  link: z
+    .object({
+      openInNewTab: z.boolean(),
+      title: z.string(),
+      href: z.string(),
+      isExternal: z.boolean(),
+    })
+    .optional(),
+  system: z.object({
+    locale: z.nativeEnum(Lang),
+    uid: z.string(),
+  }),
+})
+
+const loyaltyPageCardsItems = z.discriminatedUnion("__typename", [
+  loyaltyCardBlock,
+  cardBlock,
+])
+
 const loyaltyPageCards = z.object({
   __typename: z.literal(LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksCardsGrid),
   cards_grid: z.object({
@@ -80,7 +108,7 @@ const loyaltyPageCards = z.object({
     preamble: z.string().nullable(),
     layout: z.enum(["twoColumnGrid", "threeColumnGrid", "twoPlusOne"]),
     theme: z.enum(["one", "two", "three"]).nullable(),
-    cards: z.array(cardBlock),
+    cards: z.array(loyaltyPageCardsItems),
   }),
 })
 
@@ -132,14 +160,23 @@ const loyaltyPageJoinLoyaltyContact = z.object({
         contact: z.object({
           display_text: z.string().nullable(),
           contact_field: z.string(),
+          footnote: z.string().nullable(),
         }),
       })
     ),
   }),
 })
 
+const loyaltyPageSidebarDynamicContent = z.object({
+  __typename: z.literal(SidebarTypenameEnum.LoyaltyPageSidebarDynamicContent),
+  dynamic_content: z.object({
+    component: z.nativeEnum(LoyaltySidebarDynamicComponentEnum),
+  }),
+})
+
 const loyaltyPageSidebarItem = z.discriminatedUnion("__typename", [
   loyaltyPageSidebarTextContent,
+  loyaltyPageSidebarDynamicContent,
   loyaltyPageJoinLoyaltyContact,
 ])
 
@@ -151,7 +188,6 @@ export const validateLoyaltyPageSchema = z.object({
 })
 
 // Block types
-
 export type DynamicContent = z.infer<typeof loyaltyPageDynamicContent>
 
 type BlockContentRaw = z.infer<typeof loyaltyPageBlockTextContent>
@@ -164,11 +200,25 @@ export interface RteBlockContent extends BlockContentRaw {
   }
 }
 
+type LoyaltyCardRaw = z.infer<typeof loyaltyCardBlock>
+
+type LoyaltyCard = Omit<LoyaltyCardRaw, "image"> & {
+  image?: ImageVaultAsset
+}
+
+type CardRaw = z.infer<typeof cardBlock>
+
+type Card = Omit<CardRaw, "background_image"> & {
+  backgroundImage?: ImageVaultAsset
+}
+
 type CardsGridRaw = z.infer<typeof loyaltyPageCards>
 
-export type CardsRaw = CardsGridRaw["cards_grid"]["cards"][number]
+export type CardsGrid = Omit<CardsGridRaw, "cards"> & {
+  cards: (LoyaltyCard | Card)[]
+}
 
-export type CardsGrid = z.infer<typeof loyaltyPageCards>
+export type CardsRaw = CardsGrid["cards_grid"]["cards"][number]
 
 export type Shortcuts = z.infer<typeof loyaltyPageShortcuts>
 
@@ -185,8 +235,13 @@ export type RteSidebarContent = Omit<SidebarContentRaw, "content"> & {
     }
   }
 }
+type SideBarDynamicContent = z.infer<typeof loyaltyPageSidebarDynamicContent>
+
 export type JoinLoyaltyContact = z.infer<typeof loyaltyPageJoinLoyaltyContact>
-export type Sidebar = JoinLoyaltyContact | RteSidebarContent
+export type Sidebar =
+  | JoinLoyaltyContact
+  | RteSidebarContent
+  | SideBarDynamicContent
 type LoyaltyPageDataRaw = z.infer<typeof validateLoyaltyPageSchema>
 
 export type LoyaltyPage = Omit<LoyaltyPageDataRaw, "blocks" | "sidebar"> & {
@@ -210,6 +265,7 @@ const pageConnectionRefs = z.object({
 })
 
 const cardBlockRefs = z.object({
+  __typename: z.literal(LoyaltyCardsGridEnum.Card),
   primary_button: z
     .object({
       linkConnection: pageConnectionRefs,
@@ -227,13 +283,32 @@ const cardBlockRefs = z.object({
   }),
 })
 
+const loyaltyCardBlockRefs = z.object({
+  __typename: z.literal(LoyaltyCardsGridEnum.LoyaltyCard),
+  link: z
+    .object({
+      linkConnection: pageConnectionRefs,
+    })
+    .nullable(),
+
+  system: z.object({
+    content_type_uid: z.string(),
+    uid: z.string(),
+  }),
+})
+
+const cardGridCardsRef = z.discriminatedUnion("__typename", [
+  loyaltyCardBlockRefs,
+  cardBlockRefs,
+])
+
 const loyaltyPageCardsRefs = z.object({
   __typename: z.literal(LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksCardsGrid),
   cards_grid: z.object({
     cardConnection: z.object({
       edges: z.array(
         z.object({
-          node: cardBlockRefs,
+          node: cardGridCardsRef,
         })
       ),
     }),

server/routers/contentstack/loyaltyPage/query.ts

@@ -11,6 +11,7 @@ import {
   generateTag,
   generateTags,
 } from "@/utils/generateTag"
+import { insertResponseToImageVaultAsset } from "@/utils/imageVault"
 import { removeMultipleSlashes } from "@/utils/url"
 
 import { removeEmptyObjects } from "../../utils"
@@ -22,7 +23,17 @@ import {
 } from "./output"
 import { getConnections } from "./utils"
 
-import { LoyaltyBlocksTypenameEnum } from "@/types/components/loyalty/enums"
+import { InsertResponse } from "@/types/components/imageVaultImage"
+import {
+  LoyaltyBlocksTypenameEnum,
+  LoyaltyCardsGridEnum,
+} from "@/types/components/loyalty/enums"
+
+function makeImageVaultImage(image: any) {
+  return image && !!Object.keys(image).length
+    ? insertResponseToImageVaultAsset(image as InsertResponse)
+    : undefined
+}
 
 function makeButtonObject(button: any) {
   return {
@@ -35,9 +46,9 @@ function makeButtonObject(button: any) {
     href:
       button.is_contentstack_link && button.linkConnection.edges.length
         ? button.linkConnection.edges[0].node.web?.original_url ||
-        removeMultipleSlashes(
-          `/${button.linkConnection.edges[0].node.system.locale}/${button.linkConnection.edges[0].node.url}`
-        )
+          removeMultipleSlashes(
+            `/${button.linkConnection.edges[0].node.system.locale}/${button.linkConnection.edges[0].node.url}`
+          )
         : button.external_link.href,
     isExternal: !button.is_contentstack_link,
   }
@@ -96,66 +107,82 @@ export const loyaltyPageQueryRouter = router({
 
     const blocks = response.data.loyalty_page.blocks
       ? response.data.loyalty_page.blocks.map((block: any) => {
-        switch (block.__typename) {
-          case LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksDynamicContent:
-            return {
-              ...block,
-              dynamic_content: {
-                ...block.dynamic_content,
-                link: block.dynamic_content.link.pageConnection.edges.length
-                  ? {
-                    text: block.dynamic_content.link.text,
-                    href: removeMultipleSlashes(
-                      `/${block.dynamic_content.link.pageConnection.edges[0].node.system.locale}/${block.dynamic_content.link.pageConnection.edges[0].node.url}`
-                    ),
-                    title:
-                      block.dynamic_content.link.pageConnection.edges[0]
-                        .node.title,
-                  }
-                  : undefined,
-              },
-            }
-          case LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksShortcuts:
-            return {
-              ...block,
-              shortcuts: {
-                ...block.shortcuts,
-                shortcuts: block.shortcuts.shortcuts.map((shortcut: any) => ({
-                  text: shortcut.text,
-                  openInNewTab: shortcut.open_in_new_tab,
-                  ...shortcut.linkConnection.edges[0].node,
-                  url:
-                    shortcut.linkConnection.edges[0].node.web?.original_url ||
-                    removeMultipleSlashes(
-                      `/${shortcut.linkConnection.edges[0].node.system.locale}/${shortcut.linkConnection.edges[0].node.url}`
-                    ),
-                })),
-              },
-            }
-          case LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksCardsGrid:
-            return {
-              ...block,
-              cards_grid: {
-                ...block.cards_grid,
-                cards: block.cards_grid.cardConnection.edges.map(
-                  ({ node: card }: { node: any }) => {
-                    return {
-                      ...card,
-                      primaryButton: card.has_primary_button
-                        ? makeButtonObject(card.primary_button)
-                        : undefined,
-                      secondaryButton: card.has_secondary_button
-                        ? makeButtonObject(card.secondary_button)
-                        : undefined,
+          switch (block.__typename) {
+            case LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksDynamicContent:
+              return {
+                ...block,
+                dynamic_content: {
+                  ...block.dynamic_content,
+                  link: block.dynamic_content.link.pageConnection.edges.length
+                    ? {
+                        text: block.dynamic_content.link.text,
+                        href: removeMultipleSlashes(
+                          `/${block.dynamic_content.link.pageConnection.edges[0].node.system.locale}/${block.dynamic_content.link.pageConnection.edges[0].node.url}`
+                        ),
+                        title:
+                          block.dynamic_content.link.pageConnection.edges[0]
+                            .node.title,
+                      }
+                    : undefined,
+                },
+              }
+            case LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksShortcuts:
+              return {
+                ...block,
+                shortcuts: {
+                  ...block.shortcuts,
+                  shortcuts: block.shortcuts.shortcuts.map((shortcut: any) => ({
+                    text: shortcut.text,
+                    openInNewTab: shortcut.open_in_new_tab,
+                    ...shortcut.linkConnection.edges[0].node,
+                    url:
+                      shortcut.linkConnection.edges[0].node.web?.original_url ||
+                      removeMultipleSlashes(
+                        `/${shortcut.linkConnection.edges[0].node.system.locale}/${shortcut.linkConnection.edges[0].node.url}`
+                      ),
+                  })),
+                },
+              }
+            case LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksCardsGrid:
+              return {
+                ...block,
+                cards_grid: {
+                  ...block.cards_grid,
+                  cards: block.cards_grid.cardConnection.edges.map(
+                    ({ node: card }: { node: any }) => {
+                      switch (card.__typename) {
+                        case LoyaltyCardsGridEnum.LoyaltyCard:
+                          return {
+                            ...card,
+                            image: makeImageVaultImage(card.image),
+                            link: makeButtonObject({
+                              ...card.link,
+                              is_contentstack_link:
+                                !!card.link.linkConnection.edges.length,
+                            }),
+                          }
+                        case LoyaltyCardsGridEnum.Card:
+                          return {
+                            ...card,
+                            backgroundImage: makeImageVaultImage(
+                              card.background_image
+                            ),
+                            primaryButton: card.has_primary_button
+                              ? makeButtonObject(card.primary_button)
+                              : undefined,
+                            secondaryButton: card.has_secondary_button
+                              ? makeButtonObject(card.secondary_button)
+                              : undefined,
+                          }
+                      }
                     }
-                  }
-                ),
-              },
-            }
-          default:
-            return block
-        }
-      })
+                  ),
+                },
+              }
+            default:
+              return block
+          }
+        })
       : null
 
     const loyaltyPage = {

server/routers/contentstack/loyaltyPage/utils.ts

@@ -1,6 +1,9 @@
 import { LoyaltyPageRefsDataRaw } from "./output"
 
-import { LoyaltyBlocksTypenameEnum } from "@/types/components/loyalty/enums"
+import {
+  LoyaltyBlocksTypenameEnum,
+  LoyaltyCardsGridEnum,
+} from "@/types/components/loyalty/enums"
 import type { Edges } from "@/types/requests/utils/edges"
 import type { NodeRefs } from "@/types/requests/utils/refs"
 
@@ -18,13 +21,23 @@ export function getConnections(refs: LoyaltyPageRefsDataRaw) {
         case LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksCardsGrid: {
           connections.push(item.cards_grid.cardConnection)
           item.cards_grid.cardConnection.edges.forEach((card) => {
-            if (card.node.primary_button) {
-              connections.push(card.node.primary_button?.linkConnection)
-            } else if (card.node.secondary_button) {
-              connections.push(card.node.secondary_button?.linkConnection)
+            switch (card.node.__typename) {
+              case LoyaltyCardsGridEnum.LoyaltyCard: {
+                if (card.node.link) {
+                  connections.push(card.node.link?.linkConnection)
+                }
+                break
+              }
+              case LoyaltyCardsGridEnum.Card: {
+                if (card.node.primary_button) {
+                  connections.push(card.node.primary_button?.linkConnection)
+                } else if (card.node.secondary_button) {
+                  connections.push(card.node.secondary_button?.linkConnection)
+                }
+                break
+              }
             }
           })
-
           break
         }
         case LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksShortcuts: {