Explicit index pattern namespace (elastic#57194) (elastic#57415)

* Explicit index pattern namespace * typing of index patterns * fix ts error on master * export FieldList * Move isFilterable into indexPatterns namespace * Server index pattern cleanup * comment * isDefault * karma mock fix + discover fix Co-authored-by: Elastic Machine <[email protected]> Co-authored-by: Elastic Machine <[email protected]>
alexwizp · Feb 12, 2020 · 5a93fdb · 5a93fdb
1 parent b9f4eec
commit 5a93fdb
Show file tree

Hide file tree

Showing 48 changed files with 273 additions and 209 deletions.
diff --git a/src/legacy/core_plugins/data/public/search/aggs/param_types/field.ts b/src/legacy/core_plugins/data/public/search/aggs/param_types/field.ts
@@ -25,7 +25,11 @@ import { SavedObjectNotFound } from '../../../../../../../plugins/kibana_utils/p
 import { BaseParamType } from './base';
 import { propFilter } from '../filter';
 import { IMetricAggConfig } from '../metrics/metric_agg_type';
-import { Field, isNestedField, KBN_FIELD_TYPES } from '../../../../../../../plugins/data/public';
+import {
+  IndexPatternField,
+  indexPatterns,
+  KBN_FIELD_TYPES,
+} from '../../../../../../../plugins/data/public';
 
 const filterByType = propFilter('type');
 
@@ -72,7 +76,7 @@ export class FieldParamType extends BaseParamType {
       };
     }
 
