chore: remove extra fetching and get user locale from headers in sett…

…ings pages (#18048) * add settings pages to matcher * fetch user locale from headers in settings pages
calcom · Dec 10, 2024 · a66eb9d · a66eb9d
1 parent 5ba676b
commit a66eb9d
Show file tree

Hide file tree

Showing 43 changed files with 92 additions and 180 deletions.
diff --git a/apps/web/app/_utils.tsx b/apps/web/app/_utils.tsx
@@ -27,6 +27,15 @@ export const getFixedT = async (locale: string, ns = "common") => {
   return i18n.getFixedT(locale, ns);
 };
 
+export const getTranslate = async () => {
+  const headersList = await headers();
+  // If "x-locale" does not exist in header,
+  // ensure that config.matcher in middleware includes the page you are testing
+  const locale = headersList.get("x-locale");
+  const t = await getFixedT(locale ?? "en");
+  return t;
+};
+
 export const _generateMetadata = async (
   getTitle: (t: TFunction<string, undefined>) => string,
   getDescription: (t: TFunction<string, undefined>) => string,

diff --git a/apps/web/app/settings/(admin-layout)/admin/apps/[category]/page.tsx b/apps/web/app/settings/(admin-layout)/admin/apps/[category]/page.tsx
@@ -1,7 +1,6 @@
 import { _generateMetadata } from "app/_utils";
-import { getFixedT } from "app/_utils";
+import { getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import AdminAppsList from "@calcom/features/apps/AdminAppsList";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
@@ -12,9 +11,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader title={t("apps")} description={t("admin_apps_description")}>

diff --git a/apps/web/app/settings/(admin-layout)/admin/flags/page.tsx b/apps/web/app/settings/(admin-layout)/admin/flags/page.tsx
@@ -1,6 +1,5 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import { FlagListingView } from "@calcom/features/flags/pages/flag-listing-view";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
@@ -11,8 +10,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
   return (
     <SettingsHeader title={t("feature_flags")} description={t("admin_flags_description")}>
       <FlagListingView />

diff --git a/apps/web/app/settings/(admin-layout)/admin/impersonation/page.tsx b/apps/web/app/settings/(admin-layout)/admin/impersonation/page.tsx
@@ -1,7 +1,6 @@
 import { _generateMetadata } from "app/_utils";
-import { getFixedT } from "app/_utils";
+import { getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
 import ImpersonationView from "~/settings/admin/impersonation-view";
@@ -13,9 +12,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
   return (
     <SettingsHeader title={t("admin")} description={t("impersonation")}>
       <ImpersonationView />

diff --git a/apps/web/app/settings/(admin-layout)/admin/lockedSMS/page.tsx b/apps/web/app/settings/(admin-layout)/admin/lockedSMS/page.tsx
@@ -1,6 +1,5 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
 import LockedSMSView from "~/settings/admin/locked-sms-view";
@@ -12,8 +11,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
   return (
     <SettingsHeader title={t("lockedSMS")} description={t("admin_lockedSMS_description")}>
       <LockedSMSView />

diff --git a/apps/web/app/settings/(admin-layout)/admin/oAuth/page.tsx b/apps/web/app/settings/(admin-layout)/admin/oAuth/page.tsx
@@ -1,6 +1,5 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
 import LegacyPage from "~/settings/admin/oauth-view";
@@ -12,8 +11,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
   return (
     <SettingsHeader title={t("oAuth")} description={t("admin_oAuth_description")}>
       <LegacyPage />

diff --git a/apps/web/app/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx b/apps/web/app/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx
@@ -1,9 +1,8 @@
 import { type Params } from "app/_types";
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 import { notFound } from "next/navigation";
 import { z } from "zod";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
 import { OrgForm } from "@calcom/features/ee/organizations/pages/settings/admin/AdminOrgEditPage";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
@@ -35,8 +34,7 @@ const Page = async ({ params }: { params: Params }) => {
 
   try {
     const org = await OrganizationRepository.adminFindById({ id: input.data.id });
-    const session = await getServerSessionForAppDir();
-    const t = await getFixedT(session?.user.locale || "en");
+    const t = await getTranslate();
     return (
       <SettingsHeader
         title={`${t("editing_org")}: ${org.name}`}

diff --git a/apps/web/app/settings/(admin-layout)/admin/organizations/page.tsx b/apps/web/app/settings/(admin-layout)/admin/organizations/page.tsx
@@ -1,7 +1,6 @@
 import { _generateMetadata } from "app/_utils";
-import { getFixedT } from "app/_utils";
+import { getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
 import AdminOrgTable from "@calcom/features/ee/organizations/pages/settings/admin/AdminOrgPage";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
@@ -13,9 +12,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
   return (
     <SettingsHeader title={t("organizations")} description={t("orgs_page_description")}>
       <LicenseRequired>

diff --git a/apps/web/app/settings/(admin-layout)/admin/users/[id]/edit/page.tsx b/apps/web/app/settings/(admin-layout)/admin/users/[id]/edit/page.tsx
@@ -1,9 +1,8 @@
 import { type Params } from "app/_types";
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 import { notFound } from "next/navigation";
 import { z } from "zod";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
 import { UsersEditView } from "@calcom/features/ee/users/pages/users-edit-view";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
@@ -37,8 +36,7 @@ const Page = async ({ params }: { params: Params }) => {
 
   try {
     const user = await UserRepository.adminFindById(input.data.id);
-    const session = await getServerSessionForAppDir();
-    const t = await getFixedT(session?.user.locale || "en");
+    const t = await getTranslate();
 
     return (
       <SettingsHeader title={t("editing_user")} description={t("admin_users_edit_description")}>

diff --git a/apps/web/app/settings/(admin-layout)/admin/users/add/page.tsx b/apps/web/app/settings/(admin-layout)/admin/users/add/page.tsx
@@ -1,6 +1,5 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import UsersAddView from "@calcom/features/ee/users/pages/users-add-view";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
@@ -11,8 +10,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader title={t("add_new_user")} description={t("admin_users_add_description")}>

diff --git a/apps/web/app/settings/(admin-layout)/admin/users/page.tsx b/apps/web/app/settings/(admin-layout)/admin/users/page.tsx
@@ -1,6 +1,5 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import UsersListingView from "@calcom/features/ee/users/pages/users-listing-view";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 import { Button } from "@calcom/ui";
@@ -12,8 +11,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
   return (
     <SettingsHeader
       title={t("users")}

diff --git a/apps/web/app/settings/(settings-layout)/billing/page.tsx b/apps/web/app/settings/(settings-layout)/billing/page.tsx
@@ -1,7 +1,6 @@
 import { _generateMetadata } from "app/_utils";
-import { getFixedT } from "app/_utils";
+import { getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
 import BillingView from "~/settings/billing/billing-view";
@@ -13,8 +12,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader

diff --git a/apps/web/app/settings/(settings-layout)/developer/api-keys/page.tsx b/apps/web/app/settings/(settings-layout)/developer/api-keys/page.tsx
@@ -1,6 +1,5 @@
-import { getFixedT, _generateMetadata } from "app/_utils";
+import { getTranslate, _generateMetadata } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 import { APP_NAME } from "@calcom/lib/constants";
 
@@ -13,10 +12,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");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader

diff --git a/apps/web/app/settings/(settings-layout)/developer/webhooks/[id]/page.tsx b/apps/web/app/settings/(settings-layout)/developer/webhooks/[id]/page.tsx
@@ -1,7 +1,6 @@
 import type { PageProps } from "app/_types";
-import { getFixedT, _generateMetadata } from "app/_utils";
+import { getTranslate, _generateMetadata } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 import { EditWebhookView } from "@calcom/features/webhooks/pages/webhook-edit-view";
 import { APP_NAME } from "@calcom/lib/constants";
@@ -14,9 +13,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async ({ params }: PageProps) => {
-  const session = await getServerSessionForAppDir();
-
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
   const id = typeof params?.id === "string" ? params.id : undefined;
 
   const webhook = await WebhookRepository.findByWebhookId(id);

diff --git a/apps/web/app/settings/(settings-layout)/developer/webhooks/new/page.tsx b/apps/web/app/settings/(settings-layout)/developer/webhooks/new/page.tsx
@@ -1,6 +1,5 @@
-import { getFixedT, _generateMetadata } from "app/_utils";
+import { getTranslate, _generateMetadata } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 import { NewWebhookView } from "@calcom/features/webhooks/pages/webhook-new-view";
 import { APP_NAME } from "@calcom/lib/constants";
@@ -12,9 +11,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader

diff --git a/apps/web/app/settings/(settings-layout)/my-account/appearance/page.tsx b/apps/web/app/settings/(settings-layout)/my-account/appearance/page.tsx
@@ -1,7 +1,6 @@
 import { _generateMetadata } from "app/_utils";
-import { getFixedT } from "app/_utils";
+import { getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
 import AppearancePage from "~/settings/my-account/appearance-view";
@@ -13,8 +12,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader title={t("appearance")} description={t("appearance_description")}>

diff --git a/apps/web/app/settings/(settings-layout)/my-account/calendars/page.tsx b/apps/web/app/settings/(settings-layout)/my-account/calendars/page.tsx
@@ -1,7 +1,6 @@
 import { _generateMetadata } from "app/_utils";
-import { getFixedT } from "app/_utils";
+import { getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 import { Button } from "@calcom/ui";
 
@@ -14,8 +13,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   const AddCalendarButton = () => {
     return (

diff --git a/apps/web/app/settings/(settings-layout)/my-account/conferencing/page.tsx b/apps/web/app/settings/(settings-layout)/my-account/conferencing/page.tsx
@@ -1,8 +1,7 @@
 import { _generateMetadata } from "app/_utils";
-import { getFixedT } from "app/_utils";
+import { getTranslate } from "app/_utils";
 
 import { ConferencingAppsViewWebWrapper } from "@calcom/atoms/monorepo";
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 
 export const generateMetadata = async () =>
   await _generateMetadata(
@@ -11,8 +10,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <ConferencingAppsViewWebWrapper

diff --git a/apps/web/app/settings/(settings-layout)/my-account/general/page.tsx b/apps/web/app/settings/(settings-layout)/my-account/general/page.tsx
@@ -1,8 +1,7 @@
 import { _generateMetadata } from "app/_utils";
-import { getFixedT } from "app/_utils";
+import { getTranslate } from "app/_utils";
 import { revalidatePath } from "next/cache";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
 import GeneralQueryView from "~/settings/my-account/general-view";
@@ -14,9 +13,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
   const revalidatePage = async () => {
     "use server";
     revalidatePath("settings/my-account/general");

diff --git a/apps/web/app/settings/(settings-layout)/my-account/out-of-office/page.tsx b/apps/web/app/settings/(settings-layout)/my-account/out-of-office/page.tsx
@@ -1,7 +1,6 @@
 import { _generateMetadata } from "app/_utils";
-import { getFixedT } from "app/_utils";
+import { getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 import CreateNewOutOfOfficeEntryButton from "@calcom/features/settings/outOfOffice/CreateNewOutOfOfficeEntryButton";
 import { OutOfOfficeEntriesList } from "@calcom/features/settings/outOfOffice/OutOfOfficeEntriesList";
@@ -13,9 +12,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader