chore: settings/teams and settings/billing - remove pages router …

…and use app router (#16751)

* remove pages router and use app router

* revert yarn.lock

* remove line break from yarn lock

* Add booking limits page to app dir

* revert yarn.lock

* do not render bookingLimits from pages router

* clean up code

* remove isAppDir

* revert unneeded change

* add layout to billing page

* remove files not needed

* rename imports

* remove APP_ROUTER_SETTINGS_DEVELOPER

* remove layout

.env.example

@@ -357,7 +357,6 @@ APP_ROUTER_APPS_CATEGORIES_CATEGORY_ENABLED=0
 APP_ROUTER_BOOKING_ENABLED=0
 APP_ROUTER_BOOKINGS_STATUS_ENABLED=0
 APP_ROUTER_WORKFLOWS_ENABLED=0
-APP_ROUTER_SETTINGS_TEAMS_ENABLED=0
 APP_ROUTER_GETTING_STARTED_STEP_ENABLED=0
 APP_ROUTER_APPS_ENABLED=0
 APP_ROUTER_VIDEO_ENABLED=0

apps/web/abTest/middlewareFactory.ts

@@ -21,7 +21,6 @@ const ROUTES: [URLPattern, boolean][] = [
   ["/auth/platform/:path*", process.env.APP_ROUTER_AUTH_PLATFORM_ENABLED === "1"] as const,
   ["/auth/oauth2/:path*", process.env.APP_ROUTER_AUTH_OAUTH2_ENABLED === "1"] as const,
   ["/workflows/:path*", process.env.APP_ROUTER_WORKFLOWS_ENABLED === "1"] as const,
-  ["/settings/teams/:path*", process.env.APP_ROUTER_SETTINGS_TEAMS_ENABLED === "1"] as const,
   ["/getting-started/:step", process.env.APP_ROUTER_GETTING_STARTED_STEP_ENABLED === "1"] as const,
   ["/apps", process.env.APP_ROUTER_APPS_ENABLED === "1"] as const,
   ["/bookings/:status", process.env.APP_ROUTER_BOOKINGS_STATUS_ENABLED === "1"] as const,

apps/web/app/future/settings/(settings)/billing/page.tsx → apps/web/app/settings/(settings-layout)/billing/page.tsx

@@ -13,9 +13,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  // FIXME: Refactor me once next-auth endpoint is migrated to App Router
   const session = await getServerSessionForAppDir();
-
   const t = await getFixedT(session?.user.locale || "en");
 
   return (

apps/web/app/settings/(settings-layout)/organizations/billing/page.tsx

@@ -1,4 +1,4 @@
-import BillingPage, { generateMetadata } from "app/future/settings/(settings)/billing/page";
+import BillingPage, { generateMetadata } from "app/settings/(settings-layout)/billing/page";
 
 export { generateMetadata };
 

apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/appearance/page.tsx

@@ -19,7 +19,7 @@ const Page = async () => {
       title={t("booking_appearance")}
       description={t("appearance_team_description")}
       borderInShellHeader={false}>
-      <LegacyPage isAppDir={true} />
+      <LegacyPage />
     </SettingsHeader>
   );
 };

apps/web/app/future/settings/(settings)/teams/[id]/appearance/page.tsx → apps/web/app/settings/(settings-layout)/teams/[id]/appearance/page.tsx

@@ -19,7 +19,7 @@ const Page = async () => {
       title={t("booking_appearance")}
       description={t("appearance_team_description")}
       borderInShellHeader={false}>
-      <LegacyPage isAppDir={true} />
+      <LegacyPage />
     </SettingsHeader>
   );
 };

apps/web/app/settings/(settings-layout)/teams/[id]/billing/page.tsx

@@ -0,0 +1,4 @@
+import BillingPage, { generateMetadata } from "app/settings/(settings-layout)/billing/page";
+
+export { generateMetadata };
+export default BillingPage;

apps/web/app/settings/(settings-layout)/teams/[id]/bookingLimits/page.tsx

@@ -0,0 +1,27 @@
+import { _generateMetadata, getFixedT } from "app/_utils";
+
+import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
+import TeamBookingLimitsView from "@calcom/features/ee/teams/pages/team-booking-limits-view";
+import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("booking_limits"),
+    (t) => t("booking_limits_team_description")
+  );
+
+const Page = async () => {
+  const session = await getServerSessionForAppDir();
+  const t = await getFixedT(session?.user.locale || "en");
+
+  return (
+    <SettingsHeader
+      title={t("booking_limits")}
+      description={t("booking_limits_team_description")}
+      borderInShellHeader={false}>
+      <TeamBookingLimitsView />
+    </SettingsHeader>
+  );
+};
+
+export default Page;

apps/web/app/future/settings/(settings)/teams/[id]/members/page.tsx → apps/web/app/settings/(settings-layout)/teams/[id]/members/page.tsx

@@ -16,7 +16,7 @@ const Page = async () => {
 
   return (
     <SettingsHeader title={t("team_members")} description={t("members_team_description")}>
-      <LegacyPage isAppDir={true} />
+      <LegacyPage />
     </SettingsHeader>
   );
 };

apps/web/app/future/settings/(settings)/teams/[id]/profile/page.tsx → apps/web/app/settings/(settings-layout)/teams/[id]/profile/page.tsx

@@ -19,7 +19,7 @@ const Page = async () => {
       title={t("profile")}
       description={t("profile_team_description")}
       borderInShellHeader={true}>
-      <LegacyPage isAppDir={true} />
+      <LegacyPage />
     </SettingsHeader>
   );
 };

apps/web/app/future/settings/(settings)/teams/page.tsx → apps/web/app/settings/(settings-layout)/teams/page.tsx

@@ -16,7 +16,7 @@ const Page = async () => {
 
   return (
     <SettingsHeader title={t("teams")} description={t("create_manage_teams_collaborative")}>
-      <LegacyPage isAppDir={true} />
+      <LegacyPage />
     </SettingsHeader>
   );
 };

apps/web/middleware.ts

@@ -180,7 +180,6 @@ export const config = {
     "/workflows/:path*",
     "/future/workflows/:path*",
     "/settings/teams/:path*",
-    "/future/settings/teams/:path*",
     "/getting-started/:step/",
     "/future/getting-started/:step/",
     "/apps",