diff --git a/src/plugins/data/common/index_patterns/constants.ts b/src/plugins/data/common/data_views/constants.ts similarity index 100% rename from src/plugins/data/common/index_patterns/constants.ts rename to src/plugins/data/common/data_views/constants.ts diff --git a/src/plugins/data/common/index_patterns/index_patterns/__snapshots__/index_pattern.test.ts.snap b/src/plugins/data/common/data_views/data_views/__snapshots__/index_pattern.test.ts.snap similarity index 100% rename from src/plugins/data/common/index_patterns/index_patterns/__snapshots__/index_pattern.test.ts.snap rename to src/plugins/data/common/data_views/data_views/__snapshots__/index_pattern.test.ts.snap diff --git a/src/plugins/data/common/index_patterns/index_patterns/__snapshots__/index_patterns.test.ts.snap b/src/plugins/data/common/data_views/data_views/__snapshots__/index_patterns.test.ts.snap similarity index 100% rename from src/plugins/data/common/index_patterns/index_patterns/__snapshots__/index_patterns.test.ts.snap rename to src/plugins/data/common/data_views/data_views/__snapshots__/index_patterns.test.ts.snap diff --git a/src/plugins/data/common/index_patterns/index_patterns/_pattern_cache.ts b/src/plugins/data/common/data_views/data_views/_pattern_cache.ts similarity index 96% rename from src/plugins/data/common/index_patterns/index_patterns/_pattern_cache.ts rename to src/plugins/data/common/data_views/data_views/_pattern_cache.ts index a647f306ca7f..f304d0e93d79 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/_pattern_cache.ts +++ b/src/plugins/data/common/data_views/data_views/_pattern_cache.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { DataView } from './index_pattern'; +import { DataView } from './data_view'; export interface DataViewCache { get: (id: string) => Promise | undefined; diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/data_views/data_views/data_view.ts similarity index 100% rename from src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts rename to src/plugins/data/common/data_views/data_views/data_view.ts diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/data_views/data_views/data_views.ts similarity index 99% rename from src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts rename to src/plugins/data/common/data_views/data_views/data_views.ts index a72224d1c3fe..1284f0043632 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts +++ b/src/plugins/data/common/data_views/data_views/data_views.ts @@ -15,8 +15,8 @@ import { DATA_VIEW_SAVED_OBJECT_TYPE, SavedObjectsClientCommon } from '../..'; import { createDataViewCache } from '.'; import type { RuntimeField } from '../types'; -import { DataView } from './index_pattern'; -import { createEnsureDefaultDataView, EnsureDefaultDataView } from './ensure_default_index_pattern'; +import { DataView } from './data_view'; +import { createEnsureDefaultDataView, EnsureDefaultDataView } from './ensure_default_data_view'; import { OnNotification, OnError, @@ -237,7 +237,7 @@ export class DataViewsService { /** * Checks if current user has a user created index pattern ignoring fleet's server default index patterns */ - async hasUserIndexPattern(): Promise { + async hasUserDataView(): Promise { return this.apiClient.hasUserIndexPattern(); } diff --git a/src/plugins/data/common/index_patterns/index_patterns/ensure_default_index_pattern.ts b/src/plugins/data/common/data_views/data_views/ensure_default_data_view.ts similarity index 75% rename from src/plugins/data/common/index_patterns/index_patterns/ensure_default_index_pattern.ts rename to src/plugins/data/common/data_views/data_views/ensure_default_data_view.ts index da20053bf1fe..2975ddbd107c 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/ensure_default_index_pattern.ts +++ b/src/plugins/data/common/data_views/data_views/ensure_default_data_view.ts @@ -7,17 +7,17 @@ */ import { includes } from 'lodash'; -import { DataViewsContract } from './index_patterns'; +import { DataViewsContract } from './data_views'; import { UiSettingsCommon } from '../types'; export type EnsureDefaultDataView = () => Promise | undefined; export const createEnsureDefaultDataView = ( uiSettings: UiSettingsCommon, - onRedirectNoIndexPattern: () => Promise | void + onRedirectNoDefaultView: () => Promise | void ) => { /** - * Checks whether a default index pattern is set and exists and defines + * Checks whether a default data view is set and exists and defines * one otherwise. */ return async function ensureDefaultDataView(this: DataViewsContract) { @@ -36,12 +36,12 @@ export const createEnsureDefaultDataView = ( } // If there is any user index pattern created, set the first as default - // if there is 0 patterns, then don't even call `hasUserIndexPattern()` - if (patterns.length >= 1 && (await this.hasUserIndexPattern().catch(() => true))) { + // if there is 0 patterns, then don't even call `hasUserDataView()` + if (patterns.length >= 1 && (await this.hasUserDataView().catch(() => true))) { defaultId = patterns[0]; await uiSettings.set('defaultIndex', defaultId); } else { - return onRedirectNoIndexPattern(); + return onRedirectNoDefaultView(); } }; }; diff --git a/src/plugins/data/common/index_patterns/index_patterns/flatten_hit.test.ts b/src/plugins/data/common/data_views/data_views/flatten_hit.test.ts similarity index 97% rename from src/plugins/data/common/index_patterns/index_patterns/flatten_hit.test.ts rename to src/plugins/data/common/data_views/data_views/flatten_hit.test.ts index 5cb531a97ff7..f8e1309a38ff 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/flatten_hit.test.ts +++ b/src/plugins/data/common/data_views/data_views/flatten_hit.test.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { IndexPattern } from './index_pattern'; +import { IndexPattern } from './data_view'; import { fieldFormatsMock } from '../../../../field_formats/common/mocks'; import { flattenHitWrapper } from './flatten_hit'; diff --git a/src/plugins/data/common/index_patterns/index_patterns/flatten_hit.ts b/src/plugins/data/common/data_views/data_views/flatten_hit.ts similarity index 98% rename from src/plugins/data/common/index_patterns/index_patterns/flatten_hit.ts rename to src/plugins/data/common/data_views/data_views/flatten_hit.ts index 421994a9e02f..58a5dff66acc 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/flatten_hit.ts +++ b/src/plugins/data/common/data_views/data_views/flatten_hit.ts @@ -7,7 +7,7 @@ */ import _ from 'lodash'; -import { DataView } from './index_pattern'; +import { DataView } from './data_view'; // Takes a hit, merges it with any stored/scripted fields, and with the metaFields // returns a flattened version diff --git a/src/plugins/data/common/index_patterns/index_patterns/format_hit.ts b/src/plugins/data/common/data_views/data_views/format_hit.ts similarity index 98% rename from src/plugins/data/common/index_patterns/index_patterns/format_hit.ts rename to src/plugins/data/common/data_views/data_views/format_hit.ts index 9ae630e8de65..b22601375262 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/format_hit.ts +++ b/src/plugins/data/common/data_views/data_views/format_hit.ts @@ -7,7 +7,7 @@ */ import _ from 'lodash'; -import { DataView } from './index_pattern'; +import { DataView } from './data_view'; import { FieldFormatsContentType } from '../../../../field_formats/common'; const formattedCache = new WeakMap(); diff --git a/src/plugins/data/common/index_patterns/index_patterns/index.ts b/src/plugins/data/common/data_views/data_views/index.ts similarity index 87% rename from src/plugins/data/common/index_patterns/index_patterns/index.ts rename to src/plugins/data/common/data_views/data_views/index.ts index b8b47cf09950..7c94dff961c9 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/index.ts +++ b/src/plugins/data/common/data_views/data_views/index.ts @@ -9,5 +9,5 @@ export * from './_pattern_cache'; export * from './flatten_hit'; export * from './format_hit'; -export * from './index_pattern'; -export * from './index_patterns'; +export * from './data_view'; +export * from './data_views'; diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.stub.ts b/src/plugins/data/common/data_views/data_views/index_pattern.stub.ts similarity index 93% rename from src/plugins/data/common/index_patterns/index_patterns/index_pattern.stub.ts rename to src/plugins/data/common/data_views/data_views/index_pattern.stub.ts index 0799afbb8593..3b6660c6d93d 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.stub.ts +++ b/src/plugins/data/common/data_views/data_views/index_pattern.stub.ts @@ -6,8 +6,8 @@ * Side Public License, v 1. */ -import { IndexPattern } from './index_pattern'; -import { IndexPatternSpec } from '../types'; +import { IndexPattern } from './data_view'; +import { DataViewSpec } from '../types'; import { FieldFormatsStartCommon } from '../../../../field_formats/common'; import { fieldFormatsMock } from '../../../../field_formats/common/mocks'; @@ -37,7 +37,7 @@ export const createStubIndexPattern = ({ opts, deps, }: { - spec: IndexPatternSpec; + spec: DataViewSpec; opts?: { shortDotsEnable?: boolean; metaFields?: string[]; diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts b/src/plugins/data/common/data_views/data_views/index_pattern.test.ts similarity index 99% rename from src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts rename to src/plugins/data/common/data_views/data_views/index_pattern.test.ts index 1d97c6fa413e..a12d4897fe11 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts +++ b/src/plugins/data/common/data_views/data_views/index_pattern.test.ts @@ -8,7 +8,7 @@ import { map, last } from 'lodash'; -import { IndexPattern } from './index_pattern'; +import { IndexPattern } from './data_view'; import { DuplicateField } from '../../../../kibana_utils/common'; diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts b/src/plugins/data/common/data_views/data_views/index_patterns.test.ts similarity index 100% rename from src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts rename to src/plugins/data/common/data_views/data_views/index_patterns.test.ts diff --git a/src/plugins/data/common/index_patterns/errors/duplicate_index_pattern.ts b/src/plugins/data/common/data_views/errors/duplicate_index_pattern.ts similarity index 100% rename from src/plugins/data/common/index_patterns/errors/duplicate_index_pattern.ts rename to src/plugins/data/common/data_views/errors/duplicate_index_pattern.ts diff --git a/src/plugins/data/common/index_patterns/errors/index.ts b/src/plugins/data/common/data_views/errors/index.ts similarity index 100% rename from src/plugins/data/common/index_patterns/errors/index.ts rename to src/plugins/data/common/data_views/errors/index.ts diff --git a/src/plugins/data/common/index_patterns/expressions/index.ts b/src/plugins/data/common/data_views/expressions/index.ts similarity index 100% rename from src/plugins/data/common/index_patterns/expressions/index.ts rename to src/plugins/data/common/data_views/expressions/index.ts diff --git a/src/plugins/data/common/index_patterns/expressions/load_index_pattern.ts b/src/plugins/data/common/data_views/expressions/load_index_pattern.ts similarity index 97% rename from src/plugins/data/common/index_patterns/expressions/load_index_pattern.ts rename to src/plugins/data/common/data_views/expressions/load_index_pattern.ts index 8fe9e40e0ac6..dd47a9fc0dfb 100644 --- a/src/plugins/data/common/index_patterns/expressions/load_index_pattern.ts +++ b/src/plugins/data/common/data_views/expressions/load_index_pattern.ts @@ -8,7 +8,7 @@ import { i18n } from '@kbn/i18n'; import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common'; -import { DataViewsContract } from '../index_patterns'; +import { DataViewsContract } from '../data_views'; import { DataViewSpec } from '..'; import { SavedObjectReference } from '../../../../../core/types'; diff --git a/src/plugins/data/common/index_patterns/field.stub.ts b/src/plugins/data/common/data_views/field.stub.ts similarity index 100% rename from src/plugins/data/common/index_patterns/field.stub.ts rename to src/plugins/data/common/data_views/field.stub.ts diff --git a/src/plugins/data/common/index_patterns/fields/__snapshots__/index_pattern_field.test.ts.snap b/src/plugins/data/common/data_views/fields/__snapshots__/index_pattern_field.test.ts.snap similarity index 100% rename from src/plugins/data/common/index_patterns/fields/__snapshots__/index_pattern_field.test.ts.snap rename to src/plugins/data/common/data_views/fields/__snapshots__/index_pattern_field.test.ts.snap diff --git a/src/plugins/data/common/index_patterns/fields/field_list.ts b/src/plugins/data/common/data_views/fields/field_list.ts similarity index 98% rename from src/plugins/data/common/index_patterns/fields/field_list.ts rename to src/plugins/data/common/data_views/fields/field_list.ts index 78cc390c8c13..8dd407e16e4c 100644 --- a/src/plugins/data/common/index_patterns/fields/field_list.ts +++ b/src/plugins/data/common/data_views/fields/field_list.ts @@ -10,7 +10,7 @@ import { findIndex } from 'lodash'; import { IFieldType } from './types'; import { DataViewField } from './index_pattern_field'; import { FieldSpec, DataViewFieldMap } from '../types'; -import { DataView } from '../index_patterns'; +import { DataView } from '../data_views'; type FieldMap = Map; diff --git a/src/plugins/data/common/index_patterns/fields/fields.mocks.ts b/src/plugins/data/common/data_views/fields/fields.mocks.ts similarity index 100% rename from src/plugins/data/common/index_patterns/fields/fields.mocks.ts rename to src/plugins/data/common/data_views/fields/fields.mocks.ts diff --git a/src/plugins/data/common/index_patterns/fields/index.ts b/src/plugins/data/common/data_views/fields/index.ts similarity index 100% rename from src/plugins/data/common/index_patterns/fields/index.ts rename to src/plugins/data/common/data_views/fields/index.ts diff --git a/src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts b/src/plugins/data/common/data_views/fields/index_pattern_field.test.ts similarity index 99% rename from src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts rename to src/plugins/data/common/data_views/fields/index_pattern_field.test.ts index 51687cfd8260..18d331b4e135 100644 --- a/src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts +++ b/src/plugins/data/common/data_views/fields/index_pattern_field.test.ts @@ -7,7 +7,7 @@ */ import { IndexPatternField } from './index_pattern_field'; -import { IndexPattern } from '../index_patterns'; +import { IndexPattern } from '..'; import { KBN_FIELD_TYPES } from '../../../common'; import { FieldSpec, RuntimeField } from '../types'; import { FieldFormat } from '../../../../field_formats/common'; diff --git a/src/plugins/data/common/index_patterns/fields/index_pattern_field.ts b/src/plugins/data/common/data_views/fields/index_pattern_field.ts similarity index 100% rename from src/plugins/data/common/index_patterns/fields/index_pattern_field.ts rename to src/plugins/data/common/data_views/fields/index_pattern_field.ts diff --git a/src/plugins/data/common/index_patterns/fields/types.ts b/src/plugins/data/common/data_views/fields/types.ts similarity index 100% rename from src/plugins/data/common/index_patterns/fields/types.ts rename to src/plugins/data/common/data_views/fields/types.ts diff --git a/src/plugins/data/common/index_patterns/fields/utils.ts b/src/plugins/data/common/data_views/fields/utils.ts similarity index 100% rename from src/plugins/data/common/index_patterns/fields/utils.ts rename to src/plugins/data/common/data_views/fields/utils.ts diff --git a/src/plugins/data/common/index_patterns/index.ts b/src/plugins/data/common/data_views/index.ts similarity index 76% rename from src/plugins/data/common/index_patterns/index.ts rename to src/plugins/data/common/data_views/index.ts index 99639676bdab..fd1df0336815 100644 --- a/src/plugins/data/common/index_patterns/index.ts +++ b/src/plugins/data/common/data_views/index.ts @@ -14,12 +14,8 @@ export { IndexPatternsContract, DataViewsService, DataViewsContract, -} from './index_patterns'; -export type { - IndexPattern, - IndexPatternListItem, - DataView, - DataViewListItem, -} from './index_patterns'; +} from './data_views'; +// todo was trying to export this as type but wasn't working +export { IndexPattern, IndexPatternListItem, DataView, DataViewListItem } from './data_views'; export * from './errors'; export * from './expressions'; diff --git a/src/plugins/data/common/index_patterns/index_pattern.stub.ts b/src/plugins/data/common/data_views/index_pattern.stub.ts similarity index 90% rename from src/plugins/data/common/index_patterns/index_pattern.stub.ts rename to src/plugins/data/common/data_views/index_pattern.stub.ts index 13cda8ccfb84..16624087f83b 100644 --- a/src/plugins/data/common/index_patterns/index_pattern.stub.ts +++ b/src/plugins/data/common/data_views/index_pattern.stub.ts @@ -7,8 +7,8 @@ */ import { stubFieldSpecMap, stubLogstashFieldSpecMap } from './field.stub'; -import { createStubIndexPattern } from './index_patterns/index_pattern.stub'; -export { createStubIndexPattern } from './index_patterns/index_pattern.stub'; +import { createStubIndexPattern } from './data_views/index_pattern.stub'; +export { createStubIndexPattern } from './data_views/index_pattern.stub'; import { SavedObject } from '../../../../core/types'; import { IndexPatternAttributes } from '../types'; diff --git a/src/plugins/data/common/index_patterns/lib/errors.ts b/src/plugins/data/common/data_views/lib/errors.ts similarity index 82% rename from src/plugins/data/common/index_patterns/lib/errors.ts rename to src/plugins/data/common/data_views/lib/errors.ts index 20f422c5124e..83cc7ea56d02 100644 --- a/src/plugins/data/common/index_patterns/lib/errors.ts +++ b/src/plugins/data/common/data_views/lib/errors.ts @@ -22,3 +22,9 @@ export class DataViewMissingIndices extends KbnError { ); } } + +/** + * @deprecated Use DataViewMissingIndices. All index pattern interfaces were renamed. + */ + +export class IndexPatternMissingIndices extends DataViewMissingIndices {} diff --git a/src/plugins/data/common/index_patterns/lib/get_title.ts b/src/plugins/data/common/data_views/lib/get_title.ts similarity index 100% rename from src/plugins/data/common/index_patterns/lib/get_title.ts rename to src/plugins/data/common/data_views/lib/get_title.ts diff --git a/src/plugins/data/common/index_patterns/lib/index.ts b/src/plugins/data/common/data_views/lib/index.ts similarity index 100% rename from src/plugins/data/common/index_patterns/lib/index.ts rename to src/plugins/data/common/data_views/lib/index.ts diff --git a/src/plugins/data/common/index_patterns/lib/is_default.ts b/src/plugins/data/common/data_views/lib/is_default.ts similarity index 100% rename from src/plugins/data/common/index_patterns/lib/is_default.ts rename to src/plugins/data/common/data_views/lib/is_default.ts diff --git a/src/plugins/data/common/index_patterns/lib/types.ts b/src/plugins/data/common/data_views/lib/types.ts similarity index 100% rename from src/plugins/data/common/index_patterns/lib/types.ts rename to src/plugins/data/common/data_views/lib/types.ts diff --git a/src/plugins/data/common/index_patterns/lib/validate_index_pattern.test.ts b/src/plugins/data/common/data_views/lib/validate_index_pattern.test.ts similarity index 100% rename from src/plugins/data/common/index_patterns/lib/validate_index_pattern.test.ts rename to src/plugins/data/common/data_views/lib/validate_index_pattern.test.ts diff --git a/src/plugins/data/common/index_patterns/lib/validate_index_pattern.ts b/src/plugins/data/common/data_views/lib/validate_index_pattern.ts similarity index 100% rename from src/plugins/data/common/index_patterns/lib/validate_index_pattern.ts rename to src/plugins/data/common/data_views/lib/validate_index_pattern.ts diff --git a/src/plugins/data/common/index_patterns/mocks.ts b/src/plugins/data/common/data_views/mocks.ts similarity index 88% rename from src/plugins/data/common/index_patterns/mocks.ts rename to src/plugins/data/common/data_views/mocks.ts index b8b3b67c56df..6e82118f7b8b 100644 --- a/src/plugins/data/common/index_patterns/mocks.ts +++ b/src/plugins/data/common/data_views/mocks.ts @@ -7,4 +7,4 @@ */ export * from './fields/fields.mocks'; -export * from './index_patterns/index_pattern.stub'; +export * from './data_views/index_pattern.stub'; diff --git a/src/plugins/data/common/index_patterns/types.ts b/src/plugins/data/common/data_views/types.ts similarity index 100% rename from src/plugins/data/common/index_patterns/types.ts rename to src/plugins/data/common/data_views/types.ts diff --git a/src/plugins/data/common/index_patterns/utils.test.ts b/src/plugins/data/common/data_views/utils.test.ts similarity index 100% rename from src/plugins/data/common/index_patterns/utils.test.ts rename to src/plugins/data/common/data_views/utils.test.ts diff --git a/src/plugins/data/common/index_patterns/utils.ts b/src/plugins/data/common/data_views/utils.ts similarity index 93% rename from src/plugins/data/common/index_patterns/utils.ts rename to src/plugins/data/common/data_views/utils.ts index 48a0776dc43a..2d36ab6c7222 100644 --- a/src/plugins/data/common/index_patterns/utils.ts +++ b/src/plugins/data/common/data_views/utils.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import type { IndexPatternSavedObjectAttrs } from './index_patterns'; +import type { IndexPatternSavedObjectAttrs } from './data_views'; import type { SavedObjectsClientCommon } from '../types'; import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../constants'; diff --git a/src/plugins/data/common/index.ts b/src/plugins/data/common/index.ts index 44285a482421..8a9a93f96b68 100644 --- a/src/plugins/data/common/index.ts +++ b/src/plugins/data/common/index.ts @@ -11,7 +11,7 @@ export * from './constants'; export * from './es_query'; -export * from './index_patterns'; +export * from './data_views'; export * from './kbn_field_types'; export * from './query'; export * from './search'; @@ -25,4 +25,4 @@ export * from './exports'; * @removeBy 8.1 */ -export { IndexPatternAttributes, DataViewAttributes } from './types'; +export { IndexPatternAttributes } from './types'; diff --git a/src/plugins/data/common/mocks.ts b/src/plugins/data/common/mocks.ts index a9fc4c822a66..66ad3b695d24 100644 --- a/src/plugins/data/common/mocks.ts +++ b/src/plugins/data/common/mocks.ts @@ -6,4 +6,4 @@ * Side Public License, v 1. */ -export * from './index_patterns/fields/fields.mocks'; +export * from './data_views/fields/fields.mocks'; diff --git a/src/plugins/data/common/search/aggs/agg_config.test.ts b/src/plugins/data/common/search/aggs/agg_config.test.ts index d15cccebd08f..2cb875eb9c04 100644 --- a/src/plugins/data/common/search/aggs/agg_config.test.ts +++ b/src/plugins/data/common/search/aggs/agg_config.test.ts @@ -15,7 +15,7 @@ import { AggType } from './agg_type'; import { AggTypesRegistryStart } from './agg_types_registry'; import { mockAggTypesRegistry } from './test_helpers'; import { MetricAggType } from './metrics/metric_agg_type'; -import { IndexPattern, IndexPatternField, IIndexPatternFieldList } from '../../index_patterns'; +import { IndexPattern, IndexPatternField, IIndexPatternFieldList } from '../..'; describe('AggConfig', () => { let indexPattern: IndexPattern; diff --git a/src/plugins/data/common/search/aggs/agg_configs.test.ts b/src/plugins/data/common/search/aggs/agg_configs.test.ts index 978ec79147a1..59b306c2df0b 100644 --- a/src/plugins/data/common/search/aggs/agg_configs.test.ts +++ b/src/plugins/data/common/search/aggs/agg_configs.test.ts @@ -11,7 +11,7 @@ import { AggConfig } from './agg_config'; import { AggConfigs } from './agg_configs'; import { AggTypesRegistryStart } from './agg_types_registry'; import { mockAggTypesRegistry } from './test_helpers'; -import { IndexPattern } from '../../index_patterns/'; +import { IndexPattern } from '../..'; import { stubIndexPattern } from '../../stubs'; import { IEsSearchResponse } from '..'; diff --git a/src/plugins/data/common/search/aggs/agg_configs.ts b/src/plugins/data/common/search/aggs/agg_configs.ts index c80becd271bb..08a7022ee894 100644 --- a/src/plugins/data/common/search/aggs/agg_configs.ts +++ b/src/plugins/data/common/search/aggs/agg_configs.ts @@ -23,7 +23,7 @@ import { AggConfig, AggConfigSerialized, IAggConfig } from './agg_config'; import { IAggType } from './agg_type'; import { AggTypesRegistryStart } from './agg_types_registry'; import { AggGroupNames } from './agg_groups'; -import { IndexPattern } from '../../index_patterns/index_patterns/index_pattern'; +import { IndexPattern } from '../..'; import { TimeRange, getTime, calculateBounds } from '../../../common'; import { IBucketAggConfig } from './buckets'; import { insertTimeShiftSplit, mergeTimeShifts } from './utils/time_splits'; diff --git a/src/plugins/data/common/search/aggs/buckets/_terms_other_bucket_helper.test.ts b/src/plugins/data/common/search/aggs/buckets/_terms_other_bucket_helper.test.ts index 523bbe1f0101..9d61178405b5 100644 --- a/src/plugins/data/common/search/aggs/buckets/_terms_other_bucket_helper.test.ts +++ b/src/plugins/data/common/search/aggs/buckets/_terms_other_bucket_helper.test.ts @@ -16,8 +16,8 @@ import { AggConfigs, CreateAggConfigParams } from '../agg_configs'; import { BUCKET_TYPES } from './bucket_agg_types'; import { IBucketAggConfig } from './bucket_agg_type'; import { mockAggTypesRegistry } from '../test_helpers'; -import type { IndexPatternField } from '../../../index_patterns'; -import { IndexPattern } from '../../../index_patterns/index_patterns/index_pattern'; +import type { IndexPatternField } from '../../..'; +import { IndexPattern } from '../../..'; const indexPattern = { id: '1234', diff --git a/src/plugins/data/common/search/aggs/buckets/date_histogram.ts b/src/plugins/data/common/search/aggs/buckets/date_histogram.ts index befffe915b6a..f2bd6ea734e0 100644 --- a/src/plugins/data/common/search/aggs/buckets/date_histogram.ts +++ b/src/plugins/data/common/search/aggs/buckets/date_histogram.ts @@ -11,7 +11,7 @@ import moment from 'moment-timezone'; import { i18n } from '@kbn/i18n'; import { KBN_FIELD_TYPES, TimeRange, TimeRangeBounds, UI_SETTINGS } from '../../../../common'; -import { IFieldType } from '../../../index_patterns'; +import { IFieldType } from '../../..'; import { ExtendedBounds, extendedBoundsToAst, timerangeToAst } from '../../expressions'; import { intervalOptions, autoInterval, isAutoInterval } from './_interval_options'; diff --git a/src/plugins/data/common/search/aggs/buckets/terms.test.ts b/src/plugins/data/common/search/aggs/buckets/terms.test.ts index 09dfbb28a4e5..6345e29b6fbe 100644 --- a/src/plugins/data/common/search/aggs/buckets/terms.test.ts +++ b/src/plugins/data/common/search/aggs/buckets/terms.test.ts @@ -10,8 +10,8 @@ import { AggConfigs } from '../agg_configs'; import { METRIC_TYPES } from '../metrics'; import { mockAggTypesRegistry } from '../test_helpers'; import { BUCKET_TYPES } from './bucket_agg_types'; -import type { IndexPatternField } from '../../../index_patterns'; -import { IndexPattern } from '../../../index_patterns/index_patterns/index_pattern'; +import type { IndexPatternField } from '../../..'; +import { IndexPattern } from '../../..'; describe('Terms Agg', () => { describe('order agg editor UI', () => { diff --git a/src/plugins/data/common/search/aggs/param_types/field.ts b/src/plugins/data/common/search/aggs/param_types/field.ts index 62dac9831211..e1c872ac1670 100644 --- a/src/plugins/data/common/search/aggs/param_types/field.ts +++ b/src/plugins/data/common/search/aggs/param_types/field.ts @@ -15,7 +15,7 @@ import { import { BaseParamType } from './base'; import { propFilter } from '../utils'; import { KBN_FIELD_TYPES } from '../../../kbn_field_types/types'; -import { isNestedField, IndexPatternField } from '../../../index_patterns/fields'; +import { isNestedField, IndexPatternField } from '../../../data_views/fields'; const filterByType = propFilter('type'); diff --git a/src/plugins/data/common/search/aggs/types.ts b/src/plugins/data/common/search/aggs/types.ts index 7d5b7d4eeff9..7a87a83b7b00 100644 --- a/src/plugins/data/common/search/aggs/types.ts +++ b/src/plugins/data/common/search/aggs/types.ts @@ -8,7 +8,7 @@ import { Assign } from '@kbn/utility-types'; import { DatatableColumn } from 'src/plugins/expressions'; -import { IndexPattern } from '../../index_patterns/index_patterns/index_pattern'; +import { IndexPattern } from '../..'; import { aggAvg, aggBucketAvg, diff --git a/src/plugins/data/common/search/aggs/utils/datatable_column_meta.ts b/src/plugins/data/common/search/aggs/utils/datatable_column_meta.ts index c5e09e662285..0e3ff69fac1d 100644 --- a/src/plugins/data/common/search/aggs/utils/datatable_column_meta.ts +++ b/src/plugins/data/common/search/aggs/utils/datatable_column_meta.ts @@ -7,7 +7,7 @@ */ import { DatatableColumn } from 'src/plugins/expressions/common'; -import { IndexPattern } from '../../../index_patterns'; +import { IndexPattern } from '../../..'; import { AggConfigs, CreateAggConfigParams } from '../agg_configs'; import { AggTypesRegistryStart } from '../agg_types_registry'; import { IAggType } from '../agg_type'; diff --git a/src/plugins/data/common/search/aggs/utils/infer_time_zone.test.ts b/src/plugins/data/common/search/aggs/utils/infer_time_zone.test.ts index 0c94769f0538..91f69f3bfb14 100644 --- a/src/plugins/data/common/search/aggs/utils/infer_time_zone.test.ts +++ b/src/plugins/data/common/search/aggs/utils/infer_time_zone.test.ts @@ -18,7 +18,7 @@ jest.mock('moment', () => { return moment; }); -import { IndexPattern, IndexPatternField } from '../../../index_patterns'; +import { IndexPattern, IndexPatternField } from '../../..'; import { AggParamsDateHistogram } from '../buckets'; import { inferTimeZone } from './infer_time_zone'; diff --git a/src/plugins/data/common/search/aggs/utils/infer_time_zone.ts b/src/plugins/data/common/search/aggs/utils/infer_time_zone.ts index b031fb890b77..21c022d8e293 100644 --- a/src/plugins/data/common/search/aggs/utils/infer_time_zone.ts +++ b/src/plugins/data/common/search/aggs/utils/infer_time_zone.ts @@ -7,7 +7,7 @@ */ import moment from 'moment'; -import { IndexPattern } from '../../../index_patterns'; +import { IndexPattern } from '../../..'; import { AggParamsDateHistogram } from '../buckets'; export function inferTimeZone( diff --git a/src/plugins/data/common/search/expressions/esaggs/esaggs_fn.ts b/src/plugins/data/common/search/expressions/esaggs/esaggs_fn.ts index 496225ad9f00..a9078d6042db 100644 --- a/src/plugins/data/common/search/expressions/esaggs/esaggs_fn.ts +++ b/src/plugins/data/common/search/expressions/esaggs/esaggs_fn.ts @@ -12,8 +12,8 @@ import { Observable } from 'rxjs'; import type { Datatable, ExpressionFunctionDefinition } from 'src/plugins/expressions/common'; import { buildExpressionFunction } from '../../../../../../plugins/expressions/common'; -import { IndexPatternExpressionType } from '../../../index_patterns/expressions'; -import { IndexPatternsContract } from '../../../index_patterns/index_patterns'; +import { IndexPatternExpressionType } from '../../../data_views/expressions'; +import { IndexPatternsContract } from '../../..'; import { AggsStart, AggExpressionType, aggCountFnName } from '../../aggs'; import { ISearchStartSearchSource } from '../../search_source'; diff --git a/src/plugins/data/common/search/expressions/esaggs/request_handler.test.ts b/src/plugins/data/common/search/expressions/esaggs/request_handler.test.ts index dae3661f00c2..56f6c9da6d84 100644 --- a/src/plugins/data/common/search/expressions/esaggs/request_handler.test.ts +++ b/src/plugins/data/common/search/expressions/esaggs/request_handler.test.ts @@ -9,7 +9,7 @@ import { from } from 'rxjs'; import type { MockedKeys } from '@kbn/utility-types/jest'; import type { Filter } from '../../../es_query'; -import type { IndexPattern } from '../../../index_patterns'; +import type { IndexPattern } from '../../..'; import type { IAggConfigs } from '../../aggs'; import type { ISearchSource } from '../../search_source'; import { searchSourceCommonMock, searchSourceInstanceMock } from '../../search_source/mocks'; diff --git a/src/plugins/data/common/search/expressions/esdsl.ts b/src/plugins/data/common/search/expressions/esdsl.ts index a5834001143e..c5b116073c06 100644 --- a/src/plugins/data/common/search/expressions/esdsl.ts +++ b/src/plugins/data/common/search/expressions/esdsl.ts @@ -14,7 +14,7 @@ import { EsRawResponse } from './es_raw_response'; import { RequestStatistics, RequestAdapter } from '../../../../inspector/common'; import { ISearchGeneric, KibanaContext } from '..'; import { getEsQueryConfig } from '../../es_query'; -import { UiSettingsCommon } from '../../index_patterns'; +import { UiSettingsCommon } from '../..'; const name = 'esdsl'; diff --git a/src/plugins/data/common/search/expressions/exists_filter.ts b/src/plugins/data/common/search/expressions/exists_filter.ts index 75d83ca7f259..3edb65996646 100644 --- a/src/plugins/data/common/search/expressions/exists_filter.ts +++ b/src/plugins/data/common/search/expressions/exists_filter.ts @@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n'; import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common'; import { buildFilter, FILTERS } from '@kbn/es-query'; import { KibanaField, KibanaFilter } from './kibana_context_type'; -import { IndexPattern } from '../../index_patterns/index_patterns'; +import { IndexPattern } from '../..'; interface Arguments { field: KibanaField; diff --git a/src/plugins/data/common/search/expressions/kibana_context.ts b/src/plugins/data/common/search/expressions/kibana_context.ts index fb766b497c39..47ca24b5be42 100644 --- a/src/plugins/data/common/search/expressions/kibana_context.ts +++ b/src/plugins/data/common/search/expressions/kibana_context.ts @@ -17,7 +17,7 @@ import { ExecutionContextSearch, KibanaContext, KibanaFilter } from './kibana_co import { KibanaQueryOutput } from './kibana_context_type'; import { KibanaTimerangeOutput } from './timerange'; import { SavedObjectReference } from '../../../../../core/types'; -import { SavedObjectsClientCommon } from '../../index_patterns'; +import { SavedObjectsClientCommon } from '../..'; /** @internal */ export interface KibanaContextStartDependencies { diff --git a/src/plugins/data/common/search/expressions/kibana_context_type.ts b/src/plugins/data/common/search/expressions/kibana_context_type.ts index ae38faf6b244..9cc69c769f69 100644 --- a/src/plugins/data/common/search/expressions/kibana_context_type.ts +++ b/src/plugins/data/common/search/expressions/kibana_context_type.ts @@ -8,7 +8,7 @@ import { ExpressionValueBoxed } from 'src/plugins/expressions/common'; import { Filter } from '../../es_query'; import { Query, TimeRange } from '../../query'; -import { IndexPatternField } from '../../index_patterns/fields'; +import { IndexPatternField } from '../..'; // eslint-disable-next-line @typescript-eslint/consistent-type-definitions export type ExecutionContextSearch = { diff --git a/src/plugins/data/common/search/expressions/phrase_filter.ts b/src/plugins/data/common/search/expressions/phrase_filter.ts index 837d4be4d52e..6714edef5500 100644 --- a/src/plugins/data/common/search/expressions/phrase_filter.ts +++ b/src/plugins/data/common/search/expressions/phrase_filter.ts @@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n'; import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common'; import { buildFilter, FILTERS } from '@kbn/es-query'; import { KibanaField, KibanaFilter } from './kibana_context_type'; -import { IndexPattern } from '../../index_patterns/index_patterns'; +import { IndexPattern } from '../..'; interface Arguments { field: KibanaField; diff --git a/src/plugins/data/common/search/expressions/range_filter.ts b/src/plugins/data/common/search/expressions/range_filter.ts index ed65475a9d28..bac50f200027 100644 --- a/src/plugins/data/common/search/expressions/range_filter.ts +++ b/src/plugins/data/common/search/expressions/range_filter.ts @@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n'; import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common'; import { buildFilter, FILTERS } from '@kbn/es-query'; import { KibanaField, KibanaFilter } from './kibana_context_type'; -import { IndexPattern } from '../../index_patterns/index_patterns'; +import { IndexPattern } from '../..'; import { KibanaRange } from './range'; interface Arguments { diff --git a/src/plugins/data/common/search/search_source/create_search_source.test.ts b/src/plugins/data/common/search/search_source/create_search_source.test.ts index c084b029a5bd..9ac9dc93a807 100644 --- a/src/plugins/data/common/search/search_source/create_search_source.test.ts +++ b/src/plugins/data/common/search/search_source/create_search_source.test.ts @@ -8,8 +8,8 @@ import { createSearchSource as createSearchSourceFactory } from './create_search_source'; import { SearchSourceDependencies } from './search_source'; -import { IIndexPattern } from '../../index_patterns'; -import { IndexPatternsContract } from '../../index_patterns/index_patterns'; +import { IIndexPattern } from '../..'; +import { IndexPatternsContract } from '../..'; import { Filter } from '../../es_query'; describe('createSearchSource', () => { diff --git a/src/plugins/data/common/search/search_source/create_search_source.ts b/src/plugins/data/common/search/search_source/create_search_source.ts index 3f7a290d812c..80547ca2e71f 100644 --- a/src/plugins/data/common/search/search_source/create_search_source.ts +++ b/src/plugins/data/common/search/search_source/create_search_source.ts @@ -8,7 +8,7 @@ import { migrateLegacyQuery } from './migrate_legacy_query'; import { SearchSource, SearchSourceDependencies } from './search_source'; -import { IndexPatternsContract } from '../../index_patterns/index_patterns'; +import { IndexPatternsContract } from '../..'; import { SearchSourceFields } from './types'; /** diff --git a/src/plugins/data/common/search/search_source/normalize_sort_request.test.ts b/src/plugins/data/common/search/search_source/normalize_sort_request.test.ts index 9155f1a55d43..689740326ab9 100644 --- a/src/plugins/data/common/search/search_source/normalize_sort_request.test.ts +++ b/src/plugins/data/common/search/search_source/normalize_sort_request.test.ts @@ -8,7 +8,7 @@ import { normalizeSortRequest } from './normalize_sort_request'; import { SortDirection } from './types'; -import { IIndexPattern } from '../../index_patterns'; +import { IIndexPattern } from '../..'; describe('SearchSource#normalizeSortRequest', function () { const scriptedField = { diff --git a/src/plugins/data/common/search/search_source/normalize_sort_request.ts b/src/plugins/data/common/search/search_source/normalize_sort_request.ts index 928daa7ad963..3d8f9482d16d 100644 --- a/src/plugins/data/common/search/search_source/normalize_sort_request.ts +++ b/src/plugins/data/common/search/search_source/normalize_sort_request.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { IIndexPattern } from '../../index_patterns'; +import { IIndexPattern } from '../..'; import { EsQuerySortValue, SortOptions } from './types'; export function normalizeSortRequest( diff --git a/src/plugins/data/common/search/search_source/search_source.test.ts b/src/plugins/data/common/search/search_source/search_source.test.ts index aad588275bd6..9a76985bca6e 100644 --- a/src/plugins/data/common/search/search_source/search_source.test.ts +++ b/src/plugins/data/common/search/search_source/search_source.test.ts @@ -7,7 +7,7 @@ */ import { of } from 'rxjs'; -import { IndexPattern } from '../../index_patterns'; +import { IndexPattern } from '../..'; import { SearchSource, SearchSourceDependencies, SortDirection } from './'; import { AggConfigs, AggTypesRegistryStart } from '../../'; import { mockAggTypesRegistry } from '../aggs/test_helpers'; diff --git a/src/plugins/data/common/search/search_source/search_source.ts b/src/plugins/data/common/search/search_source/search_source.ts index f0bcf6446c14..7b4537043c31 100644 --- a/src/plugins/data/common/search/search_source/search_source.ts +++ b/src/plugins/data/common/search/search_source/search_source.ts @@ -75,7 +75,7 @@ import { estypes } from '@elastic/elasticsearch'; import { buildEsQuery, Filter } from '@kbn/es-query'; import { normalizeSortRequest } from './normalize_sort_request'; import { fieldWildcardFilter } from '../../../../kibana_utils/common'; -import { IIndexPattern, IndexPattern, IndexPatternField } from '../../index_patterns'; +import { IIndexPattern, IndexPattern, IndexPatternField } from '../..'; import { AggConfigs, EsQuerySortValue, diff --git a/src/plugins/data/common/search/search_source/search_source_service.test.ts b/src/plugins/data/common/search/search_source/search_source_service.test.ts index 23bb809092bd..69ffef3f9ccd 100644 --- a/src/plugins/data/common/search/search_source/search_source_service.test.ts +++ b/src/plugins/data/common/search/search_source/search_source_service.test.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { IndexPatternsContract } from '../../index_patterns/index_patterns'; +import { IndexPatternsContract } from '../..'; import { SearchSourceService, SearchSourceDependencies } from './'; describe('SearchSource service', () => { diff --git a/src/plugins/data/common/search/search_source/search_source_service.ts b/src/plugins/data/common/search/search_source/search_source_service.ts index 1db63247a172..886420365f54 100644 --- a/src/plugins/data/common/search/search_source/search_source_service.ts +++ b/src/plugins/data/common/search/search_source/search_source_service.ts @@ -7,7 +7,7 @@ */ import { createSearchSource, SearchSource, SearchSourceDependencies } from './'; -import { IndexPatternsContract } from '../../index_patterns/index_patterns'; +import { IndexPatternsContract } from '../..'; export class SearchSourceService { public setup() {} diff --git a/src/plugins/data/common/search/search_source/types.ts b/src/plugins/data/common/search/search_source/types.ts index f9dbd83295b1..a19316c1c841 100644 --- a/src/plugins/data/common/search/search_source/types.ts +++ b/src/plugins/data/common/search/search_source/types.ts @@ -9,7 +9,7 @@ import type { estypes } from '@elastic/elasticsearch'; import { IAggConfigs } from 'src/plugins/data/public'; import { Query } from '../..'; import { Filter } from '../../es_query'; -import { IndexPattern } from '../../index_patterns'; +import { IndexPattern } from '../..'; import { SearchSource } from './search_source'; /** diff --git a/src/plugins/data/common/search/tabify/tabify.test.ts b/src/plugins/data/common/search/tabify/tabify.test.ts index 478f1ab13134..329d1597268d 100644 --- a/src/plugins/data/common/search/tabify/tabify.test.ts +++ b/src/plugins/data/common/search/tabify/tabify.test.ts @@ -7,7 +7,7 @@ */ import { tabifyAggResponse } from './tabify'; -import { IndexPattern } from '../../index_patterns/index_patterns/index_pattern'; +import { IndexPattern } from '../..'; import { AggConfigs, IAggConfig, IAggConfigs } from '../aggs'; import { mockAggTypesRegistry } from '../aggs/test_helpers'; import { metricOnly, threeTermBuckets } from './fixtures/fake_hierarchical_data'; diff --git a/src/plugins/data/common/search/tabify/tabify_docs.test.ts b/src/plugins/data/common/search/tabify/tabify_docs.test.ts index 113086795b3e..1a3f7195b722 100644 --- a/src/plugins/data/common/search/tabify/tabify_docs.test.ts +++ b/src/plugins/data/common/search/tabify/tabify_docs.test.ts @@ -7,7 +7,7 @@ */ import { tabifyDocs } from './tabify_docs'; -import { IndexPattern } from '../../index_patterns/index_patterns'; +import { IndexPattern } from '../..'; import type { estypes } from '@elastic/elasticsearch'; describe('tabifyDocs', () => { diff --git a/src/plugins/data/common/search/tabify/tabify_docs.ts b/src/plugins/data/common/search/tabify/tabify_docs.ts index cfc1d21129df..8e628e7741df 100644 --- a/src/plugins/data/common/search/tabify/tabify_docs.ts +++ b/src/plugins/data/common/search/tabify/tabify_docs.ts @@ -8,7 +8,7 @@ import type { estypes } from '@elastic/elasticsearch'; import { isPlainObject } from 'lodash'; -import { IndexPattern } from '../../index_patterns/index_patterns'; +import { IndexPattern } from '../..'; import { Datatable, DatatableColumn, DatatableColumnType } from '../../../../expressions/common'; export interface TabifyDocsOptions { diff --git a/src/plugins/data/common/stubs.ts b/src/plugins/data/common/stubs.ts index 48310d8653a1..36bd3357e709 100644 --- a/src/plugins/data/common/stubs.ts +++ b/src/plugins/data/common/stubs.ts @@ -6,6 +6,6 @@ * Side Public License, v 1. */ -export * from './index_patterns/field.stub'; -export * from './index_patterns/index_pattern.stub'; +export * from './data_views/field.stub'; +export * from './data_views/index_pattern.stub'; export * from './es_query/stubs'; diff --git a/src/plugins/data/common/types.ts b/src/plugins/data/common/types.ts index 7f6ae4a346bd..c574d4854cfd 100644 --- a/src/plugins/data/common/types.ts +++ b/src/plugins/data/common/types.ts @@ -8,7 +8,7 @@ export * from './query/types'; export * from './kbn_field_types/types'; -export * from './index_patterns/types'; +export * from './data_views/types'; /** * If a service is being shared on both the client and the server, and diff --git a/src/plugins/data/public/autocomplete/providers/query_suggestion_provider.ts b/src/plugins/data/public/autocomplete/providers/query_suggestion_provider.ts index ebd90c7e92d7..0cb229c9b41b 100644 --- a/src/plugins/data/public/autocomplete/providers/query_suggestion_provider.ts +++ b/src/plugins/data/public/autocomplete/providers/query_suggestion_provider.ts @@ -7,7 +7,7 @@ */ import { ValueSuggestionsMethod } from '../../../common'; -import { IFieldType, IIndexPattern } from '../../../common/index_patterns'; +import { IFieldType, IIndexPattern } from '../../../common'; export enum QuerySuggestionTypes { Field = 'field', diff --git a/src/plugins/data/public/index_patterns/index_patterns/index.ts b/src/plugins/data/public/data_views/data_views/index.ts similarity index 87% rename from src/plugins/data/public/index_patterns/index_patterns/index.ts rename to src/plugins/data/public/data_views/data_views/index.ts index ec5b488acf34..4b3193344289 100644 --- a/src/plugins/data/public/index_patterns/index_patterns/index.ts +++ b/src/plugins/data/public/data_views/data_views/index.ts @@ -6,6 +6,6 @@ * Side Public License, v 1. */ -export * from '../../../common/index_patterns/index_patterns'; +export * from '../../../common/data_views/data_views'; export * from './redirect_no_index_pattern'; export * from './index_patterns_api_client'; diff --git a/src/plugins/data/public/index_patterns/index_patterns/index_pattern.stub.ts b/src/plugins/data/public/data_views/data_views/index_pattern.stub.ts similarity index 100% rename from src/plugins/data/public/index_patterns/index_patterns/index_pattern.stub.ts rename to src/plugins/data/public/data_views/data_views/index_pattern.stub.ts diff --git a/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.test.mock.ts b/src/plugins/data/public/data_views/data_views/index_patterns_api_client.test.mock.ts similarity index 100% rename from src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.test.mock.ts rename to src/plugins/data/public/data_views/data_views/index_patterns_api_client.test.mock.ts diff --git a/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.test.ts b/src/plugins/data/public/data_views/data_views/index_patterns_api_client.test.ts similarity index 100% rename from src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.test.ts rename to src/plugins/data/public/data_views/data_views/index_patterns_api_client.test.ts diff --git a/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.ts b/src/plugins/data/public/data_views/data_views/index_patterns_api_client.ts similarity index 94% rename from src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.ts rename to src/plugins/data/public/data_views/data_views/index_patterns_api_client.ts index b3471f063039..295cd99e7e01 100644 --- a/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.ts +++ b/src/plugins/data/public/data_views/data_views/index_patterns_api_client.ts @@ -7,12 +7,12 @@ */ import { HttpSetup } from 'src/core/public'; -import { DataViewMissingIndices } from '../../../common/index_patterns/lib'; +import { DataViewMissingIndices } from '../../../common/data_views/lib'; import { GetFieldsOptions, IIndexPatternsApiClient, GetFieldsOptionsTimePattern, -} from '../../../common/index_patterns/types'; +} from '../../../common/data_views/types'; const API_BASE_URL: string = `/api/index_patterns/`; diff --git a/src/plugins/data/public/index_patterns/index_patterns/redirect_no_index_pattern.tsx b/src/plugins/data/public/data_views/data_views/redirect_no_index_pattern.tsx similarity index 100% rename from src/plugins/data/public/index_patterns/index_patterns/redirect_no_index_pattern.tsx rename to src/plugins/data/public/data_views/data_views/redirect_no_index_pattern.tsx diff --git a/src/plugins/data/public/index_patterns/expressions/index.ts b/src/plugins/data/public/data_views/expressions/index.ts similarity index 100% rename from src/plugins/data/public/index_patterns/expressions/index.ts rename to src/plugins/data/public/data_views/expressions/index.ts diff --git a/src/plugins/data/public/index_patterns/expressions/load_index_pattern.test.ts b/src/plugins/data/public/data_views/expressions/load_index_pattern.test.ts similarity index 97% rename from src/plugins/data/public/index_patterns/expressions/load_index_pattern.test.ts rename to src/plugins/data/public/data_views/expressions/load_index_pattern.test.ts index 399fe6669544..befa78c39898 100644 --- a/src/plugins/data/public/index_patterns/expressions/load_index_pattern.test.ts +++ b/src/plugins/data/public/data_views/expressions/load_index_pattern.test.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { IndexPatternLoadStartDependencies } from '../../../common/index_patterns/expressions'; +import { IndexPatternLoadStartDependencies } from '../../../common/data_views/expressions'; import { getFunctionDefinition } from './load_index_pattern'; describe('indexPattern expression function', () => { diff --git a/src/plugins/data/public/index_patterns/expressions/load_index_pattern.ts b/src/plugins/data/public/data_views/expressions/load_index_pattern.ts similarity index 97% rename from src/plugins/data/public/index_patterns/expressions/load_index_pattern.ts rename to src/plugins/data/public/data_views/expressions/load_index_pattern.ts index d92c1dc9828e..979861c7da38 100644 --- a/src/plugins/data/public/index_patterns/expressions/load_index_pattern.ts +++ b/src/plugins/data/public/data_views/expressions/load_index_pattern.ts @@ -11,7 +11,7 @@ import { getIndexPatternLoadMeta, IndexPatternLoadExpressionFunctionDefinition, IndexPatternLoadStartDependencies, -} from '../../../common/index_patterns/expressions'; +} from '../../../common/data_views/expressions'; import { DataPublicPluginStart, DataStartDependencies } from '../../types'; /** diff --git a/src/plugins/data/public/index_patterns/index.ts b/src/plugins/data/public/data_views/index.ts similarity index 86% rename from src/plugins/data/public/index_patterns/index.ts rename to src/plugins/data/public/data_views/index.ts index d1a2b0f28f1d..02e36d893fa6 100644 --- a/src/plugins/data/public/index_patterns/index.ts +++ b/src/plugins/data/public/data_views/index.ts @@ -13,10 +13,10 @@ export { ILLEGAL_CHARACTERS, validateDataView, isDefault, -} from '../../common/index_patterns/lib'; -export { flattenHitWrapper, formatHitProvider, onRedirectNoIndexPattern } from './index_patterns'; +} from '../../common/data_views/lib'; +export { flattenHitWrapper, formatHitProvider, onRedirectNoIndexPattern } from './data_views'; -export { IndexPatternField, IIndexPatternFieldList, TypeMeta } from '../../common/index_patterns'; +export { IndexPatternField, IIndexPatternFieldList, TypeMeta } from '../../common/data_views'; export { IndexPatternsService, @@ -26,6 +26,6 @@ export { DataViewsService, DataViewsContract, DataView, -} from './index_patterns'; +} from './data_views'; export { UiSettingsPublicToCommon } from './ui_settings_wrapper'; export { SavedObjectsClientPublicToCommon } from './saved_objects_client_wrapper'; diff --git a/src/plugins/data/public/index_patterns/saved_objects_client_wrapper.ts b/src/plugins/data/public/data_views/saved_objects_client_wrapper.ts similarity index 98% rename from src/plugins/data/public/index_patterns/saved_objects_client_wrapper.ts rename to src/plugins/data/public/data_views/saved_objects_client_wrapper.ts index f6e94a120d3d..f55ca3896df3 100644 --- a/src/plugins/data/public/index_patterns/saved_objects_client_wrapper.ts +++ b/src/plugins/data/public/data_views/saved_objects_client_wrapper.ts @@ -12,7 +12,7 @@ import { SavedObjectsClientCommon, SavedObjectsClientCommonFindArgs, SavedObject, -} from '../../common/index_patterns'; +} from '../../common/data_views'; type SOClient = Pick; diff --git a/src/plugins/data/public/index_patterns/ui_settings_wrapper.ts b/src/plugins/data/public/data_views/ui_settings_wrapper.ts similarity index 93% rename from src/plugins/data/public/index_patterns/ui_settings_wrapper.ts rename to src/plugins/data/public/data_views/ui_settings_wrapper.ts index e9209e0aa609..e0998ed72b2e 100644 --- a/src/plugins/data/public/index_patterns/ui_settings_wrapper.ts +++ b/src/plugins/data/public/data_views/ui_settings_wrapper.ts @@ -7,7 +7,7 @@ */ import { IUiSettingsClient } from 'src/core/public'; -import { UiSettingsCommon } from '../../common/index_patterns'; +import { UiSettingsCommon } from '../../common'; export class UiSettingsPublicToCommon implements UiSettingsCommon { private uiSettings: IUiSettingsClient; diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts index 595a88b412e9..6480a0a34034 100644 --- a/src/plugins/data/public/index.ts +++ b/src/plugins/data/public/index.ts @@ -48,9 +48,9 @@ import { isDefault, validateDataView, flattenHitWrapper, -} from './index_patterns'; +} from './data_views'; -export type { IndexPatternsService } from './index_patterns'; +export type { IndexPatternsService } from './data_views'; // Index patterns namespace: export const indexPatterns = { @@ -71,7 +71,7 @@ export { IndexPattern, IndexPatternField, TypeMeta, -} from './index_patterns'; +} from './data_views'; export { IIndexPattern, @@ -91,7 +91,7 @@ export { IndexPatternListItem, } from '../common'; -export { DuplicateDataViewError } from '../common/index_patterns/errors'; +export { DuplicateDataViewError } from '../common/data_views/errors'; /* * Autocomplete query suggestions: diff --git a/src/plugins/data/public/plugin.ts b/src/plugins/data/public/plugin.ts index a12bb5081598..2216c5e9c0e0 100644 --- a/src/plugins/data/public/plugin.ts +++ b/src/plugins/data/public/plugin.ts @@ -26,7 +26,7 @@ import { onRedirectNoIndexPattern, IndexPatternsApiClient, UiSettingsPublicToCommon, -} from './index_patterns'; +} from './data_views'; import { setIndexPatterns, setNotifications, @@ -44,8 +44,8 @@ import { createSelectRangeAction, } from './actions'; import { APPLY_FILTER_TRIGGER, applyFilterTrigger } from './triggers'; -import { SavedObjectsClientPublicToCommon } from './index_patterns'; -import { getIndexPatternLoad } from './index_patterns/expressions'; +import { SavedObjectsClientPublicToCommon } from './data_views'; +import { getIndexPatternLoad } from './data_views/expressions'; import { UsageCollectionSetup } from '../../usage_collection/public'; import { getTableViewDescription } from './utils/table_inspector_view'; import { NowProvider, NowProviderInternalContract } from './now_provider'; diff --git a/src/plugins/data/public/search/aggs/aggs_service.ts b/src/plugins/data/public/search/aggs/aggs_service.ts index 3f91ced6de95..4907c3bcbad2 100644 --- a/src/plugins/data/public/search/aggs/aggs_service.ts +++ b/src/plugins/data/public/search/aggs/aggs_service.ts @@ -20,7 +20,7 @@ import { AggTypesDependencies, } from '../../../common/search/aggs'; import { AggsSetup, AggsStart } from './types'; -import { IndexPatternsContract } from '../../index_patterns'; +import { IndexPatternsContract } from '../..'; import { NowProviderInternalContract } from '../../now_provider'; /** diff --git a/src/plugins/data/public/search/expressions/esaggs.test.ts b/src/plugins/data/public/search/expressions/esaggs.test.ts index e43069697f6e..fa9e2755e529 100644 --- a/src/plugins/data/public/search/expressions/esaggs.test.ts +++ b/src/plugins/data/public/search/expressions/esaggs.test.ts @@ -10,7 +10,7 @@ import { omit } from 'lodash'; import { of as mockOf } from 'rxjs'; import type { MockedKeys } from '@kbn/utility-types/jest'; import type { ExecutionContext } from 'src/plugins/expressions/public'; -import type { IndexPatternsContract } from '../../../common/index_patterns/index_patterns'; +import type { IndexPatternsContract } from '../../../common'; import type { ISearchStartSearchSource, KibanaContext, diff --git a/src/plugins/data/public/search/expressions/esdsl.ts b/src/plugins/data/public/search/expressions/esdsl.ts index 1dda44ee8993..c03226542ef7 100644 --- a/src/plugins/data/public/search/expressions/esdsl.ts +++ b/src/plugins/data/public/search/expressions/esdsl.ts @@ -9,7 +9,7 @@ import { StartServicesAccessor } from 'src/core/public'; import { DataPublicPluginStart, DataStartDependencies } from '../../types'; import { getEsdslFn } from '../../../common/search/expressions/esdsl'; -import { UiSettingsCommon } from '../../../common/index_patterns'; +import { UiSettingsCommon } from '../../../common'; /** * This is some glue code that takes in `core.getStartServices`, extracts the dependencies diff --git a/src/plugins/data/public/search/expressions/kibana_context.ts b/src/plugins/data/public/search/expressions/kibana_context.ts index e7ce8edf3080..cb6e5369eb34 100644 --- a/src/plugins/data/public/search/expressions/kibana_context.ts +++ b/src/plugins/data/public/search/expressions/kibana_context.ts @@ -9,7 +9,7 @@ import { StartServicesAccessor } from 'src/core/public'; import { getKibanaContextFn } from '../../../common/search/expressions'; import { DataPublicPluginStart, DataStartDependencies } from '../../types'; -import { SavedObjectsClientCommon } from '../../../common/index_patterns'; +import { SavedObjectsClientCommon } from '../../../common'; /** * This is some glue code that takes in `core.getStartServices`, extracts the dependencies diff --git a/src/plugins/data/public/search/search_service.ts b/src/plugins/data/public/search/search_service.ts index 3baf41875ed9..7cba1ec17c32 100644 --- a/src/plugins/data/public/search/search_service.ts +++ b/src/plugins/data/public/search/search_service.ts @@ -44,7 +44,7 @@ import { esRawResponse, } from '../../common/search'; import { AggsService, AggsStartDependencies } from './aggs'; -import { IndexPatternsContract } from '../index_patterns/index_patterns'; +import { IndexPatternsContract } from '..'; import { ISearchInterceptor, SearchInterceptor } from './search_interceptor'; import { SearchUsageCollector, createUsageCollector } from './collectors'; import { UsageCollectionSetup } from '../../../usage_collection/public'; diff --git a/src/plugins/data/public/search/types.ts b/src/plugins/data/public/search/types.ts index 8190c52b5c0c..764933d15e06 100644 --- a/src/plugins/data/public/search/types.ts +++ b/src/plugins/data/public/search/types.ts @@ -10,7 +10,7 @@ import { PackageInfo } from 'kibana/server'; import { SearchUsageCollector } from './collectors'; import { AggsSetup, AggsSetupDependencies, AggsStartDependencies, AggsStart } from './aggs'; import { ISearchGeneric, ISearchStartSearchSource } from '../../common/search'; -import { IndexPatternsContract } from '../../common/index_patterns/index_patterns'; +import { IndexPatternsContract } from '../../common'; import { UsageCollectionSetup } from '../../../usage_collection/public'; import { ISessionsClient, ISessionService } from './session'; diff --git a/src/plugins/data/public/services.ts b/src/plugins/data/public/services.ts index b6306831a269..bcc23e13a1ec 100644 --- a/src/plugins/data/public/services.ts +++ b/src/plugins/data/public/services.ts @@ -8,7 +8,7 @@ import { NotificationsStart, CoreStart } from 'src/core/public'; import { createGetterSetter } from '../../kibana_utils/public'; -import { IndexPatternsContract } from './index_patterns'; +import { IndexPatternsContract } from './data_views'; import { DataPublicPluginStart } from './types'; export const [getNotifications, setNotifications] = createGetterSetter( diff --git a/src/plugins/data/public/stubs.ts b/src/plugins/data/public/stubs.ts index 2a09a3799971..8e790a2991b0 100644 --- a/src/plugins/data/public/stubs.ts +++ b/src/plugins/data/public/stubs.ts @@ -7,4 +7,4 @@ */ export * from '../common/stubs'; -export { createStubIndexPattern } from './index_patterns/index_patterns/index_pattern.stub'; +export { createStubIndexPattern } from './data_views/data_views/index_pattern.stub'; diff --git a/src/plugins/data/public/types.ts b/src/plugins/data/public/types.ts index b31a4ab933ae..7ed13c209651 100644 --- a/src/plugins/data/public/types.ts +++ b/src/plugins/data/public/types.ts @@ -17,7 +17,7 @@ import { AutocompleteSetup, AutocompleteStart } from './autocomplete'; import { createFiltersFromRangeSelectAction, createFiltersFromValueClickAction } from './actions'; import { ISearchSetup, ISearchStart } from './search'; import { QuerySetup, QueryStart } from './query'; -import { DataViewsContract } from './index_patterns'; +import { DataViewsContract } from './data_views'; import { IndexPatternSelectProps, StatefulSearchBarProps } from './ui'; import { UsageCollectionSetup, UsageCollectionStart } from '../../usage_collection/public'; import { Setup as InspectorSetup } from '../../inspector/public'; diff --git a/src/plugins/data/server/autocomplete/terms_agg.test.ts b/src/plugins/data/server/autocomplete/terms_agg.test.ts index 820ec445a22c..96a75fd3b2fd 100644 --- a/src/plugins/data/server/autocomplete/terms_agg.test.ts +++ b/src/plugins/data/server/autocomplete/terms_agg.test.ts @@ -34,7 +34,7 @@ const mockResponse = { }, } as ApiResponse>; -jest.mock('../index_patterns'); +jest.mock('../data_views'); describe('terms agg suggestions', () => { beforeEach(() => { diff --git a/src/plugins/data/server/autocomplete/terms_agg.ts b/src/plugins/data/server/autocomplete/terms_agg.ts index b902bae49898..9b1f5d92889b 100644 --- a/src/plugins/data/server/autocomplete/terms_agg.ts +++ b/src/plugins/data/server/autocomplete/terms_agg.ts @@ -11,7 +11,7 @@ import { ElasticsearchClient, SavedObjectsClientContract } from 'kibana/server'; import { estypes } from '@elastic/elasticsearch'; import { ConfigSchema } from '../../config'; import { IFieldType } from '../../common'; -import { findIndexPatternById, getFieldByName } from '../index_patterns'; +import { findIndexPatternById, getFieldByName } from '../data_views'; import { shimAbortSignal } from '../search'; export async function termsAggSuggestions( diff --git a/src/plugins/data/server/autocomplete/terms_enum.test.ts b/src/plugins/data/server/autocomplete/terms_enum.test.ts index 4e1eecc71db7..0e00e2dfe6b4 100644 --- a/src/plugins/data/server/autocomplete/terms_enum.test.ts +++ b/src/plugins/data/server/autocomplete/terms_enum.test.ts @@ -23,7 +23,7 @@ const mockResponse = { body: { terms: ['whoa', 'amazing'] }, }; -jest.mock('../index_patterns'); +jest.mock('../data_views'); describe('_terms_enum suggestions', () => { beforeEach(() => { diff --git a/src/plugins/data/server/autocomplete/terms_enum.ts b/src/plugins/data/server/autocomplete/terms_enum.ts index 4bfd1545c6fe..3d7f36923372 100644 --- a/src/plugins/data/server/autocomplete/terms_enum.ts +++ b/src/plugins/data/server/autocomplete/terms_enum.ts @@ -9,7 +9,7 @@ import { ElasticsearchClient, SavedObjectsClientContract } from 'kibana/server'; import { estypes } from '@elastic/elasticsearch'; import { IFieldType } from '../../common'; -import { findIndexPatternById, getFieldByName } from '../index_patterns'; +import { findIndexPatternById, getFieldByName } from '../data_views'; import { shimAbortSignal } from '../search'; import { ConfigSchema } from '../../config'; diff --git a/src/plugins/data/server/index_patterns/capabilities_provider.ts b/src/plugins/data/server/data_views/capabilities_provider.ts similarity index 100% rename from src/plugins/data/server/index_patterns/capabilities_provider.ts rename to src/plugins/data/server/data_views/capabilities_provider.ts diff --git a/src/plugins/data/server/index_patterns/deprecations/index.ts b/src/plugins/data/server/data_views/deprecations/index.ts similarity index 100% rename from src/plugins/data/server/index_patterns/deprecations/index.ts rename to src/plugins/data/server/data_views/deprecations/index.ts diff --git a/src/plugins/data/server/index_patterns/deprecations/scripted_fields.test.ts b/src/plugins/data/server/data_views/deprecations/scripted_fields.test.ts similarity index 100% rename from src/plugins/data/server/index_patterns/deprecations/scripted_fields.test.ts rename to src/plugins/data/server/data_views/deprecations/scripted_fields.test.ts diff --git a/src/plugins/data/server/index_patterns/deprecations/scripted_fields.ts b/src/plugins/data/server/data_views/deprecations/scripted_fields.ts similarity index 100% rename from src/plugins/data/server/index_patterns/deprecations/scripted_fields.ts rename to src/plugins/data/server/data_views/deprecations/scripted_fields.ts diff --git a/src/plugins/data/server/index_patterns/error.ts b/src/plugins/data/server/data_views/error.ts similarity index 100% rename from src/plugins/data/server/index_patterns/error.ts rename to src/plugins/data/server/data_views/error.ts diff --git a/src/plugins/data/server/index_patterns/expressions/index.ts b/src/plugins/data/server/data_views/expressions/index.ts similarity index 100% rename from src/plugins/data/server/index_patterns/expressions/index.ts rename to src/plugins/data/server/data_views/expressions/index.ts diff --git a/src/plugins/data/server/index_patterns/expressions/load_index_pattern.test.ts b/src/plugins/data/server/data_views/expressions/load_index_pattern.test.ts similarity index 98% rename from src/plugins/data/server/index_patterns/expressions/load_index_pattern.test.ts rename to src/plugins/data/server/data_views/expressions/load_index_pattern.test.ts index 998640bda884..370d7dcfd7eb 100644 --- a/src/plugins/data/server/index_patterns/expressions/load_index_pattern.test.ts +++ b/src/plugins/data/server/data_views/expressions/load_index_pattern.test.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { IndexPatternLoadStartDependencies } from '../../../common/index_patterns/expressions'; +import { IndexPatternLoadStartDependencies } from '../../../common/data_views/expressions'; import { getFunctionDefinition } from './load_index_pattern'; describe('indexPattern expression function', () => { diff --git a/src/plugins/data/server/index_patterns/expressions/load_index_pattern.ts b/src/plugins/data/server/data_views/expressions/load_index_pattern.ts similarity index 98% rename from src/plugins/data/server/index_patterns/expressions/load_index_pattern.ts rename to src/plugins/data/server/data_views/expressions/load_index_pattern.ts index 9112686c568d..4585101f2812 100644 --- a/src/plugins/data/server/index_patterns/expressions/load_index_pattern.ts +++ b/src/plugins/data/server/data_views/expressions/load_index_pattern.ts @@ -13,7 +13,7 @@ import { getIndexPatternLoadMeta, IndexPatternLoadExpressionFunctionDefinition, IndexPatternLoadStartDependencies, -} from '../../../common/index_patterns/expressions'; +} from '../../../common/data_views/expressions'; import { DataPluginStartDependencies, DataPluginStart } from '../../plugin'; /** diff --git a/src/plugins/data/server/index_patterns/fetcher/index.ts b/src/plugins/data/server/data_views/fetcher/index.ts similarity index 100% rename from src/plugins/data/server/index_patterns/fetcher/index.ts rename to src/plugins/data/server/data_views/fetcher/index.ts diff --git a/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.test.ts b/src/plugins/data/server/data_views/fetcher/index_patterns_fetcher.test.ts similarity index 100% rename from src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.test.ts rename to src/plugins/data/server/data_views/fetcher/index_patterns_fetcher.test.ts diff --git a/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.ts b/src/plugins/data/server/data_views/fetcher/index_patterns_fetcher.ts similarity index 100% rename from src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.ts rename to src/plugins/data/server/data_views/fetcher/index_patterns_fetcher.ts diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/errors.ts b/src/plugins/data/server/data_views/fetcher/lib/errors.ts similarity index 100% rename from src/plugins/data/server/index_patterns/fetcher/lib/errors.ts rename to src/plugins/data/server/data_views/fetcher/lib/errors.ts diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/es_api.test.js b/src/plugins/data/server/data_views/fetcher/lib/es_api.test.js similarity index 100% rename from src/plugins/data/server/index_patterns/fetcher/lib/es_api.test.js rename to src/plugins/data/server/data_views/fetcher/lib/es_api.test.js diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/es_api.ts b/src/plugins/data/server/data_views/fetcher/lib/es_api.ts similarity index 100% rename from src/plugins/data/server/index_patterns/fetcher/lib/es_api.ts rename to src/plugins/data/server/data_views/fetcher/lib/es_api.ts diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/__fixtures__/es_field_caps_response.json b/src/plugins/data/server/data_views/fetcher/lib/field_capabilities/__fixtures__/es_field_caps_response.json similarity index 100% rename from src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/__fixtures__/es_field_caps_response.json rename to src/plugins/data/server/data_views/fetcher/lib/field_capabilities/__fixtures__/es_field_caps_response.json diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.test.js b/src/plugins/data/server/data_views/fetcher/lib/field_capabilities/field_capabilities.test.js similarity index 100% rename from src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.test.js rename to src/plugins/data/server/data_views/fetcher/lib/field_capabilities/field_capabilities.test.js diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts b/src/plugins/data/server/data_views/fetcher/lib/field_capabilities/field_capabilities.ts similarity index 100% rename from src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts rename to src/plugins/data/server/data_views/fetcher/lib/field_capabilities/field_capabilities.ts diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js b/src/plugins/data/server/data_views/fetcher/lib/field_capabilities/field_caps_response.test.js similarity index 100% rename from src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js rename to src/plugins/data/server/data_views/fetcher/lib/field_capabilities/field_caps_response.test.js diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts b/src/plugins/data/server/data_views/fetcher/lib/field_capabilities/field_caps_response.ts similarity index 100% rename from src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts rename to src/plugins/data/server/data_views/fetcher/lib/field_capabilities/field_caps_response.ts diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/index.ts b/src/plugins/data/server/data_views/fetcher/lib/field_capabilities/index.ts similarity index 100% rename from src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/index.ts rename to src/plugins/data/server/data_views/fetcher/lib/field_capabilities/index.ts diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/overrides.ts b/src/plugins/data/server/data_views/fetcher/lib/field_capabilities/overrides.ts similarity index 100% rename from src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/overrides.ts rename to src/plugins/data/server/data_views/fetcher/lib/field_capabilities/overrides.ts diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/should_read_field_from_doc_values.test.ts b/src/plugins/data/server/data_views/fetcher/lib/field_capabilities/should_read_field_from_doc_values.test.ts similarity index 100% rename from src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/should_read_field_from_doc_values.test.ts rename to src/plugins/data/server/data_views/fetcher/lib/field_capabilities/should_read_field_from_doc_values.test.ts diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/should_read_field_from_doc_values.ts b/src/plugins/data/server/data_views/fetcher/lib/field_capabilities/should_read_field_from_doc_values.ts similarity index 100% rename from src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/should_read_field_from_doc_values.ts rename to src/plugins/data/server/data_views/fetcher/lib/field_capabilities/should_read_field_from_doc_values.ts diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/index.ts b/src/plugins/data/server/data_views/fetcher/lib/index.ts similarity index 100% rename from src/plugins/data/server/index_patterns/fetcher/lib/index.ts rename to src/plugins/data/server/data_views/fetcher/lib/index.ts diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/jobs_compatibility.test.js b/src/plugins/data/server/data_views/fetcher/lib/jobs_compatibility.test.js similarity index 100% rename from src/plugins/data/server/index_patterns/fetcher/lib/jobs_compatibility.test.js rename to src/plugins/data/server/data_views/fetcher/lib/jobs_compatibility.test.js diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/jobs_compatibility.ts b/src/plugins/data/server/data_views/fetcher/lib/jobs_compatibility.ts similarity index 100% rename from src/plugins/data/server/index_patterns/fetcher/lib/jobs_compatibility.ts rename to src/plugins/data/server/data_views/fetcher/lib/jobs_compatibility.ts diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/map_capabilities.ts b/src/plugins/data/server/data_views/fetcher/lib/map_capabilities.ts similarity index 100% rename from src/plugins/data/server/index_patterns/fetcher/lib/map_capabilities.ts rename to src/plugins/data/server/data_views/fetcher/lib/map_capabilities.ts diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/merge_capabilities_with_fields.ts b/src/plugins/data/server/data_views/fetcher/lib/merge_capabilities_with_fields.ts similarity index 100% rename from src/plugins/data/server/index_patterns/fetcher/lib/merge_capabilities_with_fields.ts rename to src/plugins/data/server/data_views/fetcher/lib/merge_capabilities_with_fields.ts diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.test.js b/src/plugins/data/server/data_views/fetcher/lib/resolve_time_pattern.test.js similarity index 100% rename from src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.test.js rename to src/plugins/data/server/data_views/fetcher/lib/resolve_time_pattern.test.js diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.ts b/src/plugins/data/server/data_views/fetcher/lib/resolve_time_pattern.ts similarity index 100% rename from src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.ts rename to src/plugins/data/server/data_views/fetcher/lib/resolve_time_pattern.ts diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/time_pattern_to_wildcard.test.ts b/src/plugins/data/server/data_views/fetcher/lib/time_pattern_to_wildcard.test.ts similarity index 100% rename from src/plugins/data/server/index_patterns/fetcher/lib/time_pattern_to_wildcard.test.ts rename to src/plugins/data/server/data_views/fetcher/lib/time_pattern_to_wildcard.test.ts diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/time_pattern_to_wildcard.ts b/src/plugins/data/server/data_views/fetcher/lib/time_pattern_to_wildcard.ts similarity index 100% rename from src/plugins/data/server/index_patterns/fetcher/lib/time_pattern_to_wildcard.ts rename to src/plugins/data/server/data_views/fetcher/lib/time_pattern_to_wildcard.ts diff --git a/src/plugins/data/server/index_patterns/has_user_index_pattern.test.ts b/src/plugins/data/server/data_views/has_user_index_pattern.test.ts similarity index 100% rename from src/plugins/data/server/index_patterns/has_user_index_pattern.test.ts rename to src/plugins/data/server/data_views/has_user_index_pattern.test.ts diff --git a/src/plugins/data/server/index_patterns/has_user_index_pattern.ts b/src/plugins/data/server/data_views/has_user_index_pattern.ts similarity index 92% rename from src/plugins/data/server/index_patterns/has_user_index_pattern.ts rename to src/plugins/data/server/data_views/has_user_index_pattern.ts index b65983a7fd5d..97abd0892b83 100644 --- a/src/plugins/data/server/index_patterns/has_user_index_pattern.ts +++ b/src/plugins/data/server/data_views/has_user_index_pattern.ts @@ -7,8 +7,8 @@ */ import { ElasticsearchClient, SavedObjectsClientContract } from '../../../../core/server'; -import { IndexPatternSavedObjectAttrs } from '../../common/index_patterns/index_patterns'; -import { FLEET_ASSETS_TO_IGNORE } from '../../common/index_patterns/constants'; +import { IndexPatternSavedObjectAttrs } from '../../common/data_views/data_views'; +import { FLEET_ASSETS_TO_IGNORE } from '../../common/data_views/constants'; interface Deps { esClient: ElasticsearchClient; diff --git a/src/plugins/data/server/index_patterns/index.ts b/src/plugins/data/server/data_views/index.ts similarity index 100% rename from src/plugins/data/server/index_patterns/index.ts rename to src/plugins/data/server/data_views/index.ts diff --git a/src/plugins/data/server/index_patterns/index_patterns_api_client.ts b/src/plugins/data/server/data_views/index_patterns_api_client.ts similarity index 94% rename from src/plugins/data/server/index_patterns/index_patterns_api_client.ts rename to src/plugins/data/server/data_views/index_patterns_api_client.ts index eeb146aee46a..4f71bf218dd4 100644 --- a/src/plugins/data/server/index_patterns/index_patterns_api_client.ts +++ b/src/plugins/data/server/data_views/index_patterns_api_client.ts @@ -11,8 +11,8 @@ import { GetFieldsOptions, IIndexPatternsApiClient, GetFieldsOptionsTimePattern, -} from '../../common/index_patterns/types'; -import { DataViewMissingIndices } from '../../common/index_patterns/lib'; +} from '../../common/data_views/types'; +import { DataViewMissingIndices } from '../../common/data_views/lib'; import { IndexPatternsFetcher } from './fetcher'; import { hasUserIndexPattern } from './has_user_index_pattern'; diff --git a/src/plugins/data/server/index_patterns/index_patterns_service.ts b/src/plugins/data/server/data_views/index_patterns_service.ts similarity index 100% rename from src/plugins/data/server/index_patterns/index_patterns_service.ts rename to src/plugins/data/server/data_views/index_patterns_service.ts diff --git a/src/plugins/data/server/index_patterns/mocks.ts b/src/plugins/data/server/data_views/mocks.ts similarity index 100% rename from src/plugins/data/server/index_patterns/mocks.ts rename to src/plugins/data/server/data_views/mocks.ts diff --git a/src/plugins/data/server/index_patterns/register_index_pattern_usage_collection.test.ts b/src/plugins/data/server/data_views/register_index_pattern_usage_collection.test.ts similarity index 100% rename from src/plugins/data/server/index_patterns/register_index_pattern_usage_collection.test.ts rename to src/plugins/data/server/data_views/register_index_pattern_usage_collection.test.ts diff --git a/src/plugins/data/server/index_patterns/register_index_pattern_usage_collection.ts b/src/plugins/data/server/data_views/register_index_pattern_usage_collection.ts similarity index 100% rename from src/plugins/data/server/index_patterns/register_index_pattern_usage_collection.ts rename to src/plugins/data/server/data_views/register_index_pattern_usage_collection.ts diff --git a/src/plugins/data/server/index_patterns/routes.ts b/src/plugins/data/server/data_views/routes.ts similarity index 100% rename from src/plugins/data/server/index_patterns/routes.ts rename to src/plugins/data/server/data_views/routes.ts diff --git a/src/plugins/data/server/index_patterns/routes/create_index_pattern.ts b/src/plugins/data/server/data_views/routes/create_index_pattern.ts similarity index 100% rename from src/plugins/data/server/index_patterns/routes/create_index_pattern.ts rename to src/plugins/data/server/data_views/routes/create_index_pattern.ts diff --git a/src/plugins/data/server/index_patterns/routes/default_index_pattern.ts b/src/plugins/data/server/data_views/routes/default_index_pattern.ts similarity index 100% rename from src/plugins/data/server/index_patterns/routes/default_index_pattern.ts rename to src/plugins/data/server/data_views/routes/default_index_pattern.ts diff --git a/src/plugins/data/server/index_patterns/routes/delete_index_pattern.ts b/src/plugins/data/server/data_views/routes/delete_index_pattern.ts similarity index 100% rename from src/plugins/data/server/index_patterns/routes/delete_index_pattern.ts rename to src/plugins/data/server/data_views/routes/delete_index_pattern.ts diff --git a/src/plugins/data/server/index_patterns/routes/fields/update_fields.ts b/src/plugins/data/server/data_views/routes/fields/update_fields.ts similarity index 100% rename from src/plugins/data/server/index_patterns/routes/fields/update_fields.ts rename to src/plugins/data/server/data_views/routes/fields/update_fields.ts diff --git a/src/plugins/data/server/index_patterns/routes/get_index_pattern.ts b/src/plugins/data/server/data_views/routes/get_index_pattern.ts similarity index 100% rename from src/plugins/data/server/index_patterns/routes/get_index_pattern.ts rename to src/plugins/data/server/data_views/routes/get_index_pattern.ts diff --git a/src/plugins/data/server/index_patterns/routes/has_user_index_pattern.ts b/src/plugins/data/server/data_views/routes/has_user_index_pattern.ts similarity index 95% rename from src/plugins/data/server/index_patterns/routes/has_user_index_pattern.ts rename to src/plugins/data/server/data_views/routes/has_user_index_pattern.ts index 6447f50f88f2..7d67e96f39f6 100644 --- a/src/plugins/data/server/index_patterns/routes/has_user_index_pattern.ts +++ b/src/plugins/data/server/data_views/routes/has_user_index_pattern.ts @@ -31,7 +31,7 @@ export const registerHasUserIndexPatternRoute = ( return res.ok({ body: { - result: await indexPatternsService.hasUserIndexPattern(), + result: await indexPatternsService.hasUserDataView(), }, }); }) diff --git a/src/plugins/data/server/index_patterns/routes/runtime_fields/create_runtime_field.ts b/src/plugins/data/server/data_views/routes/runtime_fields/create_runtime_field.ts similarity index 100% rename from src/plugins/data/server/index_patterns/routes/runtime_fields/create_runtime_field.ts rename to src/plugins/data/server/data_views/routes/runtime_fields/create_runtime_field.ts diff --git a/src/plugins/data/server/index_patterns/routes/runtime_fields/delete_runtime_field.ts b/src/plugins/data/server/data_views/routes/runtime_fields/delete_runtime_field.ts similarity index 100% rename from src/plugins/data/server/index_patterns/routes/runtime_fields/delete_runtime_field.ts rename to src/plugins/data/server/data_views/routes/runtime_fields/delete_runtime_field.ts diff --git a/src/plugins/data/server/index_patterns/routes/runtime_fields/get_runtime_field.ts b/src/plugins/data/server/data_views/routes/runtime_fields/get_runtime_field.ts similarity index 100% rename from src/plugins/data/server/index_patterns/routes/runtime_fields/get_runtime_field.ts rename to src/plugins/data/server/data_views/routes/runtime_fields/get_runtime_field.ts diff --git a/src/plugins/data/server/index_patterns/routes/runtime_fields/put_runtime_field.ts b/src/plugins/data/server/data_views/routes/runtime_fields/put_runtime_field.ts similarity index 100% rename from src/plugins/data/server/index_patterns/routes/runtime_fields/put_runtime_field.ts rename to src/plugins/data/server/data_views/routes/runtime_fields/put_runtime_field.ts diff --git a/src/plugins/data/server/index_patterns/routes/runtime_fields/update_runtime_field.ts b/src/plugins/data/server/data_views/routes/runtime_fields/update_runtime_field.ts similarity index 100% rename from src/plugins/data/server/index_patterns/routes/runtime_fields/update_runtime_field.ts rename to src/plugins/data/server/data_views/routes/runtime_fields/update_runtime_field.ts diff --git a/src/plugins/data/server/index_patterns/routes/scripted_fields/create_scripted_field.ts b/src/plugins/data/server/data_views/routes/scripted_fields/create_scripted_field.ts similarity index 100% rename from src/plugins/data/server/index_patterns/routes/scripted_fields/create_scripted_field.ts rename to src/plugins/data/server/data_views/routes/scripted_fields/create_scripted_field.ts diff --git a/src/plugins/data/server/index_patterns/routes/scripted_fields/delete_scripted_field.ts b/src/plugins/data/server/data_views/routes/scripted_fields/delete_scripted_field.ts similarity index 100% rename from src/plugins/data/server/index_patterns/routes/scripted_fields/delete_scripted_field.ts rename to src/plugins/data/server/data_views/routes/scripted_fields/delete_scripted_field.ts diff --git a/src/plugins/data/server/index_patterns/routes/scripted_fields/get_scripted_field.ts b/src/plugins/data/server/data_views/routes/scripted_fields/get_scripted_field.ts similarity index 100% rename from src/plugins/data/server/index_patterns/routes/scripted_fields/get_scripted_field.ts rename to src/plugins/data/server/data_views/routes/scripted_fields/get_scripted_field.ts diff --git a/src/plugins/data/server/index_patterns/routes/scripted_fields/put_scripted_field.ts b/src/plugins/data/server/data_views/routes/scripted_fields/put_scripted_field.ts similarity index 100% rename from src/plugins/data/server/index_patterns/routes/scripted_fields/put_scripted_field.ts rename to src/plugins/data/server/data_views/routes/scripted_fields/put_scripted_field.ts diff --git a/src/plugins/data/server/index_patterns/routes/scripted_fields/update_scripted_field.ts b/src/plugins/data/server/data_views/routes/scripted_fields/update_scripted_field.ts similarity index 100% rename from src/plugins/data/server/index_patterns/routes/scripted_fields/update_scripted_field.ts rename to src/plugins/data/server/data_views/routes/scripted_fields/update_scripted_field.ts diff --git a/src/plugins/data/server/index_patterns/routes/update_index_pattern.ts b/src/plugins/data/server/data_views/routes/update_index_pattern.ts similarity index 100% rename from src/plugins/data/server/index_patterns/routes/update_index_pattern.ts rename to src/plugins/data/server/data_views/routes/update_index_pattern.ts diff --git a/src/plugins/data/server/index_patterns/routes/util/handle_errors.ts b/src/plugins/data/server/data_views/routes/util/handle_errors.ts similarity index 100% rename from src/plugins/data/server/index_patterns/routes/util/handle_errors.ts rename to src/plugins/data/server/data_views/routes/util/handle_errors.ts diff --git a/src/plugins/data/server/index_patterns/routes/util/schemas.ts b/src/plugins/data/server/data_views/routes/util/schemas.ts similarity index 100% rename from src/plugins/data/server/index_patterns/routes/util/schemas.ts rename to src/plugins/data/server/data_views/routes/util/schemas.ts diff --git a/src/plugins/data/server/index_patterns/saved_objects_client_wrapper.ts b/src/plugins/data/server/data_views/saved_objects_client_wrapper.ts similarity index 97% rename from src/plugins/data/server/index_patterns/saved_objects_client_wrapper.ts rename to src/plugins/data/server/data_views/saved_objects_client_wrapper.ts index 32791c3c8fac..45ad8d85f608 100644 --- a/src/plugins/data/server/index_patterns/saved_objects_client_wrapper.ts +++ b/src/plugins/data/server/data_views/saved_objects_client_wrapper.ts @@ -10,7 +10,7 @@ import { SavedObjectsClientContract, SavedObject } from 'src/core/server'; import { SavedObjectsClientCommon, SavedObjectsClientCommonFindArgs, -} from '../../common/index_patterns'; +} from '../../common/data_views'; export class SavedObjectsClientServerToCommon implements SavedObjectsClientCommon { private savedObjectClient: SavedObjectsClientContract; diff --git a/src/plugins/data/server/index_patterns/ui_settings_wrapper.ts b/src/plugins/data/server/data_views/ui_settings_wrapper.ts similarity index 93% rename from src/plugins/data/server/index_patterns/ui_settings_wrapper.ts rename to src/plugins/data/server/data_views/ui_settings_wrapper.ts index bb7332dc4547..3b00aab7d6bd 100644 --- a/src/plugins/data/server/index_patterns/ui_settings_wrapper.ts +++ b/src/plugins/data/server/data_views/ui_settings_wrapper.ts @@ -7,7 +7,7 @@ */ import { IUiSettingsClient } from 'src/core/server'; -import { UiSettingsCommon } from '../../common/index_patterns'; +import { UiSettingsCommon } from '../../common'; export class UiSettingsServerToCommon implements UiSettingsCommon { private uiSettings: IUiSettingsClient; diff --git a/src/plugins/data/server/index_patterns/utils.ts b/src/plugins/data/server/data_views/utils.ts similarity index 100% rename from src/plugins/data/server/index_patterns/utils.ts rename to src/plugins/data/server/data_views/utils.ts diff --git a/src/plugins/data/server/index.ts b/src/plugins/data/server/index.ts index 7a8dfc48e395..9d2e94bcf15c 100644 --- a/src/plugins/data/server/index.ts +++ b/src/plugins/data/server/index.ts @@ -42,7 +42,7 @@ export { FieldDescriptor, getCapabilitiesForRollupIndices, IndexPatternsServiceStart, -} from './index_patterns'; +} from './data_views'; export { IndexPatternField, diff --git a/src/plugins/data/server/mocks.ts b/src/plugins/data/server/mocks.ts index af104dea72af..852dffcfa3d5 100644 --- a/src/plugins/data/server/mocks.ts +++ b/src/plugins/data/server/mocks.ts @@ -15,7 +15,7 @@ import { createFieldFormatsSetupMock, createFieldFormatsStartMock, } from '../../field_formats/server/mocks'; -import { createIndexPatternsStartMock } from './index_patterns/mocks'; +import { createIndexPatternsStartMock } from './data_views/mocks'; import { DataRequestHandlerContext } from './search'; function createSetupContract() { diff --git a/src/plugins/data/server/plugin.ts b/src/plugins/data/server/plugin.ts index e04095ed26a4..c1741cc31fc0 100644 --- a/src/plugins/data/server/plugin.ts +++ b/src/plugins/data/server/plugin.ts @@ -10,7 +10,7 @@ import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from ' import { ExpressionsServerSetup } from 'src/plugins/expressions/server'; import { BfetchServerSetup } from 'src/plugins/bfetch/server'; import { ConfigSchema } from '../config'; -import { IndexPatternsServiceProvider, IndexPatternsServiceStart } from './index_patterns'; +import { IndexPatternsServiceProvider, IndexPatternsServiceStart } from './data_views'; import { ISearchSetup, ISearchStart, SearchEnhancements } from './search'; import { SearchService } from './search/search_service'; import { QueryService } from './query/query_service'; diff --git a/src/plugins/data/server/search/aggs/aggs_service.test.ts b/src/plugins/data/server/search/aggs/aggs_service.test.ts index fdff2a4a8118..d03ee17bdaeb 100644 --- a/src/plugins/data/server/search/aggs/aggs_service.test.ts +++ b/src/plugins/data/server/search/aggs/aggs_service.test.ts @@ -12,7 +12,7 @@ import { coreMock } from '../../../../../core/server/mocks'; import { expressionsPluginMock } from '../../../../../plugins/expressions/server/mocks'; import { BucketAggType, getAggTypes, MetricAggType } from '../../../common'; import { createFieldFormatsStartMock } from '../../../../field_formats/server/mocks'; -import { createIndexPatternsStartMock } from '../../index_patterns/mocks'; +import { createIndexPatternsStartMock } from '../../data_views/mocks'; import { AggsService, AggsSetupDependencies, AggsStartDependencies } from './aggs_service'; diff --git a/src/plugins/data/server/search/aggs/aggs_service.ts b/src/plugins/data/server/search/aggs/aggs_service.ts index 197d8fd7caa9..ed18ef7e4f35 100644 --- a/src/plugins/data/server/search/aggs/aggs_service.ts +++ b/src/plugins/data/server/search/aggs/aggs_service.ts @@ -23,7 +23,7 @@ import { TimeRange, } from '../../../common'; import { FieldFormatsStart } from '../../../../field_formats/server'; -import { IndexPatternsServiceStart } from '../../index_patterns'; +import { IndexPatternsServiceStart } from '../../data_views'; import { AggsSetup, AggsStart } from './types'; /** @internal */ diff --git a/src/plugins/data/server/search/expressions/esaggs.test.ts b/src/plugins/data/server/search/expressions/esaggs.test.ts index 37c5f90f00f4..5833846cf96e 100644 --- a/src/plugins/data/server/search/expressions/esaggs.test.ts +++ b/src/plugins/data/server/search/expressions/esaggs.test.ts @@ -11,7 +11,7 @@ import { of as mockOf } from 'rxjs'; import type { MockedKeys } from '@kbn/utility-types/jest'; import { KibanaRequest } from 'src/core/server'; import type { ExecutionContext } from 'src/plugins/expressions/server'; -import type { IndexPatternsContract } from '../../../common/index_patterns/index_patterns'; +import type { IndexPatternsContract } from '../../../common'; import type { AggsCommonStart, ISearchStartSearchSource, diff --git a/src/plugins/data/server/search/expressions/kibana_context.ts b/src/plugins/data/server/search/expressions/kibana_context.ts index c8fdbf4764b0..191a0fdb7ae8 100644 --- a/src/plugins/data/server/search/expressions/kibana_context.ts +++ b/src/plugins/data/server/search/expressions/kibana_context.ts @@ -9,7 +9,7 @@ import { StartServicesAccessor } from 'src/core/server'; import { getKibanaContextFn } from '../../../common/search/expressions'; import { DataPluginStart, DataPluginStartDependencies } from '../../plugin'; -import { SavedObjectsClientCommon } from '../../../common/index_patterns'; +import { SavedObjectsClientCommon } from '../../../common'; /** * This is some glue code that takes in `core.getStartServices`, extracts the dependencies diff --git a/src/plugins/data/server/search/search_service.test.ts b/src/plugins/data/server/search/search_service.test.ts index e6db3c76ef9b..e3738fd3a930 100644 --- a/src/plugins/data/server/search/search_service.test.ts +++ b/src/plugins/data/server/search/search_service.test.ts @@ -12,7 +12,7 @@ import { coreMock } from '../../../../core/server/mocks'; import { DataPluginStart, DataPluginStartDependencies } from '../plugin'; import { createFieldFormatsStartMock } from '../../../field_formats/server/mocks'; -import { createIndexPatternsStartMock } from '../index_patterns/mocks'; +import { createIndexPatternsStartMock } from '../data_views/mocks'; import { SearchService, SearchServiceSetupDependencies } from './search_service'; import { bfetchPluginMock } from '../../../bfetch/server/mocks'; diff --git a/src/plugins/data/server/search/search_service.ts b/src/plugins/data/server/search/search_service.ts index 4961f6dc3e95..26ecd7ebed50 100644 --- a/src/plugins/data/server/search/search_service.ts +++ b/src/plugins/data/server/search/search_service.ts @@ -35,7 +35,7 @@ import type { import { AggsService } from './aggs'; import { FieldFormatsStart } from '../../../field_formats/server'; -import { IndexPatternsServiceStart } from '../index_patterns'; +import { IndexPatternsServiceStart } from '../data_views'; import { registerSearchRoute } from './routes'; import { ES_SEARCH_STRATEGY, esSearchStrategyProvider } from './strategies/es_search'; import { DataPluginStart, DataPluginStartDependencies } from '../plugin'; diff --git a/src/plugins/discover/public/application/apps/main/components/doc_table/lib/row_formatter.test.ts b/src/plugins/discover/public/application/apps/main/components/doc_table/lib/row_formatter.test.ts index 5874be19b0b7..c15c02264759 100644 --- a/src/plugins/discover/public/application/apps/main/components/doc_table/lib/row_formatter.test.ts +++ b/src/plugins/discover/public/application/apps/main/components/doc_table/lib/row_formatter.test.ts @@ -8,7 +8,7 @@ import ReactDOM from 'react-dom/server'; import { formatRow, formatTopLevelObject } from './row_formatter'; -import { IndexPattern } from '../../../../../../../../data/common/index_patterns/index_patterns'; +import { IndexPattern } from '../../../../../../../../data/common'; import { fieldFormatsMock } from '../../../../../../../../field_formats/common/mocks'; import { setServices } from '../../../../../../kibana_services'; import { DiscoverServices } from '../../../../../../build_services'; diff --git a/src/plugins/home/public/application/components/home_app.js b/src/plugins/home/public/application/components/home_app.js index 94413e6af390..b0ba4d46646d 100644 --- a/src/plugins/home/public/application/components/home_app.js +++ b/src/plugins/home/public/application/components/home_app.js @@ -66,7 +66,7 @@ export function HomeApp({ directories, solutions }) { localStorage={localStorage} urlBasePath={getBasePath()} telemetry={telemetry} - hasUserIndexPattern={() => indexPatternService.hasUserIndexPattern()} + hasUserIndexPattern={() => indexPatternService.hasUserDataView()} /> diff --git a/src/plugins/home/server/services/new_instance_status.ts b/src/plugins/home/server/services/new_instance_status.ts index 00223589a8d4..b72ada27ecba 100644 --- a/src/plugins/home/server/services/new_instance_status.ts +++ b/src/plugins/home/server/services/new_instance_status.ts @@ -7,7 +7,7 @@ */ import type { IScopedClusterClient, SavedObjectsClientContract } from '../../../../core/server'; -import type { IndexPatternSavedObjectAttrs } from '../../../data/common/index_patterns/index_patterns'; +import type { IndexPatternSavedObjectAttrs } from '../../../data/common/data_views/data_views'; const LOGS_INDEX_PATTERN = 'logs-*'; const METRICS_INDEX_PATTERN = 'metrics-*'; diff --git a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_prompts.tsx b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_prompts.tsx index 246466680c86..591d3975acae 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_prompts.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_prompts.tsx @@ -56,7 +56,7 @@ export const EmptyPrompts: FC = ({ allSources, onCancel, children, loadSo const hasDataIndices = allSources.some(isUserDataIndex); const hasUserIndexPattern = useAsync(() => - indexPatternService.hasUserIndexPattern().catch(() => true) + indexPatternService.hasUserDataView().catch(() => true) ); useEffect(() => { diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx index e6aa87172ca0..75da4dce7436 100644 --- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx +++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx @@ -10,7 +10,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { ScriptedFieldsTable } from '../scripted_fields_table'; -import { IIndexPattern, IndexPattern } from '../../../../../../plugins/data/common/index_patterns'; +import { IIndexPattern, IndexPattern } from '../../../../../../plugins/data/common'; jest.mock('@elastic/eui', () => ({ EuiTitle: 'eui-title', diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx b/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx index c8617808b10e..f82d30aff808 100644 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx +++ b/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx @@ -83,7 +83,7 @@ export const IndexPatternTable = ({ setIsLoadingIndexPatterns(false); if ( gettedIndexPatterns.length === 0 || - !(await data.dataViews.hasUserIndexPattern().catch(() => false)) + !(await data.dataViews.hasUserDataView().catch(() => false)) ) { setShowCreateDialog(true); } diff --git a/src/plugins/kibana_overview/public/components/overview/overview.tsx b/src/plugins/kibana_overview/public/components/overview/overview.tsx index b49be0670b58..07769e2f3c47 100644 --- a/src/plugins/kibana_overview/public/components/overview/overview.tsx +++ b/src/plugins/kibana_overview/public/components/overview/overview.tsx @@ -100,7 +100,7 @@ export const Overview: FC = ({ newsFetchResult, solutions, features }) => useEffect(() => { const fetchIsNewKibanaInstance = async () => { - const hasUserIndexPattern = await indexPatternService.hasUserIndexPattern().catch(() => true); + const hasUserIndexPattern = await indexPatternService.hasUserDataView().catch(() => true); setNewKibanaInstance(!hasUserIndexPattern); }; diff --git a/src/plugins/saved_objects/public/saved_object/saved_object.test.ts b/src/plugins/saved_objects/public/saved_object/saved_object.test.ts index 842e7ad96257..6d35f94eec51 100644 --- a/src/plugins/saved_objects/public/saved_object/saved_object.test.ts +++ b/src/plugins/saved_objects/public/saved_object/saved_object.test.ts @@ -20,7 +20,7 @@ import { coreMock } from '../../../../core/public/mocks'; import { dataPluginMock, createSearchSourceMock } from '../../../../plugins/data/public/mocks'; import { createStubIndexPattern } from '../../../../plugins/data/common/stubs'; import { SavedObjectAttributes, SimpleSavedObject } from 'kibana/public'; -import { IndexPattern } from '../../../data/common/index_patterns/index_patterns'; +import { IndexPattern } from '../../../data/common'; import { savedObjectsDecoratorRegistryMock } from './decorators/registry.mock'; describe('Saved Object', () => { diff --git a/test/api_integration/apis/index_patterns/es_errors/errors.js b/test/api_integration/apis/index_patterns/es_errors/errors.js index 1a48b391ae87..ac656e487323 100644 --- a/test/api_integration/apis/index_patterns/es_errors/errors.js +++ b/test/api_integration/apis/index_patterns/es_errors/errors.js @@ -15,7 +15,7 @@ import { createNoMatchingIndicesError, isNoMatchingIndicesError, convertEsError, -} from '../../../../../src/plugins/data/server/index_patterns/fetcher/lib/errors'; +} from '../../../../../src/plugins/data/server/data_views/fetcher/lib/errors'; import { getIndexNotFoundError, getDocNotFoundError } from './lib';