From 133c2994ca8ba3c8904fc5f0db524da8f4d72e28 Mon Sep 17 00:00:00 2001 From: Liza Katz Date: Mon, 27 Jan 2020 16:18:27 +0200 Subject: [PATCH] Move search service code to NP (#55430) * Move get search params into search strategy * Move search strategy to NP and clean up courier exports * Move fetch to NP * Moved search source to NP * Move shard failure to data/ui folder * move getflattenedobject to core/utils * fix discover * eslint * fix scss * fix ts Co-authored-by: Elastic Machine --- .../legacy/config/get_unused_config_keys.ts | 3 +- .../utils/get_flattened_object.test.ts | 0 .../utils/get_flattened_object.ts | 0 src/core/utils/index.ts | 1 + src/legacy/core_plugins/data/public/index.ts | 2 - src/legacy/core_plugins/data/public/plugin.ts | 38 +++++------- .../data/public/search/expressions/esaggs.ts | 5 +- .../core_plugins/data/public/search/index.ts | 2 - .../data/public/search/search_service.ts | 53 ---------------- .../core_plugins/data/public/search/types.ts | 3 - .../search/utils/courier_inspector_utils.ts | 3 +- .../public/legacy_imports.ts | 5 +- .../__tests__/get_saved_dashboard_mock.ts | 3 +- .../saved_dashboard/saved_dashboard.ts | 8 ++- .../kibana/public/discover/kibana_services.ts | 16 ++--- .../discover/np_ready/angular/discover.js | 14 +++-- .../public/embeddable/visualize_embeddable.ts | 2 +- .../visualizations/public/legacy_mocks.ts | 3 +- .../components/visualization_requesterror.tsx | 2 +- .../np_ready/public/legacy/build_pipeline.ts | 3 +- src/legacy/server/config/override.js | 2 +- src/legacy/ui/public/_index.scss | 1 - src/legacy/ui/public/agg_types/agg_config.ts | 8 ++- src/legacy/ui/public/agg_types/agg_configs.ts | 3 +- src/legacy/ui/public/agg_types/agg_type.ts | 3 +- .../ui/public/agg_types/buckets/terms.ts | 12 +++- .../ui/public/agg_types/param_types/base.ts | 2 +- src/legacy/ui/public/courier/_index.scss | 1 - src/legacy/ui/public/courier/index.ts | 62 ------------------- .../ui/public/courier/search_source/mocks.ts | 61 ------------------ .../courier/search_source/search_source.ts | 20 ------ .../public/courier/search_strategy/index.ts | 25 -------- .../courier/search_strategy/search_error.ts | 20 ------ src/legacy/ui/public/courier/types.ts | 25 -------- src/legacy/ui/public/private/private.js | 4 -- .../helpers/build_saved_object.ts | 2 +- src/legacy/ui/public/saved_objects/types.ts | 7 ++- .../loader/utils/query_geohash_bounds.ts | 8 ++- src/legacy/utils/index.d.ts | 2 - src/legacy/utils/index.js | 1 - .../data/public/index_patterns/index.ts | 2 + .../data/public/index_patterns/lib/index.ts | 1 + .../public/index_patterns/lib/is_default.ts} | 4 +- src/plugins/data/public/plugin.ts | 4 +- .../data/public/search/es_client/index.ts | 2 +- .../public/search/fetch/call_client.test.ts | 4 +- .../data/public/search/fetch/call_client.ts | 4 +- .../data/public/search/fetch/errors.ts | 5 +- .../public/search/fetch/fetch_soon.test.ts | 4 +- .../data/public/search/fetch/fetch_soon.ts | 2 +- .../search/fetch/handle_response.test.ts | 5 +- .../public/search/fetch/handle_response.tsx | 14 ++--- .../data/public/search/fetch/index.ts | 5 +- .../data/public/search/fetch/types.ts | 2 +- src/plugins/data/public/search/index.ts | 20 +++++- .../filter_docvalue_fields.test.ts | 0 .../search_source/filter_docvalue_fields.ts | 0 .../data/public/search/search_source/index.ts | 1 + .../data/public/search/search_source/mocks.ts | 0 .../normalize_sort_request.test.ts | 2 +- .../search_source/normalize_sort_request.ts | 2 +- .../search_source/search_source.test.ts | 11 +--- .../search/search_source/search_source.ts | 19 ++---- .../data/public/search/search_source/types.ts | 5 +- .../default_search_strategy.test.ts | 4 +- .../default_search_strategy.ts | 11 +--- .../get_search_params.test.ts | 2 +- .../search_strategy}/get_search_params.ts | 2 +- .../public/search/search_strategy/index.ts | 6 +- .../search_strategy/no_op_search_strategy.ts | 0 .../search/search_strategy/search_error.ts | 0 .../search_strategy_registry.test.ts | 2 +- .../search_strategy_registry.ts | 4 +- .../public/search/search_strategy/types.ts | 4 +- src/plugins/data/public/ui/_index.scss | 2 + src/plugins/data/public/ui/index.ts | 11 +++- .../__mocks__/shard_failure_request.ts | 4 +- .../__mocks__/shard_failure_response.ts | 4 +- .../shard_failure_description.test.tsx.snap | 0 .../shard_failure_modal.test.tsx.snap | 0 .../shard_failure_table.test.tsx.snap | 0 .../_shard_failure_modal.scss | 0 .../public/ui/shard_failure_modal}/index.ts | 3 +- .../shard_failure_description.test.tsx | 0 .../shard_failure_description.tsx | 2 +- .../shard_failure_description_header.tsx | 0 .../shard_failure_modal.test.tsx | 0 .../shard_failure_modal.tsx | 6 +- ...d_failure_open_modal_button.test.mocks.tsx | 3 +- .../shard_failure_open_modal_button.test.tsx | 0 .../shard_failure_open_modal_button.tsx | 11 ++-- .../shard_failure_table.test.tsx | 0 .../shard_failure_table.tsx | 0 .../shard_failure_types.ts | 4 +- .../plugins/maps/public/kibana_services.js | 4 +- .../plugins/rollup/public/search/register.js | 2 +- .../public/search/rollup_search_strategy.js | 2 +- 97 files changed, 196 insertions(+), 450 deletions(-) rename src/{legacy => core}/utils/get_flattened_object.test.ts (100%) rename src/{legacy => core}/utils/get_flattened_object.ts (100%) delete mode 100644 src/legacy/core_plugins/data/public/search/search_service.ts delete mode 100644 src/legacy/ui/public/courier/_index.scss delete mode 100644 src/legacy/ui/public/courier/index.ts delete mode 100644 src/legacy/ui/public/courier/search_source/mocks.ts delete mode 100644 src/legacy/ui/public/courier/search_source/search_source.ts delete mode 100644 src/legacy/ui/public/courier/search_strategy/index.ts delete mode 100644 src/legacy/ui/public/courier/search_strategy/search_error.ts delete mode 100644 src/legacy/ui/public/courier/types.ts rename src/{legacy/core_plugins/data/public/search/search_strategy/is_default_type_index_pattern.ts => plugins/data/public/index_patterns/lib/is_default.ts} (85%) rename src/{legacy/core_plugins => plugins}/data/public/search/fetch/call_client.test.ts (96%) rename src/{legacy/core_plugins => plugins}/data/public/search/fetch/call_client.ts (98%) rename src/{legacy/core_plugins => plugins}/data/public/search/fetch/errors.ts (88%) rename src/{legacy/core_plugins => plugins}/data/public/search/fetch/fetch_soon.test.ts (97%) rename src/{legacy/core_plugins => plugins}/data/public/search/fetch/fetch_soon.ts (98%) rename src/{legacy/core_plugins => plugins}/data/public/search/fetch/handle_response.test.ts (90%) rename src/{legacy/core_plugins => plugins}/data/public/search/fetch/handle_response.tsx (78%) rename src/{legacy/core_plugins => plugins}/data/public/search/fetch/index.ts (87%) rename src/{legacy/core_plugins => plugins}/data/public/search/fetch/types.ts (94%) rename src/{legacy/core_plugins => plugins}/data/public/search/search_source/filter_docvalue_fields.test.ts (100%) rename src/{legacy/core_plugins => plugins}/data/public/search/search_source/filter_docvalue_fields.ts (100%) rename src/{legacy/core_plugins => plugins}/data/public/search/search_source/index.ts (91%) rename src/{legacy/core_plugins => plugins}/data/public/search/search_source/mocks.ts (100%) rename src/{legacy/core_plugins => plugins}/data/public/search/search_source/normalize_sort_request.test.ts (98%) rename src/{legacy/core_plugins => plugins}/data/public/search/search_source/normalize_sort_request.ts (97%) rename src/{legacy/core_plugins => plugins}/data/public/search/search_source/search_source.test.ts (94%) rename src/{legacy/core_plugins => plugins}/data/public/search/search_source/search_source.ts (95%) rename src/{legacy/core_plugins => plugins}/data/public/search/search_source/types.ts (94%) rename src/{legacy/core_plugins => plugins}/data/public/search/search_strategy/default_search_strategy.test.ts (98%) rename src/{legacy/core_plugins => plugins}/data/public/search/search_strategy/default_search_strategy.ts (92%) rename src/{legacy/core_plugins/data/public/search/fetch => plugins/data/public/search/search_strategy}/get_search_params.test.ts (98%) rename src/{legacy/core_plugins/data/public/search/fetch => plugins/data/public/search/search_strategy}/get_search_params.ts (97%) rename src/{legacy/core_plugins => plugins}/data/public/search/search_strategy/index.ts (93%) rename src/{legacy/core_plugins => plugins}/data/public/search/search_strategy/no_op_search_strategy.ts (100%) rename src/{legacy/core_plugins => plugins}/data/public/search/search_strategy/search_error.ts (100%) rename src/{legacy/core_plugins => plugins}/data/public/search/search_strategy/search_strategy_registry.test.ts (98%) rename src/{legacy/core_plugins => plugins}/data/public/search/search_strategy/search_strategy_registry.ts (95%) rename src/{legacy/core_plugins => plugins}/data/public/search/search_strategy/types.ts (90%) rename src/{legacy/core_plugins/data/public/search/fetch/components => plugins/data/public/ui/shard_failure_modal}/__mocks__/shard_failure_request.ts (92%) rename src/{legacy/core_plugins/data/public/search/fetch/components => plugins/data/public/ui/shard_failure_modal}/__mocks__/shard_failure_response.ts (93%) rename src/{legacy/core_plugins/data/public/search/fetch/components => plugins/data/public/ui/shard_failure_modal}/__snapshots__/shard_failure_description.test.tsx.snap (100%) rename src/{legacy/core_plugins/data/public/search/fetch/components => plugins/data/public/ui/shard_failure_modal}/__snapshots__/shard_failure_modal.test.tsx.snap (100%) rename src/{legacy/core_plugins/data/public/search/fetch/components => plugins/data/public/ui/shard_failure_modal}/__snapshots__/shard_failure_table.test.tsx.snap (100%) rename src/{legacy/core_plugins/data/public/search/fetch/components => plugins/data/public/ui/shard_failure_modal}/_shard_failure_modal.scss (100%) rename src/{legacy/ui/public/courier/search_source => plugins/data/public/ui/shard_failure_modal}/index.ts (82%) rename src/{legacy/core_plugins/data/public/search/fetch/components => plugins/data/public/ui/shard_failure_modal}/shard_failure_description.test.tsx (100%) rename src/{legacy/core_plugins/data/public/search/fetch/components => plugins/data/public/ui/shard_failure_modal}/shard_failure_description.tsx (96%) rename src/{legacy/core_plugins/data/public/search/fetch/components => plugins/data/public/ui/shard_failure_modal}/shard_failure_description_header.tsx (100%) rename src/{legacy/core_plugins/data/public/search/fetch/components => plugins/data/public/ui/shard_failure_modal}/shard_failure_modal.test.tsx (100%) rename src/{legacy/core_plugins/data/public/search/fetch/components => plugins/data/public/ui/shard_failure_modal}/shard_failure_modal.tsx (96%) rename src/{legacy/core_plugins/data/public/search/fetch/components => plugins/data/public/ui/shard_failure_modal}/shard_failure_open_modal_button.test.mocks.tsx (87%) rename src/{legacy/core_plugins/data/public/search/fetch/components => plugins/data/public/ui/shard_failure_modal}/shard_failure_open_modal_button.test.tsx (100%) rename src/{legacy/core_plugins/data/public/search/fetch/components => plugins/data/public/ui/shard_failure_modal}/shard_failure_open_modal_button.tsx (84%) rename src/{legacy/core_plugins/data/public/search/fetch/components => plugins/data/public/ui/shard_failure_modal}/shard_failure_table.test.tsx (100%) rename src/{legacy/core_plugins/data/public/search/fetch/components => plugins/data/public/ui/shard_failure_modal}/shard_failure_table.tsx (100%) rename src/{legacy/core_plugins/data/public/search/fetch/components => plugins/data/public/ui/shard_failure_modal}/shard_failure_types.ts (94%) diff --git a/src/core/server/legacy/config/get_unused_config_keys.ts b/src/core/server/legacy/config/get_unused_config_keys.ts index e425082ba126d..20c9776f63c58 100644 --- a/src/core/server/legacy/config/get_unused_config_keys.ts +++ b/src/core/server/legacy/config/get_unused_config_keys.ts @@ -20,7 +20,8 @@ import { difference, get, set } from 'lodash'; // @ts-ignore import { getTransform } from '../../../../legacy/deprecation/index'; -import { unset, getFlattenedObject } from '../../../../legacy/utils'; +import { unset } from '../../../../legacy/utils'; +import { getFlattenedObject } from '../../../utils'; import { hasConfigPathIntersection } from '../../config'; import { LegacyPluginSpec, LegacyConfig, LegacyVars } from '../types'; diff --git a/src/legacy/utils/get_flattened_object.test.ts b/src/core/utils/get_flattened_object.test.ts similarity index 100% rename from src/legacy/utils/get_flattened_object.test.ts rename to src/core/utils/get_flattened_object.test.ts diff --git a/src/legacy/utils/get_flattened_object.ts b/src/core/utils/get_flattened_object.ts similarity index 100% rename from src/legacy/utils/get_flattened_object.ts rename to src/core/utils/get_flattened_object.ts diff --git a/src/core/utils/index.ts b/src/core/utils/index.ts index 7317c222d3bc3..e35356343cfe2 100644 --- a/src/core/utils/index.ts +++ b/src/core/utils/index.ts @@ -28,4 +28,5 @@ export * from './pick'; export * from './promise'; export * from './url'; export * from './unset'; +export * from './get_flattened_object'; export * from './default_app_categories'; diff --git a/src/legacy/core_plugins/data/public/index.ts b/src/legacy/core_plugins/data/public/index.ts index 4514d67ea5fcd..7fe487667f94e 100644 --- a/src/legacy/core_plugins/data/public/index.ts +++ b/src/legacy/core_plugins/data/public/index.ts @@ -28,8 +28,6 @@ export function plugin() { /** @public types */ export { DataStart }; -export { EsQuerySortValue, FetchOptions, ISearchSource, SortDirection } from './search/types'; -export { SearchSourceFields } from './search/types'; export { SavedQueryAttributes, SavedQuery, diff --git a/src/legacy/core_plugins/data/public/plugin.ts b/src/legacy/core_plugins/data/public/plugin.ts index 5329702348207..6bd85ef020f16 100644 --- a/src/legacy/core_plugins/data/public/plugin.ts +++ b/src/legacy/core_plugins/data/public/plugin.ts @@ -18,19 +18,20 @@ */ import { CoreSetup, CoreStart, Plugin } from 'kibana/public'; -import { SearchService, SearchStart } from './search'; -import { DataPublicPluginStart } from '../../../../plugins/data/public'; +import { + DataPublicPluginStart, + addSearchStrategy, + defaultSearchStrategy, +} from '../../../../plugins/data/public'; import { ExpressionsSetup } from '../../../../plugins/expressions/public'; import { - setFieldFormats, - setNotifications, setIndexPatterns, setQueryService, - setSearchService, setUiSettings, setInjectedMetadata, - setHttp, + setFieldFormats, + setSearchService, // eslint-disable-next-line @kbn/eslint/no-restricted-paths } from '../../../../plugins/data/public/services'; @@ -47,9 +48,7 @@ export interface DataPluginStartDependencies { * * @public */ -export interface DataStart { - search: SearchStart; -} +export interface DataStart {} // eslint-disable-line @typescript-eslint/no-empty-interface /** * Data Plugin - public @@ -65,29 +64,22 @@ export interface DataStart { export class DataPlugin implements Plugin { - private readonly search = new SearchService(); - public setup(core: CoreSetup) { setInjectedMetadata(core.injectedMetadata); + + // This is to be deprecated once we switch to the new search service fully + addSearchStrategy(defaultSearchStrategy); } public start(core: CoreStart, { data }: DataPluginStartDependencies): DataStart { - // This is required for when Angular code uses Field and FieldList. - setFieldFormats(data.fieldFormats); + setUiSettings(core.uiSettings); setQueryService(data.query); - setSearchService(data.search); setIndexPatterns(data.indexPatterns); setFieldFormats(data.fieldFormats); - setNotifications(core.notifications); - setUiSettings(core.uiSettings); - setHttp(core.http); + setSearchService(data.search); - return { - search: this.search.start(core), - }; + return {}; } - public stop() { - this.search.stop(); - } + public stop() {} } diff --git a/src/legacy/core_plugins/data/public/search/expressions/esaggs.ts b/src/legacy/core_plugins/data/public/search/expressions/esaggs.ts index 889c747c9a62e..143283152d104 100644 --- a/src/legacy/core_plugins/data/public/search/expressions/esaggs.ts +++ b/src/legacy/core_plugins/data/public/search/expressions/esaggs.ts @@ -28,6 +28,8 @@ import { KibanaDatatableColumn, } from 'src/plugins/expressions/public'; import { + ISearchSource, + SearchSource, Query, TimeRange, esFilters, @@ -43,8 +45,7 @@ import { PersistedState } from '../../../../../ui/public/persisted_state'; import { Adapters } from '../../../../../../plugins/inspector/public'; // eslint-disable-next-line @kbn/eslint/no-restricted-paths import { getQueryService, getIndexPatterns } from '../../../../../../plugins/data/public/services'; -import { ISearchSource, getRequestInspectorStats, getResponseInspectorStats } from '../..'; -import { SearchSource } from '../search_source'; +import { getRequestInspectorStats, getResponseInspectorStats } from '../..'; export interface RequestHandlerParams { searchSource: ISearchSource; diff --git a/src/legacy/core_plugins/data/public/search/index.ts b/src/legacy/core_plugins/data/public/search/index.ts index d930a47219514..e1c93ec0e3b1c 100644 --- a/src/legacy/core_plugins/data/public/search/index.ts +++ b/src/legacy/core_plugins/data/public/search/index.ts @@ -17,6 +17,4 @@ * under the License. */ -export { SearchService, SearchSetup, SearchStart } from './search_service'; - export { getRequestInspectorStats, getResponseInspectorStats } from './utils'; diff --git a/src/legacy/core_plugins/data/public/search/search_service.ts b/src/legacy/core_plugins/data/public/search/search_service.ts deleted file mode 100644 index 77203da9ce585..0000000000000 --- a/src/legacy/core_plugins/data/public/search/search_service.ts +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { Plugin, CoreSetup, CoreStart } from '../../../../../core/public'; -import { SearchSource } from './search_source'; -import { defaultSearchStrategy, addSearchStrategy } from './search_strategy'; -import { SearchStrategyProvider } from './search_strategy/types'; - -export interface SearchSetup {} // eslint-disable-line @typescript-eslint/no-empty-interface - -export interface SearchStart { - defaultSearchStrategy: SearchStrategyProvider; - SearchSource: typeof SearchSource; -} - -/** - * The contract provided here is a new platform shim for ui/courier. - * - * Once it has been refactored to work with new platform services, - * it will move into the existing search service in src/plugins/data/public/search - */ -export class SearchService implements Plugin { - public setup(core: CoreSetup): SearchSetup { - return {}; - } - - public start(core: CoreStart): SearchStart { - addSearchStrategy(defaultSearchStrategy); - - return { - defaultSearchStrategy, - SearchSource, - }; - } - - public stop() {} -} diff --git a/src/legacy/core_plugins/data/public/search/types.ts b/src/legacy/core_plugins/data/public/search/types.ts index 23d74ce6a57da..140ceea487099 100644 --- a/src/legacy/core_plugins/data/public/search/types.ts +++ b/src/legacy/core_plugins/data/public/search/types.ts @@ -17,7 +17,4 @@ * under the License. */ -export * from './fetch/types'; -export * from './search_source/types'; -export * from './search_strategy/types'; export * from './utils/types'; diff --git a/src/legacy/core_plugins/data/public/search/utils/courier_inspector_utils.ts b/src/legacy/core_plugins/data/public/search/utils/courier_inspector_utils.ts index 7f7d216d8f0f3..62b7c572032c8 100644 --- a/src/legacy/core_plugins/data/public/search/utils/courier_inspector_utils.ts +++ b/src/legacy/core_plugins/data/public/search/utils/courier_inspector_utils.ts @@ -26,7 +26,8 @@ import { i18n } from '@kbn/i18n'; import { SearchResponse } from 'elasticsearch'; -import { ISearchSource, RequestInspectorStats } from '../types'; +import { RequestInspectorStats } from '../types'; +import { ISearchSource } from '../../../../../../plugins/data/public'; export function getRequestInspectorStats(searchSource: ISearchSource) { const stats: RequestInspectorStats = {}; diff --git a/src/legacy/core_plugins/input_control_vis/public/legacy_imports.ts b/src/legacy/core_plugins/input_control_vis/public/legacy_imports.ts index 176fe68fe4788..9270cff84cc07 100644 --- a/src/legacy/core_plugins/input_control_vis/public/legacy_imports.ts +++ b/src/legacy/core_plugins/input_control_vis/public/legacy_imports.ts @@ -17,13 +17,14 @@ * under the License. */ -import { SearchSource as SearchSourceClass, ISearchSource } from 'ui/courier'; import { Class } from '@kbn/utility-types'; +import { SearchSource as SearchSourceClass, ISearchSource } from '../../../../plugins/data/public'; + +export { SearchSourceFields } from '../../../../plugins/data/public'; export { Vis, VisParams } from 'ui/vis'; export { VisOptionsProps } from 'ui/vis/editors/default'; export { ValidatedDualRange } from 'ui/validated_range'; -export { SearchSourceFields } from '../../data/public'; export type SearchSource = Class; export const SearchSource = SearchSourceClass; diff --git a/src/legacy/core_plugins/kibana/public/dashboard/__tests__/get_saved_dashboard_mock.ts b/src/legacy/core_plugins/kibana/public/dashboard/__tests__/get_saved_dashboard_mock.ts index 1c2405b5824f2..baf5bad510ce1 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/__tests__/get_saved_dashboard_mock.ts +++ b/src/legacy/core_plugins/kibana/public/dashboard/__tests__/get_saved_dashboard_mock.ts @@ -17,7 +17,8 @@ * under the License. */ -import { searchSourceMock } from 'ui/courier/search_source/mocks'; +// eslint-disable-next-line @kbn/eslint/no-restricted-paths +import { searchSourceMock } from '../../../../../../plugins/data/public/search/search_source/mocks'; import { SavedObjectDashboard } from '../saved_dashboard/saved_dashboard'; export function getSavedDashboardMock( diff --git a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.ts b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.ts index 18e15b215523e..08a6f067d2026 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.ts +++ b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.ts @@ -16,12 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -import { ISearchSource } from 'ui/courier'; import { SavedObject, SavedObjectKibanaServices } from 'ui/saved_objects/types'; import { createSavedObjectClass } from 'ui/saved_objects/saved_object'; import { extractReferences, injectReferences } from './saved_dashboard_references'; -import { esFilters, Query, RefreshInterval } from '../../../../../../plugins/data/public'; +import { + esFilters, + ISearchSource, + Query, + RefreshInterval, +} from '../../../../../../plugins/data/public'; import { createDashboardEditUrl } from '..'; export interface SavedObjectDashboard extends SavedObject { diff --git a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts index a870f6074f506..27aa920c98aad 100644 --- a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts +++ b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts @@ -57,16 +57,7 @@ export { wrapInI18nContext } from 'ui/i18n'; export { buildVislibDimensions } from '../../../visualizations/public'; // @ts-ignore export { callAfterBindingsWorkaround } from 'ui/compat'; -export { - getRequestInspectorStats, - getResponseInspectorStats, - hasSearchStategyForIndexPattern, - isDefaultTypeIndexPattern, - SearchSource, - EsQuerySortValue, - SortDirection, - ISearchSource, -} from 'ui/courier'; +export { getRequestInspectorStats, getResponseInspectorStats } from '../../../data/public'; // @ts-ignore export { intervalOptions } from 'ui/agg_types/buckets/_interval_options'; // @ts-ignore @@ -93,7 +84,12 @@ export { IIndexPattern, IndexPattern, indexPatterns, + hasSearchStategyForIndexPattern, IFieldType, + SearchSource, + ISearchSource, + EsQuerySortValue, + SortDirection, } from '../../../../../plugins/data/public'; export { ElasticSearchHit } from './np_ready/doc_views/doc_views_types'; export { Adapters } from 'ui/inspector/types'; diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js index 2383e58a7201b..dd782f97b075d 100644 --- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js +++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js @@ -45,7 +45,6 @@ import { getServices, hasSearchStategyForIndexPattern, intervalOptions, - isDefaultTypeIndexPattern, migrateLegacyQuery, RequestAdapter, showSaveModal, @@ -73,7 +72,10 @@ const { } = getServices(); import { getRootBreadcrumbs, getSavedSearchBreadcrumbs } from '../helpers/breadcrumbs'; -import { generateFilters } from '../../../../../../../plugins/data/public'; +import { + generateFilters, + indexPatterns as indexPatternsUtils, +} from '../../../../../../../plugins/data/public'; import { getIndexPatternId } from '../helpers/get_index_pattern_id'; import { FilterStateManager } from '../../../../../data/public'; @@ -400,7 +402,8 @@ function discoverController( // searchSource which applies time range const timeRangeSearchSource = savedSearch.searchSource.create(); - if (isDefaultTypeIndexPattern($scope.indexPattern)) { + + if (indexPatternsUtils.isDefault($scope.indexPattern)) { timeRangeSearchSource.setField('filter', () => { return timefilter.createFilter($scope.indexPattern); }); @@ -561,7 +564,8 @@ function discoverController( $scope.opts = { // number of records to fetch, then paginate through sampleSize: config.get('discover:sampleSize'), - timefield: isDefaultTypeIndexPattern($scope.indexPattern) && $scope.indexPattern.timeFieldName, + timefield: + indexPatternsUtils.isDefault($scope.indexPattern) && $scope.indexPattern.timeFieldName, savedSearch: savedSearch, indexPatternList: $route.current.locals.savedObjects.ip.list, }; @@ -1162,7 +1166,7 @@ function discoverController( // Block the UI from loading if the user has loaded a rollup index pattern but it isn't // supported. $scope.isUnsupportedIndexPattern = - !isDefaultTypeIndexPattern($route.current.locals.savedObjects.ip.loaded) && + !indexPatternsUtils.isDefault($route.current.locals.savedObjects.ip.loaded) && !hasSearchStategyForIndexPattern($route.current.locals.savedObjects.ip.loaded); if ($scope.isUnsupportedIndexPattern) { diff --git a/src/legacy/core_plugins/visualizations/public/embeddable/visualize_embeddable.ts b/src/legacy/core_plugins/visualizations/public/embeddable/visualize_embeddable.ts index c1b049ab5e969..557035b91367e 100644 --- a/src/legacy/core_plugins/visualizations/public/embeddable/visualize_embeddable.ts +++ b/src/legacy/core_plugins/visualizations/public/embeddable/visualize_embeddable.ts @@ -29,7 +29,6 @@ import { getTableAggs } from 'ui/visualize/loader/pipeline_helpers/utilities'; import { AppState } from 'ui/state_management/app_state'; import { npStart } from 'ui/new_platform'; import { IExpressionLoaderParams } from 'src/plugins/expressions/public'; -import { ISearchSource } from 'ui/courier'; import { VISUALIZE_EMBEDDABLE_TYPE } from './constants'; import { IIndexPattern, @@ -38,6 +37,7 @@ import { onlyDisabledFiltersChanged, esFilters, mapAndFlattenFilters, + ISearchSource, } from '../../../../../plugins/data/public'; import { EmbeddableInput, diff --git a/src/legacy/core_plugins/visualizations/public/legacy_mocks.ts b/src/legacy/core_plugins/visualizations/public/legacy_mocks.ts index e6ca678db563d..6cd57bb88bc26 100644 --- a/src/legacy/core_plugins/visualizations/public/legacy_mocks.ts +++ b/src/legacy/core_plugins/visualizations/public/legacy_mocks.ts @@ -17,4 +17,5 @@ * under the License. */ -export { searchSourceMock } from '../../../ui/public/courier/search_source/mocks'; +// eslint-disable-next-line @kbn/eslint/no-restricted-paths +export { searchSourceMock } from '../../../../plugins/data/public/search/search_source/mocks'; diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization_requesterror.tsx b/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization_requesterror.tsx index 1af9aa3c3e602..406f24741c911 100644 --- a/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization_requesterror.tsx +++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization_requesterror.tsx @@ -19,7 +19,7 @@ import { EuiIcon, EuiSpacer, EuiText } from '@elastic/eui'; import React from 'react'; -import { SearchError } from '../../../../../data/public/search/search_strategy'; +import { SearchError } from '../../../../../../../plugins/data/public'; interface VisualizationRequestErrorProps { onInit?: () => void; diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts index a3bf98b5e74a3..6749a44b4d5b3 100644 --- a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts +++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts @@ -21,14 +21,13 @@ import { cloneDeep, get } from 'lodash'; // @ts-ignore import moment from 'moment'; import { SerializedFieldFormat } from 'src/plugins/expressions/public'; +import { ISearchSource } from 'src/plugins/data/public'; import { AggConfig, setBounds, isDateHistogramBucketAggConfig, createFormat, } from '../../../legacy_imports'; -// eslint-disable-next-line -import { ISearchSource } from '../../../../../../ui/public/courier/search_source/search_source'; import { Vis, VisParams, VisState } from '..'; interface SchemaConfigParams { diff --git a/src/legacy/server/config/override.js b/src/legacy/server/config/override.js index 934b2165dddcf..bab9387ac006f 100644 --- a/src/legacy/server/config/override.js +++ b/src/legacy/server/config/override.js @@ -19,7 +19,7 @@ import _ from 'lodash'; import explodeBy from './explode_by'; -import { getFlattenedObject } from '../../utils'; +import { getFlattenedObject } from '../../../core/utils'; export default function(target, source) { const _target = getFlattenedObject(target); diff --git a/src/legacy/ui/public/_index.scss b/src/legacy/ui/public/_index.scss index f5a1d0a7922a7..e4e58019dda69 100644 --- a/src/legacy/ui/public/_index.scss +++ b/src/legacy/ui/public/_index.scss @@ -10,7 +10,6 @@ @import './accessibility/index'; @import './chrome/index'; -@import './courier/index'; @import './collapsible_sidebar/index'; @import './directives/index'; @import './error_auto_create_index/index'; diff --git a/src/legacy/ui/public/agg_types/agg_config.ts b/src/legacy/ui/public/agg_types/agg_config.ts index 0edf782318862..c8ce8638fe462 100644 --- a/src/legacy/ui/public/agg_types/agg_config.ts +++ b/src/legacy/ui/public/agg_types/agg_config.ts @@ -27,13 +27,17 @@ import _ from 'lodash'; import { i18n } from '@kbn/i18n'; import { npStart } from 'ui/new_platform'; -import { ISearchSource, FetchOptions } from '../courier/types'; import { AggType } from './agg_type'; import { AggGroupNames } from '../vis/editors/default/agg_groups'; import { writeParams } from './agg_params'; import { AggConfigs } from './agg_configs'; import { Schema } from '../vis/editors/default/schemas'; -import { ContentType, KBN_FIELD_TYPES } from '../../../../plugins/data/public'; +import { + ISearchSource, + ContentType, + KBN_FIELD_TYPES, + FetchOptions, +} from '../../../../plugins/data/public'; export interface AggConfigOptions { enabled: boolean; diff --git a/src/legacy/ui/public/agg_types/agg_configs.ts b/src/legacy/ui/public/agg_types/agg_configs.ts index bd2f261c0bf1d..0320cbd43fca7 100644 --- a/src/legacy/ui/public/agg_types/agg_configs.ts +++ b/src/legacy/ui/public/agg_types/agg_configs.ts @@ -31,8 +31,7 @@ import { TimeRange } from 'src/plugins/data/public'; import { Schema } from '../vis/editors/default/schemas'; import { AggConfig, AggConfigOptions } from './agg_config'; import { AggGroupNames } from '../vis/editors/default/agg_groups'; -import { IndexPattern } from '../../../../plugins/data/public'; -import { ISearchSource, FetchOptions } from '../courier/types'; +import { IndexPattern, ISearchSource, FetchOptions } from '../../../../plugins/data/public'; type Schemas = Record; diff --git a/src/legacy/ui/public/agg_types/agg_type.ts b/src/legacy/ui/public/agg_types/agg_type.ts index 39be1983223bc..952410ae0db49 100644 --- a/src/legacy/ui/public/agg_types/agg_type.ts +++ b/src/legacy/ui/public/agg_types/agg_type.ts @@ -24,11 +24,10 @@ import { initParams } from './agg_params'; import { AggConfig } from '../vis'; import { AggConfigs } from './agg_configs'; -import { ISearchSource } from '../courier'; import { Adapters } from '../inspector'; import { BaseParamType } from './param_types/base'; import { AggParamType } from '../agg_types/param_types/agg'; -import { KBN_FIELD_TYPES, FieldFormat } from '../../../../plugins/data/public'; +import { KBN_FIELD_TYPES, FieldFormat, ISearchSource } from '../../../../plugins/data/public'; export interface AggTypeConfig< TAggConfig extends AggConfig = AggConfig, diff --git a/src/legacy/ui/public/agg_types/buckets/terms.ts b/src/legacy/ui/public/agg_types/buckets/terms.ts index c805e53eb2b91..fe2c7cb427fee 100644 --- a/src/legacy/ui/public/agg_types/buckets/terms.ts +++ b/src/legacy/ui/public/agg_types/buckets/terms.ts @@ -19,7 +19,10 @@ import { noop } from 'lodash'; import { i18n } from '@kbn/i18n'; -import { ISearchSource, getRequestInspectorStats, getResponseInspectorStats } from '../../courier'; +import { + getRequestInspectorStats, + getResponseInspectorStats, +} from '../../../../core_plugins/data/public'; import { BucketAggType } from './_bucket_agg_type'; import { BUCKET_TYPES } from './bucket_agg_types'; import { IBucketAggConfig } from './_bucket_agg_type'; @@ -35,7 +38,12 @@ import { OtherBucketParamEditor } from '../../vis/editors/default/controls/other import { AggConfigs } from '../agg_configs'; import { Adapters } from '../../../../../plugins/inspector/public'; -import { ContentType, FieldFormat, KBN_FIELD_TYPES } from '../../../../../plugins/data/public'; +import { + ContentType, + ISearchSource, + FieldFormat, + KBN_FIELD_TYPES, +} from '../../../../../plugins/data/public'; // @ts-ignore import { Schemas } from '../../vis/editors/default/schemas'; diff --git a/src/legacy/ui/public/agg_types/param_types/base.ts b/src/legacy/ui/public/agg_types/param_types/base.ts index f466a9512edf9..35748c02dd903 100644 --- a/src/legacy/ui/public/agg_types/param_types/base.ts +++ b/src/legacy/ui/public/agg_types/param_types/base.ts @@ -19,7 +19,7 @@ import { AggConfigs } from '../agg_configs'; import { AggConfig } from '../../vis'; -import { ISearchSource, FetchOptions } from '../../courier/types'; +import { FetchOptions, ISearchSource } from '../../../../../plugins/data/public'; export class BaseParamType { name: string; diff --git a/src/legacy/ui/public/courier/_index.scss b/src/legacy/ui/public/courier/_index.scss deleted file mode 100644 index 17382cfa30ce5..0000000000000 --- a/src/legacy/ui/public/courier/_index.scss +++ /dev/null @@ -1 +0,0 @@ -@import '../../../core_plugins/data/public/search/fetch/components/shard_failure_modal'; \ No newline at end of file diff --git a/src/legacy/ui/public/courier/index.ts b/src/legacy/ui/public/courier/index.ts deleted file mode 100644 index 709ff1c11e901..0000000000000 --- a/src/legacy/ui/public/courier/index.ts +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/** - * Nothing to see here! - * - * Courier / SearchSource has moved to the data plugin, and is being - * re-exported from ui/courier for backwards compatibility. - */ - -import { start as dataStart } from '../../../core_plugins/data/public/legacy'; - -// runtime contracts -export const { defaultSearchStrategy, SearchSource } = dataStart.search; - -// types -export { - ISearchSource, - EsQuerySortValue, // used externally by Discover - FetchOptions, // used externally by AggTypes - SortDirection, // used externally by Discover -} from '../../../core_plugins/data/public'; - -// static code -export { - getRequestInspectorStats, - getResponseInspectorStats, -} from '../../../core_plugins/data/public'; - -// TODO: Exporting this mock outside of jest tests causes errors because -// jest is undefined. Need to refactor the mock to be consistent with -// other NP-style mocks. -// export { searchSourceMock } from './search_source/mocks'; - -// Most these can probably be made internal to the search -// service, so we are temporarily deeply importing them -// until we relocate them to a longer-term home. -/* eslint-disable @kbn/eslint/no-restricted-paths */ -export { - addSearchStrategy, // used externally by Rollups - getSearchErrorType, // used externally by Rollups - hasSearchStategyForIndexPattern, // used externally by Discover - isDefaultTypeIndexPattern, // used externally by Discover - SearchError, // used externally by Visualizations & Rollups -} from '../../../core_plugins/data/public/search/search_strategy'; -/* eslint-enable @kbn/eslint/no-restricted-paths */ diff --git a/src/legacy/ui/public/courier/search_source/mocks.ts b/src/legacy/ui/public/courier/search_source/mocks.ts deleted file mode 100644 index 7b7843d22f519..0000000000000 --- a/src/legacy/ui/public/courier/search_source/mocks.ts +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"), you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -// This mock is here for BWC, but will be left behind and replaced by -// the data service mock in the new platform. -import { ISearchSource } from '../index'; - -export const searchSourceMock: MockedKeys = { - setPreferredSearchStrategyId: jest.fn(), - setFields: jest.fn().mockReturnThis(), - setField: jest.fn().mockReturnThis(), - getId: jest.fn(), - getFields: jest.fn(), - getField: jest.fn(), - getOwnField: jest.fn(), - create: jest.fn().mockReturnThis(), - createCopy: jest.fn().mockReturnThis(), - createChild: jest.fn().mockReturnThis(), - setParent: jest.fn(), - getParent: jest.fn().mockReturnThis(), - fetch: jest.fn().mockResolvedValue({}), - onRequestStart: jest.fn(), - getSearchRequestBody: jest.fn(), - destroy: jest.fn(), - history: [], -}; diff --git a/src/legacy/ui/public/courier/search_source/search_source.ts b/src/legacy/ui/public/courier/search_source/search_source.ts deleted file mode 100644 index e7ca48a894b3d..0000000000000 --- a/src/legacy/ui/public/courier/search_source/search_source.ts +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -export { SearchSource, ISearchSource } from '../index'; diff --git a/src/legacy/ui/public/courier/search_strategy/index.ts b/src/legacy/ui/public/courier/search_strategy/index.ts deleted file mode 100644 index 1dce0316596d0..0000000000000 --- a/src/legacy/ui/public/courier/search_strategy/index.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -export { - addSearchStrategy, - hasSearchStategyForIndexPattern, - isDefaultTypeIndexPattern, - SearchError, -} from '../index'; diff --git a/src/legacy/ui/public/courier/search_strategy/search_error.ts b/src/legacy/ui/public/courier/search_strategy/search_error.ts deleted file mode 100644 index a815ac4ff008f..0000000000000 --- a/src/legacy/ui/public/courier/search_strategy/search_error.ts +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -export { SearchError } from '../index'; diff --git a/src/legacy/ui/public/courier/types.ts b/src/legacy/ui/public/courier/types.ts deleted file mode 100644 index 75035ceef321f..0000000000000 --- a/src/legacy/ui/public/courier/types.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -export { - ISearchSource, - EsQuerySortValue, // used externally by Discover - FetchOptions, // used externally by AggTypes - SortDirection, // used externally by Discover -} from './index'; diff --git a/src/legacy/ui/public/private/private.js b/src/legacy/ui/public/private/private.js index 64c667bf9ce95..05bd55f4e1bdf 100644 --- a/src/legacy/ui/public/private/private.js +++ b/src/legacy/ui/public/private/private.js @@ -86,10 +86,6 @@ import { uiModules } from '../modules'; * ```js * beforeEach(module('kibana', function (PrivateProvider) { * PrivateProvider.swap( - * // since the courier is required automatically before the tests are loaded, - * // we can't stub it's internal components unless we do so before the - * // application starts. This is why angular has config functions - * require('ui/courier/_redirect_when_missing'), * function StubbedRedirectProvider($decorate) { * // $decorate is a function that will instantiate the original module when called * return sinon.spy($decorate()); diff --git a/src/legacy/ui/public/saved_objects/helpers/build_saved_object.ts b/src/legacy/ui/public/saved_objects/helpers/build_saved_object.ts index a436f70f31ffe..7cd9a151a443d 100644 --- a/src/legacy/ui/public/saved_objects/helpers/build_saved_object.ts +++ b/src/legacy/ui/public/saved_objects/helpers/build_saved_object.ts @@ -17,7 +17,7 @@ * under the License. */ import _ from 'lodash'; -import { SearchSource } from 'ui/courier'; +import { SearchSource } from '../../../../../plugins/data/public'; import { hydrateIndexPattern } from './hydrate_index_pattern'; import { intializeSavedObject } from './initialize_saved_object'; import { serializeSavedObject } from './serialize_saved_object'; diff --git a/src/legacy/ui/public/saved_objects/types.ts b/src/legacy/ui/public/saved_objects/types.ts index 2578c2015e819..e44c323aebb87 100644 --- a/src/legacy/ui/public/saved_objects/types.ts +++ b/src/legacy/ui/public/saved_objects/types.ts @@ -24,8 +24,11 @@ import { SavedObjectAttributes, SavedObjectReference, } from 'kibana/public'; -import { ISearchSource } from 'ui/courier'; -import { IIndexPattern, IndexPatternsContract } from '../../../../plugins/data/public'; +import { + IIndexPattern, + IndexPatternsContract, + ISearchSource, +} from '../../../../plugins/data/public'; export interface SavedObject { _serialize: () => { attributes: SavedObjectAttributes; references: SavedObjectReference[] }; diff --git a/src/legacy/ui/public/visualize/loader/utils/query_geohash_bounds.ts b/src/legacy/ui/public/visualize/loader/utils/query_geohash_bounds.ts index 5054c34118f78..0ae8771dd9469 100644 --- a/src/legacy/ui/public/visualize/loader/utils/query_geohash_bounds.ts +++ b/src/legacy/ui/public/visualize/loader/utils/query_geohash_bounds.ts @@ -24,8 +24,12 @@ import { toastNotifications } from 'ui/notify'; import { AggConfig } from 'ui/vis'; import { timefilter } from 'ui/timefilter'; import { Vis } from '../../../vis'; -import { SearchSource, ISearchSource } from '../../../courier'; -import { esFilters, Query } from '../../../../../../plugins/data/public'; +import { + esFilters, + Query, + SearchSource, + ISearchSource, +} from '../../../../../../plugins/data/public'; interface QueryGeohashBoundsParams { filters?: esFilters.Filter[]; diff --git a/src/legacy/utils/index.d.ts b/src/legacy/utils/index.d.ts index 8718ffc113e10..7ac9feab09cbe 100644 --- a/src/legacy/utils/index.d.ts +++ b/src/legacy/utils/index.d.ts @@ -21,6 +21,4 @@ export function parseCommaSeparatedList(input: string | string[]): string[]; export function formatListAsProse(list: string[], options?: { inclusive?: boolean }): string; -export function getFlattenedObject(rootValue: Record): { [key: string]: any }; - export function unset(object: object, rawPath: string): void; diff --git a/src/legacy/utils/index.js b/src/legacy/utils/index.js index e2323f2ed62ee..cb890f1094b04 100644 --- a/src/legacy/utils/index.js +++ b/src/legacy/utils/index.js @@ -22,7 +22,6 @@ export { BinderFor } from './binder_for'; export { deepCloneWithBuffers } from './deep_clone_with_buffers'; export { unset } from './unset'; export { encodeQueryComponent } from './encode_query_component'; -export { getFlattenedObject } from './get_flattened_object'; export { watchStdioForLine } from './watch_stdio_for_line'; export { IS_KIBANA_DISTRIBUTABLE } from './artifact_type'; export { IS_KIBANA_RELEASE } from './artifact_type'; diff --git a/src/plugins/data/public/index_patterns/index.ts b/src/plugins/data/public/index_patterns/index.ts index 6f4821c391721..7444126ee6cae 100644 --- a/src/plugins/data/public/index_patterns/index.ts +++ b/src/plugins/data/public/index_patterns/index.ts @@ -25,6 +25,7 @@ import { IndexPatternMissingIndices, validateIndexPattern, getFromSavedObject, + isDefault, } from './lib'; import { getRoutes } from './utils'; import { flattenHitWrapper, formatHitProvider } from './index_patterns'; @@ -40,6 +41,7 @@ export const indexPatterns = { getFromSavedObject, flattenHitWrapper, formatHitProvider, + isDefault, }; export { Field, FieldList, IFieldList } from './fields'; diff --git a/src/plugins/data/public/index_patterns/lib/index.ts b/src/plugins/data/public/index_patterns/lib/index.ts index c878eb9115427..2893096c4af9d 100644 --- a/src/plugins/data/public/index_patterns/lib/index.ts +++ b/src/plugins/data/public/index_patterns/lib/index.ts @@ -22,3 +22,4 @@ export * from './types'; export { validateIndexPattern } from './validate_index_pattern'; export { IndexPatternMissingIndices } from './errors'; export { getFromSavedObject } from './get_from_saved_object'; +export { isDefault } from './is_default'; diff --git a/src/legacy/core_plugins/data/public/search/search_strategy/is_default_type_index_pattern.ts b/src/plugins/data/public/index_patterns/lib/is_default.ts similarity index 85% rename from src/legacy/core_plugins/data/public/search/search_strategy/is_default_type_index_pattern.ts rename to src/plugins/data/public/index_patterns/lib/is_default.ts index 7d03b1dc9e0b1..f6aec82af89d5 100644 --- a/src/legacy/core_plugins/data/public/search/search_strategy/is_default_type_index_pattern.ts +++ b/src/plugins/data/public/index_patterns/lib/is_default.ts @@ -17,9 +17,9 @@ * under the License. */ -import { IndexPattern } from '../../../../../../plugins/data/public'; +import { IIndexPattern } from '../..'; -export const isDefaultTypeIndexPattern = (indexPattern: IndexPattern) => { +export const isDefault = (indexPattern: IIndexPattern) => { // Default index patterns don't have `type` defined. return !indexPattern.type; }; diff --git a/src/plugins/data/public/plugin.ts b/src/plugins/data/public/plugin.ts index 2077e899d1a01..34d858b28c871 100644 --- a/src/plugins/data/public/plugin.ts +++ b/src/plugins/data/public/plugin.ts @@ -42,7 +42,7 @@ import { setFieldFormats, setOverlays, setIndexPatterns, - setHttp, + setUiSettings, } from './services'; import { createFilterAction, GLOBAL_APPLY_FILTER_ACTION } from './actions'; import { APPLY_FILTER_TRIGGER } from '../../embeddable/public'; @@ -88,7 +88,7 @@ export class DataPublicPlugin implements Plugin { return { diff --git a/src/legacy/core_plugins/data/public/search/fetch/handle_response.tsx b/src/plugins/data/public/search/fetch/handle_response.tsx similarity index 78% rename from src/legacy/core_plugins/data/public/search/fetch/handle_response.tsx rename to src/plugins/data/public/search/fetch/handle_response.tsx index a08b7d14fd1c3..7905468f91c5f 100644 --- a/src/legacy/core_plugins/data/public/search/fetch/handle_response.tsx +++ b/src/plugins/data/public/search/fetch/handle_response.tsx @@ -20,12 +20,10 @@ import React from 'react'; import { i18n } from '@kbn/i18n'; import { EuiSpacer } from '@elastic/eui'; -import { ShardFailureOpenModalButton } from './components/shard_failure_open_modal_button'; -import { Request, ResponseWithShardFailure } from './components/shard_failure_types'; -import { SearchRequest, SearchResponse } from '../types'; -import { toMountPoint } from '../../../../../../plugins/kibana_react/public'; -// eslint-disable-next-line @kbn/eslint/no-restricted-paths -import { getNotifications } from '../../../../../../plugins/data/public/services'; +import { ShardFailureOpenModalButton, ShardFailureRequest, ShardFailureResponse } from '../../ui'; +import { toMountPoint } from '../../../../kibana_react/public'; +import { getNotifications } from '../../services'; +import { SearchRequest, SearchResponse } from '..'; export function handleResponse(request: SearchRequest, response: SearchResponse) { if (response.timed_out) { @@ -56,8 +54,8 @@ export function handleResponse(request: SearchRequest, response: SearchResponse) {description} diff --git a/src/legacy/core_plugins/data/public/search/fetch/index.ts b/src/plugins/data/public/search/fetch/index.ts similarity index 87% rename from src/legacy/core_plugins/data/public/search/fetch/index.ts rename to src/plugins/data/public/search/fetch/index.ts index 7b89dea1a110c..8a80b716add32 100644 --- a/src/legacy/core_plugins/data/public/search/fetch/index.ts +++ b/src/plugins/data/public/search/fetch/index.ts @@ -17,5 +17,6 @@ * under the License. */ -export * from './fetch_soon'; -export * from './get_search_params'; +export * from './types'; +export { fetchSoon } from './fetch_soon'; +export { RequestFailure } from './errors'; diff --git a/src/legacy/core_plugins/data/public/search/fetch/types.ts b/src/plugins/data/public/search/fetch/types.ts similarity index 94% rename from src/legacy/core_plugins/data/public/search/fetch/types.ts rename to src/plugins/data/public/search/fetch/types.ts index c7f32cf08aa94..62eb965703c3a 100644 --- a/src/legacy/core_plugins/data/public/search/fetch/types.ts +++ b/src/plugins/data/public/search/fetch/types.ts @@ -18,7 +18,7 @@ */ import { ISearchStart } from 'src/plugins/data/public'; -import { IUiSettingsClient } from '../../../../../../core/public'; +import { IUiSettingsClient } from '../../../../../core/public'; export interface FetchOptions { abortSignal?: AbortSignal; diff --git a/src/plugins/data/public/search/index.ts b/src/plugins/data/public/search/index.ts index 7d62b3823771d..cf7e0268d745a 100644 --- a/src/plugins/data/public/search/index.ts +++ b/src/plugins/data/public/search/index.ts @@ -20,6 +20,7 @@ export { ISearchAppMountContext } from './i_search_app_mount_context'; export { ISearchSetup } from './i_search_setup'; +export { ISearchStart } from './search_service'; export { ISearchContext } from './i_search_context'; @@ -39,6 +40,21 @@ export { SYNC_SEARCH_STRATEGY } from './sync_search_strategy'; export { IKibanaSearchResponse, IKibanaSearchRequest } from '../../common/search'; -export { ISearchStart } from './search_service'; +export { LegacyApiCaller, SearchRequest, SearchResponse } from './es_client'; -export { LegacyApiCaller } from './es_client'; +export { + addSearchStrategy, + hasSearchStategyForIndexPattern, + defaultSearchStrategy, + SearchError, +} from './search_strategy'; + +export { + ISearchSource, + SearchSource, + SearchSourceFields, + EsQuerySortValue, + SortDirection, +} from './search_source'; + +export { FetchOptions } from './fetch'; diff --git a/src/legacy/core_plugins/data/public/search/search_source/filter_docvalue_fields.test.ts b/src/plugins/data/public/search/search_source/filter_docvalue_fields.test.ts similarity index 100% rename from src/legacy/core_plugins/data/public/search/search_source/filter_docvalue_fields.test.ts rename to src/plugins/data/public/search/search_source/filter_docvalue_fields.test.ts diff --git a/src/legacy/core_plugins/data/public/search/search_source/filter_docvalue_fields.ts b/src/plugins/data/public/search/search_source/filter_docvalue_fields.ts similarity index 100% rename from src/legacy/core_plugins/data/public/search/search_source/filter_docvalue_fields.ts rename to src/plugins/data/public/search/search_source/filter_docvalue_fields.ts diff --git a/src/legacy/core_plugins/data/public/search/search_source/index.ts b/src/plugins/data/public/search/search_source/index.ts similarity index 91% rename from src/legacy/core_plugins/data/public/search/search_source/index.ts rename to src/plugins/data/public/search/search_source/index.ts index 72170adc2b129..10f1b2bc332e1 100644 --- a/src/legacy/core_plugins/data/public/search/search_source/index.ts +++ b/src/plugins/data/public/search/search_source/index.ts @@ -18,3 +18,4 @@ */ export * from './search_source'; +export { SortDirection, EsQuerySortValue, SearchSourceFields } from './types'; diff --git a/src/legacy/core_plugins/data/public/search/search_source/mocks.ts b/src/plugins/data/public/search/search_source/mocks.ts similarity index 100% rename from src/legacy/core_plugins/data/public/search/search_source/mocks.ts rename to src/plugins/data/public/search/search_source/mocks.ts diff --git a/src/legacy/core_plugins/data/public/search/search_source/normalize_sort_request.test.ts b/src/plugins/data/public/search/search_source/normalize_sort_request.test.ts similarity index 98% rename from src/legacy/core_plugins/data/public/search/search_source/normalize_sort_request.test.ts rename to src/plugins/data/public/search/search_source/normalize_sort_request.test.ts index 22d1d931a9d09..5939074d773bf 100644 --- a/src/legacy/core_plugins/data/public/search/search_source/normalize_sort_request.test.ts +++ b/src/plugins/data/public/search/search_source/normalize_sort_request.test.ts @@ -19,7 +19,7 @@ import { normalizeSortRequest } from './normalize_sort_request'; import { SortDirection } from './types'; -import { IIndexPattern } from '../../../../../../plugins/data/public'; +import { IIndexPattern } from '../..'; jest.mock('ui/new_platform'); diff --git a/src/legacy/core_plugins/data/public/search/search_source/normalize_sort_request.ts b/src/plugins/data/public/search/search_source/normalize_sort_request.ts similarity index 97% rename from src/legacy/core_plugins/data/public/search/search_source/normalize_sort_request.ts rename to src/plugins/data/public/search/search_source/normalize_sort_request.ts index 93834c95514dc..9e36d2e416f03 100644 --- a/src/legacy/core_plugins/data/public/search/search_source/normalize_sort_request.ts +++ b/src/plugins/data/public/search/search_source/normalize_sort_request.ts @@ -17,7 +17,7 @@ * under the License. */ -import { IIndexPattern } from '../../../../../../plugins/data/public'; +import { IIndexPattern } from '../..'; import { EsQuerySortValue, SortOptions } from './types'; export function normalizeSortRequest( diff --git a/src/legacy/core_plugins/data/public/search/search_source/search_source.test.ts b/src/plugins/data/public/search/search_source/search_source.test.ts similarity index 94% rename from src/legacy/core_plugins/data/public/search/search_source/search_source.test.ts rename to src/plugins/data/public/search/search_source/search_source.test.ts index ebeee60b67c8a..936a2ae25ad1f 100644 --- a/src/legacy/core_plugins/data/public/search/search_source/search_source.test.ts +++ b/src/plugins/data/public/search/search_source/search_source.test.ts @@ -18,18 +18,13 @@ */ import { SearchSource } from '../search_source'; -import { IndexPattern } from '../../../../../../plugins/data/public'; -import { - setSearchService, - setUiSettings, - setInjectedMetadata, - // eslint-disable-next-line @kbn/eslint/no-restricted-paths -} from '../../../../../../plugins/data/public/services'; +import { IndexPattern } from '../..'; +import { setSearchService, setUiSettings, setInjectedMetadata } from '../../services'; import { injectedMetadataServiceMock, uiSettingsServiceMock, -} from '../../../../../../core/public/mocks'; +} from '../../../../../core/public/mocks'; setUiSettings(uiSettingsServiceMock.createStartContract()); setInjectedMetadata(injectedMetadataServiceMock.createSetupContract()); diff --git a/src/legacy/core_plugins/data/public/search/search_source/search_source.ts b/src/plugins/data/public/search/search_source/search_source.ts similarity index 95% rename from src/legacy/core_plugins/data/public/search/search_source/search_source.ts rename to src/plugins/data/public/search/search_source/search_source.ts index e977db713ebaa..749c59d891b7e 100644 --- a/src/legacy/core_plugins/data/public/search/search_source/search_source.ts +++ b/src/plugins/data/public/search/search_source/search_source.ts @@ -71,20 +71,13 @@ import _ from 'lodash'; import { normalizeSortRequest } from './normalize_sort_request'; -import { fetchSoon } from '../fetch'; -import { fieldWildcardFilter } from '../../../../../../plugins/kibana_utils/public'; -import { getHighlightRequest, esFilters, esQuery } from '../../../../../../plugins/data/public'; -import { RequestFailure } from '../fetch/errors'; import { filterDocvalueFields } from './filter_docvalue_fields'; -import { SearchSourceOptions, SearchSourceFields, SearchRequest } from './types'; -import { FetchOptions } from '../fetch/types'; - -import { - getSearchService, - getUiSettings, - getInjectedMetadata, - // eslint-disable-next-line @kbn/eslint/no-restricted-paths -} from '../../../../../../plugins/data/public/services'; +import { fieldWildcardFilter } from '../../../../kibana_utils/public'; +import { getHighlightRequest, esFilters, esQuery, SearchRequest } from '../..'; +import { SearchSourceOptions, SearchSourceFields } from './types'; +import { fetchSoon, FetchOptions, RequestFailure } from '../fetch'; + +import { getSearchService, getUiSettings, getInjectedMetadata } from '../../services'; export type ISearchSource = Pick; diff --git a/src/legacy/core_plugins/data/public/search/search_source/types.ts b/src/plugins/data/public/search/search_source/types.ts similarity index 94% rename from src/legacy/core_plugins/data/public/search/search_source/types.ts rename to src/plugins/data/public/search/search_source/types.ts index 9c5b57519d75f..17337c905db87 100644 --- a/src/legacy/core_plugins/data/public/search/search_source/types.ts +++ b/src/plugins/data/public/search/search_source/types.ts @@ -17,7 +17,7 @@ * under the License. */ import { NameList } from 'elasticsearch'; -import { esFilters, IndexPattern, Query } from '../../../../../../plugins/data/public'; +import { esFilters, IndexPattern, Query } from '../..'; export type EsQuerySearchAfter = [string | number, string | number]; @@ -102,6 +102,3 @@ export interface ShardFailure { }; shard: number; } - -export type SearchRequest = any; -export type SearchResponse = any; diff --git a/src/legacy/core_plugins/data/public/search/search_strategy/default_search_strategy.test.ts b/src/plugins/data/public/search/search_strategy/default_search_strategy.test.ts similarity index 98% rename from src/legacy/core_plugins/data/public/search/search_strategy/default_search_strategy.test.ts rename to src/plugins/data/public/search/search_strategy/default_search_strategy.test.ts index 8caf20c50cd3a..80ab7ceb8870f 100644 --- a/src/legacy/core_plugins/data/public/search/search_strategy/default_search_strategy.test.ts +++ b/src/plugins/data/public/search/search_strategy/default_search_strategy.test.ts @@ -17,9 +17,9 @@ * under the License. */ -import { defaultSearchStrategy } from './default_search_strategy'; -import { IUiSettingsClient } from '../../../../../../core/public'; +import { IUiSettingsClient } from '../../../../../core/public'; import { SearchStrategySearchParams } from './types'; +import { defaultSearchStrategy } from './default_search_strategy'; const { search } = defaultSearchStrategy; diff --git a/src/legacy/core_plugins/data/public/search/search_strategy/default_search_strategy.ts b/src/plugins/data/public/search/search_strategy/default_search_strategy.ts similarity index 92% rename from src/legacy/core_plugins/data/public/search/search_strategy/default_search_strategy.ts rename to src/plugins/data/public/search/search_strategy/default_search_strategy.ts index 39789504de0a7..6c178fd9cd4c8 100644 --- a/src/legacy/core_plugins/data/public/search/search_strategy/default_search_strategy.ts +++ b/src/plugins/data/public/search/search_strategy/default_search_strategy.ts @@ -18,13 +18,8 @@ */ import { SearchStrategyProvider, SearchStrategySearchParams } from './types'; -import { isDefaultTypeIndexPattern } from './is_default_type_index_pattern'; -import { - getSearchParams, - getMSearchParams, - getPreference, - getTimeout, -} from '../fetch/get_search_params'; +import { indexPatterns } from '../../index_patterns'; +import { getSearchParams, getMSearchParams, getPreference, getTimeout } from './get_search_params'; export const defaultSearchStrategy: SearchStrategyProvider = { id: 'default', @@ -34,7 +29,7 @@ export const defaultSearchStrategy: SearchStrategyProvider = { }, isViable: indexPattern => { - return indexPattern && isDefaultTypeIndexPattern(indexPattern); + return indexPattern && indexPatterns.isDefault(indexPattern); }, }; diff --git a/src/legacy/core_plugins/data/public/search/fetch/get_search_params.test.ts b/src/plugins/data/public/search/search_strategy/get_search_params.test.ts similarity index 98% rename from src/legacy/core_plugins/data/public/search/fetch/get_search_params.test.ts rename to src/plugins/data/public/search/search_strategy/get_search_params.test.ts index f856aa77bf1f8..76f3105d7f942 100644 --- a/src/legacy/core_plugins/data/public/search/fetch/get_search_params.test.ts +++ b/src/plugins/data/public/search/search_strategy/get_search_params.test.ts @@ -18,7 +18,7 @@ */ import { getMSearchParams, getSearchParams } from './get_search_params'; -import { IUiSettingsClient } from '../../../../../../core/public'; +import { IUiSettingsClient } from '../../../../../core/public'; function getConfigStub(config: any = {}) { return { diff --git a/src/legacy/core_plugins/data/public/search/fetch/get_search_params.ts b/src/plugins/data/public/search/search_strategy/get_search_params.ts similarity index 97% rename from src/legacy/core_plugins/data/public/search/fetch/get_search_params.ts rename to src/plugins/data/public/search/search_strategy/get_search_params.ts index de9ec4cb920e8..9fb8f2c728c6f 100644 --- a/src/legacy/core_plugins/data/public/search/fetch/get_search_params.ts +++ b/src/plugins/data/public/search/search_strategy/get_search_params.ts @@ -17,7 +17,7 @@ * under the License. */ -import { IUiSettingsClient } from '../../../../../../core/public'; +import { IUiSettingsClient } from '../../../../../core/public'; const sessionId = Date.now(); diff --git a/src/legacy/core_plugins/data/public/search/search_strategy/index.ts b/src/plugins/data/public/search/search_strategy/index.ts similarity index 93% rename from src/legacy/core_plugins/data/public/search/search_strategy/index.ts rename to src/plugins/data/public/search/search_strategy/index.ts index 1584baa4faade..330e10d7d30e4 100644 --- a/src/legacy/core_plugins/data/public/search/search_strategy/index.ts +++ b/src/plugins/data/public/search/search_strategy/index.ts @@ -24,8 +24,8 @@ export { getSearchStrategyForSearchRequest, } from './search_strategy_registry'; -export { defaultSearchStrategy } from './default_search_strategy'; +export { SearchError, getSearchErrorType } from './search_error'; -export { isDefaultTypeIndexPattern } from './is_default_type_index_pattern'; +export { SearchStrategyProvider, SearchStrategySearchParams } from './types'; -export { SearchError, getSearchErrorType } from './search_error'; +export { defaultSearchStrategy } from './default_search_strategy'; diff --git a/src/legacy/core_plugins/data/public/search/search_strategy/no_op_search_strategy.ts b/src/plugins/data/public/search/search_strategy/no_op_search_strategy.ts similarity index 100% rename from src/legacy/core_plugins/data/public/search/search_strategy/no_op_search_strategy.ts rename to src/plugins/data/public/search/search_strategy/no_op_search_strategy.ts diff --git a/src/legacy/core_plugins/data/public/search/search_strategy/search_error.ts b/src/plugins/data/public/search/search_strategy/search_error.ts similarity index 100% rename from src/legacy/core_plugins/data/public/search/search_strategy/search_error.ts rename to src/plugins/data/public/search/search_strategy/search_error.ts diff --git a/src/legacy/core_plugins/data/public/search/search_strategy/search_strategy_registry.test.ts b/src/plugins/data/public/search/search_strategy/search_strategy_registry.test.ts similarity index 98% rename from src/legacy/core_plugins/data/public/search/search_strategy/search_strategy_registry.test.ts rename to src/plugins/data/public/search/search_strategy/search_strategy_registry.test.ts index 73b011896a97d..eaf86e1b270d5 100644 --- a/src/legacy/core_plugins/data/public/search/search_strategy/search_strategy_registry.test.ts +++ b/src/plugins/data/public/search/search_strategy/search_strategy_registry.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { IndexPattern } from '../../../../../../plugins/data/public'; +import { IndexPattern } from '../..'; import { noOpSearchStrategy } from './no_op_search_strategy'; import { searchStrategies, diff --git a/src/legacy/core_plugins/data/public/search/search_strategy/search_strategy_registry.ts b/src/plugins/data/public/search/search_strategy/search_strategy_registry.ts similarity index 95% rename from src/legacy/core_plugins/data/public/search/search_strategy/search_strategy_registry.ts rename to src/plugins/data/public/search/search_strategy/search_strategy_registry.ts index d814a04737f75..1ab6f7d4e1eff 100644 --- a/src/legacy/core_plugins/data/public/search/search_strategy/search_strategy_registry.ts +++ b/src/plugins/data/public/search/search_strategy/search_strategy_registry.ts @@ -17,10 +17,10 @@ * under the License. */ -import { IndexPattern } from '../../../../../../plugins/data/public'; +import { IndexPattern } from '../..'; import { SearchStrategyProvider } from './types'; import { noOpSearchStrategy } from './no_op_search_strategy'; -import { SearchResponse } from '../types'; +import { SearchResponse } from '..'; export const searchStrategies: SearchStrategyProvider[] = []; diff --git a/src/legacy/core_plugins/data/public/search/search_strategy/types.ts b/src/plugins/data/public/search/search_strategy/types.ts similarity index 90% rename from src/legacy/core_plugins/data/public/search/search_strategy/types.ts rename to src/plugins/data/public/search/search_strategy/types.ts index ad8576589e4e3..764370d8ff649 100644 --- a/src/legacy/core_plugins/data/public/search/search_strategy/types.ts +++ b/src/plugins/data/public/search/search_strategy/types.ts @@ -17,9 +17,9 @@ * under the License. */ -import { IndexPattern } from '../../../../../../plugins/data/public'; +import { IndexPattern } from '../..'; import { FetchHandlers } from '../fetch/types'; -import { SearchRequest, SearchResponse } from '../types'; +import { SearchRequest, SearchResponse } from '..'; export interface SearchStrategyProvider { id: string; diff --git a/src/plugins/data/public/ui/_index.scss b/src/plugins/data/public/ui/_index.scss index 39f29ac777588..1ca49963f3ded 100644 --- a/src/plugins/data/public/ui/_index.scss +++ b/src/plugins/data/public/ui/_index.scss @@ -6,3 +6,5 @@ @import './saved_query_management/index'; @import './query_string_input/index'; + +@import './shard_failure_modal/shard_failure_modal'; \ No newline at end of file diff --git a/src/plugins/data/public/ui/index.ts b/src/plugins/data/public/ui/index.ts index cd4ec3c3bf74b..0755363c9b16b 100644 --- a/src/plugins/data/public/ui/index.ts +++ b/src/plugins/data/public/ui/index.ts @@ -23,6 +23,15 @@ export { FilterBar } from './filter_bar'; export { QueryStringInput } from './query_string_input/query_string_input'; export { SearchBar, SearchBarProps } from './search_bar'; -// temp export - will be removed as final components are migrated to NP +// @internal +export { + ShardFailureOpenModalButton, + ShardFailureRequest, + ShardFailureResponse, +} from './shard_failure_modal'; + +// @internal export { SavedQueryManagementComponent } from './saved_query_management'; + +// @internal export { SaveQueryForm, SavedQueryMeta } from './saved_query_form'; diff --git a/src/legacy/core_plugins/data/public/search/fetch/components/__mocks__/shard_failure_request.ts b/src/plugins/data/public/ui/shard_failure_modal/__mocks__/shard_failure_request.ts similarity index 92% rename from src/legacy/core_plugins/data/public/search/fetch/components/__mocks__/shard_failure_request.ts rename to src/plugins/data/public/ui/shard_failure_modal/__mocks__/shard_failure_request.ts index 701ff19a38ab9..a9192ee98b192 100644 --- a/src/legacy/core_plugins/data/public/search/fetch/components/__mocks__/shard_failure_request.ts +++ b/src/plugins/data/public/ui/shard_failure_modal/__mocks__/shard_failure_request.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { Request } from '../shard_failure_types'; +import { ShardFailureRequest } from '../shard_failure_types'; export const shardFailureRequest = { version: true, size: 500, @@ -29,4 +29,4 @@ export const shardFailureRequest = { docvalue_fields: [], query: {}, highlight: {}, -} as Request; +} as ShardFailureRequest; diff --git a/src/legacy/core_plugins/data/public/search/fetch/components/__mocks__/shard_failure_response.ts b/src/plugins/data/public/ui/shard_failure_modal/__mocks__/shard_failure_response.ts similarity index 93% rename from src/legacy/core_plugins/data/public/search/fetch/components/__mocks__/shard_failure_response.ts rename to src/plugins/data/public/ui/shard_failure_modal/__mocks__/shard_failure_response.ts index 7a519b62a9cc7..573aeefcdf469 100644 --- a/src/legacy/core_plugins/data/public/search/fetch/components/__mocks__/shard_failure_response.ts +++ b/src/plugins/data/public/ui/shard_failure_modal/__mocks__/shard_failure_response.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { ResponseWithShardFailure } from '../shard_failure_types'; +import { ShardFailureResponse } from '../shard_failure_types'; export const shardFailureResponse = { _shards: { @@ -43,4 +43,4 @@ export const shardFailureResponse = { }, ], }, -} as ResponseWithShardFailure; +} as ShardFailureResponse; diff --git a/src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_description.test.tsx.snap b/src/plugins/data/public/ui/shard_failure_modal/__snapshots__/shard_failure_description.test.tsx.snap similarity index 100% rename from src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_description.test.tsx.snap rename to src/plugins/data/public/ui/shard_failure_modal/__snapshots__/shard_failure_description.test.tsx.snap diff --git a/src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_modal.test.tsx.snap b/src/plugins/data/public/ui/shard_failure_modal/__snapshots__/shard_failure_modal.test.tsx.snap similarity index 100% rename from src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_modal.test.tsx.snap rename to src/plugins/data/public/ui/shard_failure_modal/__snapshots__/shard_failure_modal.test.tsx.snap diff --git a/src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_table.test.tsx.snap b/src/plugins/data/public/ui/shard_failure_modal/__snapshots__/shard_failure_table.test.tsx.snap similarity index 100% rename from src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_table.test.tsx.snap rename to src/plugins/data/public/ui/shard_failure_modal/__snapshots__/shard_failure_table.test.tsx.snap diff --git a/src/legacy/core_plugins/data/public/search/fetch/components/_shard_failure_modal.scss b/src/plugins/data/public/ui/shard_failure_modal/_shard_failure_modal.scss similarity index 100% rename from src/legacy/core_plugins/data/public/search/fetch/components/_shard_failure_modal.scss rename to src/plugins/data/public/ui/shard_failure_modal/_shard_failure_modal.scss diff --git a/src/legacy/ui/public/courier/search_source/index.ts b/src/plugins/data/public/ui/shard_failure_modal/index.ts similarity index 82% rename from src/legacy/ui/public/courier/search_source/index.ts rename to src/plugins/data/public/ui/shard_failure_modal/index.ts index e7ca48a894b3d..f4c2e26a756e3 100644 --- a/src/legacy/ui/public/courier/search_source/index.ts +++ b/src/plugins/data/public/ui/shard_failure_modal/index.ts @@ -17,4 +17,5 @@ * under the License. */ -export { SearchSource, ISearchSource } from '../index'; +export { ShardFailureRequest, ShardFailureResponse } from './shard_failure_types'; +export { ShardFailureOpenModalButton } from './shard_failure_open_modal_button'; diff --git a/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description.test.tsx b/src/plugins/data/public/ui/shard_failure_modal/shard_failure_description.test.tsx similarity index 100% rename from src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description.test.tsx rename to src/plugins/data/public/ui/shard_failure_modal/shard_failure_description.test.tsx diff --git a/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description.tsx b/src/plugins/data/public/ui/shard_failure_modal/shard_failure_description.tsx similarity index 96% rename from src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description.tsx rename to src/plugins/data/public/ui/shard_failure_modal/shard_failure_description.tsx index 60e0e35a0f152..d440f09ca09dd 100644 --- a/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description.tsx +++ b/src/plugins/data/public/ui/shard_failure_modal/shard_failure_description.tsx @@ -19,7 +19,7 @@ import React from 'react'; import { EuiCodeBlock, EuiDescriptionList, EuiSpacer } from '@elastic/eui'; import { ShardFailure } from './shard_failure_types'; -import { getFlattenedObject } from '../../../../../../../legacy/utils/get_flattened_object'; +import { getFlattenedObject } from '../../../../../core/utils'; import { ShardFailureDescriptionHeader } from './shard_failure_description_header'; /** diff --git a/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description_header.tsx b/src/plugins/data/public/ui/shard_failure_modal/shard_failure_description_header.tsx similarity index 100% rename from src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description_header.tsx rename to src/plugins/data/public/ui/shard_failure_modal/shard_failure_description_header.tsx diff --git a/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_modal.test.tsx b/src/plugins/data/public/ui/shard_failure_modal/shard_failure_modal.test.tsx similarity index 100% rename from src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_modal.test.tsx rename to src/plugins/data/public/ui/shard_failure_modal/shard_failure_modal.test.tsx diff --git a/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_modal.tsx b/src/plugins/data/public/ui/shard_failure_modal/shard_failure_modal.tsx similarity index 96% rename from src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_modal.tsx rename to src/plugins/data/public/ui/shard_failure_modal/shard_failure_modal.tsx index 65cb49c611575..3dcab7732f769 100644 --- a/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_modal.tsx +++ b/src/plugins/data/public/ui/shard_failure_modal/shard_failure_modal.tsx @@ -33,12 +33,12 @@ import { EuiCallOut, } from '@elastic/eui'; import { ShardFailureTable } from './shard_failure_table'; -import { ResponseWithShardFailure, Request } from './shard_failure_types'; +import { ShardFailureResponse, ShardFailureRequest } from './shard_failure_types'; export interface Props { onClose: () => void; - request: Request; - response: ResponseWithShardFailure; + request: ShardFailureRequest; + response: ShardFailureResponse; title: string; } diff --git a/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.test.mocks.tsx b/src/plugins/data/public/ui/shard_failure_modal/shard_failure_open_modal_button.test.mocks.tsx similarity index 87% rename from src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.test.mocks.tsx rename to src/plugins/data/public/ui/shard_failure_modal/shard_failure_open_modal_button.test.mocks.tsx index 4dd4d5943fadc..516eae9d46a6b 100644 --- a/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.test.mocks.tsx +++ b/src/plugins/data/public/ui/shard_failure_modal/shard_failure_open_modal_button.test.mocks.tsx @@ -17,8 +17,7 @@ * under the License. */ -// eslint-disable-next-line @kbn/eslint/no-restricted-paths -import { setOverlays } from '../../../../../../../plugins/data/public/services'; +import { setOverlays } from '../../services'; import { OverlayStart } from 'kibana/public'; export const openModal = jest.fn(); diff --git a/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.test.tsx b/src/plugins/data/public/ui/shard_failure_modal/shard_failure_open_modal_button.test.tsx similarity index 100% rename from src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.test.tsx rename to src/plugins/data/public/ui/shard_failure_modal/shard_failure_open_modal_button.test.tsx diff --git a/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.tsx b/src/plugins/data/public/ui/shard_failure_modal/shard_failure_open_modal_button.tsx similarity index 84% rename from src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.tsx rename to src/plugins/data/public/ui/shard_failure_modal/shard_failure_open_modal_button.tsx index c3ff042083473..fa42745da2e48 100644 --- a/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.tsx +++ b/src/plugins/data/public/ui/shard_failure_modal/shard_failure_open_modal_button.tsx @@ -20,15 +20,14 @@ import React from 'react'; import { FormattedMessage } from '@kbn/i18n/react'; import { EuiButton, EuiTextAlign } from '@elastic/eui'; -// eslint-disable-next-line @kbn/eslint/no-restricted-paths -import { getOverlays } from '../../../../../../../plugins/data/public/services'; -import { toMountPoint } from '../../../../../../../plugins/kibana_react/public'; +import { getOverlays } from '../../services'; +import { toMountPoint } from '../../../../kibana_react/public'; import { ShardFailureModal } from './shard_failure_modal'; -import { ResponseWithShardFailure, Request } from './shard_failure_types'; +import { ShardFailureResponse, ShardFailureRequest } from './shard_failure_types'; interface Props { - request: Request; - response: ResponseWithShardFailure; + request: ShardFailureRequest; + response: ShardFailureResponse; title: string; } diff --git a/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_table.test.tsx b/src/plugins/data/public/ui/shard_failure_modal/shard_failure_table.test.tsx similarity index 100% rename from src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_table.test.tsx rename to src/plugins/data/public/ui/shard_failure_modal/shard_failure_table.test.tsx diff --git a/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_table.tsx b/src/plugins/data/public/ui/shard_failure_modal/shard_failure_table.tsx similarity index 100% rename from src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_table.tsx rename to src/plugins/data/public/ui/shard_failure_modal/shard_failure_table.tsx diff --git a/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_types.ts b/src/plugins/data/public/ui/shard_failure_modal/shard_failure_types.ts similarity index 94% rename from src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_types.ts rename to src/plugins/data/public/ui/shard_failure_modal/shard_failure_types.ts index 22fc20233cc87..b1ce3f30c4278 100644 --- a/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_types.ts +++ b/src/plugins/data/public/ui/shard_failure_modal/shard_failure_types.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -export interface Request { +export interface ShardFailureRequest { docvalue_fields: string[]; _source: unknown; query: unknown; @@ -25,7 +25,7 @@ export interface Request { stored_fields: string[]; } -export interface ResponseWithShardFailure { +export interface ShardFailureResponse { _shards: { failed: number; failures: ShardFailure[]; diff --git a/x-pack/legacy/plugins/maps/public/kibana_services.js b/x-pack/legacy/plugins/maps/public/kibana_services.js index 1ec7565df6f26..dadae7a3fdca9 100644 --- a/x-pack/legacy/plugins/maps/public/kibana_services.js +++ b/x-pack/legacy/plugins/maps/public/kibana_services.js @@ -7,12 +7,12 @@ import { getRequestInspectorStats, getResponseInspectorStats, -} from '../../../../../src/legacy/ui/public/courier'; +} from '../../../../../src/legacy/core_plugins/data/public'; import { esFilters } from '../../../../../src/plugins/data/public'; import { npStart } from 'ui/new_platform'; export const SPATIAL_FILTER_TYPE = esFilters.FILTERS.SPATIAL_FILTER; -export { SearchSource } from '../../../../../src/legacy/ui/public/courier'; +export { SearchSource } from '../../../../../src/plugins/data/public'; export const indexPatternService = npStart.plugins.data.indexPatterns; let licenseId; diff --git a/x-pack/legacy/plugins/rollup/public/search/register.js b/x-pack/legacy/plugins/rollup/public/search/register.js index f7f1c681b63ca..05db100088e8a 100644 --- a/x-pack/legacy/plugins/rollup/public/search/register.js +++ b/x-pack/legacy/plugins/rollup/public/search/register.js @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { addSearchStrategy } from '../../../../../../src/legacy/ui/public/courier'; +import { addSearchStrategy } from '../../../../../../src/plugins/data/public'; import { rollupSearchStrategy } from './rollup_search_strategy'; export function initSearch() { diff --git a/x-pack/legacy/plugins/rollup/public/search/rollup_search_strategy.js b/x-pack/legacy/plugins/rollup/public/search/rollup_search_strategy.js index becaf6dd338c8..18e72cdf0fd3d 100644 --- a/x-pack/legacy/plugins/rollup/public/search/rollup_search_strategy.js +++ b/x-pack/legacy/plugins/rollup/public/search/rollup_search_strategy.js @@ -5,7 +5,7 @@ */ import { kfetch } from 'ui/kfetch'; -import { SearchError, getSearchErrorType } from '../../../../../../src/legacy/ui/public/courier'; +import { SearchError, getSearchErrorType } from '../../../../../../src/plugins/data/public'; function serializeFetchParams(searchRequests) { return JSON.stringify(