github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Maps] fix join metric field selection bugs (#56044)

Browse source 
* lint fixes

* move aggregation check to MEtricEditor

* fix functional test, handle case where fields are not loaded
This commit is contained in:
Nathan Reese 2020-01-27 20:13:21 -05:00 • committed by GitHub
parent 1ec7ee79b6
commit 1488aa9eaf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

42
x-pack/legacy/plugins/maps/public/components/metric_editor.js
View file

@ -14,12 +14,41 @@ import { MetricSelect, METRIC_AGGREGATION_VALUES } from './metric_select';
import { SingleFieldSelect } from './single_field_select';
import { METRIC_TYPE } from '../../common/constants';
function filterFieldsForAgg(fields, aggType) {
if (!fields) {
return [];
}
if (aggType === METRIC_TYPE.UNIQUE_COUNT) {
return fields.filter(field => {
return field.aggregatable;
});
}
return fields.filter(field => {
return field.aggregatable && field.type === 'number';
});
}
export function MetricEditor({ fields, metricsFilter, metric, onChange, removeButton }) {
const onAggChange = metricAggregationType => {
onChange({
const newMetricProps = {
...metric,
type: metricAggregationType,
});
};
// unset field when new agg type does not support currently selected field.
if (metric.field && metricAggregationType !== METRIC_TYPE.COUNT) {
const fieldsForNewAggType = filterFieldsForAgg(fields, metricAggregationType);
const found = fieldsForNewAggType.find(field => {
return field.name === metric.field;
});
if (!found) {
newMetricProps.field = undefined;
}
}
onChange(newMetricProps);
};
const onFieldChange = fieldName => {
onChange({
@ -36,12 +65,6 @@ export function MetricEditor({ fields, metricsFilter, metric, onChange, removeBu
let fieldSelect;
if (metric.type && metric.type !== METRIC_TYPE.COUNT) {
const filterField =
metric.type !== METRIC_TYPE.UNIQUE_COUNT
? field => {
return field.type === 'number';
}
: undefined;
fieldSelect = (
<EuiFormRow
label={i18n.translate('xpack.maps.metricsEditor.selectFieldLabel', {
@ -55,8 +78,7 @@ export function MetricEditor({ fields, metricsFilter, metric, onChange, removeBu
})}
value={metric.field}
onChange={onFieldChange}
filterField={filterField}
fields={fields}
fields={filterFieldsForAgg(fields, metric.type)}
isClearable={false}
compressed
/>