scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(SW-194): change naming

Browse Source
This commit is contained in:
Matilda Landström
2024-10-15 16:40:10 +02:00
parent e5aa3faa0b
commit 47aa63cd9f
7 changed files with 58 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/Blocks/index.tsx
View File

@@ -18,7 +18,7 @@ export default function Blocks({ blocks }: BlocksProps) {
case BlocksEnums.block.Accordion:
return (
<AccordionSection
accordion={block.accordion.faq}
accordion={block.accordion.accordions}
title={block.accordion.title}
key={`${block.typename}-${idx}`}
/>

4
components/ContentType/HotelPage/index.tsx
View File

@@ -82,7 +82,9 @@ export default async function HotelPage() {
</div>
<Rooms rooms={roomCategories} />
<Facilities facilities={facilities} activitiesCard={activitiesCard} />
{faq && <AccordionSection accordion={faq.faq} title={faq.title} />}
{faq && (
<AccordionSection accordion={faq.accordions} title={faq.title} />
)}
</main>
{googleMapsApiKey ? (
<>

32
lib/graphql/Fragments/Blocks/Accordion.graphql
View File

@@ -36,18 +36,18 @@ fragment Accordion_ContentPage on ContentPageBlocksAccordion {
__typename
accordion {
title
faq {
accordions {
__typename
...GlobalFaq
...SpecificFaq
...GlobalAccordion
...SpecificAccordion
}
}
}
fragment GlobalFaq on ContentPageBlocksAccordionBlockFaqGlobalFaq {
fragment GlobalAccordion on ContentPageBlocksAccordionBlockAccordionsGlobalAccordion {
__typename
global_faq {
global_faqConnection {
global_accordion {
global_accordionConnection {
edges {
node {
...AccordionBlock
@@ -57,9 +57,9 @@ fragment GlobalFaq on ContentPageBlocksAccordionBlockFaqGlobalFaq {
}
}
fragment SpecificFaq on ContentPageBlocksAccordionBlockFaqSpecificFaq {
fragment SpecificAccordion on ContentPageBlocksAccordionBlockAccordionsSpecificAccordion {
__typename
specific_faq {
specific_accordion {
questions {
question
answer {
@@ -82,17 +82,17 @@ fragment SpecificFaq on ContentPageBlocksAccordionBlockFaqSpecificFaq {
fragment Accordion_ContentPageRefs on ContentPageBlocksAccordion {
accordion {
faq {
accordions {
__typename
...GlobalFaqRefs
...SpecificFaqRefs
...GlobalAccordionRefs
...SpecificAccordionRefs
}
}
}
fragment GlobalFaqRefs on ContentPageBlocksAccordionBlockFaqGlobalFaq {
global_faq {
global_faqConnection {
fragment GlobalAccordionRefs on ContentPageBlocksAccordionBlockAccordionsGlobalAccordion {
global_accordion {
global_accordionConnection {
edges {
node {
...AccordionBlockRefs
@@ -102,8 +102,8 @@ fragment GlobalFaqRefs on ContentPageBlocksAccordionBlockFaqGlobalFaq {
}
}
fragment SpecificFaqRefs on ContentPageBlocksAccordionBlockFaqSpecificFaq {
specific_faq {
fragment SpecificAccordionRefs on ContentPageBlocksAccordionBlockAccordionsSpecificAccordion {
specific_accordion {
questions {
answer {
embedded_itemsConnection {

64
server/routers/contentstack/schemas/blocks/accordion.ts
View File

@@ -36,8 +36,8 @@ export const accordionItemsSchema = z.array(
export type Accordion = z.infer<typeof accordionSchema>
enum AccordionEnum {
ContentPageBlocksAccordionBlockFaqGlobalFaq = "ContentPageBlocksAccordionBlockFaqGlobalFaq",
ContentPageBlocksAccordionBlockFaqSpecificFaq = "ContentPageBlocksAccordionBlockFaqSpecificFaq",
ContentPageBlocksAccordionBlockAccordionsGlobalAccordion = "ContentPageBlocksAccordionBlockAccordionsGlobalAccordion",
ContentPageBlocksAccordionBlockAccordionsSpecificAccordion = "ContentPageBlocksAccordionBlockAccordionsSpecificAccordion",
}
export const accordionSchema = z.object({
@@ -48,15 +48,15 @@ export const accordionSchema = z.object({
accordion: z
.object({
title: z.string().optional().default(""),
faq: z.array(
accordions: z.array(
z.object({
__typename: z.enum([
AccordionEnum.ContentPageBlocksAccordionBlockFaqGlobalFaq,
AccordionEnum.ContentPageBlocksAccordionBlockFaqSpecificFaq,
AccordionEnum.ContentPageBlocksAccordionBlockAccordionsGlobalAccordion,
AccordionEnum.ContentPageBlocksAccordionBlockAccordionsSpecificAccordion,
]),
global_faq: z
global_accordion: z
.object({
global_faqConnection: z.object({
global_accordionConnection: z.object({
edges: z.array(
z.object({
node: z.object({
@@ -67,7 +67,7 @@ export const accordionSchema = z.object({
}),
})
.optional(),
specific_faq: z
specific_accordion: z
.object({
questions: accordionItemsSchema,
})
@@ -78,18 +78,18 @@ export const accordionSchema = z.object({
.transform((data) => {
return {
...data,
faq: data.faq.flatMap((faq) => {
switch (faq.__typename) {
case AccordionEnum.ContentPageBlocksAccordionBlockFaqGlobalFaq:
accordions: data.accordions.flatMap((acc) => {
switch (acc.__typename) {
case AccordionEnum.ContentPageBlocksAccordionBlockAccordionsGlobalAccordion:
return (
faq.global_faq?.global_faqConnection.edges.flatMap(
({ node: faqConnection }) => {
return faqConnection.questions
acc.global_accordion?.global_accordionConnection.edges.flatMap(
({ node: accordionConnection }) => {
return accordionConnection.questions
}
) || []
)
case AccordionEnum.ContentPageBlocksAccordionBlockFaqSpecificFaq:
return faq.specific_faq?.questions || []
case AccordionEnum.ContentPageBlocksAccordionBlockAccordionsSpecificAccordion:
return acc.specific_accordion?.questions || []
}
}),
}
@@ -103,7 +103,7 @@ const actualRefs = z.discriminatedUnion("__typename", [
pageLinks.loyaltyPageRefSchema,
])
export const globalFaqConnectionRefs = z.object({
export const globalAccordionConnectionRefs = z.object({
edges: z.array(
z.object({
node: z.object({
@@ -125,7 +125,7 @@ export const globalFaqConnectionRefs = z.object({
),
})
export const specificFaqConnectionRefs = z.object({
export const specificAccordionConnectionRefs = z.object({
questions: z.array(
z.object({
answer: z.object({
@@ -144,29 +144,29 @@ export const specificFaqConnectionRefs = z.object({
export const accordionRefsSchema = z.object({
accordion: z
.object({
faq: z.array(
accordions: z.array(
z.object({
__typename: z.enum([
AccordionEnum.ContentPageBlocksAccordionBlockFaqGlobalFaq,
AccordionEnum.ContentPageBlocksAccordionBlockFaqSpecificFaq,
AccordionEnum.ContentPageBlocksAccordionBlockAccordionsGlobalAccordion,
AccordionEnum.ContentPageBlocksAccordionBlockAccordionsSpecificAccordion,
]),
global_faq: z
global_accordion: z
.object({
global_faqConnection: globalFaqConnectionRefs,
global_accordionConnection: globalAccordionConnectionRefs,
})
.optional(),
specific_faq: specificFaqConnectionRefs.optional(),
specific_accordion: specificAccordionConnectionRefs.optional(),
})
),
})
.transform((data) => {
return data.faq.flatMap((faq) => {
switch (faq.__typename) {
case AccordionEnum.ContentPageBlocksAccordionBlockFaqGlobalFaq:
return data.accordions.flatMap((accordion) => {
switch (accordion.__typename) {
case AccordionEnum.ContentPageBlocksAccordionBlockAccordionsGlobalAccordion:
return (
faq.global_faq?.global_faqConnection.edges.flatMap(
({ node: faqConnection }) => {
return faqConnection.questions.flatMap((question) =>
accordion.global_accordion?.global_accordionConnection.edges.flatMap(
({ node: accordionConnection }) => {
return accordionConnection.questions.flatMap((question) =>
question.answer.embedded_itemsConnection.edges.flatMap(
({ node }) => node.system
)
@@ -174,9 +174,9 @@ export const accordionRefsSchema = z.object({
}
) || []
)
case AccordionEnum.ContentPageBlocksAccordionBlockFaqSpecificFaq:
case AccordionEnum.ContentPageBlocksAccordionBlockAccordionsSpecificAccordion:
return (
faq.specific_faq?.questions.flatMap((question) =>
accordion.specific_accordion?.questions.flatMap((question) =>
question.answer.embedded_itemsConnection.edges.flatMap(
({ node }) => node.system
)

10
server/routers/contentstack/schemas/blocks/hotelFaq.ts
View File

@@ -2,8 +2,8 @@ import { z } from "zod"
import {
accordionItemsSchema,
globalFaqConnectionRefs,
specificFaqConnectionRefs,
globalAccordionConnectionRefs,
specificAccordionConnectionRefs,
} from "./accordion"
import { BlocksEnums } from "@/types/enums/blocks"
@@ -41,7 +41,7 @@ export const hotelFaqSchema = z
}) || []
)
array.push(data.specific_faq?.questions || [])
return { ...data, faq: array.flat(2) }
return { ...data, accordions: array.flat(2) }
})
export const hotelFaqRefsSchema = z
@@ -50,8 +50,8 @@ export const hotelFaqRefsSchema = z
.literal(HotelPageEnum.ContentStack.blocks.Faq)
.optional()
.default(HotelPageEnum.ContentStack.blocks.Faq),
global_faqConnection: globalFaqConnectionRefs.optional(),
specific_faq: specificFaqConnectionRefs.optional(),
global_faqConnection: globalAccordionConnectionRefs.optional(),
specific_faq: specificAccordionConnectionRefs.optional(),
})
.transform((data) => {
const array = []

2
types/components/blocks/Accordion.ts
View File

@@ -1,6 +1,6 @@
import type { Accordion } from "@/server/routers/contentstack/schemas/blocks/accordion"
export type AccordionProps = {
accordion: Accordion["accordion"]["faq"]
accordion: Accordion["accordion"]["accordions"]
title?: string
}

3
types/trpc/routers/contentstack/contentPage.ts
View File

@@ -17,9 +17,6 @@ export interface ContentPageRefs
export interface GetContentPageSchema
extends z.input<typeof contentPageSchema> {}
export interface GetContentPageSchemaBlocks
extends z.input<typeof contentPageSchemaBlocks> {}
export interface ContentPage extends z.output<typeof contentPageSchema> {}
export type Block = z.output<typeof blocksSchema>