From 2df553b58bee551c2c341f2e3a3fcf9b45e7eef1 Mon Sep 17 00:00:00 2001 From: Benny Joo Date: Tue, 26 Nov 2024 09:33:01 -0500 Subject: [PATCH] chore: use app router for `settings/platform/members` page (#17849) * use i18n strings * migrate platform/members page --- apps/web/app/settings/platform/members/page.tsx | 14 ++++++++++++++ apps/web/pages/settings/platform/members/index.tsx | 9 --------- apps/web/public/static/locales/en/common.json | 2 ++ .../ee/platform/pages/settings/members.tsx | 6 ++++-- 4 files changed, 20 insertions(+), 11 deletions(-) create mode 100644 apps/web/app/settings/platform/members/page.tsx delete mode 100644 apps/web/pages/settings/platform/members/index.tsx diff --git a/apps/web/app/settings/platform/members/page.tsx b/apps/web/app/settings/platform/members/page.tsx new file mode 100644 index 0000000000..20650f7def --- /dev/null +++ b/apps/web/app/settings/platform/members/page.tsx @@ -0,0 +1,14 @@ +import { _generateMetadata } from "app/_utils"; +import { WithLayout } from "app/layoutHOC"; + +import PlatformMembersView from "@calcom/features/ee/platform/pages/settings/members"; + +export const generateMetadata = async () => + await _generateMetadata( + (t) => t("platform_members"), + (t) => t("platform_members_description") + ); + +export default WithLayout({ + Page: PlatformMembersView, +}); diff --git a/apps/web/pages/settings/platform/members/index.tsx b/apps/web/pages/settings/platform/members/index.tsx deleted file mode 100644 index dad151765a..0000000000 --- a/apps/web/pages/settings/platform/members/index.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import PlatformMembersView from "@calcom/features/ee/platform/pages/settings/members"; - -import PageWrapper from "@components/PageWrapper"; - -const Page = () => ; - -Page.PageWrapper = PageWrapper; - -export default Page; diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json index e4da0bc5a9..2d7c7413b2 100644 --- a/apps/web/public/static/locales/en/common.json +++ b/apps/web/public/static/locales/en/common.json @@ -1643,6 +1643,8 @@ "format": "Format", "uppercase_for_letters": "Use uppercase for all letters", "replace_whitespaces_underscores": "Replace whitespaces with underscores", + "platform_members": "Platform members", + "platform_members_description": "Manage the admins and members in your platform team", "platform_billing": "Platform billing", "manage_billing": "Manage billing", "manage_billing_description": "Manage all things billing", diff --git a/packages/features/ee/platform/pages/settings/members.tsx b/packages/features/ee/platform/pages/settings/members.tsx index 3f90e1c2b2..81437aed90 100644 --- a/packages/features/ee/platform/pages/settings/members.tsx +++ b/packages/features/ee/platform/pages/settings/members.tsx @@ -2,6 +2,7 @@ import Shell from "@calcom/features/shell/Shell"; import { UserListTable } from "@calcom/features/users/components/UserTable/UserListTable"; +import { useLocale } from "@calcom/lib/hooks/useLocale"; import { MembershipRole } from "@calcom/prisma/enums"; import { trpc } from "@calcom/trpc/react"; import { Button } from "@calcom/ui"; @@ -10,6 +11,7 @@ import { useGetUserAttributes } from "@calcom/web/components/settings/platform/h import { PlatformPricing } from "@calcom/web/components/settings/platform/pricing/platform-pricing/index"; const PlatformMembersView = () => { + const { t } = useLocale(); const { isUserLoading, isUserBillingDataLoading, isPlatformUser, isPaidUser, userBillingData, userOrgId } = useGetUserAttributes(); const { data: currentOrg, isPending } = trpc.viewer.organizations.listCurrent.useQuery(); @@ -61,10 +63,10 @@ const PlatformMembersView = () => { /> } - title="Platform members" + title={t("platform_members")} + subtitle={t("platform_members_description")} hideHeadingOnMobile withoutMain={false} - subtitle="Manage the admins and members in your platform team" isPlatformUser={true}>
{!isPending && canLoggedInUserSeeMembers && }