Merged in chore/next15 (pull request #1999)
chore (SW-834): Upgrade to Next 15 * wip: apply codemod and upgrade swc plugin * wip: design-system to react 19, fix issues from async (search)params * wip: fix remaining issues from codemod serverClient is now async because context use headers() getLang is now async because it uses headers() * Minor cleanup * Inline react-material-symbols package Package is seemingly not maintained any more and doesn't support React 19. This copies the package source into `design-system`, makes the necessary changes for 19 and export it for others to use. * Fix missing awaits * Disable modal exit animations Enabling modal exit animations via isExiting prop is causing modals to be rendered in "hidden" state and never unmount. Seems to be an issue with react-aria-components, see https://github.com/adobe/react-spectrum/issues/7563. Can probably be fixed by rewriting to a solution similar to https://react-spectrum.adobe.com/react-aria/examples/framer-modal-sheet.html * Remove unstable cache implementation and use in memory cache locally * Fix ref type in SelectFilter * Use cloneElement to add key prop to element Approved-by: Linus Flood
This commit is contained in:
Anton Gunnarsson
@@ -15,13 +15,14 @@ import type {
|
||||
import { BlocksEnums } from "@/types/enums/blocks"
|
||||
import { DynamicContentEnum } from "@/types/enums/dynamicContent"
|
||||
|
||||
function DynamicComponent({ dynamic_content }: AccountPageContentProps) {
|
||||
async function DynamicComponent({ dynamic_content }: AccountPageContentProps) {
|
||||
const lang = await getLang()
|
||||
const dynamicContent = {
|
||||
...dynamic_content,
|
||||
link: dynamic_content.link
|
||||
? {
|
||||
...dynamic_content.link,
|
||||
href: modWebviewLink(dynamic_content.link.href, getLang()),
|
||||
href: await modWebviewLink(dynamic_content.link.href, lang),
|
||||
}
|
||||
: undefined,
|
||||
}
|
||||
@@ -45,49 +46,54 @@ function DynamicComponent({ dynamic_content }: AccountPageContentProps) {
|
||||
}
|
||||
}
|
||||
|
||||
export default function Content({ content }: ContentProps) {
|
||||
export default async function Content({ content }: ContentProps) {
|
||||
const lang = await getLang()
|
||||
return (
|
||||
<>
|
||||
{content.map((item, idx) => {
|
||||
switch (item.typename) {
|
||||
case BlocksEnums.block.DynamicContent:
|
||||
return (
|
||||
<DynamicComponent
|
||||
key={`${item.dynamic_content.title}-${idx}`}
|
||||
dynamic_content={item.dynamic_content}
|
||||
/>
|
||||
)
|
||||
case BlocksEnums.block.Shortcuts:
|
||||
const shortcuts = item.shortcuts.shortcuts.map((shortcut) => {
|
||||
return {
|
||||
...shortcut,
|
||||
url: modWebviewLink(shortcut.url, getLang()),
|
||||
}
|
||||
})
|
||||
return (
|
||||
<ShortcutsList
|
||||
key={`${item.shortcuts.title}-${idx}`}
|
||||
shortcuts={shortcuts}
|
||||
subtitle={item.shortcuts.subtitle}
|
||||
title={item.shortcuts.title}
|
||||
hasTwoColumns={item.shortcuts.hasTwoColumns}
|
||||
/>
|
||||
)
|
||||
case BlocksEnums.block.TextContent:
|
||||
return (
|
||||
<section key={`${item.__typename}-${idx}`}>
|
||||
<JsonToHtml
|
||||
embeds={
|
||||
item.text_content.content.embedded_itemsConnection.edges
|
||||
}
|
||||
nodes={item.text_content.content.json.children}
|
||||
{await Promise.all(
|
||||
content.map(async (item, idx) => {
|
||||
switch (item.typename) {
|
||||
case BlocksEnums.block.DynamicContent:
|
||||
return (
|
||||
<DynamicComponent
|
||||
key={`${item.dynamic_content.title}-${idx}`}
|
||||
dynamic_content={item.dynamic_content}
|
||||
/>
|
||||
</section>
|
||||
)
|
||||
default:
|
||||
return null
|
||||
}
|
||||
})}
|
||||
)
|
||||
case BlocksEnums.block.Shortcuts:
|
||||
const shortcuts = await Promise.all(
|
||||
item.shortcuts.shortcuts.map(async (shortcut) => {
|
||||
return {
|
||||
...shortcut,
|
||||
url: await modWebviewLink(shortcut.url, lang),
|
||||
}
|
||||
})
|
||||
)
|
||||
return (
|
||||
<ShortcutsList
|
||||
key={`${item.shortcuts.title}-${idx}`}
|
||||
shortcuts={shortcuts}
|
||||
subtitle={item.shortcuts.subtitle}
|
||||
title={item.shortcuts.title}
|
||||
hasTwoColumns={item.shortcuts.hasTwoColumns}
|
||||
/>
|
||||
)
|
||||
case BlocksEnums.block.TextContent:
|
||||
return (
|
||||
<section key={`${item.__typename}-${idx}`}>
|
||||
<JsonToHtml
|
||||
embeds={
|
||||
item.text_content.content.embedded_itemsConnection.edges
|
||||
}
|
||||
nodes={item.text_content.content.json.children}
|
||||
/>
|
||||
</section>
|
||||
)
|
||||
default:
|
||||
return null
|
||||
}
|
||||
})
|
||||
)}
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -11,7 +11,8 @@ import { getLang } from "@/i18n/serverContext"
|
||||
import styles from "./accountPage.module.css"
|
||||
|
||||
export default async function AccountPage() {
|
||||
const accountPageRes = await serverClient().contentstack.accountPage.get()
|
||||
const caller = await serverClient()
|
||||
const accountPageRes = await caller.contentstack.accountPage.get()
|
||||
|
||||
if (!accountPageRes) {
|
||||
return null
|
||||
@@ -19,8 +20,8 @@ export default async function AccountPage() {
|
||||
|
||||
const { tracking, accountPage } = accountPageRes
|
||||
|
||||
const linkToOverview =
|
||||
`/${getLang()}/webview${accountPage.url}` !== overview[getLang()]
|
||||
const lang = await getLang()
|
||||
const linkToOverview = `/${lang}/webview${accountPage.url}` !== overview[lang]
|
||||
|
||||
return (
|
||||
<>
|
||||
|
||||
@@ -11,9 +11,10 @@ import styles from "./linkToOverview.module.css"
|
||||
|
||||
export default async function LinkToOverview() {
|
||||
const intl = await getIntl()
|
||||
const searchParams = webviewSearchParams()
|
||||
const searchParams = await webviewSearchParams()
|
||||
|
||||
const overviewHref = `${overview[getLang()]}?${searchParams.toString()}`
|
||||
const lang = await getLang()
|
||||
const overviewHref = `${overview[lang]}?${searchParams.toString()}`
|
||||
return (
|
||||
<Link className={styles.overviewLink} href={overviewHref}>
|
||||
<ArrowLeft height={20} width={20} />
|
||||
|
||||
@@ -8,61 +8,67 @@ import { modWebviewLink } from "@/utils/webviews"
|
||||
import type { BlocksProps } from "@/types/components/blocks"
|
||||
import { BlocksEnums } from "@/types/enums/blocks"
|
||||
|
||||
export default function Blocks({ blocks }: BlocksProps) {
|
||||
return blocks.map((block, idx) => {
|
||||
switch (block.typename) {
|
||||
case BlocksEnums.block.CardsGrid:
|
||||
return (
|
||||
<CardsGrid
|
||||
key={`${block.cards_grid.title}-${idx}`}
|
||||
cards_grid={block.cards_grid}
|
||||
/>
|
||||
)
|
||||
case BlocksEnums.block.Content:
|
||||
return (
|
||||
<section key={`${block.__typename}-${idx}`}>
|
||||
<JsonToHtml
|
||||
nodes={block.content.json.children}
|
||||
embeds={block.content.embedded_itemsConnection.edges}
|
||||
/>
|
||||
</section>
|
||||
)
|
||||
case BlocksEnums.block.DynamicContent:
|
||||
const dynamicContent = {
|
||||
...block.dynamic_content,
|
||||
link: block.dynamic_content.link
|
||||
? {
|
||||
...block.dynamic_content.link,
|
||||
href: modWebviewLink(
|
||||
block.dynamic_content.link.href,
|
||||
getLang()
|
||||
),
|
||||
}
|
||||
: undefined,
|
||||
}
|
||||
export default async function Blocks({ blocks }: BlocksProps) {
|
||||
const lang = await getLang()
|
||||
|
||||
return (
|
||||
<DynamicContent
|
||||
dynamic_content={dynamicContent}
|
||||
key={`${block.dynamic_content.title}-${idx}`}
|
||||
/>
|
||||
)
|
||||
case BlocksEnums.block.Shortcuts:
|
||||
const shortcuts = block.shortcuts.shortcuts.map((shortcut) => ({
|
||||
...shortcut,
|
||||
url: modWebviewLink(shortcut.url, getLang()),
|
||||
}))
|
||||
return (
|
||||
<ShortcutsList
|
||||
key={`${block.shortcuts.title}-${idx}`}
|
||||
shortcuts={shortcuts}
|
||||
subtitle={block.shortcuts.subtitle}
|
||||
title={block.shortcuts.title}
|
||||
hasTwoColumns={block.shortcuts.hasTwoColumns}
|
||||
/>
|
||||
)
|
||||
default:
|
||||
return null
|
||||
}
|
||||
})
|
||||
return Promise.all(
|
||||
blocks.map(async (block, idx) => {
|
||||
switch (block.typename) {
|
||||
case BlocksEnums.block.CardsGrid:
|
||||
return (
|
||||
<CardsGrid
|
||||
key={`${block.cards_grid.title}-${idx}`}
|
||||
cards_grid={block.cards_grid}
|
||||
/>
|
||||
)
|
||||
case BlocksEnums.block.Content:
|
||||
return (
|
||||
<section key={`${block.__typename}-${idx}`}>
|
||||
<JsonToHtml
|
||||
nodes={block.content.json.children}
|
||||
embeds={block.content.embedded_itemsConnection.edges}
|
||||
/>
|
||||
</section>
|
||||
)
|
||||
case BlocksEnums.block.DynamicContent:
|
||||
const dynamicContent = {
|
||||
...block.dynamic_content,
|
||||
link: block.dynamic_content.link
|
||||
? {
|
||||
...block.dynamic_content.link,
|
||||
href: await modWebviewLink(
|
||||
block.dynamic_content.link.href,
|
||||
lang
|
||||
),
|
||||
}
|
||||
: undefined,
|
||||
}
|
||||
|
||||
return (
|
||||
<DynamicContent
|
||||
dynamic_content={dynamicContent}
|
||||
key={`${block.dynamic_content.title}-${idx}`}
|
||||
/>
|
||||
)
|
||||
case BlocksEnums.block.Shortcuts:
|
||||
const shortcuts = await Promise.all(
|
||||
block.shortcuts.shortcuts.map(async (shortcut) => ({
|
||||
...shortcut,
|
||||
url: await modWebviewLink(shortcut.url, lang),
|
||||
}))
|
||||
)
|
||||
return (
|
||||
<ShortcutsList
|
||||
key={`${block.shortcuts.title}-${idx}`}
|
||||
shortcuts={shortcuts}
|
||||
subtitle={block.shortcuts.subtitle}
|
||||
title={block.shortcuts.title}
|
||||
hasTwoColumns={block.shortcuts.hasTwoColumns}
|
||||
/>
|
||||
)
|
||||
default:
|
||||
return null
|
||||
}
|
||||
})
|
||||
)
|
||||
}
|
||||
|
||||
@@ -10,7 +10,8 @@ import Blocks from "./Blocks"
|
||||
import styles from "./loyaltyPage.module.css"
|
||||
|
||||
export default async function AboutScandicFriends() {
|
||||
const loyaltyPageRes = await serverClient().contentstack.loyaltyPage.get()
|
||||
const caller = await serverClient()
|
||||
const loyaltyPageRes = await caller.contentstack.loyaltyPage.get()
|
||||
|
||||
if (!loyaltyPageRes) {
|
||||
return null
|
||||
|
||||
Reference in New Issue
Block a user