From 16ac6ad5a6f70d93a13258672669f529fb44b425 Mon Sep 17 00:00:00 2001
From: Zizhou Wang <zizhou.wang@elastic.co>
Date: Mon, 22 Nov 2021 14:35:27 -0500
Subject: [PATCH] Fix error rendering logic

---
 .../public/components/SessionView/index.tsx   | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/x-pack/plugins/session_view/public/components/SessionView/index.tsx b/x-pack/plugins/session_view/public/components/SessionView/index.tsx
index 7bc89f262f474..949a2dc7f0afa 100644
--- a/x-pack/plugins/session_view/public/components/SessionView/index.tsx
+++ b/x-pack/plugins/session_view/public/components/SessionView/index.tsx
@@ -64,14 +64,16 @@ export const SessionView = ({ sessionEntityId, height }: SessionViewDeps) => {
     }
   };
 
-  const { isLoading, data: getData } = useQuery<ProcessEventResults, Error>(
-    ['process-tree', 'process_tree'],
-    () =>
-      http.get<ProcessEventResults>(PROCESS_EVENTS_ROUTE, {
-        query: {
-          sessionEntityId,
-        },
-      })
+  const {
+    isLoading,
+    isError,
+    data: getData,
+  } = useQuery<ProcessEventResults, Error>(['process-tree', 'process_tree'], () =>
+    http.get<ProcessEventResults>(PROCESS_EVENTS_ROUTE, {
+      query: {
+        sessionEntityId,
+      },
+    })
   );
 
   const sortEvents = (a: ProcessEvent, b: ProcessEvent) => {
@@ -118,7 +120,18 @@ export const SessionView = ({ sessionEntityId, height }: SessionViewDeps) => {
           />
         </SectionLoading>
       );
-    } else if (data) {
+    }
+    if (isError) {
+      return (
+        <EuiEmptyPrompt
+          iconType="alert"
+          color="danger"
+          title={<h2>Error loading Session View</h2>}
+          body={<p>There was an error loading the Session View.</p>}
+        />
+      );
+    }
+    if (data) {
       return (
         <div css={styles.processTree}>
           <ProcessTree
@@ -131,17 +144,9 @@ export const SessionView = ({ sessionEntityId, height }: SessionViewDeps) => {
         </div>
       );
     }
-    return (
-      <EuiEmptyPrompt
-        iconType="alert"
-        color="danger"
-        title={<h2>Error loading Session View</h2>}
-        body={<p>There was an error loading the Session View.</p>}
-      />
-    );
   };
 
-  if (!(isLoading || data.length)) {
+  if (!(isLoading || isError || data.length)) {
     return renderNoData();
   }