feat(SW-322): change output variable name

This commit is contained in:
Fredrik Thorsson
2024-10-08 13:32:10 +02:00
parent febd400c81
commit 84a11d731a
6 changed files with 58 additions and 51 deletions

View File

@@ -12,7 +12,7 @@ export default function Shortcuts({
shortcuts, shortcuts,
subtitle, subtitle,
title, title,
columns, twoColumnList,
}: ShortcutsProps) { }: ShortcutsProps) {
const middleIndex = Math.ceil(shortcuts.length / 2) const middleIndex = Math.ceil(shortcuts.length / 2)
const leftColumn = shortcuts.slice(0, middleIndex) const leftColumn = shortcuts.slice(0, middleIndex)
@@ -37,11 +37,11 @@ export default function Shortcuts({
return ( return (
<SectionContainer> <SectionContainer>
<SectionHeader preamble={subtitle} title={title} topTitle={firstItem} /> <SectionHeader preamble={subtitle} title={title} topTitle={firstItem} />
<section className={setStyles(columns).section}> <section className={setStyles(twoColumnList).section}>
<div className={setStyles(columns).leftColumn}> <div className={setStyles(twoColumnList).leftColumn}>
<ShortcutList shortCutList={leftColumn} /> <ShortcutList shortCutList={leftColumn} />
</div> </div>
<div className={setStyles(columns).rightColumn}> <div className={setStyles(twoColumnList).rightColumn}>
<ShortcutList shortCutList={rightColumn} /> <ShortcutList shortCutList={rightColumn} />
</div> </div>
</section> </section>

View File

@@ -47,7 +47,7 @@ export default function Blocks({ blocks }: BlocksProps) {
shortcuts={block.shortcuts.shortcuts} shortcuts={block.shortcuts.shortcuts}
subtitle={block.shortcuts.subtitle} subtitle={block.shortcuts.subtitle}
title={block.shortcuts.title} title={block.shortcuts.title}
columns={block.shortcuts.columns} twoColumnList={block.shortcuts.twoColumnList}
/> />
) )
case BlocksEnums.block.Table: case BlocksEnums.block.Table:

View File

@@ -70,7 +70,7 @@ export default function Content({ content }: ContentProps) {
shortcuts={shortcuts} shortcuts={shortcuts}
subtitle={item.shortcuts.subtitle} subtitle={item.shortcuts.subtitle}
title={item.shortcuts.title} title={item.shortcuts.title}
columns={item.shortcuts.columns} twoColumnList={item.shortcuts.twoColumnList}
/> />
) )
case BlocksEnums.block.TextContent: case BlocksEnums.block.TextContent:

View File

@@ -61,7 +61,7 @@ export default function Blocks({ blocks }: BlocksProps) {
shortcuts={shortcuts} shortcuts={shortcuts}
subtitle={block.shortcuts.subtitle} subtitle={block.shortcuts.subtitle}
title={block.shortcuts.title} title={block.shortcuts.title}
columns={block.shortcuts.columns} twoColumnList={block.shortcuts.twoColumnList}
/> />
) )
default: default:

View File

@@ -9,7 +9,7 @@
fragment Shortcuts on Shortcuts { fragment Shortcuts on Shortcuts {
subtitle: preamble subtitle: preamble
title title
columns two_column_list
shortcuts { shortcuts {
open_in_new_tab open_in_new_tab
text text

View File

@@ -9,50 +9,57 @@ export const shortcutsSchema = z.object({
.literal(BlocksEnums.block.Shortcuts) .literal(BlocksEnums.block.Shortcuts)
.optional() .optional()
.default(BlocksEnums.block.Shortcuts), .default(BlocksEnums.block.Shortcuts),
shortcuts: z.object({ shortcuts: z
subtitle: z.string().nullable(), .object({
title: z.string().nullable(), subtitle: z.string().nullable(),
columns: z.boolean().default(false), title: z.string().nullable(),
shortcuts: z two_column_list: z.boolean().default(false),
.array( shortcuts: z
z.object({ .array(
open_in_new_tab: z.boolean(), z.object({
text: z.string().optional().default(""), open_in_new_tab: z.boolean(),
linkConnection: z.object({ text: z.string().optional().default(""),
edges: z.array( linkConnection: z.object({
z.object({ edges: z.array(
node: z z.object({
.discriminatedUnion("__typename", [ node: z
pageLinks.accountPageSchema, .discriminatedUnion("__typename", [
pageLinks.contentPageSchema, pageLinks.accountPageSchema,
pageLinks.loyaltyPageSchema, pageLinks.contentPageSchema,
]) pageLinks.loyaltyPageSchema,
.transform((data) => { ])
const link = pageLinks.transform(data) .transform((data) => {
if (link) { const link = pageLinks.transform(data)
return link if (link) {
} return link
return data }
}), return data
}) }),
), })
}), ),
}) }),
)
.transform((data) => {
return data
.filter((node) => node.linkConnection.edges.length)
.map((node) => {
const link = node.linkConnection.edges[0].node
return {
openInNewTab: node.open_in_new_tab,
text: node.text,
title: link.title,
url: link.url,
}
}) })
}), )
}), .transform((data) => {
return data
.filter((node) => node.linkConnection.edges.length)
.map((node) => {
const link = node.linkConnection.edges[0].node
return {
openInNewTab: node.open_in_new_tab,
text: node.text,
title: link.title,
url: link.url,
}
})
}),
})
.transform(({ two_column_list, ...rest }) => {
return {
...rest,
twoColumnList: two_column_list,
}
}),
}) })
export const shortcutsRefsSchema = z.object({ export const shortcutsRefsSchema = z.object({