IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Navigation: Redirect to root page when switching organization (#66655)

Browse Source 
* just redirect to root when switching org

* remove old orgswitcher modal
This commit is contained in:
Ashley Harrison
2023-04-17 11:42:21 +01:00
committed by GitHub
parent 9b15c79e19
commit 90f0b1c6e2
3 changed files with 1 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
public/app/core/specs/OrgSwitcher.test.tsx
View File

@@ -1,71 +0,0 @@
import { render, screen, waitFor, within } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import React from 'react';
import { api } from '../../features/profile/api';
import { OrgRole } from '../../types';
import { OrgSwitcher } from '../components/OrgSwitcher';
jest.mock('@grafana/runtime', () => ({
config: {
appSubUrl: '/subUrl',
},
}));
jest.mock('app/core/services/context_srv', () => ({
contextSrv: {
user: { orgId: 1 },
},
}));
describe('OrgSwitcher', () => {
const { location } = window;
let setUserOrgSpy: jest.SpyInstance;
beforeEach(async () => {
jest.clearAllMocks();
const orgs = [
{ orgId: 1, name: 'Main Org.', role: OrgRole.Admin },
{ orgId: 2, name: 'Org 2', role: OrgRole.Admin },
];
const loadOrgsSpy = jest.spyOn(api, 'loadOrgs').mockResolvedValue(orgs);
setUserOrgSpy = jest.spyOn(api, 'setUserOrg').mockResolvedValue(undefined);
// @ts-ignore
delete window.location;
window.location = {} as Location;
render(<OrgSwitcher onDismiss={() => {}} />);
await waitFor(() => expect(loadOrgsSpy).toHaveBeenCalledTimes(1));
});
afterEach(() => {
window.location = location;
});
describe('when switching org', () => {
it('should render correct rows', async () => {
expect(screen.getAllByRole('row')).toHaveLength(3); // header + 2 orgs
expect(screen.getByRole('row', { name: /main org. admin current/i })).toBeInTheDocument();
expect(screen.getByRole('row', { name: /org 2 admin switch to/i })).toBeInTheDocument();
});
it('should switch orgId in call to backend', async () => {
const row = screen.getByRole('row', { name: /org 2 admin switch to/i });
const switchToButton = within(row).getByText(/switch to/i);
await userEvent.click(switchToButton);
await waitFor(() => expect(setUserOrgSpy).toBeCalledWith({ orgId: 2, name: 'Org 2', role: 'Admin' }));
});
it('should redirect to home page', async () => {
expect(window.location.href).toBeUndefined();
const row = screen.getByRole('row', { name: /org 2 admin switch to/i });
const switchToButton = within(row).getByText(/switch to/i);
await userEvent.click(switchToButton);
await waitFor(() => expect(window.location.href).toEqual('/subUrl/?orgId=2'));
});
});
});