AppChrome: Unify logic for chromeless pages that should not have NavBar, CommandPalette, Search etc (#62281)

* Keybindings: No global keybindings on chromeless pages

* simplify condition

* Refactoring

* Align name and file

* Move logic into AppChrome

* minor fix

* Update Page.tsx

* Fixing test

* Fixed tests

* More fixes

* Fixed more tests

* Fixing final test

* Fixed search in old nav
This commit is contained in:
Torkel Ödegaard
2023-02-02 09:53:06 +01:00
committed by GitHub
parent ce50168b70
commit b8e7ef48d0
63 changed files with 318 additions and 497 deletions
@@ -1,14 +1,13 @@
import { render, screen, within } from '@testing-library/react';
import userEvent, { PointerEventsCheckLevel } from '@testing-library/user-event';
import React from 'react';
import { Provider } from 'react-redux';
import { TestProvider } from 'test/helpers/TestProvider';
import { selectors } from '@grafana/e2e-selectors';
import { ApiKey, OrgRole } from 'app/types';
import { mockToolkitActionCreator } from '../../../test/core/redux/mocks';
import { silenceConsoleOutput } from '../../../test/core/utils/silenceConsoleOutput';
import { configureStore } from '../../store/configureStore';
import { ApiKeysPageUnconnected, Props } from './ApiKeysPage';
import { getMultipleMockKeys } from './__mocks__/apiKeysMock';
@@ -24,7 +23,6 @@ jest.mock('app/core/core', () => {
});
const setup = (propOverrides: Partial<Props>) => {
const store = configureStore();
const loadApiKeysMock = jest.fn();
const deleteApiKeyMock = jest.fn();
const migrateApiKeyMock = jest.fn();
@@ -58,12 +56,12 @@ const setup = (propOverrides: Partial<Props>) => {
Object.assign(props, propOverrides);
const { rerender } = render(
<Provider store={store}>
<TestProvider>
<ApiKeysPageUnconnected {...props} />
</Provider>
</TestProvider>
);
return {
rerender: (element: JSX.Element) => rerender(<Provider store={store}>{element}</Provider>),
rerender: (element: JSX.Element) => rerender(<TestProvider>{element}</TestProvider>),
props,
loadApiKeysMock,
setSearchQueryMock,