Merged in feat/LOY-362-promo-blocks (pull request #2880)

feat(LOY-362): add blocks

* feat(LOY-362): add blocks

* fix(LOY-362): hide RTE while waiting for CS


Approved-by: Chuma Mcphoy (We Ahead)

packages/trpc/lib/routers/contentstack/promoCampaignPage/output.ts

@@ -4,8 +4,35 @@ import { transformedImageVaultAssetSchema } from "@scandic-hotels/common/utils/i
 import { isMembershipLevel } from "@scandic-hotels/common/utils/membershipLevels"
 import { nullableStringValidator } from "@scandic-hotels/common/utils/zod/stringValidator"
 
+import { PromoCampaignPageEnum } from "../../../types/promoCampaignPage"
+import { discriminatedUnionArray } from "../../../utils/discriminatedUnion"
+import {
+  accordionRefsSchema,
+  accordionSchema,
+} from "../schemas/blocks/accordion"
+import {
+  //contentRefsSchema as blockContentRefsSchema,
+  contentSchema as blockContentSchema,
+} from "../schemas/blocks/content"
 import { systemSchema } from "../schemas/system"
 
+export const promoCampaignPageContent = z
+  .object({
+    __typename: z.literal(PromoCampaignPageEnum.ContentStack.blocks.Content),
+  })
+  .merge(blockContentSchema)
+
+export const promoCampaignPageAccordion = z
+  .object({
+    __typename: z.literal(PromoCampaignPageEnum.ContentStack.blocks.Accordion),
+  })
+  .merge(accordionSchema)
+
+export const blocksSchema = z.discriminatedUnion("__typename", [
+  promoCampaignPageAccordion,
+  //promoCampaignPageContent,
+])
+
 export const CAMPAIGN_TYPES = {
   TIER: "TIER",
   POINT: "POINT",
@@ -43,6 +70,7 @@ export const promoCampaignPageSchema = z
           if (!data) return []
           return data.filter(isMembershipLevel)
         }),
