diff --git a/apps/meteor/client/views/admin/AdministrationRouter.tsx b/apps/meteor/client/views/admin/AdministrationRouter.tsx index 1575ab3020ed..9a86f6ea61f7 100644 --- a/apps/meteor/client/views/admin/AdministrationRouter.tsx +++ b/apps/meteor/client/views/admin/AdministrationRouter.tsx @@ -49,7 +49,7 @@ const AdministrationRouter = ({ children }: AdministrationRouterProps): ReactEle return; } - const defaultRoutePath = getAdminSidebarItems().find(firstSidebarPage)?.href ?? '/admin/workspace-status'; + const defaultRoutePath = getAdminSidebarItems().find(firstSidebarPage)?.href ?? '/admin/workspace'; if (isGoRocketChatLink(defaultRoutePath)) { window.open(defaultRoutePath, '_blank'); diff --git a/apps/meteor/client/views/admin/routes.tsx b/apps/meteor/client/views/admin/routes.tsx index c6f211df431b..da25cc764471 100644 --- a/apps/meteor/client/views/admin/routes.tsx +++ b/apps/meteor/client/views/admin/routes.tsx @@ -17,9 +17,9 @@ declare module '@rocket.chat/ui-contexts' { pathname: '/admin/info'; pattern: '/admin/info'; }; - 'workspace-status': { - pathname: '/admin/workspace-status'; - pattern: '/admin/workspace-status'; + 'workspace': { + pathname: '/admin/workspace'; + pattern: '/admin/workspace'; }; 'admin-import': { pathname: '/admin/import'; @@ -123,18 +123,14 @@ registerAdminRoute('/sounds/:context?/:id?', { component: lazy(() => import('./customSounds/CustomSoundsRoute')), }); -/** @deprecated in favor of `/workspace-status` route, this is a fallback to work in Mobile app, should be removed in the next major */ +/** @deprecated in favor of `/workspace` route, this is a fallback to work in Mobile app, should be removed in the next major */ registerAdminRoute('/info', { name: 'info', component: lazy(() => import('./workspaceStatus/WorkspaceStatusRoute')), }); -registerAdminRoute('/workspace-status', { - name: 'workspace-status', - component: lazy(() => import('./workspaceStatus/WorkspaceStatusRoute')), -}); -registerAdminRoute('/workspace-status', { - name: 'workspace-status', +registerAdminRoute('/workspace', { + name: 'workspace', component: lazy(() => import('./workspaceStatus/WorkspaceStatusRoute')), }); diff --git a/apps/meteor/client/views/admin/sidebarItems.ts b/apps/meteor/client/views/admin/sidebarItems.ts index a4334c1390d6..2beee76cee02 100644 --- a/apps/meteor/client/views/admin/sidebarItems.ts +++ b/apps/meteor/client/views/admin/sidebarItems.ts @@ -8,8 +8,8 @@ export const { subscribeToSidebarItems: subscribeToAdminSidebarItems, } = createSidebarItems([ { - href: '/admin/workspace-status', - i18nLabel: 'Workspace_status', + href: '/admin/workspace', + i18nLabel: 'Workspace', icon: 'info-circled', permissionGranted: (): boolean => hasPermission('view-statistics'), }, diff --git a/apps/meteor/client/views/admin/workspaceStatus/WorkspaceStatusPage.tsx b/apps/meteor/client/views/admin/workspaceStatus/WorkspaceStatusPage.tsx index 66f582033f66..0021c1546e2c 100644 --- a/apps/meteor/client/views/admin/workspaceStatus/WorkspaceStatusPage.tsx +++ b/apps/meteor/client/views/admin/workspaceStatus/WorkspaceStatusPage.tsx @@ -36,8 +36,8 @@ const WorkspaceStatusPage = ({ const alertOplogForMultipleInstances = warningMultipleInstances && !statistics.oplogEnabled; return ( - - + + {canViewStatistics && (