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:
@@ -18,7 +18,8 @@ import type { LevelCardProps } from "@/types/components/overviewTable"
|
||||
export default async function LoyaltyLevels({
|
||||
dynamic_content,
|
||||
}: LoyaltyLevelsProps) {
|
||||
const uniqueLevels = await serverClient().contentstack.rewards.all({
|
||||
const caller = await serverClient()
|
||||
const uniqueLevels = await caller.contentstack.rewards.all({
|
||||
unique: true,
|
||||
})
|
||||
|
||||
|
||||
@@ -18,7 +18,8 @@ export default async function ExpiringPoints({ user }: UserProps) {
|
||||
}
|
||||
const d = dt(membership.pointsExpiryDate)
|
||||
|
||||
const dateFormat = getLang() == Lang.fi ? "DD.MM.YYYY" : "YYYY-MM-DD"
|
||||
const lang = await getLang()
|
||||
const dateFormat = lang == Lang.fi ? "DD.MM.YYYY" : "YYYY-MM-DD"
|
||||
|
||||
return (
|
||||
<section>
|
||||
|
||||
@@ -14,9 +14,10 @@ export default async function Points({ user }: UserProps) {
|
||||
|
||||
const membership = user.loyalty ? getFriendsMembership(user.loyalty) : null
|
||||
|
||||
const caller = await serverClient()
|
||||
const nextLevel =
|
||||
membership?.nextLevel && MembershipLevelEnum[membership.nextLevel]
|
||||
? await serverClient().contentstack.loyaltyLevels.byLevel({
|
||||
? await caller.contentstack.loyaltyLevels.byLevel({
|
||||
level: MembershipLevelEnum[membership.nextLevel],
|
||||
})
|
||||
: null
|
||||
|
||||
@@ -9,8 +9,9 @@ import type { OverviewTableProps } from "@/types/components/blocks/dynamicConten
|
||||
export default async function OverviewTable({
|
||||
dynamic_content,
|
||||
}: OverviewTableProps) {
|
||||
const caller = await serverClient()
|
||||
const [levels, membershipLevel] = await Promise.all([
|
||||
serverClient().contentstack.rewards.all(),
|
||||
caller.contentstack.rewards.all(),
|
||||
getMembershipLevelSafely(),
|
||||
])
|
||||
|
||||
|
||||
@@ -29,7 +29,8 @@ export default async function NextLevelRewardsBlock({
|
||||
return null
|
||||
}
|
||||
|
||||
const nextLevelRewards = await serverClient().contentstack.rewards.byLevel({
|
||||
const caller = await serverClient()
|
||||
const nextLevelRewards = await caller.contentstack.rewards.byLevel({
|
||||
level_id: MembershipLevelEnum[membershipLevel?.nextLevel],
|
||||
unique: true,
|
||||
})
|
||||
|
||||
@@ -27,7 +27,7 @@ export default async function SASTransferPoints({
|
||||
return null
|
||||
}
|
||||
|
||||
const lang = getLang()
|
||||
const lang = await getLang()
|
||||
|
||||
return (
|
||||
<SectionContainer>
|
||||
|
||||
@@ -10,8 +10,9 @@ export default async function SASTierComparisonBlock({
|
||||
title,
|
||||
preamble,
|
||||
}: SASTierComparisonBlockProps) {
|
||||
const caller = await serverClient()
|
||||
const tierComparison =
|
||||
await serverClient().contentstack.partner.getSasTierComparison()
|
||||
await caller.contentstack.partner.getSasTierComparison()
|
||||
|
||||
if (!tierComparison) return null
|
||||
|
||||
|
||||
@@ -13,7 +13,8 @@ export default async function PreviousStays({
|
||||
subtitle,
|
||||
link,
|
||||
}: AccountPageComponentProps) {
|
||||
const initialPreviousStays = await serverClient().user.stays.previous({
|
||||
const caller = await serverClient()
|
||||
const initialPreviousStays = await caller.user.stays.previous({
|
||||
limit: 6,
|
||||
})
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ import styles from "./emptyUpcomingStays.module.css"
|
||||
|
||||
export default async function EmptyUpcomingStaysBlock() {
|
||||
const intl = await getIntl()
|
||||
const lang = getLang()
|
||||
const lang = await getLang()
|
||||
const baseUrl = env.PUBLIC_URL || "https://www.scandichotels.com"
|
||||
|
||||
const href = !env.isLangLive(lang)
|
||||
|
||||
@@ -15,7 +15,8 @@ export default async function SoonestStays({
|
||||
subtitle,
|
||||
link,
|
||||
}: AccountPageComponentProps) {
|
||||
const upcomingStays = await serverClient().user.stays.upcoming({ limit: 3 })
|
||||
const caller = await serverClient()
|
||||
const upcomingStays = await caller.user.stays.upcoming({ limit: 3 })
|
||||
if (!upcomingStays?.data) {
|
||||
return null
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ import styles from "./emptyUpcomingStays.module.css"
|
||||
|
||||
export default async function EmptyUpcomingStaysBlock() {
|
||||
const intl = await getIntl()
|
||||
const lang = getLang()
|
||||
const lang = await getLang()
|
||||
const baseUrl = env.PUBLIC_URL || "https://www.scandichotels.com"
|
||||
|
||||
const href = !env.isLangLive(lang)
|
||||
|
||||
@@ -16,7 +16,8 @@ export default async function UpcomingStays({
|
||||
subtitle,
|
||||
link,
|
||||
}: AccountPageComponentProps) {
|
||||
const initialUpcomingStays = await serverClient().user.stays.upcoming({
|
||||
const caller = await serverClient()
|
||||
const initialUpcomingStays = await caller.user.stays.upcoming({
|
||||
limit: 6,
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user