remove StaticIndexPattern

elastic · Jul 22, 2019 · 78bf464 · 78bf464
1 parent 9bd8719
commit 78bf464
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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(