+      blocks: discriminatedUnionArray(blocksSchema.options).nullish(),
       system: systemSchema.merge(
         z.object({
           created_at: z.string(),
@@ -70,8 +98,28 @@ export const promoCampaignPageSchema = z
   })
 
 /** REFS */
+/*const promoCampaignPageBlockContentRefs = z
+  .object({
+    __typename: z.literal(PromoCampaignPageEnum.ContentStack.blocks.Content),
+  })
+  .merge(blockContentRefsSchema)*/
+
+const promoCampaignPageAccordionRefs = z
+  .object({
+    __typename: z.literal(PromoCampaignPageEnum.ContentStack.blocks.Accordion),
+  })
+  .merge(accordionRefsSchema)
+
+const promoCampaignPageBlockRefsItem = z.discriminatedUnion("__typename", [
+  promoCampaignPageAccordionRefs,
+  //promoCampaignPageBlockContentRefs,
+])
+
 export const promoCampaignPageRefsSchema = z.object({
   promo_campaign_page: z.object({
+    blocks: discriminatedUnionArray(
+      promoCampaignPageBlockRefsItem.options
+    ).nullable(),
     system: systemSchema,
   }),
 })

packages/trpc/lib/routers/contentstack/promoCampaignPage/utils.ts

@@ -1,8 +1,11 @@
+import {
+  PromoCampaignPageEnum,
+  type PromoCampaignPageRefs,
+} from "../../../types/promoCampaignPage"
 import { generateTag, generateTagsFromSystem } from "../../../utils/generateTag"
 
 import type { Lang } from "@scandic-hotels/common/constants/language"
 
-import type { PromoCampaignPageRefs } from "../../../types/promoCampaignPage"
 import type { System } from "../schemas/system"
 
 export function generatePageTags(
@@ -19,5 +22,24 @@ export function generatePageTags(
 export function getConnections({ promo_campaign_page }: PromoCampaignPageRefs) {
   const connections: System["system"][] = [promo_campaign_page.system]
 
+  if (promo_campaign_page.blocks) {
+    promo_campaign_page.blocks.forEach((block) => {
+      switch (block.__typename) {
+        case PromoCampaignPageEnum.ContentStack.blocks.Accordion: {
+          if (block.accordion.length) {
+            connections.push(...block.accordion)
+          }
+          break
+        }
+        /*case PromoCampaignPageEnum.ContentStack.blocks.Content:
+          {
+            if (block.content.length) {
+              connections.push(...block.content)
+            }
+          }
+          break*/
+      }
+    })
+  }
   return connections
 }

packages/trpc/lib/routers/contentstack/schemas/blocks/accordion.ts

@@ -47,6 +47,8 @@ enum AccordionEnum {
   DestinationCountryPageBlocksAccordionBlockAccordionsSpecificAccordion = "DestinationCountryPageBlocksAccordionBlockAccordionsSpecificAccordion",
   DestinationFilterBlocksAccordionBlockAccordionsSpecificAccordion = "DestinationFilterBlocksAccordionBlockAccordionsSpecificAccordion",
   DestinationFilterBlocksAccordionBlockAccordionsGlobalAccordion = "DestinationFilterBlocksAccordionBlockAccordionsGlobalAccordion",
+  PromoCampaignPageBlocksAccordionBlockAccordionsGlobalAccordion = "PromoCampaignPageBlocksAccordionBlockAccordionsGlobalAccordion",
+  PromoCampaignPageBlocksAccordionBlockAccordionsSpecificAccordion = "PromoCampaignPageBlocksAccordionBlockAccordionsSpecificAccordion",
 }
 
 export const accordionSchema = z.object({
@@ -92,6 +94,7 @@ export const accordionSchema = z.object({
             case AccordionEnum.DestinationCityPageBlocksAccordionBlockAccordionsGlobalAccordion:
             case AccordionEnum.DestinationCountryPageBlocksAccordionBlockAccordionsGlobalAccordion:
             case AccordionEnum.DestinationFilterBlocksAccordionBlockAccordionsGlobalAccordion:
+            case AccordionEnum.PromoCampaignPageBlocksAccordionBlockAccordionsGlobalAccordion:
               return (
                 acc.global_accordion?.global_accordionConnection.edges.flatMap(
                   ({ node: accordionConnection }) => {
@@ -105,6 +108,7 @@ export const accordionSchema = z.object({
             case AccordionEnum.DestinationCityPageBlocksAccordionBlockAccordionsSpecificAccordion:
             case AccordionEnum.DestinationCountryPageBlocksAccordionBlockAccordionsSpecificAccordion:
             case AccordionEnum.DestinationFilterBlocksAccordionBlockAccordionsSpecificAccordion:
+            case AccordionEnum.PromoCampaignPageBlocksAccordionBlockAccordionsSpecificAccordion:
               return acc.specific_accordion?.questions || []
             default:
               return null
@@ -175,6 +179,7 @@ export const accordionRefsSchema = z.object({
           case AccordionEnum.DestinationCityPageBlocksAccordionBlockAccordionsGlobalAccordion:
           case AccordionEnum.DestinationCountryPageBlocksAccordionBlockAccordionsGlobalAccordion:
           case AccordionEnum.DestinationFilterBlocksAccordionBlockAccordionsGlobalAccordion:
+          case AccordionEnum.PromoCampaignPageBlocksAccordionBlockAccordionsGlobalAccordion:
             return (
               accordion.global_accordion?.global_accordionConnection.edges.flatMap(
                 ({ node: accordionConnection }) => {
@@ -190,6 +195,7 @@ export const accordionRefsSchema = z.object({
           case AccordionEnum.DestinationCityPageBlocksAccordionBlockAccordionsSpecificAccordion:
           case AccordionEnum.DestinationCountryPageBlocksAccordionBlockAccordionsSpecificAccordion:
           case AccordionEnum.DestinationFilterBlocksAccordionBlockAccordionsSpecificAccordion:
+          case AccordionEnum.PromoCampaignPageBlocksAccordionBlockAccordionsSpecificAccordion:
             return (
               accordion.specific_accordion?.questions.flatMap((question) =>
                 question.answer.embedded_itemsConnection.edges.flatMap(