IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Elasticsearch: Fix infinite loop when using mixed datasources (#70386)

Browse Source 
* Elasticsearch context: do not init query when it is already initialized

* Fix buggy conditional
This commit is contained in:
Matias Chomicki 2023-06-22 12:44:02 +02:00 committed by GitHub
parent e60966d977
commit dbf7ebb923
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/state/reducer.ts
View File

@ -107,10 +107,9 @@ export const createReducer =
} }
if (initQuery.match(action)) { if (initQuery.match(action)) {
if (state?.length || 0 > 0) { if (state && state.length > 0) {
return state; return state;
} }
return [{ ...defaultBucketAgg('2'), field: defaultTimeField }]; return [{ ...defaultBucketAgg('2'), field: defaultTimeField }];
} }

4
public/app/plugins/datasource/elasticsearch/components/QueryEditor/ElasticsearchQueryContext.tsx
View File

@ -59,11 +59,11 @@ export const ElasticsearchProvider = ({
// This initializes the query by dispatching an init action to each reducer. // This initializes the query by dispatching an init action to each reducer.
// useStatelessReducer will then call `onChange` with the newly generated query // useStatelessReducer will then call `onChange` with the newly generated query
useEffect(() => { useEffect(() => {
if (shouldRunInit) { if (shouldRunInit && isUninitialized) {
dispatch(initQuery()); dispatch(initQuery());
setShouldRunInit(false); setShouldRunInit(false);
} }
}, [shouldRunInit, dispatch]); }, [shouldRunInit, dispatch, isUninitialized]);
if (isUninitialized) { if (isUninitialized) {
return null; return null;

2
public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/state/reducer.ts
View File

@ -155,7 +155,7 @@ export const reducer = (state: ElasticsearchQuery['metrics'], action: Action): E
} }
if (initQuery.match(action)) { if (initQuery.match(action)) {
if (state?.length || 0 > 0) { if (state && state.length > 0) {
return state; return state;
} }
return [defaultMetricAgg('1')]; return [defaultMetricAgg('1')];