Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
b37e132c
Unverified
Commit
b37e132c
authored
Sep 14, 2020
by
Torkel Ödegaard
Committed by
GitHub
Sep 14, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Annotations: Fixes issue with showing error notice for cancelled annotation queries (#27557)
parent
eb970a49
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
0 deletions
+2
-0
public/app/core/services/backend_srv.ts
+1
-0
public/app/core/specs/backend_srv.test.ts
+1
-0
No files found.
public/app/core/services/backend_srv.ts
View file @
b37e132c
...
...
@@ -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'
,
...
...
public/app/core/specs/backend_srv.test.ts
View file @
b37e132c
...
...
@@ -353,6 +353,7 @@ describe('backendSrv', () => {
expect
(
slowError
).
toEqual
({
type
:
DataQueryErrorType
.
Cancelled
,
cancelled
:
true
,
data
:
null
,
status
:
-
1
,
statusText
:
'Request was aborted'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment