Annotations: Fixes issue with showing error notice for cancelled annotation queries (#27557)

pull/21835/head^2
Torkel Ödegaard 5 years ago committed by GitHub
parent eb970a4985
commit b37e132cec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      public/app/core/services/backend_srv.ts
  2. 1
      public/app/core/specs/backend_srv.test.ts

@ -342,6 +342,7 @@ export class BackendSrv implements BackendService {
// in throwIfEmpty we'll then throw an cancelled error and then we'll return the correct result in the catchError or rethrow
throwIfEmpty(() => ({
type: DataQueryErrorType.Cancelled,
cancelled: true,
data: null,
status: this.HTTP_REQUEST_CANCELED,
statusText: 'Request was aborted',

@ -353,6 +353,7 @@ describe('backendSrv', () => {
expect(slowError).toEqual({
type: DataQueryErrorType.Cancelled,
cancelled: true,
data: null,
status: -1,
statusText: 'Request was aborted',

Loading…
Cancel
Save