Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport 2.x] Keep previous query result if current query result in error #8870

Merged
merged 1 commit into from
Nov 15, 2024
Merged

[Backport 2.x] Keep previous query result if current query result in error #8870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/8863.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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))
23 changes: 12 additions & 11 deletions src/plugins/discover/public/application/view_components/canvas/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,13 @@
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);
}
Expand Down Expand Up @@ -152,20 +157,16 @@
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()} />

Check warning on line 165 in src/plugins/discover/public/application/view_components/canvas/index.tsx

View check run for this annotation

Codecov / codecov/patch

src/plugins/discover/public/application/view_components/canvas/index.tsx#L165 

Added line #L165 was not covered by tests
)}
{(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} />
Expand Down
Loading