Remove field type filtering from IndexPatternSelect (elastic#97035)

* Remove field type filtering from IndexPatternSelect * remove unused import * api doc updates * update jest snapshots * another fix for jest test * review feedback * tslint * update jest snapshot for changes Co-authored-by: Kibana Machine <[email protected]>
nreese · Apr 15, 2021 · f7d1cf4 · f7d1cf4
1 parent d26c41a
commit f7d1cf4
Show file tree

Hide file tree

Showing 10 changed files with 67 additions and 94 deletions.
diff --git a/...lugins/data/public/kibana-plugin-plugins-data-public.indexpatternselectprops.md b/...lugins/data/public/kibana-plugin-plugins-data-public.indexpatternselectprops.md
@@ -10,7 +10,6 @@
 export declare type IndexPatternSelectProps = Required<Omit<EuiComboBoxProps<any>, 'isLoading' | 'onSearchChange' | 'options' | 'selectedOptions' | 'onChange'>, 'placeholder'> & {
     onChange: (indexPatternId?: string) => void;
     indexPatternId: string;
-    fieldTypes?: string[];
     onNoIndexPatterns?: () => void;
 };
 ```
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
@@ -1564,7 +1564,6 @@ export type IndexPatternsContract = PublicMethodsOf<IndexPatternsService>;
 export type IndexPatternSelectProps = Required<Omit<EuiComboBoxProps<any>, 'isLoading' | 'onSearchChange' | 'options' | 'selectedOptions' | 'onChange'>, 'placeholder'> & {
     onChange: (indexPatternId?: string) => void;
     indexPatternId: string;
-    fieldTypes?: string[];
     onNoIndexPatterns?: () => void;
 };
 

diff --git a/src/plugins/data/public/ui/index_pattern_select/index_pattern_select.tsx b/src/plugins/data/public/ui/index_pattern_select/index_pattern_select.tsx
@@ -23,7 +23,6 @@ export type IndexPatternSelectProps = Required<
 > & {
   onChange: (indexPatternId?: string) => void;
   indexPatternId: string;
-  fieldTypes?: string[];
   onNoIndexPatterns?: () => void;
 };
 
@@ -102,49 +101,18 @@ export default class IndexPatternSelect extends Component<IndexPatternSelectInte
   };
 
   debouncedFetch = _.debounce(async (searchValue: string) => {
-    const isCurrentSearch = () => {
-      return this.isMounted && searchValue === this.state.searchValue;
-    };
-
     const idsAndTitles = await this.props.indexPatternService.getIdsWithTitle();
-    if (!isCurrentSearch()) {
+    if (!this.isMounted || searchValue !== this.state.searchValue) {
       return;
     }
 
     const options = [];
     for (let i = 0; i < idsAndTitles.length; i++) {
-      if (!idsAndTitles[i].title.toLowerCase().includes(searchValue.toLowerCase())) {
-        // index pattern excluded due to title not matching search
-        continue;
-      }
-
-      if (this.props.fieldTypes) {
-        try {
-          const indexPattern = await this.props.indexPatternService.get(idsAndTitles[i].id);
-          if (!isCurrentSearch()) {
-            return;
-          }
-          const hasRequiredFieldTypes = indexPattern.fields.some((field) => {
-            return this.props.fieldTypes!.includes(field.type);
-          });
-          if (!hasRequiredFieldTypes) {
-            continue;
-          }
-        } catch (err) {
-          // could not load index pattern, exclude it from list.
-          continue;
-        }
-      }
-
-      options.push({
-        label: idsAndTitles[i].title,
-        value: idsAndTitles[i].id,
-      });
-
-      // Loading each index pattern object requires a network call so just find small number of matching index patterns
-      // Users can use 'searchValue' to further refine the list and locate their index pattern.
-      if (options.length > 15) {
-        break;
+      if (idsAndTitles[i].title.toLowerCase().includes(searchValue.toLowerCase())) {
+        options.push({
+          label: idsAndTitles[i].title,
+          value: idsAndTitles[i].id,
+        });
       }
     }
 
@@ -174,7 +142,6 @@ export default class IndexPatternSelect extends Component<IndexPatternSelectInte
 
   render() {
     const {
-      fieldTypes,
       onChange,
       indexPatternId,
       placeholder,

diff --git a/x-pack/plugins/maps/public/components/__snapshots__/geo_index_pattern_select.test.tsx.snap b/x-pack/plugins/maps/public/components/__snapshots__/geo_index_pattern_select.test.tsx.snap
diff --git a/x-pack/plugins/maps/public/components/geo_index_pattern_select.test.tsx b/x-pack/plugins/maps/public/components/geo_index_pattern_select.test.tsx
@@ -38,6 +38,6 @@ test('should render', async () => {
 
 test('should render no index pattern warning when there are no matching index patterns', async () => {
   const component = shallow(<GeoIndexPatternSelect onChange={() => {}} value={'indexPatternId'} />);
-  component.setState({ noGeoIndexPatternsExist: true });
+  component.setState({ noIndexPatternsExist: true });
   expect(component).toMatchSnapshot();
 });
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
@@ -24,14 +24,16 @@ interface Props {
 }
 
 interface State {
-  noGeoIndexPatternsExist: boolean;
+  doesIndexPatternHaveGeoField: boolean;
+  noIndexPatternsExist: boolean;
 }
 
 export class GeoIndexPatternSelect extends Component<Props, State> {
   private _isMounted: boolean = false;
 
   state = {
-    noGeoIndexPatternsExist: false,
+    doesIndexPatternHaveGeoField: false,
+    noIndexPatternsExist: false,
   };
 
   componentWillUnmount() {
@@ -57,24 +59,31 @@ export class GeoIndexPatternSelect extends Component<Props, State> {
     // method may be called again before 'get' returns
     // ignore response when fetched index pattern does not match active index pattern
     if (this._isMounted && indexPattern.id === indexPatternId) {
+      this.setState({
+        doesIndexPatternHaveGeoField: indexPattern.fields.some((field) => {
+          return this.props?.isGeoPointsOnly
+            ? (ES_GEO_FIELD_TYPE.GEO_POINT as string) === field.type
+            : ES_GEO_FIELD_TYPES.includes(field.type);
+        }),
+      });
       this.props.onChange(indexPattern);
     }
   };
 
   _onNoIndexPatterns = () => {
-    this.setState({ noGeoIndexPatternsExist: true });
+    this.setState({ noIndexPatternsExist: true });
   };
 
   _renderNoIndexPatternWarning() {
-    if (!this.state.noGeoIndexPatternsExist) {
+    if (!this.state.noIndexPatternsExist) {
       return null;
     }
 
     return (
       <>
         <EuiCallOut
           title={i18n.translate('xpack.maps.noIndexPattern.messageTitle', {
-            defaultMessage: `Couldn't find any index patterns with geospatial fields`,
+            defaultMessage: `Couldn't find any index patterns`,
           })}
           color="warning"
         >
