chore: settings/admin - remove pages router and use app router & add i18n to metadata (#16773)

* remove pages router and  use app router

* remove testBothFutureAndLegacyRoutes for settings-admin e2e test

* add i18n for metadata

.env.example

@@ -334,7 +334,6 @@ AB_TEST_BUCKET_PROBABILITY=50
 # whether we redirect to the future/event-types from event-types or not
 APP_ROUTER_EVENT_TYPES_ENABLED=0
 APP_ROUTER_SETTINGS_DEVELOPER_ENABLED=0
-APP_ROUTER_SETTINGS_ADMIN_ENABLED=0
 APP_ROUTER_SETTINGS_MY_ACCOUNT_ENABLED=0
 APP_ROUTER_SETTINGS_PLATFORM_ENABLED=0
 APP_ROUTER_SETTINGS_ORG_ENABLED=0

apps/web/abTest/middlewareFactory.ts

@@ -8,7 +8,6 @@ import { FUTURE_ROUTES_ENABLED_COOKIE_NAME, FUTURE_ROUTES_OVERRIDE_COOKIE_NAME }
 const ROUTES: [URLPattern, boolean][] = [
   ["/event-types", process.env.APP_ROUTER_EVENT_TYPES_ENABLED === "1"] as const,
   ["/settings/developer/:path*", process.env.APP_ROUTER_SETTINGS_DEVELOPER_ENABLED === "1"] as const,
-  ["/settings/admin/:path*", process.env.APP_ROUTER_SETTINGS_ADMIN_ENABLED === "1"] as const,
   ["/settings/my-account/:path*", process.env.APP_ROUTER_SETTINGS_MY_ACCOUNT_ENABLED === "1"] as const,
   ["/settings/platform/:path*", process.env.APP_ROUTER_SETTINGS_PLATFORM_ENABLED === "1"] as const,
   ["/settings/organizations/:path*", process.env.APP_ROUTER_SETTINGS_ORG_ENABLED === "1"] as const,

apps/web/app/future/settings/(admin)/admin/flags/page.tsx

@@ -1,20 +0,0 @@
-import { _generateMetadata } from "app/_utils";
-
-import { FlagListingView } from "@calcom/features/flags/pages/flag-listing-view";
-import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
-
-export const generateMetadata = async () =>
-  await _generateMetadata(
-    () => "Feature Flags",
-    () => "Here you can toggle your Cal.com instance features."
-  );
-
-const Page = async () => {
-  return (
-    <SettingsHeader title="Feature Flags" description="Here you can toggle your Cal.com instance features.">
-      <FlagListingView />
-    </SettingsHeader>
-  );
-};
-
-export default Page;

apps/web/app/future/settings/(admin)/admin/lockedSMS/page.tsx

@@ -1,21 +0,0 @@
-import { _generateMetadata } from "app/_utils";
-
-import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
-
-import LockedSMSView from "~/settings/admin/locked-sms-view";
-
-export const generateMetadata = async () =>
-  await _generateMetadata(
-    () => "Locked SMS",
-    () => "Lock or unlock SMS sending for users"
-  );
-
-const Page = () => {
-  return (
-    <SettingsHeader title="Locked SMS" description="Lock or unlock SMS sending for users">
-      <LockedSMSView />
-    </SettingsHeader>
-  );
-};
-
-export default Page;

apps/web/app/future/settings/(admin)/admin/oAuth/page.tsx

@@ -1,21 +0,0 @@
-import { _generateMetadata } from "app/_utils";
-
-import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
-
-import LegacyPage from "~/settings/admin/oauth-view";
-
-export const generateMetadata = async () =>
-  await _generateMetadata(
-    () => "OAuth",
-    () => "Add new OAuth Clients"
-  );
-
-const Page = () => {
-  return (
-    <SettingsHeader title="OAuth" description="Add new OAuth Clients">
-      <LegacyPage />
-    </SettingsHeader>
-  );
-};
-
-export default Page;

apps/web/app/future/settings/(admin)/admin/users/add/page.tsx

@@ -1,20 +0,0 @@
-import { _generateMetadata } from "app/_utils";
-
-import UsersAddView from "@calcom/features/ee/users/pages/users-add-view";
-import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
-
-export const generateMetadata = async () =>
-  await _generateMetadata(
-    () => "Add new user",
-    () => "Here you can add a new user."
-  );
-
-const Page = () => {
-  return (
-    <SettingsHeader title="Add new user" description="Here you can add a new user">
-      <UsersAddView />
-    </SettingsHeader>
-  );
-};
-
-export default Page;

apps/web/app/settings/(admin-layout)/admin/flags/page.tsx

@@ -0,0 +1,23 @@
+import { _generateMetadata, getFixedT } 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";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("feature_flags"),
+    (t) => t("admin_flags_description")
+  );
+
+const Page = async () => {
+  const session = await getServerSessionForAppDir();
+  const t = await getFixedT(session?.user.locale || "en");
+  return (
+    <SettingsHeader title={t("feature_flags")} description={t("admin_flags_description")}>
+      <FlagListingView />
+    </SettingsHeader>
+  );
+};
+
+export default Page;

apps/web/app/settings/(admin-layout)/admin/lockedSMS/page.tsx

@@ -0,0 +1,24 @@
+import { _generateMetadata, getFixedT } 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";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("lockedSMS"),
+    (t) => t("admin_lockedSMS_description")
+  );
+
+const Page = async () => {
+  const session = await getServerSessionForAppDir();
+  const t = await getFixedT(session?.user.locale || "en");
+  return (
+    <SettingsHeader title={t("lockedSMS")} description={t("admin_lockedSMS_description")}>
+      <LockedSMSView />
+    </SettingsHeader>
+  );
+};
+
+export default Page;

