Annotations: Ignore cancelled annotation queries (#26681)

3f212836 · Torkel Ödegaard · GitHub · eb0b9de0 · 3f212836
Commit 3f212836 authored Jul 30, 2020 by Torkel Ödegaard Committed by GitHub Jul 30, 2020
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

public/app/features/annotations/annotations_srv.ts
+5 -0

No files found.
--- a/public/app/features/annotations/annotations_srv.ts
+++ b/public/app/features/annotations/annotations_srv.ts
@@ -59,9 +59,14 @@ export class AnnotationsSrv {
        };
      })
      .catch(err => {
+        if (err.cancelled) {
+          return [];
+        }
+
        if (!err.message && err.data && err.data.message) {
          err.message = err.data.message;
        }
+
        console.error('AnnotationSrv.query error', err);
        appEvents.emit(AppEvents.alertError, ['Annotation Query Failed', err.message || err]);
        return [];