IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14369 from grafana/davkal/explore-error-handling

Browse Source 
Explore: improve error handling
This commit is contained in:
Torkel Ödegaard 2018-12-06 20:26:47 +01:00 committed by GitHub
commit 940dda6c30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/features/explore/Explore.tsx
View File

@ -735,7 +735,7 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
console.error(response); console.error(response);
let error: string | JSX.Element = response; let error: string | JSX.Element;
if (response.data) { if (response.data) {
if (typeof response.data === 'string') { if (typeof response.data === 'string') {
error = response.data; error = response.data;
@ -752,6 +752,12 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
} else { } else {
throw new Error('Could not handle error response'); throw new Error('Could not handle error response');
} }
} else if (response.message) {
error = response.message;
} else if (typeof response === 'string') {
error = response;
} else {
error = 'Unknown error during query transaction. Please check JS console logs.';
} }
this.setState(state => { this.setState(state => {