commonscomputer/cal.diy
4
0
Fork 0
Code Issues Pull Requests Actions 2.3k Packages Projects Releases Wiki Activity

chore: remove extra fetching and get user locale from headers in settings pages (#18048)

Browse Source 
* add settings pages to matcher

* fetch user locale from headers in settings pages
This commit is contained in:
Benny Joo
2024-12-10 16:56:12 -07:00
committed by GitHub
parent 5ba676b014
commit a66eb9dfac
43 changed files with 92 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/web/app/_utils.tsx
+9
View File
@@ -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,
apps/web/app/settings/(admin-layout)/admin/apps/[category]/page.tsx
+2 -5
View File
@@ -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")}>
apps/web/app/settings/(admin-layout)/admin/flags/page.tsx
+2 -4
View File
@@ -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 />
apps/web/app/settings/(admin-layout)/admin/impersonation/page.tsx
+2 -5
View File
@@ -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 />
apps/web/app/settings/(admin-layout)/admin/lockedSMS/page.tsx
+2 -4
View File
@@ -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 />
apps/web/app/settings/(admin-layout)/admin/oAuth/page.tsx
+2 -4
View File
@@ -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 />
apps/web/app/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx
+2 -4
View File
@@ -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}`}
apps/web/app/settings/(admin-layout)/admin/organizations/page.tsx
+2 -5
View File
@@ -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>
apps/web/app/settings/(admin-layout)/admin/users/[id]/edit/page.tsx
+2 -4
View File
@@ -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")}>
apps/web/app/settings/(admin-layout)/admin/users/add/page.tsx
+2 -4
View File
@@ -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")}>
apps/web/app/settings/(admin-layout)/admin/users/page.tsx
+2 -4
View File
@@ -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")}
apps/web/app/settings/(settings-layout)/billing/page.tsx
+2 -4
View File
@@ -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
apps/web/app/settings/(settings-layout)/developer/api-keys/page.tsx
+2 -6
View File
@@ -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
apps/web/app/settings/(settings-layout)/developer/webhooks/[id]/page.tsx
+2 -5
View File
@@ -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);
apps/web/app/settings/(settings-layout)/developer/webhooks/new/page.tsx
+2 -5
View File
@@ -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
apps/web/app/settings/(settings-layout)/my-account/appearance/page.tsx
+2 -4
View File
@@ -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")}>
apps/web/app/settings/(settings-layout)/my-account/calendars/page.tsx
+2 -4
View File
@@ -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 (
apps/web/app/settings/(settings-layout)/my-account/conferencing/page.tsx
+2 -4
View File
@@ -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
apps/web/app/settings/(settings-layout)/my-account/general/page.tsx
+2 -5
View File
@@ -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");
apps/web/app/settings/(settings-layout)/my-account/out-of-office/page.tsx
+2 -5
View File
@@ -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
apps/web/app/settings/(settings-layout)/my-account/profile/page.tsx
+2 -4
View File
@@ -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 { APP_NAME } from "@calcom/lib/constants";
@@ -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();
return (
<SettingsHeader
apps/web/app/settings/(settings-layout)/organizations/admin-api/page.tsx
+2 -5
View File
@@ -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 { AdminAPIView } from "@calcom/features/ee/organizations/pages/settings/admin-api";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
@@ -11,9 +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
apps/web/app/settings/(settings-layout)/organizations/attributes/page.tsx
+2 -4
View File
@@ -1,7 +1,6 @@
import { _generateMetadata, getFixedT } from "app/_utils";
import { _generateMetadata, getTranslate } from "app/_utils";
import OrgSettingsAttributesPage from "@calcom/ee/organizations/pages/settings/attributes/attributes-list-view";
import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
export const generateMetadata = async () =>
@@ -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("attributes")} description={t("attribute_meta_description")}>
apps/web/app/settings/(settings-layout)/organizations/dsync/page.tsx
+2 -4
View File
@@ -1,6 +1,5 @@
import { _generateMetadata, getFixedT } from "app/_utils";
import { _generateMetadata, getTranslate } from "app/_utils";
import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
import DirectorySyncTeamView from "@calcom/features/ee/dsync/page/team-dsync-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("directory_sync")} description={t("directory_sync_description")}>
apps/web/app/settings/(settings-layout)/organizations/general/page.tsx
+2 -4
View File
@@ -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 LegacyPage from "@calcom/features/ee/organizations/pages/settings/general";
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("general")} description={t("general_description")} borderInShellHeader={true}>
apps/web/app/settings/(settings-layout)/organizations/privacy/page.tsx
+2 -4
View File
@@ -1,6 +1,5 @@
import { _generateMetadata, getFixedT } from "app/_utils";
import { _generateMetadata, getTranslate } from "app/_utils";
import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
import PrivacyView from "@calcom/features/ee/organizations/pages/settings/privacy";
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("privacy")} description={t("privacy_organization_description")}>
apps/web/app/settings/(settings-layout)/organizations/profile/page.tsx
+2 -4
View File
@@ -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 LegacyPage from "@calcom/features/ee/organizations/pages/settings/profile";
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
apps/web/app/settings/(settings-layout)/organizations/sso/page.tsx
+2 -4
View File
@@ -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 OrgSSOView from "@calcom/features/ee/sso/page/orgs-sso-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("sso_configuration")} description={t("sso_configuration_description_orgs")}>
apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/appearance/page.tsx
+2 -4
View File
@@ -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 LegacyPage from "@calcom/features/ee/teams/pages/team-appearance-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
apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/members/page.tsx
+2 -4
View File
@@ -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 LegacyPage, {
TeamMembersCTA,
} from "@calcom/features/ee/organizations/pages/settings/other-team-members-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
apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/profile/page.tsx
+2 -4
View File
@@ -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 LegacyPage from "@calcom/features/ee/organizations/pages/settings/other-team-profile-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("profile")} description={t("profile_team_description")}>
apps/web/app/settings/(settings-layout)/organizations/teams/other/page.tsx
+2 -4
View File
@@ -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 LegacyPage from "@calcom/features/ee/organizations/pages/settings/other-team-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("org_admin_other_teams")} description={t("org_admin_other_teams_description")}>
apps/web/app/settings/(settings-layout)/security/impersonation/page.tsx
+2 -5
View File
@@ -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 ProfileImpersonationViewWrapper from "~/settings/security/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
apps/web/app/settings/(settings-layout)/security/password/page.tsx
+2 -5
View File
@@ -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 PasswordViewWrapper from "~/settings/security/password-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("password")} description={t("password_description")} borderInShellHeader={true}>
apps/web/app/settings/(settings-layout)/security/sso/page.tsx
+2 -5
View File
@@ -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 SAMLSSO from "@calcom/features/ee/sso/page/user-sso-view";
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
apps/web/app/settings/(settings-layout)/security/two-factor-auth/page.tsx
+2 -5
View File
@@ -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 TwoFactorAuthView from "~/settings/security/two-factor-auth-view";
@@ -12,9 +11,7 @@ export const generateMetadata = async () =>
(t) => t("add_an_extra_layer_of_security")
);
const Page = async () => {
const session = await getServerSessionForAppDir();
const t = await getFixedT(session?.user.locale || "en");
const t = await getTranslate();
return (
<SettingsHeader
apps/web/app/settings/(settings-layout)/teams/[id]/appearance/page.tsx
+2 -4
View File
@@ -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 LegacyPage from "@calcom/features/ee/teams/pages/team-appearance-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
apps/web/app/settings/(settings-layout)/teams/[id]/bookingLimits/page.tsx
+2 -4
View File
@@ -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 TeamBookingLimitsView from "@calcom/features/ee/teams/pages/team-booking-limits-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
apps/web/app/settings/(settings-layout)/teams/[id]/members/page.tsx
+2 -4
View File
@@ -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 LegacyPage from "@calcom/features/ee/teams/pages/team-members-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("team_members")} description={t("members_team_description")}>
apps/web/app/settings/(settings-layout)/teams/[id]/profile/page.tsx
+2 -4
View File
@@ -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 LegacyPage from "@calcom/features/ee/teams/pages/team-profile-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
apps/web/app/settings/(settings-layout)/teams/page.tsx
+2 -4
View File
@@ -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 LegacyPage from "@calcom/features/ee/teams/pages/team-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("teams")} description={t("create_manage_teams_collaborative")}>
apps/web/app/settings/organizations/members/page.tsx
+2 -4
View File
@@ -1,7 +1,6 @@
import { _generateMetadata, getFixedT } from "app/_utils";
import { _generateMetadata, getTranslate } from "app/_utils";
import { WithLayout } from "app/layoutHOC";
import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
import LegacyPage from "@calcom/features/ee/organizations/pages/members";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
import SettingsLayoutAppDir from "@calcom/features/settings/appDir/SettingsLayoutAppDir";
@@ -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("organization_members")} description={t("organization_description")}>
apps/web/middleware.ts
+1 -2
View File
@@ -166,7 +166,6 @@ export const config = {
"/event-types",
"/future/event-types/",
"/settings/admin/:path*",
"/apps/installed/:category/",
"/future/apps/installed/:category/",
"/apps/:slug/",
@@ -179,7 +178,6 @@ export const config = {
"/future/apps/categories/:category/",
"/workflows/:path*",
"/future/workflows/:path*",
"/settings/teams/:path*",
"/getting-started/:step/",
"/future/getting-started/:step/",
"/apps",
@@ -189,6 +187,7 @@ export const config = {
"/future/video/:path*",
"/teams",
"/future/teams/",
"/settings/:path*",
],
};