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: Fixes issue where kiosk mode was not being exited (#68021)

Browse Source
This commit is contained in:
Joao Silva 2023-05-08 19:35:34 +02:00 committed by GitHub
parent 29801a5ec0
commit d0adcd7d5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/app/core/components/AppChrome/AppChromeService.test.tsx
View File

@ -8,6 +8,13 @@ describe('AppChromeService', () => {
expect(chromeService.state.getValue().chromeless).toBe(true);
});
it('onToggleSearchBar should clear kiosk mode', () => {
const chromeService = new AppChromeService();
chromeService.onToggleKioskMode();
chromeService.onToggleSearchBar();
expect(chromeService.state.getValue().kioskMode).toBeFalsy();
});
it('Ignore state updates when sectionNav and pageNav have new instance but same text, url or active child', () => {
const chromeService = new AppChromeService();
let stateChanges = 0;

12
public/app/core/components/AppChrome/AppChromeService.tsx
View File

@ -104,9 +104,15 @@ export class AppChromeService {
};
onToggleSearchBar = () => {
const searchBarHidden = !this.state.getValue().searchBarHidden;
store.set(this.searchBarStorageKey, searchBarHidden);
this.update({ searchBarHidden });
const { searchBarHidden, kioskMode } = this.state.getValue();
const newSearchBarHidden = !searchBarHidden;
store.set(this.searchBarStorageKey, newSearchBarHidden);
if (kioskMode) {
locationService.partial({ kiosk: null });
}
this.update({ searchBarHidden: newSearchBarHidden, kioskMode: null });
};
onToggleKioskMode = () => {