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: case BlocksEnums.block.Accordion:
return ( return (
<AccordionSection <AccordionSection
accordion={block.accordion.faq} accordion={block.accordion.accordions}
title={block.accordion.title} title={block.accordion.title}
key={`${block.typename}-${idx}`} key={`${block.typename}-${idx}`}
/> />

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

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

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

@@ -36,18 +36,18 @@ fragment Accordion_ContentPage on ContentPageBlocksAccordion {
__typename __typename
accordion { accordion {
title title
faq { accordions {
__typename __typename
...GlobalFaq ...GlobalAccordion
...SpecificFaq ...SpecificAccordion
} }
} }
} }
fragment GlobalFaq on ContentPageBlocksAccordionBlockFaqGlobalFaq { fragment GlobalAccordion on ContentPageBlocksAccordionBlockAccordionsGlobalAccordion {
__typename __typename
global_faq { global_accordion {
global_faqConnection { global_accordionConnection {
edges { edges {
node { node {
...AccordionBlock ...AccordionBlock
@@ -57,9 +57,9 @@ fragment GlobalFaq on ContentPageBlocksAccordionBlockFaqGlobalFaq {
} }
} }
fragment SpecificFaq on ContentPageBlocksAccordionBlockFaqSpecificFaq { fragment SpecificAccordion on ContentPageBlocksAccordionBlockAccordionsSpecificAccordion {
__typename __typename
specific_faq { specific_accordion {
questions { questions {
question question
answer { answer {
@@ -82,17 +82,17 @@ fragment SpecificFaq on ContentPageBlocksAccordionBlockFaqSpecificFaq {
fragment Accordion_ContentPageRefs on ContentPageBlocksAccordion { fragment Accordion_ContentPageRefs on ContentPageBlocksAccordion {
accordion { accordion {
faq { accordions {
__typename __typename
...GlobalFaqRefs ...GlobalAccordionRefs
...SpecificFaqRefs ...SpecificAccordionRefs
} }
} }
} }
fragment GlobalFaqRefs on ContentPageBlocksAccordionBlockFaqGlobalFaq { fragment GlobalAccordionRefs on ContentPageBlocksAccordionBlockAccordionsGlobalAccordion {
global_faq { global_accordion {
global_faqConnection { global_accordionConnection {
edges { edges {
node { node {
...AccordionBlockRefs ...AccordionBlockRefs
@@ -102,8 +102,8 @@ fragment GlobalFaqRefs on ContentPageBlocksAccordionBlockFaqGlobalFaq {
} }
} }
fragment SpecificFaqRefs on ContentPageBlocksAccordionBlockFaqSpecificFaq { fragment SpecificAccordionRefs on ContentPageBlocksAccordionBlockAccordionsSpecificAccordion {
specific_faq { specific_accordion {
questions { questions {
answer { answer {
embedded_itemsConnection { 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> export type Accordion = z.infer<typeof accordionSchema>
enum AccordionEnum { enum AccordionEnum {
ContentPageBlocksAccordionBlockFaqGlobalFaq = "ContentPageBlocksAccordionBlockFaqGlobalFaq", ContentPageBlocksAccordionBlockAccordionsGlobalAccordion = "ContentPageBlocksAccordionBlockAccordionsGlobalAccordion",
ContentPageBlocksAccordionBlockFaqSpecificFaq = "ContentPageBlocksAccordionBlockFaqSpecificFaq", ContentPageBlocksAccordionBlockAccordionsSpecificAccordion = "ContentPageBlocksAccordionBlockAccordionsSpecificAccordion",
} }
export const accordionSchema = z.object({ export const accordionSchema = z.object({
@@ -48,15 +48,15 @@ export const accordionSchema = z.object({
accordion: z accordion: z
.object({ .object({
title: z.string().optional().default(""), title: z.string().optional().default(""),
faq: z.array( accordions: z.array(
z.object({ z.object({
__typename: z.enum([ __typename: z.enum([
AccordionEnum.ContentPageBlocksAccordionBlockFaqGlobalFaq, AccordionEnum.ContentPageBlocksAccordionBlockAccordionsGlobalAccordion,
AccordionEnum.ContentPageBlocksAccordionBlockFaqSpecificFaq, AccordionEnum.ContentPageBlocksAccordionBlockAccordionsSpecificAccordion,
]), ]),
global_faq: z global_accordion: z
.object({ .object({
global_faqConnection: z.object({ global_accordionConnection: z.object({
edges: z.array( edges: z.array(
z.object({ z.object({
node: z.object({ node: z.object({
@@ -67,7 +67,7 @@ export const accordionSchema = z.object({
}), }),
}) })
.optional(), .optional(),
specific_faq: z specific_accordion: z
.object({ .object({
questions: accordionItemsSchema, questions: accordionItemsSchema,
}) })
@@ -78,18 +78,18 @@ export const accordionSchema = z.object({
.transform((data) => { .transform((data) => {
return { return {
...data, ...data,
faq: data.faq.flatMap((faq) => { accordions: data.accordions.flatMap((acc) => {
switch (faq.__typename) { switch (acc.__typename) {
case AccordionEnum.ContentPageBlocksAccordionBlockFaqGlobalFaq: case AccordionEnum.ContentPageBlocksAccordionBlockAccordionsGlobalAccordion:
return ( return (
faq.global_faq?.global_faqConnection.edges.flatMap( acc.global_accordion?.global_accordionConnection.edges.flatMap(
({ node: faqConnection }) => { ({ node: accordionConnection }) => {
return faqConnection.questions return accordionConnection.questions
} }
) || [] ) || []
) )
case AccordionEnum.ContentPageBlocksAccordionBlockFaqSpecificFaq: case AccordionEnum.ContentPageBlocksAccordionBlockAccordionsSpecificAccordion:
return faq.specific_faq?.questions || [] return acc.specific_accordion?.questions || []
} }
}), }),
} }
@@ -103,7 +103,7 @@ const actualRefs = z.discriminatedUnion("__typename", [
pageLinks.loyaltyPageRefSchema, pageLinks.loyaltyPageRefSchema,
]) ])
export const globalFaqConnectionRefs = z.object({ export const globalAccordionConnectionRefs = z.object({
edges: z.array( edges: z.array(
z.object({ z.object({
node: 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( questions: z.array(
z.object({ z.object({
answer: z.object({ answer: z.object({
@@ -144,29 +144,29 @@ export const specificFaqConnectionRefs = z.object({
export const accordionRefsSchema = z.object({ export const accordionRefsSchema = z.object({
accordion: z accordion: z
.object({ .object({
faq: z.array( accordions: z.array(
z.object({ z.object({
__typename: z.enum([ __typename: z.enum([
AccordionEnum.ContentPageBlocksAccordionBlockFaqGlobalFaq, AccordionEnum.ContentPageBlocksAccordionBlockAccordionsGlobalAccordion,
AccordionEnum.ContentPageBlocksAccordionBlockFaqSpecificFaq, AccordionEnum.ContentPageBlocksAccordionBlockAccordionsSpecificAccordion,
]), ]),
global_faq: z global_accordion: z
.object({ .object({
global_faqConnection: globalFaqConnectionRefs, global_accordionConnection: globalAccordionConnectionRefs,
}) })
.optional(), .optional(),
specific_faq: specificFaqConnectionRefs.optional(), specific_accordion: specificAccordionConnectionRefs.optional(),
}) })
), ),
}) })
.transform((data) => { .transform((data) => {
return data.faq.flatMap((faq) => { return data.accordions.flatMap((accordion) => {
switch (faq.__typename) { switch (accordion.__typename) {
case AccordionEnum.ContentPageBlocksAccordionBlockFaqGlobalFaq: case AccordionEnum.ContentPageBlocksAccordionBlockAccordionsGlobalAccordion:
return ( return (
faq.global_faq?.global_faqConnection.edges.flatMap( accordion.global_accordion?.global_accordionConnection.edges.flatMap(
({ node: faqConnection }) => { ({ node: accordionConnection }) => {
return faqConnection.questions.flatMap((question) => return accordionConnection.questions.flatMap((question) =>
question.answer.embedded_itemsConnection.edges.flatMap( question.answer.embedded_itemsConnection.edges.flatMap(
({ node }) => node.system ({ node }) => node.system
) )
@@ -174,9 +174,9 @@ export const accordionRefsSchema = z.object({
} }
) || [] ) || []
) )
case AccordionEnum.ContentPageBlocksAccordionBlockFaqSpecificFaq: case AccordionEnum.ContentPageBlocksAccordionBlockAccordionsSpecificAccordion:
return ( return (
faq.specific_faq?.questions.flatMap((question) => accordion.specific_accordion?.questions.flatMap((question) =>
question.answer.embedded_itemsConnection.edges.flatMap( question.answer.embedded_itemsConnection.edges.flatMap(
({ node }) => node.system ({ node }) => node.system
) )

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

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

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

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

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

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