Merged in feat/sw-2865-move-navigation-router-to-trpc-package (pull request #2427)

feat(SW-2862): Move navigation router to trpc package

* Fix most errors in scandic-web

Just 100 left...

* Move Props type out of trpc

* Fix CategorizedFilters types

* Move more schemas in hotel router

* Fix deps

* fix getNonContentstackUrls

* Fix import error

* Fix entry error handling

* Fix generateMetadata metrics

* Fix alertType enum

* Fix duplicated types

* lint:fix

* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package

* Fix broken imports

* Move booking router to trpc package

* Move partners router to trpc package

* Move autocomplete router to trpc package

* Move booking router to trpc package

* Remove translations from My Pages navigation trpc procedure

* Move navigation router to trpc package

* Merge branch 'master' into feat/sw-2862-move-booking-router-to-trpc-package

* Merge branch 'feat/sw-2862-move-booking-router-to-trpc-package' into feat/sw-2865-move-navigation-router-to-trpc-package

* Merge branch 'master' into feat/sw-2865-move-navigation-router-to-trpc-package

* Merge branch 'master' into feat/sw-2865-move-navigation-router-to-trpc-package

* Merge branch 'master' into feat/sw-2865-move-navigation-router-to-trpc-package


Approved-by: Linus Flood
This commit is contained in:
Anton Gunnarsson
2025-06-27 06:54:49 +00:00
parent 39250e21e3
commit 00bcdaaa28
39 changed files with 150 additions and 130 deletions

View File

@@ -21,6 +21,11 @@ export const env = createEnv({
SAS_AUTH_ENDPOINT: z.string().default(""),
SAS_OCP_APIM: z.string().default(""),
SAS_AUTH_CLIENTID: z.string().default(""),
SAS_ENABLED: z
.string()
.refine((s) => s === "1" || s === "0")
.transform((s) => s === "1")
.default("0"),
CACHE_TIME_HOTELS: z.coerce
.number()
.default(TWENTYFOUR_HOURS)
@@ -53,6 +58,7 @@ export const env = createEnv({
SAS_AUTH_ENDPOINT: process.env.SAS_AUTH_ENDPOINT,
SAS_OCP_APIM: process.env.SAS_OCP_APIM,
SAS_AUTH_CLIENTID: process.env.SAS_AUTH_CLIENTID,
SAS_ENABLED: process.env.SAS,
CACHE_TIME_HOTELS: process.env.CACHE_TIME_HOTELS,
CACHE_TIME_CITY_SEARCH: process.env.CACHE_TIME_CITY_SEARCH,
NODE_ENV: process.env.NODE_ENV,

View File

@@ -0,0 +1,4 @@
import { router } from "../.."
import { myPagesNavigation } from "./mypages/index"
export const navigationRouter = router({ myPages: myPagesNavigation })

View File

@@ -0,0 +1,20 @@
export type MyPagesLinkKey =
| "overview"
| "points"
| "stays"
| "benefits"
| "partnerSas"
| "teamMemberCard"
| "scandicFriends"
| "profile"
type BaseLink = {
type: "link" | "withbadge"
key: MyPagesLinkKey
href: string
}
type NormalLink = BaseLink & { type: "link" }
type LinkWithBadge = BaseLink & { type: "withbadge"; number: number }
export type MyPagesLink = NormalLink | LinkWithBadge

View File

@@ -0,0 +1,83 @@
import { cache } from "react"
import * as routes from "@scandic-hotels/common/constants/routes/myPages"
import { safeTry } from "@scandic-hotels/common/utils/safeTry"
import { env } from "../../../../env/server"
import { getEurobonusMembership } from "../../user/helpers"
import type { Lang } from "@scandic-hotels/common/constants/language"
import type { UserLoyalty } from "@scandic-hotels/trpc/types/user"
import type { MyPagesLink } from "./MyPagesLink"
export const getPrimaryLinks = cache(
async ({
lang,
userLoyalty,
}: {
lang: Lang
userLoyalty?: UserLoyalty
}): Promise<MyPagesLink[]> => {
const showSASLink = userLoyalty ? isScandicXSASActive(userLoyalty) : false
const [showTeamMemberLink] = await safeTry(showTeamMemberCard())
const menuItems: MyPagesLink[] = [
{
type: "link",
key: "overview",
href: routes.overview[lang],
},
{
type: "link",
key: "points",
href: routes.points[lang],
},
{
type: "link",
key: "stays",
href: routes.stays[lang],
},
{
type: "link",
key: "benefits",
href: routes.benefits[lang],
},
]
if (showSASLink) {
menuItems.push({
type: "link",
key: "partnerSas",
href: routes.partnerSas[lang],
})
}
if (showTeamMemberLink) {
menuItems.push({
type: "link",
key: "teamMemberCard",
href: "#",
})
}
return menuItems
}
)
const isScandicXSASActive = (loyalty: UserLoyalty) => {
const eurobonusMembership = getEurobonusMembership(loyalty)
const isLinked = Boolean(eurobonusMembership)
return env.SAS_ENABLED && isLinked
}
const showTeamMemberCard = cache(async () => {
async function getIsTeamMember() {
// TODO: Implement this check
return false
}
const isTeamMember = await getIsTeamMember()
return isTeamMember
})

View File

@@ -0,0 +1,26 @@
import * as routes from "@scandic-hotels/common/constants/routes/myPages"
import type { Lang } from "@scandic-hotels/common/constants/language"
import type { MyPagesLink } from "./MyPagesLink"
export async function getSecondaryLinks({
lang,
}: {
lang: Lang
}): Promise<MyPagesLink[]> {
const menuItems: MyPagesLink[] = [
{
type: "link",
key: "scandicFriends",
href: routes.scandicFriends[lang],
},
{
type: "link",
key: "profile",
href: routes.profile[lang],
},
]
return menuItems
}

View File

@@ -0,0 +1,56 @@
import { TRPCError } from "@trpc/server"
import { z } from "zod"
import { Lang } from "@scandic-hotels/common/constants/language"
import { safeProtectedProcedure } from "../../../procedures"
import { getVerifiedUser } from "../../../routers/user/utils"
import { isValidSession } from "../../../utils/session"
import { getPrimaryLinks } from "./getPrimaryLinks"
import { getSecondaryLinks } from "./getSecondaryLinks"
import type { MyPagesLink } from "./MyPagesLink"
export const myPagesNavigation = safeProtectedProcedure
.input(
z.object({
lang: z.nativeEnum(Lang).optional(),
})
)
.query(
async ({
ctx,
input,
}): Promise<{
primaryLinks: MyPagesLink[]
secondaryLinks: MyPagesLink[]
} | null> => {
if (!isValidSession(ctx.session)) {
return null
}
const lang = input.lang || ctx.lang
if (!lang) {
throw new TRPCError({
code: "BAD_REQUEST",
message: "Language must be provided.",
})
}
const user = await getVerifiedUser({ session: ctx.session })
if (!user || user.error) {
return null
}
const [primaryLinks, secondaryLinks] = await Promise.all([
getPrimaryLinks({ lang, userLoyalty: user.data.loyalty }),
getSecondaryLinks({ lang }),
])
return {
primaryLinks,
secondaryLinks,
}
}
)

View File

@@ -1,4 +1,5 @@
import type {
EurobonusMembership,
Membership,
NativeFriendsMembership,
UserLoyalty,
@@ -45,3 +46,13 @@ export function getFriendsMembership(userLoyalty: UserLoyalty) {
}
return result
}
function isEurobonusMembership(
membership: Membership
): membership is EurobonusMembership {
return membership.type === scandicMembershipTypes.SAS_EB
}
export function getEurobonusMembership(loyalty: UserLoyalty) {
return loyalty.memberships?.find(isEurobonusMembership)
}

View File

@@ -27,6 +27,7 @@
"./routers/user/*": "./lib/routers/user/*.ts",
"./routers/partners/*": "./lib/routers/partners/*.ts",
"./routers/autocomplete/*": "./lib/routers/autocomplete/*.ts",
"./routers/navigation/*": "./lib/routers/navigation/*.ts",
"./enums/*": "./lib/enums/*.ts",
"./types/*": "./lib/types/*.ts",
"./constants/*": "./lib/constants/*.ts",