Move IndexPatternsSelector ⇒ NP

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

@@ -47,7 +47,6 @@ export {
   CONTAINS_SPACES,
   getFromSavedObject,
   getRoutes,
-  IndexPatternSelect,
   validateIndexPattern,
   ILLEGAL_CHARACTERS,
   INDEX_PATTERN_ILLEGAL_CHARACTERS,

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

@@ -33,7 +33,6 @@ const createSetupContractMock = () => {
     flattenHitWrapper: jest.fn().mockImplementation(flattenHitWrapper),
     formatHitProvider: jest.fn(),
     indexPatterns: jest.fn() as any,
-    IndexPatternSelect: jest.fn(),
     __LEGACY: {
       // For BWC we must temporarily export the class implementation of Field,
       // which is only used externally by the Index Pattern UI.

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

@@ -25,7 +25,6 @@ import {
 } from 'src/core/public';
 import { FieldFormatsStart } from '../../../../../plugins/data/public';
 import { Field, FieldList, FieldListInterface, FieldType } from './fields';
-import { createIndexPatternSelect } from './components';
 import { setNotifications, setFieldFormats } from './services';
 
 import {
@@ -79,7 +78,6 @@ export class IndexPatternsService {
     return {
       ...this.setupApi,
       indexPatterns: new IndexPatterns(uiSettings, savedObjectsClient, http),
-      IndexPatternSelect: createIndexPatternSelect(savedObjectsClient),
     };
   }
 
@@ -91,7 +89,6 @@ export class IndexPatternsService {
 // static code
 
 /** @public */
-export { IndexPatternSelect } from './components';
 export {
   CONTAINS_SPACES,
   getFromSavedObject,
@@ -120,4 +117,4 @@ export type IndexPatternsStart = ReturnType<IndexPatternsService['start']>;
 export { IndexPattern, IndexPatterns, StaticIndexPattern, Field, FieldType, FieldListInterface };
 
 /** @public */
-export { getIndexPatternTitle, findIndexPatternByTitle } from './utils';
+export { findIndexPatternByTitle } from './utils';

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

@@ -71,19 +71,6 @@ export async function findIndexPatternByTitle(
   );
 }
 
-export async function getIndexPatternTitle(
-  client: SavedObjectsClientContract,
-  indexPatternId: string
-): Promise<SimpleSavedObject<any>> {
-  const savedObject = (await client.get('index-pattern', indexPatternId)) as SimpleSavedObject<any>;
-
-  if (savedObject.error) {
-    throw new Error(`Unable to get index-pattern title: ${savedObject.error.message}`);
-  }
-
-  return savedObject.attributes.title;
-}
-
 function indexPatternContainsSpaces(indexPattern: string): boolean {
   return indexPattern.includes(' ');
 }

src/legacy/core_plugins/input_control_vis/public/components/editor/controls_tab.test.js

@@ -17,8 +17,27 @@
  * under the License.
  */
 
-jest.mock('ui/new_platform');
-jest.mock('ui/index_patterns');
+jest.mock('../../../../../core_plugins/data/public/legacy', () => ({
+  indexPatterns: {
+    indexPatterns: {
+      get: jest.fn(),
+    }
+  }
+}));
+
+jest.mock('ui/new_platform', () => ({
+  npStart: {
+    plugins: {
+      data: {
+        ui: {
+          IndexPatternSelect: () => {
+            return <div/>;
+          }
+        }
+      }
+    },
+  },
+}));
 
 import React from 'react';
 import { shallowWithIntl, mountWithIntl } from 'test_utils/enzyme_helpers';

src/legacy/core_plugins/input_control_vis/public/components/editor/index_pattern_select_form_row.js

@@ -20,12 +20,13 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { injectI18n } from '@kbn/i18n/react';
-import { IndexPatternSelect } from 'ui/index_patterns';
-
 import {
   EuiFormRow,
 } from '@elastic/eui';
 
+import { npStart } from 'ui/new_platform';
+const { IndexPatternSelect } = npStart.plugins.data.ui;
+
 function IndexPatternSelectFormRowUi(props) {
   const {
     controlIndex,

src/legacy/core_plugins/input_control_vis/public/components/editor/list_control_editor.test.js

@@ -17,12 +17,24 @@
  * under the License.
  */
 
-jest.mock('ui/new_platform');
-jest.mock('ui/index_patterns');
+jest.mock('ui/new_platform', () => ({
+  npStart: {
+    plugins: {
+      data: {
+        ui: {
+          IndexPatternSelect: () => {
+            return <div/>;
+          }
+        }
+      }
+    },
+  },
+}));
 
 import React from 'react';
 import sinon from 'sinon';
 import { shallow } from 'enzyme';
+
 import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { getIndexPatternMock } from './__tests__/get_index_pattern_mock';

src/legacy/core_plugins/input_control_vis/public/components/editor/range_control_editor.test.js

@@ -17,19 +17,30 @@
  * under the License.
  */
 
-jest.mock('ui/new_platform');
-jest.mock('ui/index_patterns');
 
 import React from 'react';
 import sinon from 'sinon';
 import { shallow } from 'enzyme';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
+
+jest.mock('ui/new_platform', () => ({
+  npStart: {
+    plugins: {
+      data: {
+        ui: {
+          IndexPatternSelect: () => {
+            return <div/>;
+          }
+        }
+      }
+    },
+  },
+}));
+
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { getIndexPatternMock } from './__tests__/get_index_pattern_mock';
 
-import {
-  RangeControlEditor,
-} from './range_control_editor';
+import { RangeControlEditor } from './range_control_editor';
 
 const controlParams = {
   id: '1',

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

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

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

@@ -30,7 +30,6 @@ export const {
   FieldList, // only used in Discover and StubIndexPattern
   flattenHitWrapper,
   formatHitProvider,
-  IndexPatternSelect, // only used in x-pack/plugin/maps and input control vis
 } = data.indexPatterns;
 
 // static code

src/legacy/ui/public/new_platform/new_platform.karma_mock.js

@@ -26,6 +26,10 @@ const mockObservable = () => {
   };
 };
 
+const mockComponent = () => {
+  return null;
+};
+
 export const mockUiSettings = {
   get: (item) => {
     return mockUiSettings[item];
@@ -139,6 +143,9 @@ export const npStart = {
         getProvider: sinon.fake(),
       },
       getSuggestions: sinon.fake(),
+      ui: {
+        IndexPatternSelect: mockComponent,
+      },
       query: {
         filterManager: {
           getFetches$: sinon.fake(),

src/plugins/data/public/index_patterns/lib/get_index_pattern_title.ts

@@ -0,0 +1,33 @@
+/*
+ * 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 { SavedObjectsClientContract, SimpleSavedObject } from '../../../../../core/public';
+
+export async function getIndexPatternTitle(
+  client: SavedObjectsClientContract,
+  indexPatternId: string
+): Promise<SimpleSavedObject<any>> {
+  const savedObject = (await client.get('index-pattern', indexPatternId)) as SimpleSavedObject<any>;
+
+  if (savedObject.error) {
+    throw new Error(`Unable to get index-pattern title: ${savedObject.error.message}`);
+  }
+
+  return savedObject.attributes.title;
+}

src/plugins/data/public/index_patterns/lib/index.ts

@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+
+export { getIndexPatternTitle } from './get_index_pattern_title';

src/plugins/data/public/mocks.ts

@@ -66,6 +66,9 @@ const createStartContract = (): Start => {
     search: { search: jest.fn() },
     fieldFormats: fieldFormatsMock as FieldFormatsStart,
     query: queryStartMock,
+    ui: {
+      IndexPatternSelect: jest.fn(),
+    },
   };
   return startContract;
 };

src/plugins/data/public/plugin.ts

@@ -25,6 +25,7 @@ import { getSuggestionsProvider } from './suggestions_provider';
 import { SearchService } from './search/search_service';
 import { FieldFormatsService } from './field_formats_provider';
 import { QueryService } from './query';
+import { createIndexPatternSelect } from './ui/index_pattern_select';
 
 export class DataPublicPlugin implements Plugin<DataPublicPluginSetup, DataPublicPluginStart> {
   private readonly autocomplete = new AutocompleteProviderRegister();
@@ -59,6 +60,9 @@ export class DataPublicPlugin implements Plugin<DataPublicPluginSetup, DataPubli
       search: this.searchService.start(core),
       fieldFormats: this.fieldFormatsService.start(),
       query: this.queryService.start(),
+      ui: {
+        IndexPatternSelect: createIndexPatternSelect(core.savedObjects.client),
+      },
     };
   }
 

src/plugins/data/public/types.ts

@@ -24,6 +24,7 @@ import { FieldFormatsSetup, FieldFormatsStart } from './field_formats_provider';
 import { ISearchSetup, ISearchStart } from './search';
 import { IGetSuggestions } from './suggestions_provider/types';
 import { QuerySetup, QueryStart } from './query';
+import { IndexPatternSelectProps } from './ui/index_pattern_select';
 
 export interface DataPublicPluginSetup {
   autocomplete: AutocompletePublicPluginSetup;
@@ -38,6 +39,9 @@ export interface DataPublicPluginStart {
   search: ISearchStart;
   fieldFormats: FieldFormatsStart;
   query: QueryStart;
+  ui: {
+    IndexPatternSelect: React.ComponentType<IndexPatternSelectProps>;
+  };
 }
 
 export * from './autocomplete_provider/types';

src/plugins/data/public/ui/index.ts

@@ -17,5 +17,6 @@
  * under the License.
  */
 
+export { IndexPatternSelect } from './index_pattern_select';
 export { FilterBar } from './filter_bar';
 export { applyFiltersPopover } from './apply_filters';

src/legacy/core_plugins/data/public/index_patterns/components/index_pattern_select.tsx → src/plugins/data/public/ui/index_pattern_select/index_pattern_select.tsx

@@ -21,10 +21,10 @@ import _ from 'lodash';
 import React, { Component } from 'react';
 
 import { EuiComboBox } from '@elastic/eui';
-import { SavedObjectsClientContract, SimpleSavedObject } from '../../../../../../core/public';
-import { getIndexPatternTitle } from '../utils';
+import { SavedObjectsClientContract, SimpleSavedObject } from '../../../../../core/public';
+import { getIndexPatternTitle } from '../../index_patterns/lib';
 
-interface IndexPatternSelectProps {
+export interface IndexPatternSelectProps {
   onChange: (opt: any) => void;
   indexPatternId: string;
   placeholder: string;

x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/join_expression.js

@@ -16,7 +16,6 @@ import {
   EuiFormHelpText,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { IndexPatternSelect } from 'ui/index_patterns';
 import { SingleFieldSelect } from '../../../../components/single_field_select';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { getTermsFields } from '../../../../index_pattern_util';
@@ -25,6 +24,9 @@ import {
   indexPatternService,
 } from '../../../../kibana_services';
 
+import { npStart } from 'ui/new_platform';
+const { IndexPatternSelect } = npStart.plugins.data.ui;
+
 export class JoinExpression extends Component {
 
   state = {

x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/create_source_editor.js

@@ -8,7 +8,6 @@ import _ from 'lodash';
 import React, { Fragment, Component } from 'react';
 import PropTypes from 'prop-types';
 
-import { IndexPatternSelect } from 'ui/index_patterns';
 import { SingleFieldSelect } from '../../../components/single_field_select';
 import { RENDER_AS } from './render_as';
 import { indexPatternService } from '../../../kibana_services';
@@ -22,6 +21,9 @@ import {
 } from '@elastic/eui';
 import { ES_GEO_FIELD_TYPE } from '../../../../common/constants';
 
+import { npStart } from 'ui/new_platform';
+const { IndexPatternSelect } = npStart.plugins.data.ui;
+
 function filterGeoField({ type }) {
   return [ES_GEO_FIELD_TYPE.GEO_POINT].includes(type);
 }

x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/create_source_editor.js

@@ -8,7 +8,6 @@ import _ from 'lodash';
 import React, { Fragment, Component } from 'react';
 import PropTypes from 'prop-types';
 
-import { IndexPatternSelect } from 'ui/index_patterns';
 import { SingleFieldSelect } from '../../../components/single_field_select';
 import { indexPatternService } from '../../../kibana_services';
 import { i18n } from '@kbn/i18n';
@@ -20,6 +19,8 @@ import {
 } from '@elastic/eui';
 import { ES_GEO_FIELD_TYPE } from '../../../../common/constants';
 
+import { npStart } from 'ui/new_platform';
+const { IndexPatternSelect } = npStart.plugins.data.ui;
 const GEO_FIELD_TYPES = [ES_GEO_FIELD_TYPE.GEO_POINT];
 
 function filterGeoField({ type }) {