Revert "Keep previous query result if current query result in error (o…

…pensearch-project#8863)" This reverts commit bca4f5c. Signed-off-by: abbyhu2000 <[email protected]>
abbyhu2000 · Nov 25, 2024 · 4df77a5 · 4df77a5
1 parent 539675e
commit 4df77a5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/changelogs/fragments/8863.yml b/changelogs/fragments/8863.yml
diff --git a/src/plugins/discover/public/application/view_components/canvas/index.tsx b/src/plugins/discover/public/application/view_components/canvas/index.tsx
@@ -84,13 +84,8 @@ export default function DiscoverCanvas({ setHeaderActionMenu, history, optionalR
       if (next.bucketInterval && next.bucketInterval !== fetchState.bucketInterval)
         shouldUpdateState = true;
       if (next.chartData && next.chartData !== fetchState.chartData) shouldUpdateState = true;
-      // we still want to show rows from the previous query while current query is loading or the current query results in error
-      if (
-        next.status !== ResultStatus.LOADING &&
-        next.status !== ResultStatus.ERROR &&
-        next.rows &&
-        next.rows !== fetchState.rows
-      ) {
+      // we still want to show rows from the previous query while current query is loading
+      if (next.status !== ResultStatus.LOADING && next.rows && next.rows !== fetchState.rows) {
         shouldUpdateState = true;
         setRows(next.rows);
       }
@@ -157,16 +152,20 @@ export default function DiscoverCanvas({ setHeaderActionMenu, history, optionalR
               timeFieldName={timeField}
             />
           )}
+          {fetchState.status === ResultStatus.ERROR && (
+            <DiscoverNoResults
+              queryString={data.query.queryString}
+              query={data.query.queryString.getQuery()}
+              savedQuery={data.query.savedQueries}
+              timeFieldName={timeField}
+            />
+          )}
           {fetchState.status === ResultStatus.UNINITIALIZED && (
             <DiscoverUninitialized onRefresh={() => refetch$.next()} />
           )}
           {fetchState.status === ResultStatus.LOADING && !rows?.length && <LoadingSpinner />}
-          {fetchState.status === ResultStatus.ERROR && !rows?.length && (
-            <DiscoverUninitialized onRefresh={() => refetch$.next()} />
-          )}
           {(fetchState.status === ResultStatus.READY ||
-            (fetchState.status === ResultStatus.LOADING && !!rows?.length) ||
-            (fetchState.status === ResultStatus.ERROR && !!rows?.length)) &&
+            (fetchState.status === ResultStatus.LOADING && !!rows?.length)) &&
             (isEnhancementsEnabled ? (
               <>
                 <MemoizedDiscoverChartContainer {...fetchState} />