{
- return ;
+ return ;
};
export default EventTypePageWrapper;
diff --git a/apps/web/pages/event-types/[type]/index.tsx b/apps/web/pages/event-types/[type]/index.tsx
deleted file mode 100644
index 027bd8b837..0000000000
--- a/apps/web/pages/event-types/[type]/index.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import type { PageProps } from "@lib/event-types/[type]/getServerSideProps";
-
-import PageWrapper from "@components/PageWrapper";
-
-import EventTypePageWrapper from "~/event-types/views/event-types-single-view";
-
-export type {
- FormValues,
- CustomInputParsed,
- EventTypeSetup,
- EventTypeSetupProps,
- Host,
-} from "@calcom/features/eventtypes/lib/types";
-
-const Page = (props: PageProps) => ;
-Page.PageWrapper = PageWrapper;
-
-export { getServerSideProps } from "@lib/event-types/[type]/getServerSideProps";
-export default Page;
diff --git a/apps/web/pages/event-types/index.tsx b/apps/web/pages/event-types/index.tsx
deleted file mode 100644
index 25af9e4ea4..0000000000
--- a/apps/web/pages/event-types/index.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import PageWrapper from "@components/PageWrapper";
-
-import EventTypesPage from "~/event-types/views/event-types-listing-view";
-
-export { getServerSideProps } from "@lib/event-types/getServerSideProps";
-
-EventTypesPage.PageWrapper = PageWrapper;
-
-export default EventTypesPage;
diff --git a/apps/web/playwright/manage-booking-questions.e2e.ts b/apps/web/playwright/manage-booking-questions.e2e.ts
index ce2d3bd22e..41fe6c46c4 100644
--- a/apps/web/playwright/manage-booking-questions.e2e.ts
+++ b/apps/web/playwright/manage-booking-questions.e2e.ts
@@ -258,8 +258,6 @@ test.describe("Manage Booking Questions", () => {
await test.step("Go to First Team Event", async () => {
await page.getByTestId(`horizontal-tab-${team?.name}`).click();
- await page.waitForLoadState("networkidle");
-
const $eventTypes = page.locator("[data-testid=event-types]").locator("li a");
const firstEventTypeElement = $eventTypes.first();
diff --git a/apps/web/scripts/vercel-app-router-deploy.sh b/apps/web/scripts/vercel-app-router-deploy.sh
index 84f1a6775a..f7b2f81ddc 100755
--- a/apps/web/scripts/vercel-app-router-deploy.sh
+++ b/apps/web/scripts/vercel-app-router-deploy.sh
@@ -6,7 +6,6 @@ checkRoute () {
# These conditionals are used to remove directories from the build that are not needed in production
# This is to reduce the size of the build and prevent OOM errors
-checkRoute "$APP_ROUTER_EVENT_TYPES_ENABLED" app/future/event-types
checkRoute "$APP_ROUTER_APPS_INSTALLED_CATEGORY_ENABLED" app/future/apps/installed
checkRoute "$APP_ROUTER_APPS_SLUG_ENABLED" app/future/apps/\[slug\]
checkRoute "$APP_ROUTER_APPS_SLUG_SETUP_ENABLED" app/future/apps/\[slug\]/setup
diff --git a/packages/features/eventtypes/components/EventTypeLayout.tsx b/packages/features/eventtypes/components/EventTypeLayout.tsx
index 4b2a69f05f..526060cd90 100644
--- a/packages/features/eventtypes/components/EventTypeLayout.tsx
+++ b/packages/features/eventtypes/components/EventTypeLayout.tsx
@@ -101,6 +101,7 @@ function EventTypeSingleLayout({
backPath="/event-types"
title={`${eventType.title} | ${t("event_type")}`}
heading={eventType.title}
+ withoutSeo={!isPlatform} // Metadata is handled by App Router Metadata API for Event Type Web Page
CTA={
{!formMethods.getValues("metadata")?.managedEventConfig && (
diff --git a/packages/platform/atoms/event-types/wrappers/EventTypeWebWrapper.tsx b/packages/platform/atoms/event-types/wrappers/EventTypeWebWrapper.tsx
index 2819a7a42b..c3f4601cc5 100644
--- a/packages/platform/atoms/event-types/wrappers/EventTypeWebWrapper.tsx
+++ b/packages/platform/atoms/event-types/wrappers/EventTypeWebWrapper.tsx
@@ -1,12 +1,7 @@
"use client";
-import type { AppRouterInstance } from "next/dist/shared/lib/app-router-context.shared-runtime";
import dynamic from "next/dynamic";
import { usePathname, useRouter as useAppRouter } from "next/navigation";
-// eslint-disable-next-line @calcom/eslint/deprecated-imports-next-router
-import { useRouter as usePageRouter } from "next/router";
-// eslint-disable-next-line @calcom/eslint/deprecated-imports-next-router
-import type { NextRouter as NextPageRouter } from "next/router";
import { useEffect, useRef, useState } from "react";
import { z } from "zod";
@@ -89,74 +84,21 @@ const EventAITab = dynamic(() =>
export type EventTypeWebWrapperProps = {
id: number;
- isAppDir?: boolean;
};
-// discriminative factor: isAppDir
-type EventTypeAppComponentProp = {
- id: number;
- isAppDir: true;
- pathname: string;
- pageRouter: null;
- appRouter: AppRouterInstance;
-};
-
-// discriminative factor: isAppDir
-type EventTypePageComponentProp = {
- id: number;
- isAppDir: false;
- pageRouter: NextPageRouter;
- pathname: null;
- appRouter: null;
-};
-
-type EventTypeAppPageComponentProp = EventTypeAppComponentProp | EventTypePageComponentProp;
-
-export const EventTypeWebWrapper = ({ id, isAppDir }: EventTypeWebWrapperProps & { isAppDir?: boolean }) => {
+export const EventTypeWebWrapper = ({ id }: EventTypeWebWrapperProps) => {
const { data: eventTypeQueryData } = trpc.viewer.eventTypes.get.useQuery({ id });
if (!eventTypeQueryData) return null;
- return isAppDir ? (
-
- ) : (
-
- );
+ return ;
};
-const EventTypePageWrapper = ({ id, ...rest }: EventTypeSetupProps & { id: number }) => {
- const router = usePageRouter();
- return (
-
- );
-};
-
-const EventTypeAppWrapper = ({ id, ...rest }: EventTypeSetupProps & { id: number }) => {
- const pathname = usePathname();
- const router = useAppRouter();
- return (
-
- );
-};
-
-const EventTypeWeb = ({
- id,
- isAppDir,
- pageRouter,
- appRouter,
- pathname,
- ...rest
-}: EventTypeSetupProps & EventTypeAppPageComponentProp) => {
+const EventTypeWeb = ({ id, ...rest }: EventTypeSetupProps & { id: number }) => {
const { t } = useLocale();
const utils = trpc.useUtils();
-
+ const pathname = usePathname();
+ const appRouter = useAppRouter();
const { data: user, isPending: isLoggedInUserPending } = useMeQuery();
const isTeamEventTypeDeleted = useRef(false);
const leaveWithoutAssigningHosts = useRef(false);
@@ -281,7 +223,7 @@ const EventTypeWeb = ({
} as const;
useHandleRouteChange({
- watchTrigger: isAppDir ? pageRouter : pathname,
+ watchTrigger: pathname,
isTeamEventTypeDeleted: isTeamEventTypeDeleted.current,
isleavingWithoutAssigningHosts: leaveWithoutAssigningHosts.current,
isTeamEventType: !!team,
@@ -292,22 +234,10 @@ const EventTypeWeb = ({
onError: (url) => {
setIsOpenAssignmentWarnDialog(true);
setPendingRoute(url);
- if (!isAppDir) {
- pageRouter.events.emit(
- "routeChangeError",
- new Error(`Aborted route change to ${url} because none was assigned to team event`)
- );
- throw "Aborted";
- }
-
- if (isAppDir) throw new Error(`Aborted route change to ${url} because none was assigned to team event`);
+ throw new Error(`Aborted route change to ${url} because none was assigned to team event`);
},
onStart: (handleRouteChange) => {
- !isAppDir && pageRouter.events.on("routeChangeStart", handleRouteChange);
- isAppDir && handleRouteChange(pathname || "");
- },
- onEnd: (handleRouteChange) => {
- !isAppDir && pageRouter.events.off("routeChangeStart", handleRouteChange);
+ handleRouteChange(pathname || "");
},
});
@@ -370,7 +300,7 @@ const EventTypeWeb = ({
await utils.viewer.eventTypes.invalidate();
showToast(t("event_type_deleted_successfully"), "success");
isTeamEventTypeDeleted.current = true;
- isAppDir ? appRouter.push("/event-types") : pageRouter.push("/event-types");
+ appRouter.push("/event-types");
setSlugExistsChildrenDialogOpen([]);
setIsOpenAssignmentWarnDialog(false);
},
diff --git a/turbo.json b/turbo.json
index a9871f96d3..837bbb7431 100644
--- a/turbo.json
+++ b/turbo.json
@@ -243,7 +243,6 @@
"APP_ROUTER_APPS_INSTALLED_CATEGORY_ENABLED",
"APP_ROUTER_APPS_SLUG_ENABLED",
"APP_ROUTER_APPS_SLUG_SETUP_ENABLED",
- "APP_ROUTER_EVENT_TYPES_ENABLED",
"APP_ROUTER_AUTH_FORGOT_PASSWORD_ENABLED",
"APP_ROUTER_AUTH_LOGIN_ENABLED",
"APP_ROUTER_AUTH_LOGOUT_ENABLED",