Merge branch 'master' into emt-issue-65_add-endpoint_list_api

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/kbn_doc_views/public/views/json_code_block.test.tsx

@@ -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/table/table.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/kibana/public/dashboard/np_ready/dashboard_app_controller.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/management/sections/index_patterns/create_index_pattern_wizard/__jest__/render.test.js

@@ -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/components/step_index_pattern/__jest__/step_index_pattern.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/step_index_pattern.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/ui/public/agg_types/agg_configs.ts

@@ -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/filter/agg_type_filters.test.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';

src/legacy/ui/public/agg_types/filter/agg_type_filters.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { IndexPattern } from '../../index_patterns';
+import { IndexPattern } from '../../../../../plugins/data/public';
 import { AggConfig } from '../../vis';
 import { AggType } from '..';
 

src/legacy/ui/public/agg_types/param_types/field.ts

@@ -25,7 +25,7 @@ import { FieldParamEditor } from '../../vis/editors/default/controls/field';
 import { BaseParamType } from './base';
 import { toastNotifications } from '../../notify';
 import { propFilter } from '../filter';
-import { Field, IFieldList } from '../../index_patterns';
+import { Field, IFieldList } from '../../../../../plugins/data/public';
 
 const filterByType = propFilter('type');
 

src/legacy/ui/public/agg_types/param_types/filter/field_filters.test.ts

@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import { Field } from 'ui/index_patterns';
 import { IndexedArray } from 'ui/indexed_array';
 import { AggTypeFieldFilters } from './field_filters';
 import { AggConfig } from 'ui/vis';
