Skip to content

Commit

Permalink
regression: Rollback admin/workspace route to admin/info (#30648)
Browse files Browse the repository at this point in the history
  • Loading branch information
rique223 authored Oct 23, 2023
1 parent ad7e52b commit 696629c
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion apps/meteor/client/views/admin/AdministrationRouter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const AdministrationRouter = ({ children }: AdministrationRouterProps): ReactEle
return;
}

const defaultRoutePath = getAdminSidebarItems().find(firstSidebarPage)?.href ?? '/admin/workspace';
const defaultRoutePath = getAdminSidebarItems().find(firstSidebarPage)?.href ?? '/admin/info';

if (isGoRocketChatLink(defaultRoutePath)) {
window.open(defaultRoutePath, '_blank');
Expand Down
6 changes: 3 additions & 3 deletions apps/meteor/client/views/admin/routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ declare module '@rocket.chat/ui-contexts' {
pattern: '/admin/sounds/:context?/:id?';
};
'admin-info': {
pathname: '/admin/workspace';
pattern: '/admin/workspace';
pathname: '/admin/info';
pattern: '/admin/info';
};
'admin-import': {
pathname: '/admin/import';
Expand Down Expand Up @@ -119,7 +119,7 @@ registerAdminRoute('/sounds/:context?/:id?', {
component: lazy(() => import('./customSounds/CustomSoundsRoute')),
});

registerAdminRoute('/workspace', {
registerAdminRoute('/info', {
name: 'admin-info',
component: lazy(() => import('./info/InformationRoute')),
});
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/admin/sidebarItems.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const {
subscribeToSidebarItems: subscribeToAdminSidebarItems,
} = createSidebarItems([
{
href: '/admin/workspace',
href: '/admin/info',
i18nLabel: 'Workspace',
icon: 'info-circled',
permissionGranted: (): boolean => hasPermission('view-statistics'),
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/tests/e2e/administration-menu.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ test.describe.serial('administration-menu', () => {
test.skip(!IS_EE, 'Enterprise only');
await poHomeDiscussion.sidenav.openAdministrationByLabel('Workspace');

await expect(page).toHaveURL('admin/workspace');
await expect(page).toHaveURL('admin/info');
});

test('expect open omnichannel page', async ({ page }) => {
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/tests/e2e/administration.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ test.describe.parallel('administration', () => {

test.describe('Workspace', () => {
test.beforeEach(async ({ page }) => {
await page.goto('/admin/workspace');
await page.goto('/admin/info');
});

test('expect download info as JSON', async ({ page }) => {
Expand Down

0 comments on commit 696629c

Please sign in to comment.