From 5847721dfa8effe420c21c77389750ebab56122d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 15 Nov 2024 00:19:41 +0000
Subject: [PATCH] Keep previous query result if current query result in error
 (#8863)

* keep previous result

Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com>

* Changeset file for PR #8863 created/updated

* add some comment

Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com>

* invalid first query shows refresh data page

Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com>

---------

Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
(cherry picked from commit bca4f5c637020b23c1b90c2a715f263f55807876)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 changelogs/fragments/8863.yml                 |  2 ++
 .../view_components/canvas/index.tsx          | 23 ++++++++++---------
 2 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 changelogs/fragments/8863.yml

diff --git a/changelogs/fragments/8863.yml b/changelogs/fragments/8863.yml
new file mode 100644
index 000000000000..51dc8d37cc2f
--- /dev/null
+++ b/changelogs/fragments/8863.yml
@@ -0,0 +1,2 @@
+fix:
+- Keep previous query result if current query result in error ([#8863](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8863))
\ No newline at end of file
diff --git a/src/plugins/discover/public/application/view_components/canvas/index.tsx b/src/plugins/discover/public/application/view_components/canvas/index.tsx
index 71d47446c75c..5fe1bac50891 100644
--- a/src/plugins/discover/public/application/view_components/canvas/index.tsx
+++ b/src/plugins/discover/public/application/view_components/canvas/index.tsx
@@ -84,8 +84,13 @@ 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
-      if (next.status !== ResultStatus.LOADING && next.rows && next.rows !== fetchState.rows) {
+      // 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
+      ) {
         shouldUpdateState = true;
         setRows(next.rows);
       }
@@ -152,20 +157,16 @@ 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.LOADING && !!rows?.length) ||
+            (fetchState.status === ResultStatus.ERROR && !!rows?.length)) &&
             (isEnhancementsEnabled ? (
               <>
                 <MemoizedDiscoverChartContainer {...fetchState} />