From 78bf464511feb301156902c06f5c9ebc814462ab Mon Sep 17 00:00:00 2001 From: Xavier Mouligneau <189600+XavierM@users.noreply.github.com> Date: Fri, 19 Jul 2019 18:43:31 +0200 Subject: [PATCH] remove StaticIndexPattern --- src/core/server/saved_objects/service/lib/repository.ts | 2 +- .../service/lib/search_dsl/query_params.test.ts | 4 ++-- .../saved_objects/service/lib/search_dsl/query_params.ts | 5 ++--- .../saved_objects/service/lib/search_dsl/search_dsl.ts | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/core/server/saved_objects/service/lib/repository.ts b/src/core/server/saved_objects/service/lib/repository.ts index 2bfa06b55c9b31d..b80a1bd4f5b2a72 100644 --- a/src/core/server/saved_objects/service/lib/repository.ts +++ b/src/core/server/saved_objects/service/lib/repository.ts @@ -448,7 +448,7 @@ export class SavedObjectsRepository { search, defaultSearchOperator, searchFields, - type: types, + type: allowedTypes, sortField, sortOrder, namespace, diff --git a/src/core/server/saved_objects/service/lib/search_dsl/query_params.test.ts b/src/core/server/saved_objects/service/lib/search_dsl/query_params.test.ts index 024f30228e44c61..f3e55598e7c94d7 100644 --- a/src/core/server/saved_objects/service/lib/search_dsl/query_params.test.ts +++ b/src/core/server/saved_objects/service/lib/search_dsl/query_params.test.ts @@ -17,8 +17,8 @@ * under the License. */ -import { StaticIndexPattern } from 'ui/index_patterns'; import { schemaMock } from '../../../schema/schema.mock'; +import { SavedObjectsIndexPattern } from '../../saved_objects_client'; import { getQueryParams } from './query_params'; const SCHEMA = schemaMock.create(); @@ -62,7 +62,7 @@ const MAPPINGS = { }, }, }; -const INDEX_PATTERN: StaticIndexPattern = { +const INDEX_PATTERN: SavedObjectsIndexPattern = { fields: [ { aggregatable: true, diff --git a/src/core/server/saved_objects/service/lib/search_dsl/query_params.ts b/src/core/server/saved_objects/service/lib/search_dsl/query_params.ts index dc9d1672ee4c88d..fe99f1b826ec3a2 100644 --- a/src/core/server/saved_objects/service/lib/search_dsl/query_params.ts +++ b/src/core/server/saved_objects/service/lib/search_dsl/query_params.ts @@ -17,10 +17,9 @@ * under the License. */ -import { StaticIndexPattern } from 'ui/index_patterns'; - import { getRootPropertiesObjects, IndexMapping } from '../../../mappings'; import { SavedObjectsSchema } from '../../../schema'; +import { SavedObjectsIndexPattern } from '../../saved_objects_client'; import { convertKueryToElasticSearchQuery } from '../kuery_utils'; /** @@ -94,7 +93,7 @@ interface QueryParams { defaultSearchOperator?: string; hasReference?: HasReferenceQueryParams; filter?: string; - indexPattern?: StaticIndexPattern; + indexPattern?: SavedObjectsIndexPattern; } /** diff --git a/src/core/server/saved_objects/service/lib/search_dsl/search_dsl.ts b/src/core/server/saved_objects/service/lib/search_dsl/search_dsl.ts index b065c4132d1de3b..c64d07cf515ac34 100644 --- a/src/core/server/saved_objects/service/lib/search_dsl/search_dsl.ts +++ b/src/core/server/saved_objects/service/lib/search_dsl/search_dsl.ts @@ -18,10 +18,10 @@ */ import Boom from 'boom'; -import { StaticIndexPattern } from 'ui/index_patterns'; import { IndexMapping } from '../../../mappings'; import { SavedObjectsSchema } from '../../../schema'; +import { SavedObjectsIndexPattern } from '../../saved_objects_client'; import { getQueryParams } from './query_params'; import { getSortingParams } from './sorting_params'; @@ -38,7 +38,7 @@ interface GetSearchDslOptions { id: string; }; filter?: string; - indexPattern?: StaticIndexPattern; + indexPattern?: SavedObjectsIndexPattern; } export function getSearchDsl(