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

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

Browse Source
This commit is contained in:
Torkel Ödegaard
2023-06-12 11:18:37 +02:00
committed by GitHub
parent 380843de36
commit 3cb14074a9
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/features/dashboard/services/DashboardSrv.ts
View File

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

5
public/app/features/dashboard/state/actions.ts
View File

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