diff --git a/apps/web/app/future/org/[orgSlug]/team/[slug]/[type]/page.tsx b/apps/web/app/future/org/[orgSlug]/team/[slug]/[type]/page.tsx index 9a3d0dbd10..72713f9d31 100644 --- a/apps/web/app/future/org/[orgSlug]/team/[slug]/[type]/page.tsx +++ b/apps/web/app/future/org/[orgSlug]/team/[slug]/[type]/page.tsx @@ -18,7 +18,8 @@ export const generateMetadata = async ({ }) => { const legacyCtx = buildLegacyCtx(headers(), cookies(), params, searchParams); const props = await getData(legacyCtx as unknown as GetServerSidePropsContext); - const { entity, user, slug, booking } = props; + const { eventData, user, slug, booking } = props; + const entity = eventData.entity; const { trpc } = await import("@calcom/trpc"); const { data: event } = trpc.viewer.public.event.useQuery( { username: user, eventSlug: slug, isTeamEvent: false, org: entity.orgSlug ?? null }, diff --git a/apps/web/app/future/team/[slug]/[type]/page.tsx b/apps/web/app/future/team/[slug]/[type]/page.tsx index 424faf6fb3..e46cc9f14a 100644 --- a/apps/web/app/future/team/[slug]/[type]/page.tsx +++ b/apps/web/app/future/team/[slug]/[type]/page.tsx @@ -16,7 +16,8 @@ export const generateMetadata = async ({ }) => { const legacyCtx = buildLegacyCtx(headers(), cookies(), params, searchParams); const props = await getData(legacyCtx as unknown as GetServerSidePropsContext); - const { entity, user, slug, booking } = props; + const { eventData, user, slug, booking } = props; + const entity = eventData.entity; const { trpc } = await import("@calcom/trpc"); const { data: event } = trpc.viewer.public.event.useQuery( { username: user, eventSlug: slug, isTeamEvent: false, org: entity.orgSlug ?? null }, diff --git a/apps/web/lib/team/[slug]/[type]/getServerSideProps.tsx b/apps/web/lib/team/[slug]/[type]/getServerSideProps.tsx index d6d79eda3a..9ac2616607 100644 --- a/apps/web/lib/team/[slug]/[type]/getServerSideProps.tsx +++ b/apps/web/lib/team/[slug]/[type]/getServerSideProps.tsx @@ -2,7 +2,7 @@ import type { GetServerSidePropsContext } from "next"; import { z } from "zod"; import { getServerSession } from "@calcom/features/auth/lib/getServerSession"; -import { getBookingForReschedule, getMultipleDurationValue } from "@calcom/features/bookings/lib/get-booking"; +import { getBookingForReschedule } from "@calcom/features/bookings/lib/get-booking"; import type { GetBookingType } from "@calcom/features/bookings/lib/get-booking"; import { getSlugOrRequestedSlug } from "@calcom/features/ee/organizations/lib/orgDomains"; import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains"; @@ -82,12 +82,11 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) => return { props: { - entity: eventData.entity, - duration: getMultipleDurationValue( - eventData.metadata?.multipleDuration, - queryDuration, - eventData.length - ), + eventData: { + entity: eventData.entity, + length: eventData.length, + metadata: eventData.metadata, + }, booking, away: false, user: teamSlug, diff --git a/apps/web/pages/team/[slug]/[type].tsx b/apps/web/pages/team/[slug]/[type].tsx index 933dd5e695..01ec4ad810 100644 --- a/apps/web/pages/team/[slug]/[type].tsx +++ b/apps/web/pages/team/[slug]/[type].tsx @@ -1,5 +1,7 @@ "use client"; +import { useSearchParams } from "next/navigation"; + import { Booker } from "@calcom/atoms"; import { getBookerWrapperClasses } from "@calcom/features/bookings/Booker/utils/getBookerWrapperClasses"; import { BookerSeo } from "@calcom/features/bookings/components/BookerSeo"; @@ -14,6 +16,15 @@ export type PageProps = inferSSRProps & EmbedProps; export { getServerSideProps }; +export const getMultipleDurationValue = ( + multipleDurationConfig: number[] | undefined, + queryDuration: string | string[] | null | undefined, + defaultValue: number +) => { + if (!multipleDurationConfig) return null; + if (multipleDurationConfig.includes(Number(queryDuration))) return Number(queryDuration); + return defaultValue; +}; export default function Type({ slug, user, @@ -21,10 +32,11 @@ export default function Type({ away, isEmbed, isBrandingHidden, - entity, - duration, + eventData, isInstantMeeting, }: PageProps) { + const searchParams = useSearchParams(); + return (
);