Scheduling infrastructure for absolutely everyone.
chore: migrate orgDomain instant meeting route to App Router (#19067)
Benny Joo77a00b3e8ca9
diff --git a/apps/web/app/future/org/[orgSlug]/instant-meeting/team/[slug]/[type]/page.tsx b/apps/web/app/future/org/[orgSlug]/instant-meeting/team/[slug]/[type]/page.tsxdeleted file mode 100644index d853d90be4d..00000000000--- a/apps/web/app/future/org/[orgSlug]/instant-meeting/team/[slug]/[type]/page.tsx+++ /dev/null@@ -1,41 +0,0 @@-import { withAppDirSsr } from "app/WithAppDirSsr";-import type { PageProps as _PageProps } from "app/_types";-import { _generateMetadata } from "app/_utils";-import { WithLayout } from "app/layoutHOC";-import { headers, cookies } from "next/headers";--import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";-import { EventRepository } from "@calcom/lib/server/repository/event";--import { buildLegacyCtx } from "@lib/buildLegacyCtx";-import { getServerSideProps } from "@lib/org/[orgSlug]/instant-meeting/team/[slug]/[type]/getServerSideProps";--import type { PageProps } from "~/org/[orgSlug]/instant-meeting/team/[slug]/[type]/instant-meeting-view";-import Page from "~/org/[orgSlug]/instant-meeting/team/[slug]/[type]/instant-meeting-view";--export const generateMetadata = async ({ params, searchParams }: _PageProps) => {- const context = buildLegacyCtx(headers(), cookies(), params, searchParams);- const { slug: eventSlug, user: username } = await getData(context);- const { currentOrgDomain, isValidOrgDomain } = orgDomainConfig(context.req, context.params?.orgSlug);-- const org = isValidOrgDomain ? currentOrgDomain : null;-- const event = await EventRepository.getPublicEvent({- username,- eventSlug,- isTeamEvent: true,- org,- fromRedirectOfNonOrgLink: context.query.orgRedirection === "true",- });-- const profileName = event?.profile.name ?? "";- const title = event?.title ?? "";-- return await _generateMetadata(- () => `${title} | ${profileName}`,- () => `${title}`- );-};--const getData = withAppDirSsr<PageProps>(getServerSideProps);-export default WithLayout({ getData, Page })<"P">;diff --git a/apps/web/app/org/[orgSlug]/instant-meeting/team/[slug]/[type]/page.tsx b/apps/web/app/org/[orgSlug]/instant-meeting/team/[slug]/[type]/page.tsxnew file mode 100644index 00000000000..df2662740d6--- /dev/null+++ b/apps/web/app/org/[orgSlug]/instant-meeting/team/[slug]/[type]/page.tsx@@ -0,0 +1,51 @@+import { withAppDirSsr } from "app/WithAppDirSsr";+import type { PageProps as _PageProps } from "app/_types";+import { generateMeetingMetadata } from "app/_utils";+import { WithLayout } from "app/layoutHOC";+import { headers, cookies } from "next/headers";++import { getOrgFullOrigin } from "@calcom/features/ee/organizations/lib/orgDomains";++import { buildLegacyCtx } from "@lib/buildLegacyCtx";+import { getServerSideProps } from "@lib/org/[orgSlug]/instant-meeting/team/[slug]/[type]/getServerSideProps";++import type { Props } from "~/org/[orgSlug]/instant-meeting/team/[slug]/[type]/instant-meeting-view";+import Page from "~/org/[orgSlug]/instant-meeting/team/[slug]/[type]/instant-meeting-view";++export const generateMetadata = async ({ params, searchParams }: _PageProps) => {+ const context = buildLegacyCtx(headers(), cookies(), params, searchParams);+ const { isBrandingHidden, eventData } = await getData(context);++ const profileName = eventData?.profile.name ?? "";+ const profileImage = eventData?.profile.image;+ const title = eventData?.title ?? "";++ const meeting = {+ title,+ profile: { name: profileName, image: profileImage },+ users: [+ ...(eventData?.users || []).map((user) => ({+ name: `${user.name}`,+ username: `${user.username}`,+ })),+ ],+ };+ const metadata = await generateMeetingMetadata(+ meeting,+ () => `${title} | ${profileName}`,+ () => `${title}`,+ isBrandingHidden,+ getOrgFullOrigin(eventData?.entity.orgSlug ?? null)+ );++ return {+ ...metadata,+ robots: {+ follow: !eventData?.hidden,+ index: !eventData?.hidden,+ },+ };+};++const getData = withAppDirSsr<Props>(getServerSideProps);+export default WithLayout({ getData, Page, isBookingPage: true })<"P">;diff --git a/apps/web/lib/org/[orgSlug]/instant-meeting/team/[slug]/[type]/getServerSideProps.ts b/apps/web/lib/org/[orgSlug]/instant-meeting/team/[slug]/[type]/getServerSideProps.tsindex 6c0ec85f048..3d16f2c1791 100644--- a/apps/web/lib/org/[orgSlug]/instant-meeting/team/[slug]/[type]/getServerSideProps.ts+++ b/apps/web/lib/org/[orgSlug]/instant-meeting/team/[slug]/[type]/getServerSideProps.ts@@ -55,6 +55,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>return {props: {+ eventData,entity: eventData.entity,eventTypeId: eventData.id,duration: getMultipleDurationValue(diff --git a/apps/web/modules/org/[orgSlug]/instant-meeting/team/[slug]/[type]/instant-meeting-view.tsx b/apps/web/modules/org/[orgSlug]/instant-meeting/team/[slug]/[type]/instant-meeting-view.tsxindex 55cede897b9..be6efb41f82 100644--- a/apps/web/modules/org/[orgSlug]/instant-meeting/team/[slug]/[type]/instant-meeting-view.tsx+++ b/apps/web/modules/org/[orgSlug]/instant-meeting/team/[slug]/[type]/instant-meeting-view.tsx@@ -4,25 +4,15 @@ import type { EmbedProps } from "app/WithEmbedSSR";import { Booker } from "@calcom/atoms/monorepo";import { getBookerWrapperClasses } from "@calcom/features/bookings/Booker/utils/getBookerWrapperClasses";-import { BookerSeo } from "@calcom/features/bookings/components/BookerSeo";import type { getServerSideProps } from "@lib/org/[orgSlug]/instant-meeting/team/[slug]/[type]/getServerSideProps";import type { inferSSRProps } from "@lib/types/inferSSRProps";-export type PageProps = inferSSRProps<typeof getServerSideProps> & EmbedProps;+export type Props = inferSSRProps<typeof getServerSideProps> & EmbedProps;-function Type({ slug, user, booking, isEmbed, isBrandingHidden, entity, eventTypeId, duration }: PageProps) {+function Type({ slug, user, booking, isEmbed, isBrandingHidden, entity, eventTypeId, duration }: Props) {return (<main className={getBookerWrapperClasses({ isEmbed: !!isEmbed })}>- <BookerSeo- username={user}- eventSlug={slug}- rescheduleUid={undefined}- hideBranding={isBrandingHidden}- isTeamEvent- entity={entity}- bookingData={booking}- /><Bookerusername={user}eventSlug={slug}@@ -37,6 +27,4 @@ function Type({ slug, user, booking, isEmbed, isBrandingHidden, entity, eventTyp);}-Type.isBookingPage = true;-export default Type;diff --git a/apps/web/pages/org/[orgSlug]/instant-meeting/team/[slug]/[type].tsx b/apps/web/pages/org/[orgSlug]/instant-meeting/team/[slug]/[type].tsxdeleted file mode 100644index 2877917dba9..00000000000--- a/apps/web/pages/org/[orgSlug]/instant-meeting/team/[slug]/[type].tsx+++ /dev/null@@ -1,10 +0,0 @@-import PageWrapper from "@components/PageWrapper";--import type { PageProps } from "~/org/[orgSlug]/instant-meeting/team/[slug]/[type]/instant-meeting-view";-import Type from "~/org/[orgSlug]/instant-meeting/team/[slug]/[type]/instant-meeting-view";--const Page = (props: PageProps) => <Type {...props} />;-Page.PageWrapper = PageWrapper;--export { getServerSideProps } from "@lib/org/[orgSlug]/instant-meeting/team/[slug]/[type]/getServerSideProps";-export default Page;