Skip to content

Commit

Permalink
review feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
@nreese
nreese committed Jun 26, 2020
1 parent aaf17fd commit ebdff3f
Showing 1 changed file with 25 additions and 21 deletions.
46 changes: 25 additions & 21 deletions x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/layer_template.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,18 @@ export enum BOUNDARIES_SOURCE {
}

const BOUNDARIES_OPTIONS = [
{
id: BOUNDARIES_SOURCE.ELASTICSEARCH,
label: i18n.translate('xpack.maps.choropleth.boundaries.elasticsearch', {
defaultMessage: 'Points, lines, and polygons from Elasticsearch',
}),
},
{
id: BOUNDARIES_SOURCE.EMS,
label: i18n.translate('xpack.maps.choropleth.boundaries.ems', {
defaultMessage: 'Administrative boundaries from Elastic Maps Service',
}),
},
{
id: BOUNDARIES_SOURCE.ELASTICSEARCH,
label: i18n.translate('xpack.maps.choropleth.boundaries.elasticsearch', {
defaultMessage: 'Points, lines, and polygons from Elasticsearch',
}),
},
];

interface State {
Expand All @@ -58,7 +58,8 @@ interface State {
leftGeoFields: IFieldType[];
leftJoinFields: IFieldType[];
leftGeoField: string | null;
leftJoinField: string | null;
leftEmsJoinField: string | null;
leftElasticsearchJoinField: string | null;
rightIndexPatternId: string | null;
rightIndexPatternTitle: string | null;
rightTermsFields: IFieldType[];
Expand All @@ -76,7 +77,8 @@ export class LayerTemplate extends Component<RenderWizardArguments, State> {
leftGeoFields: [],
leftJoinFields: [],
leftGeoField: null,
leftJoinField: null,
leftEmsJoinField: null,
leftElasticsearchJoinField: null,
rightIndexPatternId: null,
rightIndexPatternTitle: null,
rightTermsFields: [],
Expand Down Expand Up @@ -137,15 +139,15 @@ export class LayerTemplate extends Component<RenderWizardArguments, State> {
this.setState(
{
leftEmsFields,
leftJoinField: leftEmsFields.length ? leftEmsFields[0].value : null,
leftEmsJoinField: leftEmsFields.length ? leftEmsFields[0].value : null,
},
this._previewLayer
);
};

_onLeftSourceChange = (optionId: string) => {
this.setState(
{ leftSource: optionId as BOUNDARIES_SOURCE, leftJoinField: null, rightJoinField: null },
{ leftSource: optionId as BOUNDARIES_SOURCE, rightJoinField: null },
this._previewLayer
);
};
Expand All @@ -157,7 +159,7 @@ export class LayerTemplate extends Component<RenderWizardArguments, State> {
leftGeoFields: getGeoFields(indexPattern.fields),
leftJoinFields: getSourceFields(indexPattern.fields),
leftGeoField: null,
leftJoinField: null,
leftElasticsearchJoinField: null,
rightJoinField: null,
},
() => {
Expand All @@ -181,11 +183,11 @@ export class LayerTemplate extends Component<RenderWizardArguments, State> {
if (!joinField) {
return;
}
this.setState({ leftJoinField: joinField }, this._previewLayer);
this.setState({ leftElasticsearchJoinField: joinField }, this._previewLayer);
};

_onLeftEmsFileChange = (emFileId: string) => {
this.setState({ leftEmsFileId: emFileId, leftJoinField: null, rightJoinField: null }, () => {
this.setState({ leftEmsFileId: emFileId, leftEmsJoinField: null, rightJoinField: null }, () => {
this._previewLayer();
this._loadEmsFileFields();
});
Expand All @@ -196,7 +198,7 @@ export class LayerTemplate extends Component<RenderWizardArguments, State> {
return;
}

this.setState({ leftJoinField: selectedOptions[0].value! }, this._previewLayer);
this.setState({ leftEmsJoinField: selectedOptions[0].value! }, this._previewLayer);
};

_onRightIndexPatternChange = (indexPatternId: string) => {
Expand Down Expand Up @@ -226,10 +228,12 @@ export class LayerTemplate extends Component<RenderWizardArguments, State> {
_isLeftConfigComplete() {
if (this.state.leftSource === BOUNDARIES_SOURCE.ELASTICSEARCH) {
return (
!!this.state.leftIndexPattern && !!this.state.leftGeoField && !!this.state.leftJoinField
!!this.state.leftIndexPattern &&
!!this.state.leftGeoField &&
!!this.state.leftElasticsearchJoinField
);
} else {
return !!this.state.leftEmsFileId && !!this.state.leftJoinField;
return !!this.state.leftEmsFileId && !!this.state.leftEmsJoinField;
}
}

Expand All @@ -249,14 +253,14 @@ export class LayerTemplate extends Component<RenderWizardArguments, State> {
// @ts-expect-error - avoid wrong "Property 'id' does not exist on type 'never'." compile error
leftIndexPatternId: this.state.leftIndexPattern!.id,
leftGeoField: this.state.leftGeoField!,
leftJoinField: this.state.leftJoinField!,
leftJoinField: this.state.leftElasticsearchJoinField!,
rightIndexPatternId: this.state.rightIndexPatternId!,
rightIndexPatternTitle: this.state.rightIndexPatternTitle!,
rightTermField: this.state.rightJoinField!,
})
: createEmsChoroplethLayerDescriptor({
leftEmsFileId: this.state.leftEmsFileId!,
leftEmsField: this.state.leftJoinField!,
leftEmsField: this.state.leftEmsJoinField!,
rightIndexPatternId: this.state.rightIndexPatternId!,
rightIndexPatternTitle: this.state.rightIndexPatternTitle!,
rightTermField: this.state.rightJoinField!,
Expand Down Expand Up @@ -299,7 +303,7 @@ export class LayerTemplate extends Component<RenderWizardArguments, State> {
placeholder={i18n.translate('xpack.maps.choropleth.joinFieldPlaceholder', {
defaultMessage: 'Select field',
})}
value={this.state.leftJoinField}
value={this.state.leftElasticsearchJoinField}
onChange={this._onLeftJoinFieldSelect}
fields={this.state.leftJoinFields}
isClearable={false}
Expand All @@ -322,10 +326,10 @@ export class LayerTemplate extends Component<RenderWizardArguments, State> {
let emsFieldSelect;
if (this.state.leftEmsFields.length) {
let selectedOption;
if (this.state.leftJoinField) {
if (this.state.leftEmsJoinField) {
selectedOption = this.state.leftEmsFields.find(
(option: EuiComboBoxOptionOption<string>) => {
return this.state.leftJoinField === option.value;
return this.state.leftEmsJoinField === option.value;
}
);
}
Expand Down

0 comments on commit ebdff3f

Please sign in to comment.