Commit c3c8cd3f by Torkel Ödegaard

Fix for annotations not clearing when switching dashboards, fixes #15063

parent 2bed7629
...@@ -21,12 +21,16 @@ export class AnnotationsSrv { ...@@ -21,12 +21,16 @@ export class AnnotationsSrv {
constructor(private $rootScope, private $q, private datasourceSrv, private backendSrv, private timeSrv) {} constructor(private $rootScope, private $q, private datasourceSrv, private backendSrv, private timeSrv) {}
init(dashboard: DashboardModel) { init(dashboard: DashboardModel) {
// always clearPromiseCaches when loading new dashboard
this.clearPromiseCaches();
// clear promises on refresh events // clear promises on refresh events
dashboard.on('refresh', () => { dashboard.on('refresh', this.clearPromiseCaches.bind(this));
this.globalAnnotationsPromise = null; }
this.alertStatesPromise = null;
this.datasourcePromises = null; clearPromiseCaches() {
}); this.globalAnnotationsPromise = null;
this.alertStatesPromise = null;
this.datasourcePromises = null;
} }
getAnnotations(options) { getAnnotations(options) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment