Browse Source

Merge pull request #14260 from grafana/davkal/fix-14258

Explore: Show logging errors from backend
David 7 years ago
parent
commit
ba18b470a4
1 changed files with 14 additions and 8 deletions
  1. 14 8
      public/app/features/explore/Explore.tsx

+ 14 - 8
public/app/features/explore/Explore.tsx

@@ -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 (response.data.response) {
-        error = (
-          <>
-            <span>{response.data.error}</span>
-            <details>{response.data.response}</details>
-          </>
-        );
+      if (typeof response.data === 'string') {
+        error = response.data;
+      } else if (response.data.error) {
+        error = response.data.error;
+        if (response.data.response) {
+          error = (
+            <>
+              <span>{response.data.error}</span>
+              <details>{response.data.response}</details>
+            </>
+          );
+        }
+      } else {
+        throw new Error('Could not handle error response');
       }
       }
     }
     }