Commit b37e132c by Torkel Ödegaard Committed by GitHub

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

parent eb970a49
...@@ -342,6 +342,7 @@ export class BackendSrv implements BackendService { ...@@ -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 // in throwIfEmpty we'll then throw an cancelled error and then we'll return the correct result in the catchError or rethrow
throwIfEmpty(() => ({ throwIfEmpty(() => ({
type: DataQueryErrorType.Cancelled, type: DataQueryErrorType.Cancelled,
cancelled: true,
data: null, data: null,
status: this.HTTP_REQUEST_CANCELED, status: this.HTTP_REQUEST_CANCELED,
statusText: 'Request was aborted', statusText: 'Request was aborted',
......
...@@ -353,6 +353,7 @@ describe('backendSrv', () => { ...@@ -353,6 +353,7 @@ describe('backendSrv', () => {
expect(slowError).toEqual({ expect(slowError).toEqual({
type: DataQueryErrorType.Cancelled, type: DataQueryErrorType.Cancelled,
cancelled: true,
data: null, data: null,
status: -1, status: -1,
statusText: 'Request was aborted', statusText: 'Request was aborted',
......
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