maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Maps] use style-prop methods to determine state (#55607)

Browse source
This commit is contained in:
Thomas Neirynck 2020-01-23 15:56:11 -05:00 committed by GitHub
parent 5daed94c30
commit 5a15ad123d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.js
View file

@ -24,7 +24,12 @@ import { RENDER_AS } from './render_as';
import { CreateSourceEditor } from './create_source_editor';
import { UpdateSourceEditor } from './update_source_editor';
import { GRID_RESOLUTION } from '../../grid_resolution';
import { SOURCE_DATA_ID_ORIGIN, ES_GEO_GRID, COUNT_PROP_NAME } from '../../../../common/constants';
import {
SOURCE_DATA_ID_ORIGIN,
ES_GEO_GRID,
COUNT_PROP_NAME,
COLOR_MAP_TYPE,
} from '../../../../common/constants';
import { i18n } from '@kbn/i18n';
import { getDataSourceLabel } from '../../../../common/i18n_getters';
import { AbstractESAggSource } from '../es_agg_source';
@ -251,6 +256,7 @@ export class ESGeoGridSource extends AbstractESAggSource {
origin: SOURCE_DATA_ID_ORIGIN,
},
color: COLOR_GRADIENTS[0].value,
type: COLOR_MAP_TYPE.ORDINAL,
},
},
[VECTOR_STYLES.LINE_COLOR]: {

4
x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_form.js
View file

@ -55,7 +55,7 @@ export function DynamicColorForm({
return null;
}
if (styleOptions.type === COLOR_MAP_TYPE.ORDINAL) {
if (styleProperty.isOrdinal()) {
return (
<ColorMapSelect
colorMapOptions={COLOR_GRADIENTS}
@ -95,7 +95,7 @@ export function DynamicColorForm({
<EuiFlexItem>
<FieldSelect
fields={fields}
selectedFieldName={_.get(styleOptions, 'field.name')}
selectedFieldName={styleProperty.getFieldName()}
onChange={onFieldChange}
compressed
/>

3
x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/dynamic_label_form.js
View file

@ -4,7 +4,6 @@
* you may not use this file except in compliance with the Elastic License.
*/
import _ from 'lodash';
import React from 'react';
import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
import { FieldSelect } from '../field_select';
@ -27,7 +26,7 @@ export function DynamicLabelForm({
<EuiFlexItem>
<FieldSelect
fields={fields}
selectedFieldName={_.get(styleOptions, 'field.name')}
selectedFieldName={styleProperty.getFieldName()}
onChange={onFieldChange}
compressed
/>

3
x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/dynamic_orientation_form.js
View file

@ -4,7 +4,6 @@
* you may not use this file except in compliance with the Elastic License.
*/
import _ from 'lodash';
import React from 'react';
import { FieldSelect } from '../field_select';
import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
@ -30,7 +29,7 @@ export function DynamicOrientationForm({
<EuiFlexItem>
<FieldSelect
fields={fields}
selectedFieldName={_.get(styleOptions, 'field.name')}
selectedFieldName={styleProperty.getFieldName()}
onChange={onFieldChange}
compressed
/>

3
x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/dynamic_size_form.js
View file

@ -4,7 +4,6 @@
* you may not use this file except in compliance with the Elastic License.
*/
import _ from 'lodash';
import React, { Fragment } from 'react';
import { FieldSelect } from '../field_select';
import { SizeRangeSelector } from './size_range_selector';
@ -50,7 +49,7 @@ export function DynamicSizeForm({
<EuiFlexItem>
<FieldSelect
fields={fields}
selectedFieldName={_.get(styleOptions, 'field.name')}
selectedFieldName={styleProperty.getFieldName()}
onChange={onFieldChange}
compressed
/>

4
x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.js
View file

@ -32,6 +32,10 @@ export class DynamicStyleProperty extends AbstractStyleProperty {
return this._field;
}
getFieldName() {
return this._field ? this._field.getName() : '';
}
getComputedFieldName() {
if (!this.isComplete()) {
return null;