[search source] Stop building invalid queries and then rewriting them (…

…#60954) (#64259) * Stop rewriting invalid filters in search source * Fix type issue * Use automated fixing tool * Update test * Fix test * Fix docs Co-authored-by: Elastic Machine <[email protected]> Co-authored-by: Elastic Machine <[email protected]>
elastic · Apr 23, 2020 · 1a662d0 · 1a662d0
1 parent 8c4b8f4
commit 1a662d0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 22 deletions.
diff --git a/src/plugins/data/public/search/aggs/buckets/create_filter/filters.ts b/src/plugins/data/public/search/aggs/buckets/create_filter/filters.ts
@@ -28,6 +28,6 @@ export const createFilterFilters = (aggConfig: IBucketAggConfig, key: string) =>
   const indexPattern = aggConfig.getIndexPattern();
 
   if (filter && indexPattern && indexPattern.id) {
-    return buildQueryFilter(filter.query, indexPattern.id, key);
+    return buildQueryFilter(filter, indexPattern.id, key);
   }
 };
diff --git a/src/plugins/data/public/search/aggs/buckets/filters.ts b/src/plugins/data/public/search/aggs/buckets/filters.ts
@@ -107,7 +107,7 @@ export const getFiltersBucketAgg = ({
                   (typeof filter.input.query === 'string'
                     ? filter.input.query
                     : toAngularJSON(filter.input.query));
-                filters[label] = { query };
+                filters[label] = query;
               },
               {}
             );

diff --git a/src/plugins/data/public/search/search_source/search_source.ts b/src/plugins/data/public/search/search_source/search_source.ts
@@ -447,26 +447,6 @@ export class SearchSource {
       delete searchRequest.highlightAll;
     }
 
-    const translateToQuery = (filter: Filter) => filter && (filter.query || filter);
-
-    // re-write filters within filter aggregations
-    (function recurse(aggBranch) {
-      if (!aggBranch) return;
-      Object.keys(aggBranch).forEach(function(id) {
-        const agg = aggBranch[id];
-
-        if (agg.filters) {
-          // translate filters aggregations
-          const { filters: aggFilters } = agg.filters;
-          Object.keys(aggFilters).forEach(filterId => {
-            aggFilters[filterId] = translateToQuery(aggFilters[filterId]);
-          });
-        }
-
-        recurse(agg.aggs || agg.aggregations);
-      });
-    })(body.aggs || body.aggregations);
-
     return searchRequest;
   }