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 #14260 from grafana/davkal/fix-14258

Browse Source 
Explore: Show logging errors from backend
This commit is contained in:
David
2018-12-03 10:00:22 +01:00
committed by GitHub
parent 3c8515bb77 47468fca68
commit ba18b470a4
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -727,14 +727,20 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
let error: string | JSX.Element = response; let error: string | JSX.Element = response;
if (response.data) { if (response.data) {
error = response.data.error; if (typeof response.data === 'string') {
if (response.data.response) { error = response.data;
error = ( } else if (response.data.error) {
<> error = response.data.error;
<span>{response.data.error}</span> if (response.data.response) {
<details>{response.data.response}</details> error = (
</> <>
); <span>{response.data.error}</span>
<details>{response.data.response}</details>
</>
);
}
} else {
throw new Error('Could not handle error response');
} }
} }