+import { Field } from '../../../../../../plugins/data/public';
 
 describe('AggTypeFieldFilters', () => {
   let registry: AggTypeFieldFilters;

src/legacy/ui/public/agg_types/param_types/filter/field_filters.ts

@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Field } from 'ui/index_patterns';
 import { AggConfig } from '../../../vis';
+import { Field } from '../../../../../../plugins/data/public';
 
 type AggTypeFieldFilter = (field: Field, aggConfig: AggConfig) => boolean;
 

src/legacy/ui/public/indices/constants/index.js

@@ -17,11 +17,11 @@
  * under the License.
  */
 
-import { INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE } from '../../index_patterns';
+import { indexPatterns } from '../../../../../plugins/data/public';
 
-export const INDEX_ILLEGAL_CHARACTERS_VISIBLE = [...INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE, '*'];
+export const INDEX_ILLEGAL_CHARACTERS_VISIBLE = [...indexPatterns.ILLEGAL_CHARACTERS_VISIBLE, '*'];
 
 // Insert the comma into the middle, so it doesn't look as if it has grammatical meaning when
 // these characters are rendered in the UI.
-const insertionIndex = Math.floor(INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE.length / 2);
+const insertionIndex = Math.floor(indexPatterns.ILLEGAL_CHARACTERS_VISIBLE.length / 2);
 INDEX_ILLEGAL_CHARACTERS_VISIBLE.splice(insertionIndex, 0, ',');

src/legacy/ui/public/registry/doc_views_types.ts

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { IndexPattern } from 'src/legacy/core_plugins/data/public';
 import { ComponentType } from 'react';
 import { IScope } from 'angular';
+import { IndexPattern } from '../../../../plugins/data/public';
 
 export interface AngularDirective {
   controller: (scope: AngularScope) => void;

src/legacy/ui/public/saved_objects/helpers/apply_es_resp.ts

@@ -20,7 +20,7 @@ import _ from 'lodash';
 import { EsResponse, SavedObject, SavedObjectConfig } from 'ui/saved_objects/types';
 import { parseSearchSource } from 'ui/saved_objects/helpers/parse_search_source';
 import { expandShorthand, SavedObjectNotFound } from '../../../../../plugins/kibana_utils/public';
-import { IndexPattern } from '../../../../core_plugins/data/public';
+import { IndexPattern } from '../../../../../plugins/data/public';
 
 /**
  * A given response of and ElasticSearch containing a plain saved object is applied to the given

src/legacy/ui/public/vis/editors/config/editor_config_providers.ts

@@ -20,7 +20,7 @@
 import { TimeIntervalParam } from 'ui/vis/editors/config/types';
 import { AggConfig } from '../..';
 import { AggType } from '../../../agg_types';
-import { IndexPattern } from '../../../index_patterns';
+import { IndexPattern } from '../../../../../../plugins/data/public';
 import { leastCommonMultiple } from '../../../utils/math';
 import { parseEsInterval } from '../../../../../core_plugins/data/public';
 import { leastCommonInterval } from '../../lib/least_common_interval';

src/legacy/ui/public/vis/editors/default/components/agg.test.tsx

@@ -24,8 +24,8 @@ import { AggGroupNames } from '../agg_groups';
 import { DefaultEditorAgg, DefaultEditorAggProps } from './agg';
 import { act } from 'react-dom/test-utils';
 import { DefaultEditorAggParams } from './agg_params';
-import { IndexPattern } from 'ui/index_patterns';
 import { AggType } from 'ui/agg_types';
+import { IndexPattern } from '../../../../../../../plugins/data/public';
 
 jest.mock('./agg_params', () => ({
   DefaultEditorAggParams: () => null,

src/legacy/ui/public/vis/editors/default/components/agg_param_props.ts

@@ -17,13 +17,13 @@
  * under the License.
  */
 
-import { Field } from 'ui/index_patterns';
 import { AggParam } from 'ui/agg_types';
 import { AggConfig } from '../../../../agg_types/agg_config';
 import { ComboBoxGroupedOptions } from '../utils';
 import { EditorConfig } from '../../config/types';
 import { VisState } from '../../..';
 import { SubAggParamsProp } from './agg_params';
+import { Field } from '../../../../../../../plugins/data/public';
 
 // NOTE: we cannot export the interface with export { InterfaceName }
 // as there is currently a bug on babel typescript transform plugin for it

src/legacy/ui/public/vis/editors/default/components/agg_params.test.tsx

@@ -19,9 +19,9 @@
 
 import React from 'react';
 import { mount, shallow } from 'enzyme';
-import { IndexPattern } from 'ui/index_patterns';
 import { AggConfig, VisState } from '../../..';
 import { DefaultEditorAggParams, DefaultEditorAggParamsProps } from './agg_params';
+import { IndexPattern } from '../../../../../../../plugins/data/public';
 
 const mockEditorConfig = {
   useNormalizedEsInterval: { hidden: false, fixedValue: false },

src/legacy/ui/public/vis/editors/default/components/agg_params.tsx

@@ -23,8 +23,8 @@ import { i18n } from '@kbn/i18n';
 import useUnmount from 'react-use/lib/useUnmount';
 
 import { VisState } from 'ui/vis';
-import { IndexPattern } from 'ui/index_patterns';
 import { aggTypes, AggType, AggParam, AggConfig } from 'ui/agg_types/';
+import { IndexPattern } from '../../../../../../../plugins/data/public';
 
 import { DefaultEditorAggSelect } from './agg_select';
 import { DefaultEditorAggParam } from './agg_param';

src/legacy/ui/public/vis/editors/default/components/agg_params_helper.test.ts

@@ -19,7 +19,6 @@
 
 import { AggConfig, VisState } from '../../..';
 import { AggType } from 'ui/agg_types';
-import { IndexPattern, Field } from 'ui/index_patterns';
 import { IndexedArray } from 'ui/indexed_array';
 import {
   getAggParamsToRender,
@@ -28,6 +27,7 @@ import {
   isInvalidParamsTouched,
 } from './agg_params_helper';
 import { EditorConfig } from '../../config/types';
+import { IndexPattern, Field } from '../../../../../../../plugins/data/public';
 
 jest.mock('ui/agg_types', () => ({
   aggTypes: {

src/legacy/ui/public/vis/editors/default/components/agg_params_helper.ts

@@ -20,14 +20,14 @@
 import { get, isEmpty } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { aggTypeFilters } from 'ui/agg_types/filter';
-import { IndexPattern, Field } from 'ui/index_patterns';
 import { aggTypes, AggParam, FieldParamType, AggType } from 'ui/agg_types';
 import { aggTypeFieldFilters } from 'ui/agg_types/param_types/filter';
 import { AggConfig, VisState } from '../../..';
 import { groupAndSortBy, ComboBoxGroupedOptions } from '../utils';
 import { EditorConfig } from '../../config/types';
 import { AggTypeState, AggParamsState } from './agg_params_state';
 import { AggParamEditorProps } from './agg_param_props';
+import { IndexPattern, Field } from '../../../../../../../plugins/data/public';
 
 interface ParamInstanceBase {
   agg: AggConfig;