Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

regression: Rollback admin/workspace route to admin/info #30648

Merged
merged 8 commits into from
Oct 23, 2023
Merged

regression: Rollback admin/workspace route to admin/info #30648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b9afbfa
fix: :bug: Rollback admin/workspace route to admin/info
rique223 Oct 16, 2023
072cbbd
Merge branch 'develop' into regression/info-page-route
rique223 Oct 16, 2023
b0ac75d
Merge branch 'develop' into regression/info-page-route
rique223 Oct 16, 2023
6442226
Merge branch 'develop' into regression/info-page-route
rique223 Oct 17, 2023
1baff28
Merge branch 'develop' into regression/info-page-route
hugocostadev Oct 20, 2023
71821f6
Merge branch 'develop' into regression/info-page-route
casalsgh Oct 23, 2023
c26c982
Merge branch 'develop' into regression/info-page-route
casalsgh Oct 23, 2023
d3d4110
Merge branch 'develop' into regression/info-page-route
kodiakhq[bot] Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/meteor/client/views/admin/AdministrationRouter.tsx
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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