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

[Maps] fix join metric field selection bugs #56044

Merged
merged 3 commits into from
Jan 28, 2020
Merged

[Maps] fix join metric field selection bugs #56044

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
750ffdb
lint fixes
nreese Jan 27, 2020
85ab70d
move aggregation check to MEtricEditor
nreese Jan 27, 2020
adda399
fix functional test, handle case where fields are not loaded
nreese Jan 27, 2020
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
42 changes: 32 additions & 10 deletions x-pack/legacy/plugins/maps/public/components/metric_editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand All @@ -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', {
Expand All @@ -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
/>
Expand Down