Space aware saved objects using only filtering

src/server/saved_objects/service/lib/repository.js

@@ -211,7 +211,7 @@ export class SavedObjectsRepository {
    * @property {string} [options.search]
    * @property {Array<string>} [options.searchFields] - see Elasticsearch Simple Query String
    *                                        Query field argument for more information
-   * @property {object} [options.extraQueryParams] - ES Query parameters to merge/append into the generated query
+   * @property {object} [options.filters] - ES Query filters to append
    * @property {integer} [options.page=1]
    * @property {integer} [options.perPage=20]
    * @property {string} [options.sortField]
@@ -229,7 +229,7 @@ export class SavedObjectsRepository {
       sortField,
       sortOrder,
       fields,
-      extraQueryParams,
+      filters,
     } = options;
 
     if (searchFields && !Array.isArray(searchFields)) {
@@ -240,8 +240,8 @@ export class SavedObjectsRepository {
       throw new TypeError('options.searchFields must be an array');
     }
 
-    if (extraQueryParams && typeof extraQueryParams !== 'object') {
-      throw new TypeError('options.extraQueryParams must be an object');
+    if (filters && !Array.isArray(filters)) {
+      throw new TypeError('options.filters must be an array');
     }
 
     const esOptions = {
@@ -258,7 +258,7 @@ export class SavedObjectsRepository {
           type,
           sortField,
           sortOrder,
-          extraQueryParams
+          filters
         })
       }
     };

src/server/saved_objects/service/lib/repository.test.js

@@ -439,14 +439,25 @@ describe('SavedObjectsRepository', () => {
       }
     });
 
-    it('passes mappings, search, searchFields, type, sortField, extraQueryParams, and sortOrder to getSearchDsl', async () => {
+    it('requires filters to be an array if defined', async () => {
+      try {
+        await savedObjectsRepository.find({ filters: 'string' });
+        throw new Error('expected find() to reject');
+      } catch (error) {
+        sinon.assert.notCalled(callAdminCluster);
+        sinon.assert.notCalled(onBeforeWrite);
+        expect(error.message).toMatch('must be an array');
+      }
+    });
+
+    it('passes mappings, search, searchFields, type, sortField, filters, and sortOrder to getSearchDsl', async () => {
       const relevantOpts = {
         search: 'foo*',
         searchFields: ['foo'],
         type: 'bar',
         sortField: 'name',
         sortOrder: 'desc',
-        extraQueryParams: { bool: {} },
+        filters: [{ bool: {} }],
       };
 
       await savedObjectsRepository.find(relevantOpts);

src/server/saved_objects/service/lib/search_dsl/query_params.js

@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import { defaultsDeep } from 'lodash';
 import { getRootPropertiesObjects } from '../../../../mappings';
 
 /**
@@ -66,23 +65,21 @@ function getFieldsForTypes(searchFields, types) {
  *  @param  {(string|Array<string>)} type
  *  @param  {String} search
  *  @param  {Array<string>} searchFields
- *  @param {Object} extraQueryParams query parameters to merge into the result
+ *  @param {Array<object>} filters additional query filters
  *  @return {Object}
  */
-export function getQueryParams(mappings, type, search, searchFields, extraQueryParams = {}) {
-  if (!type && !search) {
-    return {};
-  }
+export function getQueryParams(mappings, type, search, searchFields, filters = []) {
 
-  const bool = {};
+  const bool = {
+    filter: [...filters],
+  };
 
   if (type) {
-    bool.filter = [{ [Array.isArray(type) ? 'terms' : 'term']: { type } }];
+    bool.filter.push({ [Array.isArray(type) ? 'terms' : 'term']: { type } });
   }
 
   if (search) {
     bool.must = [
-      ...bool.must || [],
       {
         simple_query_string: {
           query: search,
@@ -95,35 +92,12 @@ export function getQueryParams(mappings, type, search, searchFields, extraQueryP
     ];
   }
 
-  // a list of fields to manually merge together
-  const fieldsToMerge = ['filter', 'must'];
-
-  const extraParams = {
-    ...extraQueryParams.bool
-  };
-
-  // Remove the manual merge fields from the collection of properties we will automatically combine.
-  fieldsToMerge.forEach(field => delete extraParams[field]);
-
-  let query = {
-    bool: defaultsDeep(bool, extraParams)
-  };
-
-  if (extraQueryParams.bool) {
-
-    const extraBoolParams = extraQueryParams.bool;
-
-    query = fieldsToMerge.reduce((queryAcc, field) => {
-      const prop = queryAcc.bool[field];
-      const extraProp = extraBoolParams[field];
-      if (Array.isArray(prop) && Array.isArray(extraProp)) {
-        queryAcc.bool[field] = [...prop, ...extraProp];
-      }
-      return queryAcc;
-    }, query);
+  // Don't construct a query if there is nothing to search on.
+  if (bool.filter.length === 0 && !search) {
+    return {};
   }
 
-  return { query };
+  return { query: { bool } };
 }