apps/web/app/settings/(admin-layout)/admin/oAuth/page.tsx

@@ -0,0 +1,24 @@
+import { _generateMetadata, getFixedT } 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";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("oAuth"),
+    (t) => t("admin_oAuth_description")
+  );
+
+const Page = async () => {
+  const session = await getServerSessionForAppDir();
+  const t = await getFixedT(session?.user.locale || "en");
+  return (
+    <SettingsHeader title={t("oAuth")} description={t("admin_oAuth_description")}>
+      <LegacyPage />
+    </SettingsHeader>
+  );
+};
+
+export default Page;

apps/web/app/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx

@@ -1,8 +1,9 @@
 import { type Params } from "app/_types";
-import { _generateMetadata } from "app/_utils";
+import { _generateMetadata, getFixedT } 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";
@@ -14,16 +15,16 @@ export const generateMetadata = async ({ params }: { params: Params }) => {
   const input = orgIdSchema.safeParse(params);
   if (!input.success) {
     return await _generateMetadata(
-      () => `Editing organization`,
-      () => "Here you can edit an organization."
+      (t) => t("editing_org"),
+      (t) => t("admin_orgs_edit_description")
     );
   }
 
   const org = await OrganizationRepository.adminFindById({ id: input.data.id });
 
   return await _generateMetadata(
-    () => `Editing organization: ${org.name}`,
-    () => "Here you can edit an organization."
+    (t) => `${t("editing_org")}: ${org.name}`,
+    (t) => t("admin_orgs_edit_description")
   );
 };
 
