IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-01 21:19:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Elasticsearch: Fix query initialization action (#29652)

Browse Source
This commit is contained in:
Giordano Ricci 2020-12-09 12:53:59 +00:00 committed by GitHub
parent 941ba1d2f7
commit 58b63a1678
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,4 @@
import { defaultBucketAgg } from 'app/plugins/datasource/elasticsearch/query_def';
import { reducerTester } from 'test/core/redux/reducerTester';
import { changeMetricType } from '../../MetricAggregationsEditor/state/actions';
import { BucketAggregation, DateHistogram } from '../aggregations';
@ -10,6 +11,7 @@ import {
removeBucketAggregation,
} from './actions';
import { reducer } from './reducer';
import { initQuery } from '../../state';
describe('Bucket Aggregations Reducer', () => {
it('Should correctly add new aggregations', () => {
@ -140,4 +142,11 @@ describe('Bucket Aggregations Reducer', () => {
)
.thenStateShouldEqual([{ ...firstAggregation, settings: expectedSettings }, secondAggregation]);
});
it('Should correctly initialize first Bucket Aggregation', () => {
reducerTester()
.givenReducer(reducer, [])
.whenActionIsDispatched(initQuery())
.thenStateShouldEqual([defaultBucketAgg('2')]);
});
});

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

@ -102,7 +102,7 @@ export const reducer = (
});
case INIT:
return [defaultBucketAgg()];
return [defaultBucketAgg('2')];
default:
return state;

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

@ -13,6 +13,7 @@ import {
import { Derivative, ExtendedStats, MetricAggregation } from '../aggregations';
import { defaultMetricAgg } from '../../../../query_def';
import { metricAggregationConfig } from '../utils';
import { initQuery } from '../../state';
describe('Metric Aggregations Reducer', () => {
it('should correctly add new aggregations', () => {
@ -219,4 +220,11 @@ describe('Metric Aggregations Reducer', () => {
.whenActionIsDispatched({ type: 'THIS ACTION SHOULD NOT HAVE ANY EFFECT IN THIS REDUCER' })
.thenStateShouldEqual(initialState);
});
it('Should correctly initialize first Metric Aggregation', () => {
reducerTester()
.givenReducer(reducer, [])
.whenActionIsDispatched(initQuery())
.thenStateShouldEqual([defaultMetricAgg('1')]);
});
});

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

@ -141,7 +141,7 @@ export const reducer = (
});
case INIT:
return [defaultMetricAgg()];
return [defaultMetricAgg('1')];
default:
return state;