Merge remote-tracking branch 'upstream/master' into 52841

# Conflicts:
#	src/legacy/ui/public/vis/editors/config/editor_config_providers.ts

Author: alexwizp

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

@@ -28,8 +28,6 @@ export function plugin() {
 
 /** @public types */
 export { DataStart };
-
-export { Field, FieldType, IFieldList, IndexPattern } from './index_patterns';
 export { EsQuerySortValue, FetchOptions, ISearchSource, SortDirection } from './search/types';
 export { SearchSourceFields } from './search/types';
 export {
@@ -41,5 +39,4 @@ export {
 /** @public static code */
 export * from '../common';
 export { FilterStateManager } from './filter/filter_manager';
-export { getFromSavedObject, getRoutes, flattenHitWrapper } from './index_patterns';
 export { getRequestInspectorStats, getResponseInspectorStats } from './search';

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

@@ -19,7 +19,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import { JsonCodeBlock } from './json_code_block';
-import { IndexPattern } from 'ui/index_patterns';
+import { IndexPattern } from '../../../../../plugins/data/public';
 
 it('returns the `JsonCodeEditor` component', () => {
   const props = {

src/legacy/core_plugins/kbn_doc_views/public/views/json_code_block.test.tsx

@@ -18,12 +18,12 @@
  */
 import React from 'react';
 import { mount } from 'enzyme';
-import { IndexPattern } from 'ui/index_patterns';
 // @ts-ignore
 import { findTestSubject } from '@elastic/eui/lib/test';
-import { flattenHitWrapper } from '../../../../data/public/';
 import { DocViewTable } from './table';
 
+import { IndexPattern, indexPatterns } from '../../../../../../plugins/data/public';
+
 jest.mock('ui/new_platform');
 
 // @ts-ignore
@@ -70,7 +70,7 @@ const indexPattern = {
   formatHit: jest.fn(hit => hit._source),
 } as IndexPattern;
 
-indexPattern.flattenHit = flattenHitWrapper(indexPattern, indexPattern.metaFields);
+indexPattern.flattenHit = indexPatterns.flattenHitWrapper(indexPattern, indexPattern.metaFields);
 
 describe('DocViewTable at Discover', () => {
   // At Discover's main view, all buttons are rendered

src/legacy/core_plugins/kbn_doc_views/public/views/table/table.test.tsx

@@ -39,8 +39,13 @@ import {
   unhashUrl,
   VISUALIZE_EMBEDDABLE_TYPE,
 } from '../legacy_imports';
-import { FilterStateManager, IndexPattern } from '../../../../data/public';
-import { Query, SavedQuery, IndexPatternsContract } from '../../../../../../plugins/data/public';
+import { FilterStateManager } from '../../../../data/public';
+import {
+  IndexPattern,
+  Query,
+  SavedQuery,
+  IndexPatternsContract,
+} from '../../../../../../plugins/data/public';
 
 import {
   DashboardContainer,

src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx

@@ -22,12 +22,6 @@ const unmountComponentAtNode = jest.fn();
 
 jest.doMock('react-dom', () => ({ render, unmountComponentAtNode }));
 
-// If we don't mock this, Jest fails with the error `TypeError: Cannot redefine property: prototype
-// at Function.defineProperties`.
-jest.mock('ui/index_patterns', () => ({
-  INDEX_PATTERN_ILLEGAL_CHARACTERS: ['\\', '/', '?', '"', '<', '>', '|', ' '],
-}));
-
 jest.mock('ui/chrome', () => ({
   getUiSettingsClient: () => ({
     get: () => '',

src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/__jest__/render.test.js

@@ -32,11 +32,6 @@ const mockIndexPatternCreationType = {
   checkIndicesForErrors: () => false,
   getShowSystemIndices: () => false,
 };
-// If we don't mock this, Jest fails with the error `TypeError: Cannot redefine property: prototype
-// at Function.defineProperties`.
-jest.mock('ui/index_patterns', () => ({
-  INDEX_PATTERN_ILLEGAL_CHARACTERS: ['\\', '/', '?', '"', '<', '>', '|', ' '],
-}));
 
 jest.mock('ui/chrome', () => ({
   getUiSettingsClient: () => ({

src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/__jest__/step_index_pattern.test.js

@@ -19,7 +19,7 @@
 
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { INDEX_PATTERN_ILLEGAL_CHARACTERS as ILLEGAL_CHARACTERS } from 'ui/index_patterns';
+import { indexPatterns } from '../../../../../../../../../../plugins/data/public';
 import { MAX_SEARCH_SIZE } from '../../constants';
 import {
   getIndices,
@@ -71,7 +71,7 @@ export class StepIndexPattern extends Component {
       indexPatternName: indexPatternCreationType.getIndexPatternName(),
     };
 
-    this.ILLEGAL_CHARACTERS = [...ILLEGAL_CHARACTERS];
+    this.ILLEGAL_CHARACTERS = [...indexPatterns.ILLEGAL_CHARACTERS];
     this.lastQuery = null;
   }
 
@@ -243,7 +243,7 @@ export class StepIndexPattern extends Component {
     if (!query || !query.length || query === '.' || query === '..') {
       // This is an error scenario but do not report an error
       containsErrors = true;
-    } else if (containsIllegalCharacters(query, ILLEGAL_CHARACTERS)) {
+    } else if (containsIllegalCharacters(query, indexPatterns.ILLEGAL_CHARACTERS)) {
       const errorMessage = i18n.translate(
         'kbn.management.createIndexPattern.step.invalidCharactersErrorMessage',
         {

src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/step_index_pattern.js

@@ -31,7 +31,7 @@ import { TimeRange } from 'src/plugins/data/public';
 import { Schema } from '../vis/editors/default/schemas';
 import { AggConfig, AggConfigOptions } from './agg_config';
 import { AggGroupNames } from '../vis/editors/default/agg_groups';
-import { IndexPattern } from '../../../core_plugins/data/public';
+import { IndexPattern } from '../../../../plugins/data/public';
 import { ISearchSource, FetchOptions } from '../courier/types';
 
 type Schemas = Record<string, any>;

src/legacy/ui/public/agg_types/agg_configs.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { IndexPattern } from 'ui/index_patterns';
+import { IndexPattern } from '../../../../../plugins/data/public';
 import { AggTypeFilters } from './agg_type_filters';
 import { AggType } from '..';
 import { AggConfig } from '../../vis';