review feedback

elastic · Apr 14, 2021 · 6571d79 · 6571d79
1 parent cda1e3f
commit 6571d79
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/x-pack/plugins/maps/public/components/geo_index_pattern_select.tsx b/x-pack/plugins/maps/public/components/geo_index_pattern_select.tsx
@@ -62,7 +62,7 @@ export class GeoIndexPatternSelect extends Component<Props, State> {
       this.setState({
         doesIndexPatternHaveGeoField: indexPattern.fields.some((field) => {
           return this.props?.isGeoPointsOnly
-            ? [ES_GEO_FIELD_TYPE.GEO_POINT as string].includes(field.type)
+            ? (ES_GEO_FIELD_TYPE.GEO_POINT as string) === field.type
             : ES_GEO_FIELD_TYPES.includes(field.type);
         }),
       });
@@ -95,7 +95,7 @@ export class GeoIndexPatternSelect extends Component<Props, State> {
             <EuiLink href={getHttp().basePath.prepend(`/app/management/kibana/indexPatterns`)}>
               <FormattedMessage
                 id="xpack.maps.noIndexPattern.doThisLinkTextDescription"
-                defaultMessage="create an index pattern."
+                defaultMessage="Create an index pattern."
               />
             </EuiLink>
           </p>
@@ -119,10 +119,7 @@ export class GeoIndexPatternSelect extends Component<Props, State> {
 
   render() {
     const IndexPatternSelect = getIndexPatternSelectComponent();
-    const isIndexPatternInvalid =
-      this.props.value !== null &&
-      this.props.value !== '' &&
-      !this.state.doesIndexPatternHaveGeoField;
+    const isIndexPatternInvalid = this.props.value && !this.state.doesIndexPatternHaveGeoField;
     const error = isIndexPatternInvalid
       ? i18n.translate('xpack.maps.noGeoFieldInIndexPattern.message', {
           defaultMessage: 'Index pattern does not contain any geospatial fields',

diff --git a/x-pack/plugins/maps/public/components/single_field_select.tsx b/x-pack/plugins/maps/public/components/single_field_select.tsx
@@ -114,7 +114,7 @@ export function SingleFieldSelect({
       options={fieldsToOptions(fields, isFieldDisabled)}
       selectedOptions={selectedOptions}
       onChange={onSelection}
-      isDisabled={!fields}
+      isDisabled={!fields || fields.length === 0}
       renderOption={renderOption}
       {...rest}
     />

diff --git a/...ic/alert_types/geo_containment/query_builder/util_components/geo_index_pattern_select.tsx b/...ic/alert_types/geo_containment/query_builder/util_components/geo_index_pattern_select.tsx
@@ -94,7 +94,7 @@ export class GeoIndexPatternSelect extends Component<Props, State> {
             >
               <FormattedMessage
                 id="xpack.stackAlerts.geoContainment.noIndexPattern.doThisLinkTextDescription"
-                defaultMessage="create an index pattern."
+                defaultMessage="Create an index pattern."
               />
             </EuiLink>
           </p>
@@ -120,10 +120,7 @@ export class GeoIndexPatternSelect extends Component<Props, State> {
 
   render() {
     const IndexPatternSelectComponent = this.props.IndexPatternSelectComponent;
-    const isIndexPatternInvalid =
-      this.props.value !== null &&
-      this.props.value !== '' &&
-      !this.state.doesIndexPatternHaveGeoField;
+    const isIndexPatternInvalid = this.props.value && !this.state.doesIndexPatternHaveGeoField;
     const error = isIndexPatternInvalid
       ? i18n.translate('xpack.stackAlerts.geoContainment.noGeoFieldInIndexPattern.message', {
           defaultMessage: 'Index pattern does not contain any geospatial fields',