Dashboard: Clear current dashboard when moving away from dashboard (#66538)

This commit is contained in:
Torkel Ödegaard 2023-06-12 11:18:37 +02:00 committed by GitHub
parent 380843de36
commit 3cb14074a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View File

@ -50,14 +50,11 @@ export class DashboardSrv {
return new DashboardModel(dashboard, meta);
}
setCurrent(dashboard: DashboardModel) {
setCurrent(dashboard: DashboardModel | undefined) {
this.dashboard = dashboard;
}
getCurrent(): DashboardModel | undefined {
if (!this.dashboard) {
console.warn('Calling getDashboardSrv().getCurrent() without calling getDashboardSrv().setCurrent() first.');
}
return this.dashboard;
}

View File

@ -9,6 +9,7 @@ import { DashboardAcl, DashboardAclUpdateDTO, NewDashboardAclItem, PermissionLev
import { loadPluginDashboards } from '../../plugins/admin/state/actions';
import { cancelVariables } from '../../variables/state/actions';
import { getDashboardSrv } from '../services/DashboardSrv';
import { getTimeSrv } from '../services/TimeSrv';
import { cleanUpDashboard, loadDashboardPermissions } from './reducers';
@ -124,10 +125,12 @@ export const cleanUpDashboardAndVariables = (): ThunkResult<void> => (dispatch,
}
getTimeSrv().stopAutoRefresh();
dispatch(cleanUpDashboard());
dispatch(removeAllPanels());
dashboardWatcher.leave();
getDashboardSrv().setCurrent(undefined);
};
export const updateTimeZoneDashboard =