@@ -34,11 +35,12 @@ 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");
     return (
       <SettingsHeader
-        title={`Editing organization: ${org.name}`}
-        description="Here you can edit an organization.">
+        title={`${t("editing_org")}: ${org.name}`}
+        description={t("admin_orgs_edit_description")}>
         <LicenseRequired>
           <OrgForm org={org} />
         </LicenseRequired>

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

@@ -2,8 +2,8 @@ import { _generateMetadata } from "app/_utils";
 
 export const generateMetadata = async () =>
   await _generateMetadata(
-    () => "Admin",
-    () => "admin_description"
+    (t) => t("admin"),
+    () => ""
   );
 
 const Page = () => <h1>Admin index</h1>;

apps/web/app/settings/(admin-layout)/admin/users/[id]/edit/page.tsx

@@ -1,8 +1,9 @@
 import { type Params } from "app/_types";
-import { _generateMetadata } from "app/_utils";
+import { _generateMetadata, getFixedT } 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";
@@ -14,16 +15,16 @@ export const generateMetadata = async ({ params }: { params: Params }) => {
   const input = userIdSchema.safeParse(params);
   if (!input.success) {
     return await _generateMetadata(
-      () => `Editing user`,
-      () => "Here you can edit a current user."
+      (t) => t("editing_user"),
+      (t) => t("admin_users_edit_description")
     );
   }
 
   const user = await UserRepository.adminFindById(input.data.id);
 
   return await _generateMetadata(
-    () => `Editing user: ${user.username}`,
-    () => "Here you can edit a current user."
+    (t) => `${t("editing_user")}: ${user.username}`,
+    (t) => t("admin_users_edit_description")
   );
 };
 
@@ -36,9 +37,11 @@ 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");
 
     return (
-      <SettingsHeader title="Editing user" description="Here you can edit a current user">
+      <SettingsHeader title={t("editing_user")} description={t("admin_users_edit_description")}>
         <LicenseRequired>
           <UsersEditView user={user} />
         </LicenseRequired>

apps/web/app/settings/(admin-layout)/admin/users/add/page.tsx

@@ -0,0 +1,24 @@
+import { _generateMetadata, getFixedT } 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";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("add_new_user"),
+    (t) => t("admin_users_add_description")
+  );
+
+const Page = async () => {
+  const session = await getServerSessionForAppDir();
+  const t = await getFixedT(session?.user.locale || "en");
+
+  return (
+    <SettingsHeader title={t("add_new_user")} description={t("admin_users_add_description")}>
+      <UsersAddView />
+    </SettingsHeader>
+  );
+};
+
+export default Page;

apps/web/app/settings/(admin-layout)/admin/users/page.tsx

@@ -1,20 +1,23 @@
-import { _generateMetadata } from "app/_utils";
+import { _generateMetadata, getFixedT } 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";
 
 export const generateMetadata = async () =>
   await _generateMetadata(
-    () => "Users",
-    () => "A list of all the users in your account including their name, title, email and role."
+    (t) => t("users"),
+    (t) => t("admin_users_description")
   );
 
-const Page = () => {
+const Page = async () => {
+  const session = await getServerSessionForAppDir();
+  const t = await getFixedT(session?.user.locale || "en");
   return (
     <SettingsHeader
-      title="Users"
-      description="A list of all the users in your account including their name, title, email and role."
+      title={t("users")}
+      description={t("admin_users_description")}
       CTA={
         <div className="mt-4 space-x-5 sm:ml-16 sm:mt-0 sm:flex-none">
           {/* TODO: Add import users functionality */}

apps/web/middleware.ts

@@ -167,7 +167,6 @@ export const config = {
     "/event-types",
     "/future/event-types/",
     "/settings/admin/:path*",
-    "/future/settings/admin/:path*",
     "/apps/installed/:category/",
     "/future/apps/installed/:category/",
     "/apps/:slug/",

apps/web/pages/settings/admin/apps/[category].tsx

@@ -1,23 +0,0 @@
-"use client";
-
-import AdminAppsList from "@calcom/features/apps/AdminAppsList";
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Meta } from "@calcom/ui";
-
-import PageWrapper from "@components/PageWrapper";
-import { getLayout } from "@components/auth/layouts/AdminLayout";
-
-function AdminAppsView() {
-  const { t } = useLocale();
-  return (
-    <>
-      <Meta title={t("apps")} description={t("admin_apps_description")} />
-      <AdminAppsList baseURL="/settings/admin/apps" />
-    </>
-  );
-}
-
-AdminAppsView.getLayout = getLayout;
-AdminAppsView.PageWrapper = PageWrapper;
-
-export default AdminAppsView;

apps/web/pages/settings/admin/apps/index.tsx

@@ -1,2 +0,0 @@
-"use client";
-export { default } from "./[category]";

apps/web/pages/settings/admin/flags.tsx

@@ -1,19 +0,0 @@
-"use client";
-
-import { FlagListingView } from "@calcom/features/flags/pages/flag-listing-view";
-import { Meta } from "@calcom/ui";
-
-import PageWrapper from "@components/PageWrapper";
-import { getLayout } from "@components/auth/layouts/AdminLayout";
-
-const FlagsPage = () => (
-  <div>
-    <Meta title="Feature Flags" description="Here you can toggle your Cal.com instance features." />
-    <FlagListingView />
-  </div>
-);
-
-FlagsPage.getLayout = getLayout;
-FlagsPage.PageWrapper = PageWrapper;
-
-export default FlagsPage;

apps/web/pages/settings/admin/impersonation.tsx

@@ -1,64 +0,0 @@
-import { signIn } from "next-auth/react";
-import { useSearchParams } from "next/navigation";
-import { useRef, useEffect } from "react";
-
-import { WEBAPP_URL } from "@calcom/lib/constants";
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, Meta, TextField } from "@calcom/ui";
-
-import PageWrapper from "@components/PageWrapper";
-import { getLayout } from "@components/auth/layouts/AdminLayout";
-
-function AdminView() {
-  const { t } = useLocale();
-  const usernameRef = useRef<HTMLInputElement>(null);
-  const searchParams = useSearchParams();
-
-  const username = searchParams?.get("username")?.toLowerCase();
-
-  useEffect(() => {
-    if (username) {
-      const enteredUsername = username.toLowerCase();
-      signIn("impersonation-auth", {
-        username: enteredUsername,
-        callbackUrl: `${WEBAPP_URL}/event-types`,
-      });
-    }
-  }, [username]);
-
-  return (
-    <>
-      <Meta title={t("admin")} description={t("impersonation")} />
-      <form
-        className="mb-6 w-full sm:w-1/2"
-        onSubmit={(e) => {
-          e.preventDefault();
-          const enteredUsername = usernameRef.current?.value.toLowerCase();
-          signIn("impersonation-auth", {
-            username: enteredUsername,
-            callbackUrl: `${WEBAPP_URL}/event-types`,
-          });
-        }}>
-        <div className="flex items-center space-x-2 rtl:space-x-reverse">
-          <TextField
-            containerClassName="w-full"
-            name={t("user_impersonation_heading")}
-            addOnLeading={<>{process.env.NEXT_PUBLIC_WEBSITE_URL}/</>}
-            ref={usernameRef}
-            hint={t("impersonate_user_tip")}
-            defaultValue={undefined}
-            data-testid="admin-impersonation-input"
-          />
-          <Button type="submit" data-testid="impersonation-submit">
-            {t("impersonate")}
-          </Button>
-        </div>
-      </form>
-    </>
-  );
-}
-
-AdminView.getLayout = getLayout;
-AdminView.PageWrapper = PageWrapper;
-
-export default AdminView;

apps/web/pages/settings/admin/index.tsx

@@ -1,20 +0,0 @@
-"use client";
-
-import { Meta } from "@calcom/ui";
-
-import PageWrapper from "@components/PageWrapper";
-import { getLayout } from "@components/auth/layouts/AdminLayout";
-
-function AdminAppsView() {
-  return (
-    <>
-      <Meta title="Admin" description="admin_description" />
-      <h1>Admin index</h1>
-    </>
-  );
-}
-
-AdminAppsView.getLayout = getLayout;
-AdminAppsView.PageWrapper = PageWrapper;
-
-export default AdminAppsView;

apps/web/pages/settings/admin/lockedSMS/index.tsx

@@ -1,18 +0,0 @@
-import { Meta } from "@calcom/ui";
-
-import PageWrapper from "@components/PageWrapper";
-import { getLayout } from "@components/auth/layouts/AdminLayout";
-
-import LockedSMSView from "~/settings/admin/locked-sms-view";
-
-const LockedSMSPage = () => (
-  <>
-    <Meta title="Locked SMS" description="Lock or unlock SMS sending for users" />
-    <LockedSMSView />
-  </>
-);
-
-LockedSMSPage.getLayout = getLayout;
-LockedSMSPage.PageWrapper = PageWrapper;
-
-export default LockedSMSPage;

apps/web/pages/settings/admin/oAuth/index.tsx

@@ -1,18 +0,0 @@
-import { Meta } from "@calcom/ui";
-
-import PageWrapper from "@components/PageWrapper";
-import { getLayout } from "@components/auth/layouts/AdminLayout";
-
-import OAuthView from "~/settings/admin/oauth-view";
-
-const OAuthPage = () => (
-  <>
-    <Meta title="OAuth" description="Add new OAuth Clients" />
-    <OAuthView />
-  </>
-);
-
-OAuthPage.getLayout = getLayout;
-OAuthPage.PageWrapper = PageWrapper;
-
-export default OAuthPage;

apps/web/pages/settings/admin/organizations/[id]/edit.tsx

@@ -1,40 +0,0 @@
-import { z } from "zod";
-
-import NoSSR from "@calcom/core/components/NoSSR";
-import LicenseRequired from "@calcom/ee/common/components/LicenseRequired";
-import OrgForm from "@calcom/features/ee/organizations/pages/settings/admin/AdminOrgEditPage";
-import { useParamsWithFallback } from "@calcom/lib/hooks/useParamsWithFallback";
-import { trpc } from "@calcom/trpc/react";
-import { Meta } from "@calcom/ui";
-
-import PageWrapper from "@components/PageWrapper";
-import { getLayout } from "@components/auth/layouts/AdminLayout";
-
-const paramsSchema = z.object({ id: z.coerce.number() });
-
-const Page = () => {
-  const params = useParamsWithFallback();
-  const parsedParams = paramsSchema.safeParse(params);
-
-  if (!parsedParams.success) return <div>Invalid id</div>;
-
-  const [org] = trpc.viewer.organizations.adminGet.useSuspenseQuery({ id: parsedParams.data.id });
-
-  return (
-    <div>
-      <LicenseRequired>
-        <Meta
-          title={`Editing organization: ${org.name}`}
-          description="Here you can edit a current organization."
-        />
-        <NoSSR>
-          <OrgForm org={org} />
-        </NoSSR>
-      </LicenseRequired>
-    </div>
-  );
-};
-Page.PageWrapper = PageWrapper;
-Page.getLayout = getLayout;
-
-export default Page;

apps/web/pages/settings/admin/organizations/index.tsx

@@ -1,26 +0,0 @@
-import NoSSR from "@calcom/core/components/NoSSR";
-import LicenseRequired from "@calcom/ee/common/components/LicenseRequired";
-import AdminOrgTable from "@calcom/features/ee/organizations/pages/settings/admin/AdminOrgPage";
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Meta } from "@calcom/ui";
-
-import PageWrapper from "@components/PageWrapper";
-import { getLayout } from "@components/auth/layouts/AdminLayout";
-
-const Page = () => {
-  const { t } = useLocale();
-  return (
-    <div>
-      <LicenseRequired>
-        <Meta title={t("organizations")} description={t("orgs_page_description")} />
-        <NoSSR>
-          <AdminOrgTable />
-        </NoSSR>
-      </LicenseRequired>
-    </div>
-  );
-};
-Page.PageWrapper = PageWrapper;
-Page.getLayout = getLayout;
-
-export default Page;

apps/web/pages/settings/admin/users/[id]/edit.tsx

@@ -1,41 +0,0 @@
-import { z } from "zod";
-
-import NoSSR from "@calcom/core/components/NoSSR";
-import LicenseRequired from "@calcom/ee/common/components/LicenseRequired";
-import UsersEditView from "@calcom/features/ee/users/pages/users-edit-view";
-import { useParamsWithFallback } from "@calcom/lib/hooks/useParamsWithFallback";
-import { trpc } from "@calcom/trpc/react";
-import { Meta } from "@calcom/ui";
-
-import PageWrapper from "@components/PageWrapper";
-import { getLayout } from "@components/auth/layouts/AdminLayout";
-
-const userIdSchema = z.object({ id: z.coerce.number() });
-
-const Page = () => {
-  const params = useParamsWithFallback();
-  const input = userIdSchema.safeParse(params);
-
-  if (!input.success) return <div>Invalid input</div>;
-
-  const [data] = trpc.viewer.users.get.useSuspenseQuery({ userId: input.data.id });
-  const { user } = data;
-
-  return (
-    <>
-      <Meta title={`Editing user: ${user.username}`} description="Here you can edit a current user." />
-      <div>
-        <LicenseRequired>
-          <NoSSR>
-            <UsersEditView user={user} />
-          </NoSSR>
-        </LicenseRequired>
-      </div>
-    </>
-  );
-};
-
-Page.PageWrapper = PageWrapper;
-Page.getLayout = getLayout;
-
-export default Page;

apps/web/pages/settings/admin/users/add.tsx

@@ -1,16 +0,0 @@
-import UsersAddView from "@calcom/features/ee/users/pages/users-add-view";
-import { Meta } from "@calcom/ui";
-
-import PageWrapper from "@components/PageWrapper";
-import { getLayout } from "@components/auth/layouts/AdminLayout";
-
-const Page = () => (
-  <>
-    <Meta title="Add new user" description="Here you can add a new user." />
-    <UsersAddView />
-  </>
-);
-Page.PageWrapper = PageWrapper;
-Page.getLayout = getLayout;
-
-export default Page;

apps/web/pages/settings/admin/users/index.tsx

@@ -1,28 +0,0 @@
-import UsersListingView from "@calcom/features/ee/users/pages/users-listing-view";
-import { Meta, Button } from "@calcom/ui";
-
-import PageWrapper from "@components/PageWrapper";
-import { getLayout } from "@components/auth/layouts/AdminLayout";
-
-const Page = () => {
-  return (
-    <>
-      <Meta
-        title="Users"
-        description="A list of all the users in your account including their name, title, email and role."
-        CTA={
-          <div className="mt-4 space-x-5 sm:ml-16 sm:mt-0 sm:flex-none">
-            {/* TODO: Add import users functionality */}
-            {/* <Button disabled>Import users</Button> */}
-            <Button href="/settings/admin/users/add">Add user</Button>
-          </div>
-        }
-      />
-      <UsersListingView />
-    </>
-  );
-};
-Page.PageWrapper = PageWrapper;
-Page.getLayout = getLayout;
-
-export default Page;

apps/web/playwright/settings-admin.e2e.ts

@@ -1,11 +1,10 @@
 import { expect } from "@playwright/test";
 
 import { test } from "./lib/fixtures";
-import { testBothFutureAndLegacyRoutes } from "./lib/future-legacy-routes";
 
 test.describe.configure({ mode: "parallel" });
 
-testBothFutureAndLegacyRoutes.describe("Settings/admin tests", () => {
+test.describe("Settings/admin tests", () => {
   test("should render /settings/admin page", async ({ page, users, context }) => {
     const user = await users.create({
       role: "ADMIN",

apps/web/public/static/locales/en/common.json

@@ -634,6 +634,8 @@
   "role": "Role",
   "edit_role": "Edit Role",
   "edit_team": "Edit team",
+  "editing_user": "Editing user",
+  "editing_org": "Editing organization",
   "reject": "Reject",
   "reject_all": "Reject all",
   "accept": "Accept",
@@ -992,6 +994,8 @@
   "access_token": "Access token",
   "visit_roadmap": "Roadmap",
   "featured_categories": "Featured Categories",
+  "feature_flags": "Feature Flags",
+  "admin_flags_description": "Here you can toggle your Cal.com instance features.",
   "popular_categories": "Popular Categories",
   "number_apps_one": "{{count}} App",
   "number_apps_other": "{{count}} Apps",
@@ -1761,6 +1765,12 @@
   "disable_app_description": "Disabling this app could cause problems with how your users interact with Cal",
   "edit_keys": "Edit Keys",
   "admin_apps_description": "Enable apps for your instance of Cal",
+  "admin_users_description": "A list of all the users in your account including their name, title, email and role.",
+  "admin_users_add_description": "Here you can add a new user.",
+  "admin_users_edit_description": "Here you can edit a current user.",
+  "admin_orgs_edit_description": "Here you can edit an organization.",
+  "admin_oAuth_description": "Add new OAuth Clients",
+  "admin_lockedSMS_description": "Lock or unlock SMS sending for users",
   "no_available_apps": "There are no available apps",
   "no_available_apps_description": "Please ensure there are apps in your deployment under 'packages/app-store'",
   "no_apps": "There are no apps enabled in this instance of Cal",
@@ -2320,6 +2330,7 @@
   "add_client": "Add client",
   "copy_client_secret_info": "After copying the secret you won't be able to view it anymore",
   "add_new_client": "Add new Client",
+  "add_new_user": "Add new user",
   "this_app_is_not_setup_already": "This app has not been setup yet",
   "as_csv": "as CSV",
   "overlay_my_calendar": "Overlay my calendar",

apps/web/scripts/vercel-app-router-deploy.sh

@@ -9,7 +9,6 @@ checkRoute () {
 checkRoute "$APP_ROUTER_EVENT_TYPES_ENABLED" app/future/event-types
 checkRoute "$APP_ROUTER_AVAILABILITY_ENABLED" app/future/availability
 checkRoute "$APP_ROUTER_SETTINGS_DEVELOPER_ENABLED" app/future/settings/developer
-checkRoute "$APP_ROUTER_SETTINGS_ADMIN_ENABLED" app/future/settings/admin
 checkRoute "$APP_ROUTER_SETTINGS_MY_ACCOUNT_ENABLED" app/future/settings/my-account
 checkRoute "$APP_ROUTER_SETTINGS_PLATFORM_ENABLED" app/future/settings/platform
 checkRoute "$APP_ROUTER_SETTINGS_ORG_ENABLED" app/future/settings/organizations

turbo.json

@@ -238,7 +238,6 @@
     "APP_ROUTER_EVENT_TYPES_ENABLED",
     "APP_ROUTER_GETTING_STARTED_STEP_ENABLED",
     "APP_ROUTER_SETTINGS_DEVELOPER_ENABLED",
-    "APP_ROUTER_SETTINGS_ADMIN_ENABLED",
     "APP_ROUTER_SETTINGS_MY_ACCOUNT_ENABLED",
     "APP_ROUTER_SETTINGS_PLATFORM_ENABLED",
     "APP_ROUTER_SETTINGS_ORG_ENABLED",