-    this.serialize = (field: Field) => {
+    this.serialize = (field: IndexPatternField) => {
       return field.name;
     };
 
@@ -112,11 +116,11 @@ export class FieldParamType extends BaseParamType {
    */
   getAvailableFields = (aggConfig: IAggConfig) => {
     const fields = aggConfig.getIndexPattern().fields;
-    const filteredFields = fields.filter((field: Field) => {
+    const filteredFields = fields.filter((field: IndexPatternField) => {
       const { onlyAggregatable, scriptable, filterFieldTypes } = this;
 
       if (
-        (onlyAggregatable && (!field.aggregatable || isNestedField(field))) ||
+        (onlyAggregatable && (!field.aggregatable || indexPatterns.isNestedField(field))) ||
         (!scriptable && field.scripted)
       ) {
         return false;

diff --git a/src/legacy/core_plugins/data/public/search/aggs/param_types/filter/field_filters.test.ts b/src/legacy/core_plugins/data/public/search/aggs/param_types/filter/field_filters.test.ts
@@ -20,7 +20,7 @@
 import { IndexedArray } from 'ui/indexed_array';
 import { AggTypeFieldFilters } from './field_filters';
 import { AggConfig } from '../../agg_config';
-import { Field } from '../../../../../../../../plugins/data/public';
+import { IndexPatternField } from '../../../../../../../../plugins/data/public';
 
 describe('AggTypeFieldFilters', () => {
   let registry: AggTypeFieldFilters;
@@ -31,13 +31,13 @@ describe('AggTypeFieldFilters', () => {
   });
 
   it('should filter nothing without registered filters', async () => {
-    const fields = [{ name: 'foo' }, { name: 'bar' }] as IndexedArray<Field>;
+    const fields = [{ name: 'foo' }, { name: 'bar' }] as IndexedArray<IndexPatternField>;
     const filtered = registry.filter(fields, aggConfig);
     expect(filtered).toEqual(fields);
   });
 
   it('should pass all fields to the registered filter', async () => {
-    const fields = [{ name: 'foo' }, { name: 'bar' }] as IndexedArray<Field>;
+    const fields = [{ name: 'foo' }, { name: 'bar' }] as IndexedArray<IndexPatternField>;
     const filter = jest.fn();
     registry.addFilter(filter);
     registry.filter(fields, aggConfig);
@@ -46,7 +46,7 @@ describe('AggTypeFieldFilters', () => {
   });
 
   it('should allow registered filters to filter out fields', async () => {
-    const fields = [{ name: 'foo' }, { name: 'bar' }] as IndexedArray<Field>;
+    const fields = [{ name: 'foo' }, { name: 'bar' }] as IndexedArray<IndexPatternField>;
     let filtered = registry.filter(fields, aggConfig);
     expect(filtered).toEqual(fields);
 

diff --git a/src/legacy/core_plugins/data/public/search/aggs/param_types/filter/field_filters.ts b/src/legacy/core_plugins/data/public/search/aggs/param_types/filter/field_filters.ts
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Field } from 'src/plugins/data/public';
+import { IndexPatternField } from 'src/plugins/data/public';
 import { AggConfig } from '../../agg_config';
 
-type AggTypeFieldFilter = (field: Field, aggConfig: AggConfig) => boolean;
+type AggTypeFieldFilter = (field: IndexPatternField, aggConfig: AggConfig) => boolean;
 
 /**
  * A registry to store {@link AggTypeFieldFilter} which are used to filter down
@@ -45,7 +45,7 @@ class AggTypeFieldFilters {
    * @param aggConfig The aggConfig for which the returning list will be used.
    * @return A filtered list of the passed fields.
    */
-  public filter(fields: Field[], aggConfig: AggConfig) {
+  public filter(fields: IndexPatternField[], aggConfig: AggConfig) {
     const allFilters = Array.from(this.filters);
     const allowedAggTypeFields = fields.filter(field => {
       const isAggTypeFieldAllowed = allFilters.every(filter => filter(field, aggConfig));

diff --git a/src/legacy/core_plugins/input_control_vis/public/test_utils/get_deps_mock.tsx b/src/legacy/core_plugins/input_control_vis/public/test_utils/get_deps_mock.tsx
@@ -18,13 +18,12 @@
  */
 
 import React from 'react';
-import { FieldList } from 'src/plugins/data/public';
 import { InputControlVisDependencies } from '../plugin';
 
-const fields: FieldList = [] as any;
+const fields = [] as any;
 fields.push({ name: 'myField' } as any);
 fields.getByName = (name: any) => {
-  return fields.find(({ name: n }) => n === name);
+  return fields.find(({ name: n }: { name: string }) => n === name);
 };
 
 export const getDepsMock = (): InputControlVisDependencies =>

diff --git a/...egacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_add_filter.js b/...egacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_add_filter.js
@@ -21,19 +21,13 @@ import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
 import { createStateStub } from './_utils';
 import { getQueryParameterActions } from '../../np_ready/angular/context/query_parameters/actions';
-import { createIndexPatternsStub } from '../../np_ready/angular/context/api/__tests__/_stubs';
 import { pluginInstance } from 'plugins/kibana/discover/legacy';
 import { npStart } from 'ui/new_platform';
 
 describe('context app', function() {
   beforeEach(() => pluginInstance.initializeInnerAngular());
   beforeEach(() => pluginInstance.initializeServices());
   beforeEach(ngMock.module('app/discover'));
-  beforeEach(
-    ngMock.module(function createServiceStubs($provide) {
-      $provide.value('indexPatterns', createIndexPatternsStub());
-    })
-  );
 
   describe('action addFilter', function() {
     let addFilter;

diff --git a/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts b/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
@@ -39,7 +39,7 @@ import { StateManagementConfigProvider } from 'ui/state_management/config_provid
 import { KbnUrlProvider, RedirectWhenMissingProvider } from 'ui/url';
 // @ts-ignore
 import { createTopNavDirective, createTopNavHelper } from 'ui/kbn_top_nav/kbn_top_nav';
-import { IndexPatterns, DataPublicPluginStart } from '../../../../../plugins/data/public';
+import { DataPublicPluginStart } from '../../../../../plugins/data/public';
 import { Storage } from '../../../../../plugins/kibana_utils/public';
 import { NavigationPublicPluginStart as NavigationStart } from '../../../../../plugins/navigation/public';
 import { createDocTableDirective } from './np_ready/angular/doc_table/doc_table';
@@ -125,7 +125,6 @@ export function initializeInnerAngularModule(
     createLocalAppStateModule();
     createLocalStorageModule();
     createElasticSearchModule(data);
-    createIndexPatternsModule();
     createPagerFactoryModule();
     createDocTableModule();
     initialized = true;
@@ -164,7 +163,6 @@ export function initializeInnerAngularModule(
       'discoverGlobalState',
       'discoverAppState',
       'discoverLocalStorageProvider',
-      'discoverIndexPatterns',
       'discoverEs',
       'discoverDocTable',
       'discoverPagerFactory',
@@ -299,10 +297,6 @@ function createElasticSearchModule(data: DataPublicPluginStart) {
     });
 }
 
-function createIndexPatternsModule() {
-  angular.module('discoverIndexPatterns', []).value('indexPatterns', IndexPatterns);
-}
-
 function createPagerFactoryModule() {
   angular.module('discoverPagerFactory', []).factory('pagerFactory', createPagerFactory);
 }

diff --git a/...gacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/__tests__/anchor.js b/...gacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/__tests__/anchor.js
@@ -33,12 +33,6 @@ describe('context app', function() {
     let fetchAnchor;
     let searchSourceStub;
 
-    beforeEach(
-      ngMock.module(function createServiceStubs($provide) {
-        $provide.value('indexPatterns', createIndexPatternsStub());
-      })
-    );
-
     beforeEach(
       ngMock.inject(function createPrivateStubs() {
         searchSourceStub = createSearchSourceStub([{ _id: 'hit1' }]);

diff --git a/...ore_plugins/kibana/public/discover/np_ready/angular/context/api/__tests__/predecessors.js b/...ore_plugins/kibana/public/discover/np_ready/angular/context/api/__tests__/predecessors.js
@@ -41,12 +41,6 @@ describe('context app', function() {
     let fetchPredecessors;
     let searchSourceStub;
 
-    beforeEach(
-      ngMock.module(function createServiceStubs($provide) {
-        $provide.value('indexPatterns', createIndexPatternsStub());
-      })
-    );
-
     beforeEach(
       ngMock.inject(function createPrivateStubs() {
         searchSourceStub = createContextSearchSourceStub([], '@timestamp', MS_PER_DAY * 8);

diff --git a/...cy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/field_chooser.js b/...cy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/field_chooser.js
@@ -23,8 +23,8 @@ import { fieldCalculator } from './lib/field_calculator';
 import './discover_field';
 import './discover_field_search_directive';
 import './discover_index_pattern_directive';
-import { FieldList } from '../../../../../../../../plugins/data/public';
 import fieldChooserTemplate from './field_chooser.html';
+import { IndexPatternFieldList } from '../../../../../../../../plugins/data/public';
 
 export function createFieldChooserDirective($location, config, $route) {
   return {
@@ -281,7 +281,7 @@ export function createFieldChooserDirective($location, config, $route) {
           });
         });
 
-        const fields = new FieldList(indexPattern, fieldSpecs);
+        const fields = new IndexPatternFieldList(indexPattern, fieldSpecs);
 
         if (prevFields) {
           fields.forEach(function(field) {

diff --git a/...agement/sections/index_patterns/edit_index_pattern/create_edit_field/create_edit_field.js b/...agement/sections/index_patterns/edit_index_pattern/create_edit_field/create_edit_field.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Field } from '../../../../../../../../../plugins/data/public';
+import { IndexPatternField } from '../../../../../../../../../plugins/data/public';
 import { RegistryFieldFormatEditorsProvider } from 'ui/registry/field_format_editors';
 import { docTitle } from 'ui/doc_title';
 import { KbnUrlProvider } from 'ui/url';
@@ -39,7 +39,7 @@ const renderFieldEditor = (
   $scope,
   indexPattern,
   field,
-  { Field, getConfig, $http, fieldFormatEditors, redirectAway }
+  { getConfig, $http, fieldFormatEditors, redirectAway }
 ) => {
   $scope.$$postDigest(() => {
     const node = document.getElementById(REACT_FIELD_EDITOR_ID);
@@ -53,7 +53,7 @@ const renderFieldEditor = (
           indexPattern={indexPattern}
           field={field}
           helpers={{
-            Field,
+            Field: IndexPatternField,
             getConfig,
             $http,
             fieldFormatEditors,
@@ -135,7 +135,7 @@ uiRoutes
           return;
         }
       } else if (this.mode === 'create') {
-        this.field = new Field(this.indexPattern, {
+        this.field = new IndexPatternField(this.indexPattern, {
           scripted: true,
           type: 'number',
         });
@@ -158,7 +158,6 @@ uiRoutes
       docTitle.change([fieldName, this.indexPattern.title]);
 
       renderFieldEditor($scope, this.indexPattern, this.field, {
-        Field,
         getConfig,
         $http,
         fieldFormatEditors,

diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg_param_props.ts b/src/legacy/core_plugins/vis_default_editor/public/components/agg_param_props.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Field } from 'src/plugins/data/public';
+import { IndexPatternField } from 'src/plugins/data/public';
 import { VisState } from 'src/legacy/core_plugins/visualizations/public';
 import { IAggConfig, AggParam } from '../legacy_imports';
 import { ComboBoxGroupedOptions } from '../utils';
@@ -33,7 +33,7 @@ export interface AggParamCommonProps<T, P = AggParam> {
   disabled?: boolean;
   editorConfig: EditorConfig;
   formIsTouched: boolean;
-  indexedFields?: ComboBoxGroupedOptions<Field>;
+  indexedFields?: ComboBoxGroupedOptions<IndexPatternField>;
   showValidation: boolean;
   state: VisState;
   value?: T;

diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_helper.ts b/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_helper.ts
@@ -19,7 +19,7 @@
 
 import { get, isEmpty } from 'lodash';
 
-import { IndexPattern, Field } from 'src/plugins/data/public';
+import { IndexPattern, IndexPatternField } from 'src/plugins/data/public';
 import { VisState } from 'src/legacy/core_plugins/visualizations/public';
 import { groupAndSortBy, ComboBoxGroupedOptions } from '../utils';
 import { AggTypeState, AggParamsState } from './agg_params_state';
@@ -45,7 +45,7 @@ interface ParamInstanceBase {
 
 export interface ParamInstance extends ParamInstanceBase {
   aggParam: AggParam;
-  indexedFields: ComboBoxGroupedOptions<Field>;
+  indexedFields: ComboBoxGroupedOptions<IndexPatternField>;
   paramEditor: React.ComponentType<AggParamEditorProps<unknown>>;
   value: unknown;
 }
@@ -65,15 +65,17 @@ function getAggParamsToRender({ agg, editorConfig, metricAggs, state }: ParamIns
 
   // build collection of agg params components
   paramsToRender.forEach((param: AggParam, index: number) => {
-    let indexedFields: ComboBoxGroupedOptions<Field> = [];
-    let fields: Field[];
+    let indexedFields: ComboBoxGroupedOptions<IndexPatternField> = [];
+    let fields: IndexPatternField[];
 
     if (agg.schema.hideCustomLabel && param.name === 'customLabel') {
       return;
     }
     // if field param exists, compute allowed fields
     if (param.type === 'field') {
-      const availableFields: Field[] = (param as IFieldParamType).getAvailableFields(agg);
+      const availableFields: IndexPatternField[] = (param as IFieldParamType).getAvailableFields(
+        agg
+      );
       fields = aggTypeFieldFilters.filter(availableFields, agg);
       indexedFields = groupAndSortBy(fields, 'type', 'name');
 

diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/field.test.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/controls/field.test.tsx
@@ -22,7 +22,7 @@ import { act } from 'react-dom/test-utils';
 import { mount, shallow, ReactWrapper } from 'enzyme';
 import { EuiComboBoxProps, EuiComboBox } from '@elastic/eui';
 
-import { Field } from 'src/plugins/data/public';
+import { IndexPatternField } from 'src/plugins/data/public';
 import { VisState } from 'src/legacy/core_plugins/visualizations/public';
 import { ComboBoxGroupedOptions } from '../../utils';
 import { FieldParamEditor, FieldParamEditorProps } from './field';
@@ -41,11 +41,11 @@ describe('FieldParamEditor component', () => {
   let setTouched: jest.Mock;
   let onChange: jest.Mock;
   let defaultProps: FieldParamEditorProps;
-  let indexedFields: ComboBoxGroupedOptions<Field>;
-  let field: Field;
+  let indexedFields: ComboBoxGroupedOptions<IndexPatternField>;
+  let field: IndexPatternField;
   let option: {
     label: string;
-    target: Field;
+    target: IndexPatternField;
   };
 
   beforeEach(() => {
@@ -54,7 +54,7 @@ describe('FieldParamEditor component', () => {
     setTouched = jest.fn();
     onChange = jest.fn();
 
-    field = { displayName: 'bytes' } as Field;
+    field = { displayName: 'bytes' } as IndexPatternField;
     option = { label: 'bytes', target: field };
     indexedFields = [
       {

diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/field.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/controls/field.tsx
@@ -23,7 +23,7 @@ import React, { useEffect } from 'react';
 import { EuiComboBox, EuiComboBoxOptionProps, EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { Field } from 'src/plugins/data/public';
+import { IndexPatternField } from 'src/plugins/data/public';
 import { AggParam, IAggConfig, IFieldParamType } from '../../legacy_imports';
 import { formatListAsProse, parseCommaSeparatedList, useValidation } from './utils';
 import { AggParamEditorProps } from '../agg_param_props';
@@ -33,7 +33,7 @@ const label = i18n.translate('visDefaultEditor.controls.field.fieldLabel', {
   defaultMessage: 'Field',
 });
 
-export interface FieldParamEditorProps extends AggParamEditorProps<Field> {
+export interface FieldParamEditorProps extends AggParamEditorProps<IndexPatternField> {
   customError?: string;
   customLabel?: string;
 }
@@ -50,12 +50,12 @@ function FieldParamEditor({
   setValidity,
   setValue,
 }: FieldParamEditorProps) {
-  const selectedOptions: ComboBoxGroupedOptions<Field> = value
+  const selectedOptions: ComboBoxGroupedOptions<IndexPatternField> = value
     ? [{ label: value.displayName || value.name, target: value }]
     : [];
 
   const onChange = (options: EuiComboBoxOptionProps[]) => {
-    const selectedOption: Field = get(options, '0.target');
+    const selectedOption: IndexPatternField = get(options, '0.target');
     if (!(aggParam.required && !selectedOption)) {
       setValue(selectedOption);
     }

diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/top_field.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/controls/top_field.tsx
@@ -20,12 +20,12 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { Field } from 'src/plugins/data/public';
+import { IndexPatternField } from 'src/plugins/data/public';
 import { FieldParamEditor } from './field';
 import { getCompatibleAggs } from './top_aggregate';
 import { AggParamEditorProps } from '../agg_param_props';
 
-function TopFieldParamEditor(props: AggParamEditorProps<Field>) {
+function TopFieldParamEditor(props: AggParamEditorProps<IndexPatternField>) {
   const compatibleAggs = getCompatibleAggs(props.agg);
   let customError;