From a7f24e777b6876d96e70643be788d3a7d8cc80a7 Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Wed, 18 Dec 2024 08:54:15 -0500
Subject: [PATCH] chore: app router - /reschedule pages (#18150)

* app router - /reschedule pages

* add to config.matcher

* generateMetdata is not needed
---
 .../app/{future => }/reschedule/[uid]/embed/page.tsx   | 10 ++++++----
 apps/web/app/{future => }/reschedule/[uid]/page.tsx    |  7 -------
 apps/web/middleware.ts                                 |  1 +
 apps/web/pages/reschedule/[uid].tsx                    |  6 ------
 apps/web/pages/reschedule/[uid]/embed.tsx              |  7 -------
 5 files changed, 7 insertions(+), 24 deletions(-)
 rename apps/web/app/{future => }/reschedule/[uid]/embed/page.tsx (51%)
 rename apps/web/app/{future => }/reschedule/[uid]/page.tsx (78%)
 delete mode 100644 apps/web/pages/reschedule/[uid].tsx
 delete mode 100644 apps/web/pages/reschedule/[uid]/embed.tsx

diff --git a/apps/web/app/future/reschedule/[uid]/embed/page.tsx b/apps/web/app/reschedule/[uid]/embed/page.tsx
similarity index 51%
rename from apps/web/app/future/reschedule/[uid]/embed/page.tsx
rename to apps/web/app/reschedule/[uid]/embed/page.tsx
index 52f7f7e1d9..0ec1cff1f6 100644
--- a/apps/web/app/future/reschedule/[uid]/embed/page.tsx
+++ b/apps/web/app/reschedule/[uid]/embed/page.tsx
@@ -1,15 +1,17 @@
-import { getServerSideProps as _getServerSideProps } from "@pages/reschedule/[uid]";
+import { withAppDirSsr } from "app/WithAppDirSsr";
+import withEmbedSsrAppDir from "app/WithEmbedSSR";
 import type { PageProps } from "app/_types";
 import { cookies, headers } from "next/headers";
 
 import { buildLegacyCtx } from "@lib/buildLegacyCtx";
-import withEmbedSsr from "@lib/withEmbedSsr";
+import { getServerSideProps } from "@lib/reschedule/[uid]/getServerSideProps";
 
-const getData = withEmbedSsr(_getServerSideProps);
+const getData = withAppDirSsr(getServerSideProps);
+const getEmbedData = withEmbedSsrAppDir(getData);
 
 const Page = async ({ params, searchParams }: PageProps) => {
   const legacyCtx = buildLegacyCtx(headers(), cookies(), params, searchParams);
-  await getData(legacyCtx);
+  await getEmbedData(legacyCtx);
 
   return null;
 };
diff --git a/apps/web/app/future/reschedule/[uid]/page.tsx b/apps/web/app/reschedule/[uid]/page.tsx
similarity index 78%
rename from apps/web/app/future/reschedule/[uid]/page.tsx
rename to apps/web/app/reschedule/[uid]/page.tsx
index 4f629a3ba0..4e03ebe7a4 100644
--- a/apps/web/app/future/reschedule/[uid]/page.tsx
+++ b/apps/web/app/reschedule/[uid]/page.tsx
@@ -1,17 +1,10 @@
 import { withAppDirSsr } from "app/WithAppDirSsr";
 import type { PageProps } from "app/_types";
-import { _generateMetadata } from "app/_utils";
 import { headers, cookies } from "next/headers";
 
 import { buildLegacyCtx } from "@lib/buildLegacyCtx";
 import { getServerSideProps } from "@lib/reschedule/[uid]/getServerSideProps";
 
-export const generateMetadata = async () =>
-  await _generateMetadata(
-    () => "",
-    () => ""
-  );
-
 const getData = withAppDirSsr(getServerSideProps);
 
 const Page = async ({ params, searchParams }: PageProps) => {
diff --git a/apps/web/middleware.ts b/apps/web/middleware.ts
index 5833afdbe7..cd3ddc3adc 100644
--- a/apps/web/middleware.ts
+++ b/apps/web/middleware.ts
@@ -192,6 +192,7 @@ export const config = {
     "/teams",
     "/future/teams/",
     "/settings/:path*",
+    "/reschedule/:path*",
     "/availability/:path*",
   ],
 };
diff --git a/apps/web/pages/reschedule/[uid].tsx b/apps/web/pages/reschedule/[uid].tsx
deleted file mode 100644
index 1105adaa4c..0000000000
--- a/apps/web/pages/reschedule/[uid].tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-export default function Type() {
-  // Just redirect to the schedule page to reschedule it.
-  return null;
-}
-
-export { getServerSideProps } from "@lib/reschedule/[uid]/getServerSideProps";
diff --git a/apps/web/pages/reschedule/[uid]/embed.tsx b/apps/web/pages/reschedule/[uid]/embed.tsx
deleted file mode 100644
index 5d6b405e57..0000000000
--- a/apps/web/pages/reschedule/[uid]/embed.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import withEmbedSsr from "@lib/withEmbedSsr";
-
-import { getServerSideProps as _getServerSideProps } from "../[uid]";
-
-export { default } from "../[uid]";
-
-export const getServerSideProps = withEmbedSsr(_getServerSideProps);