Utilizing memoized requests

This commit is contained in:
Linus Flood
2024-10-25 15:33:06 +02:00
parent 4a8d38912f
commit 687a110a39
13 changed files with 123 additions and 91 deletions
@@ -1,3 +1,4 @@
import { getMembershipLevelSafely } from "@/lib/trpc/memoizedRequests"
import { serverClient } from "@/lib/trpc/server"
import SectionWrapper from "../SectionWrapper"
@@ -11,7 +12,7 @@ export default async function OverviewTable({
}: OverviewTableProps) {
const [levels, membershipLevel] = await Promise.all([
serverClient().contentstack.rewards.all(),
serverClient().user.safeMembershipLevel(),
getMembershipLevelSafely(),
])
return (
@@ -1,4 +1,4 @@
import { serverClient } from "@/lib/trpc/server"
import { getMembershipLevel } from "@/lib/trpc/memoizedRequests"
import SectionContainer from "@/components/Section/Container"
import SectionHeader from "@/components/Section/Header"
@@ -12,7 +12,7 @@ export default async function ExpiringPoints({
subtitle,
title,
}: AccountPageComponentProps) {
const membershipLevel = await serverClient().user.membershipLevel()
const membershipLevel = await getMembershipLevel()
if (!membershipLevel?.pointsToExpire || !membershipLevel?.pointsExpiryDate) {
return null
@@ -1,6 +1,7 @@
import { Lock } from "react-feather"
import { MembershipLevelEnum } from "@/constants/membershipLevels"
import { getMembershipLevel } from "@/lib/trpc/memoizedRequests"
import { serverClient } from "@/lib/trpc/server"
import SectionContainer from "@/components/Section/Container"
@@ -22,7 +23,7 @@ export default async function NextLevelRewardsBlock({
link,
}: AccountPageComponentProps) {
const intl = await getIntl()
const membershipLevel = await serverClient().user.membershipLevel()
const membershipLevel = await getMembershipLevel()
if (!membershipLevel || !membershipLevel?.nextLevel) {
return null
+2 -2
View File
@@ -1,6 +1,6 @@
import { logout } from "@/constants/routes/handleAuth"
import { overview } from "@/constants/routes/myPages"
import { serverClient } from "@/lib/trpc/server"
import { getName } from "@/lib/trpc/memoizedRequests"
import Link from "@/components/TempDesignSystem/Link"
import { getIntl } from "@/i18n"
@@ -23,7 +23,7 @@ export default async function TopMenu({
languageSwitcher,
}: TopMenuProps) {
const { formatMessage } = await getIntl()
const user = await serverClient().user.name()
const user = await getName()
return (
<div className={styles.topMenu}>
<div className={styles.container}>
+2 -2
View File
@@ -1,6 +1,6 @@
import { homeHrefs } from "@/constants/homeHrefs"
import { env } from "@/env/server"
import { getLanguageSwitcher } from "@/lib/trpc/memoizedRequests"
import { getLanguageSwitcher, getName } from "@/lib/trpc/memoizedRequests"
import { serverClient } from "@/lib/trpc/server"
import { getLang } from "@/i18n/serverContext"
@@ -18,7 +18,7 @@ export default async function Header() {
serverClient().contentstack.base.currentHeader({
lang: getLang(),
}),
serverClient().user.name(),
getName(),
getLanguageSwitcher(),
serverClient().contentstack.myPages.navigation.get(),
])
@@ -1,5 +1,6 @@
import { MembershipLevelEnum } from "@/constants/membershipLevels"
import { myPages } from "@/constants/routes/myPages"
import { getMembershipLevelSafely, getName } from "@/lib/trpc/memoizedRequests"
import { serverClient } from "@/lib/trpc/server"
import Link from "@/components/TempDesignSystem/Link"
@@ -17,8 +18,8 @@ export default async function MyPagesMenuWrapper() {
const [intl, myPagesNavigation, user, membership] = await Promise.all([
getIntl(),
serverClient().contentstack.myPages.navigation.get(),
serverClient().user.name(),
serverClient().user.safeMembershipLevel(),
getName(),
getMembershipLevelSafely(),
])
const membershipLevel = membership?.membershipLevel
+3 -3
View File
@@ -1,4 +1,4 @@
import { serverClient } from "@/lib/trpc/server"
import { getName } from "@/lib/trpc/memoizedRequests"
import LoginButton from "@/components/Current/Header/LoginButton"
import ArrowRight from "@/components/Icons/ArrowRight"
@@ -19,10 +19,10 @@ export default async function JoinLoyaltyContact({
block,
}: JoinLoyaltyContactProps) {
const intl = await getIntl()
const user = await serverClient().user.name()
const username = await getName()
// Check if we have user, that means we are logged in.
if (user) {
if (username) {
return null
}
return (
+3 -3
View File
@@ -1,12 +1,12 @@
import { serverClient } from "@/lib/trpc/server"
import { getName } from "@/lib/trpc/memoizedRequests"
import MyPagesSidebar from "@/components/MyPages/Sidebar"
export default async function MyPagesNavigation() {
const user = await serverClient().user.name()
const username = await getName()
// Check if we have user, that means we are logged in andt the My Pages menu can show.
if (!user) {
if (!username) {
return null
}
return <MyPagesSidebar />
+3 -2
View File
@@ -1,3 +1,4 @@
import { getUserTracking } from "@/lib/trpc/memoizedRequests"
import { serverClient } from "@/lib/trpc/server"
import RouterTransition from "@/components/TrackingSDK/RouterTransition"
@@ -7,7 +8,7 @@ import TrackingSDKClient from "./Client"
import { TrackingSDKPageData } from "@/types/components/tracking"
export const preloadUserTracking = () => {
void serverClient().user.tracking()
void getUserTracking()
}
export default async function TrackingSDK({
@@ -15,7 +16,7 @@ export default async function TrackingSDK({
}: {
pageData: TrackingSDKPageData
}) {
const userTrackingData = await serverClient().user.tracking()
const userTrackingData = await getUserTracking()
return (
<>