@@ -86,18 +95,14 @@ 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>
-            <FormattedMessage
-              id="xpack.maps.noIndexPattern.doThisSuffixDescription"
-              defaultMessage=" with geospatial fields."
-            />
           </p>
           <p>
             <FormattedMessage
               id="xpack.maps.noIndexPattern.hintDescription"
-              defaultMessage="Don't have any geospatial data sets? "
+              defaultMessage="Don't have any data? "
             />
             <EuiLink href={getHttp().basePath.prepend('/app/home#/tutorial_directory/sampleData')}>
               <FormattedMessage
@@ -114,6 +119,12 @@ export class GeoIndexPatternSelect extends Component<Props, State> {
 
   render() {
     const IndexPatternSelect = getIndexPatternSelectComponent();
+    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',
+        })
+      : '';
     return (
       <>
         {this._renderNoIndexPatternWarning()}
@@ -122,17 +133,17 @@ export class GeoIndexPatternSelect extends Component<Props, State> {
           label={i18n.translate('xpack.maps.indexPatternSelectLabel', {
             defaultMessage: 'Index pattern',
           })}
+          isInvalid={isIndexPatternInvalid}
+          error={error}
         >
           <IndexPatternSelect
-            isDisabled={this.state.noGeoIndexPatternsExist}
+            isInvalid={isIndexPatternInvalid}
+            isDisabled={this.state.noIndexPatternsExist}
             indexPatternId={this.props.value ? this.props.value : ''}
             onChange={this._onIndexPatternSelect}
             placeholder={i18n.translate('xpack.maps.indexPatternSelectPlaceholder', {
               defaultMessage: 'Select index pattern',
             })}
-            fieldTypes={
-              this.props?.isGeoPointsOnly ? [ES_GEO_FIELD_TYPE.GEO_POINT] : ES_GEO_FIELD_TYPES
-            }
             onNoIndexPatterns={this._onNoIndexPatterns}
             isClearable={false}
           />

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
@@ -23,14 +23,16 @@ interface Props {
 }
 
 interface State {
-  noGeoIndexPatternsExist: boolean;
+  doesIndexPatternHaveGeoField: boolean;
+  noIndexPatternsExist: boolean;
 }
 
 export class GeoIndexPatternSelect extends Component<Props, State> {
   private _isMounted: boolean = false;
 
   state = {
-    noGeoIndexPatternsExist: false,
+    doesIndexPatternHaveGeoField: false,
+    noIndexPatternsExist: false,
   };
 
   componentWillUnmount() {
@@ -56,24 +58,29 @@ export class GeoIndexPatternSelect extends Component<Props, State> {
     // method may be called again before 'get' returns
     // ignore response when fetched index pattern does not match active index pattern
     if (this._isMounted && indexPattern.id === indexPatternId) {
+      this.setState({
+        doesIndexPatternHaveGeoField: indexPattern.fields.some((field) => {
+          return this.props.includedGeoTypes.includes(field.type);
+        }),
+      });
       this.props.onChange(indexPattern);
     }
   };
 
   _onNoIndexPatterns = () => {
-    this.setState({ noGeoIndexPatternsExist: true });
+    this.setState({ noIndexPatternsExist: true });
   };
 
   _renderNoIndexPatternWarning() {
-    if (!this.state.noGeoIndexPatternsExist) {
+    if (!this.state.noIndexPatternsExist) {
       return null;
     }
 
     return (
       <>
         <EuiCallOut
           title={i18n.translate('xpack.stackAlerts.geoContainment.noIndexPattern.messageTitle', {
-            defaultMessage: `Couldn't find any index patterns with geospatial fields`,
+            defaultMessage: `Couldn't find any index patterns`,
           })}
           color="warning"
         >
@@ -87,18 +94,14 @@ 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>
-            <FormattedMessage
-              id="xpack.stackAlerts.geoContainment.noIndexPattern.doThisSuffixDescription"
-              defaultMessage=" with geospatial fields."
-            />
           </p>
           <p>
             <FormattedMessage
               id="xpack.stackAlerts.geoContainment.noIndexPattern.hintDescription"
-              defaultMessage="Don't have any geospatial data sets? "
+              defaultMessage="Don't have any data? "
             />
             <EuiLink
               href={this.props.http.basePath.prepend('/app/home#/tutorial_directory/sampleData')}
@@ -117,6 +120,12 @@ export class GeoIndexPatternSelect extends Component<Props, State> {
 
   render() {
     const IndexPatternSelectComponent = this.props.IndexPatternSelectComponent;
+    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',
+        })
+      : '';
     return (
       <>
         {this._renderNoIndexPatternWarning()}
@@ -125,10 +134,13 @@ export class GeoIndexPatternSelect extends Component<Props, State> {
           label={i18n.translate('xpack.stackAlerts.geoContainment.indexPatternSelectLabel', {
             defaultMessage: 'Index pattern',
           })}
+          isInvalid={isIndexPatternInvalid}
+          error={error}
         >
           {IndexPatternSelectComponent ? (
             <IndexPatternSelectComponent
-              isDisabled={this.state.noGeoIndexPatternsExist}
+              isInvalid={isIndexPatternInvalid}
+              isDisabled={this.state.noIndexPatternsExist}
               indexPatternId={this.props.value}
               onChange={this._onIndexPatternSelect}
               placeholder={i18n.translate(