Move isFilterable to NP

src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/filter_editor_utils.ts

@@ -19,9 +19,13 @@
 
 import dateMath from '@elastic/datemath';
 import { Ipv4Address } from '../../../../../../../../plugins/kibana_utils/public';
-import { isFilterable } from '../../../../index_patterns';
 import { FILTER_OPERATORS, Operator } from './filter_operators';
-import { esFilters, IIndexPattern, IFieldType } from '../../../../../../../../plugins/data/public';
+import {
+  esFilters,
+  IIndexPattern,
+  IFieldType,
+  isFilterable,
+} from '../../../../../../../../plugins/data/public';
 
 export function getFieldFromFilter(filter: esFilters.FieldFilter, indexPattern: IIndexPattern) {
   return indexPattern.fields.find(field => field.name === filter.meta.key);

src/legacy/core_plugins/data/public/index.ts

@@ -48,7 +48,6 @@ export {
   CONTAINS_SPACES,
   getFromSavedObject,
   getRoutes,
-  isFilterable,
   IndexPatternSelect,
   validateIndexPattern,
   ILLEGAL_CHARACTERS,

src/legacy/core_plugins/data/public/index_patterns/index_patterns_service.ts

@@ -99,7 +99,6 @@ export {
   ILLEGAL_CHARACTERS,
   INDEX_PATTERN_ILLEGAL_CHARACTERS,
   INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE,
-  isFilterable,
   validateIndexPattern,
 } from './utils';
 

src/legacy/core_plugins/data/public/index_patterns/utils.test.ts

@@ -21,19 +21,9 @@ import {
   CONTAINS_SPACES,
   ILLEGAL_CHARACTERS,
   INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE,
-  isFilterable,
   validateIndexPattern,
 } from './utils';
 
-import { Field } from './fields';
-
-const mockField = {
-  name: 'foo',
-  scripted: false,
-  searchable: true,
-  type: 'string',
-} as Field;
-
 describe('Index Pattern Utils', () => {
   describe('Validation', () => {
     it('should not allow space in the pattern', () => {
@@ -52,42 +42,4 @@ describe('Index Pattern Utils', () => {
       expect(validateIndexPattern('my-pattern-*')).toEqual({});
     });
   });
-
-  describe('isFilterable', () => {
-    describe('types', () => {
-      it('should return true for filterable types', () => {
-        ['string', 'number', 'date', 'ip', 'boolean'].forEach(type => {
-          expect(isFilterable({ ...mockField, type })).toBe(true);
-        });
-      });
-
-      it('should return false for filterable types if the field is not searchable', () => {
-        ['string', 'number', 'date', 'ip', 'boolean'].forEach(type => {
-          expect(isFilterable({ ...mockField, type, searchable: false })).toBe(false);
-        });
-      });
-
-      it('should return false for un-filterable types', () => {
-        [
-          'geo_point',
-          'geo_shape',
-          'attachment',
-          'murmur3',
-          '_source',
-          'unknown',
-          'conflict',
-        ].forEach(type => {
-          expect(isFilterable({ ...mockField, type })).toBe(false);
-        });
-      });
-    });
-
-    it('should return true for scripted fields', () => {
-      expect(isFilterable({ ...mockField, scripted: true, searchable: false })).toBe(true);
-    });
-
-    it('should return true for the _id field', () => {
-      expect(isFilterable({ ...mockField, name: '_id' })).toBe(true);
-    });
-  });
 });

src/legacy/core_plugins/data/public/index_patterns/utils.ts

@@ -19,8 +19,6 @@
 
 import { find, get } from 'lodash';
 
-import { getFilterableKbnTypeNames, IFieldType } from '../../../../../plugins/data/public';
-
 import { SavedObjectsClientContract, SimpleSavedObject } from '../../../../../core/public';
 
 export const ILLEGAL_CHARACTERS = 'ILLEGAL_CHARACTERS';
@@ -106,16 +104,6 @@ export function validateIndexPattern(indexPattern: string) {
   return errors;
 }
 
-const filterableTypes = getFilterableKbnTypeNames();
-
-export function isFilterable(field: IFieldType): boolean {
-  return (
-    field.name === '_id' ||
-    field.scripted ||
-    Boolean(field.searchable && filterableTypes.includes(field.type))
-  );
-}
-
 export function getFromSavedObject(savedObject: any) {
   if (get(savedObject, 'attributes.fields') === undefined) {
     return;

src/legacy/ui/public/index_patterns/__mocks__/index.ts

@@ -35,7 +35,6 @@ export {
   CONTAINS_SPACES,
   getFromSavedObject,
   getRoutes,
-  isFilterable,
   IndexPatternSelect,
   validateIndexPattern,
   ILLEGAL_CHARACTERS,

src/legacy/ui/public/index_patterns/index.ts

@@ -38,7 +38,6 @@ export {
   CONTAINS_SPACES,
   getFromSavedObject,
   getRoutes,
-  isFilterable,
   validateIndexPattern,
   ILLEGAL_CHARACTERS,
   INDEX_PATTERN_ILLEGAL_CHARACTERS,

src/plugins/data/common/index_patterns/fields/index.ts

@@ -18,3 +18,4 @@
  */
 
 export * from './types';
+export { isFilterable } from './utils';

src/plugins/data/common/index_patterns/fields/utils.ts

@@ -0,0 +1,30 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { getFilterableKbnTypeNames, IFieldType } from '../..';
+
+const filterableTypes = getFilterableKbnTypeNames();
+
+export function isFilterable(field: IFieldType): boolean {
+  return (
+    field.name === '_id' ||
+    field.scripted ||
+    Boolean(field.searchable && filterableTypes.includes(field.type))
+  );
+}

src/plugins/data/common/index_patterns/utils.test.ts

@@ -0,0 +1,60 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { isFilterable } from '.';
+import { IFieldType } from './fields';
+
+const mockField = {
+  name: 'foo',
+  scripted: false,
+  searchable: true,
+  type: 'string',
+} as IFieldType;
+
+describe('isFilterable', () => {
+  describe('types', () => {
+    it('should return true for filterable types', () => {
+      ['string', 'number', 'date', 'ip', 'boolean'].forEach(type => {
+        expect(isFilterable({ ...mockField, type })).toBe(true);
+      });
+    });
+
+    it('should return false for filterable types if the field is not searchable', () => {
+      ['string', 'number', 'date', 'ip', 'boolean'].forEach(type => {
+        expect(isFilterable({ ...mockField, type, searchable: false })).toBe(false);
+      });
+    });
+
+    it('should return false for un-filterable types', () => {
+      ['geo_point', 'geo_shape', 'attachment', 'murmur3', '_source', 'unknown', 'conflict'].forEach(
+        type => {
+          expect(isFilterable({ ...mockField, type })).toBe(false);
+        }
+      );
+    });
+  });
+
+  it('should return true for scripted fields', () => {
+    expect(isFilterable({ ...mockField, scripted: true, searchable: false })).toBe(true);
+  });
+
+  it('should return true for the _id field', () => {
+    expect(isFilterable({ ...mockField, name: '_id' })).toBe(true);
+  });
+});

x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/field.js

@@ -7,7 +7,7 @@ import React from 'react';
 import { flatten } from 'lodash';
 import { escapeKuery } from './escape_kuery';
 import { sortPrefixFirst } from 'ui/utils/sort_prefix_first';
-import { isFilterable } from 'ui/index_patterns';
+import { isFilterable } from '../../../../../../src/plugins/data/public';
 import { FormattedMessage } from '@kbn/i18n/react';