From bfdd11681f56f0a56fba4fb24fcde06e1186eb0b Mon Sep 17 00:00:00 2001 From: Luke Elmers Date: Fri, 15 Mar 2019 15:26:33 -0600 Subject: [PATCH] Ensure saved filters from searchSource are always passed to response handlers (#33074) (#33317) --- .../public/visualize/loader/visualize_data_loader.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/ui/public/visualize/loader/visualize_data_loader.ts b/src/ui/public/visualize/loader/visualize_data_loader.ts index ca3cbf649bcbcf..956019396f9dc2 100644 --- a/src/ui/public/visualize/loader/visualize_data_loader.ts +++ b/src/ui/public/visualize/loader/visualize_data_loader.ts @@ -80,6 +80,12 @@ export class VisualizeDataLoader { typeof this.vis.params.showMetricsAtAllLevels !== 'undefined' ? !this.vis.params.showMetricsAtAllLevels : !this.vis.isHierarchical(); + + const filters = params.filters || []; + const savedFilters = params.searchSource.getField('filter') || []; + + const query = params.query || params.searchSource.getField('query'); + // searchSource is only there for courier request handler const requestHandlerResponse = await this.requestHandler({ partialRows: this.vis.type.requiresPartialRows || this.vis.params.showPartialRows, @@ -87,9 +93,8 @@ export class VisualizeDataLoader { metricsAtAllLevels: this.vis.isHierarchical(), visParams: this.vis.params, ...params, - filters: params.filters - ? params.filters.filter(filter => !filter.meta.disabled) - : undefined, + query, + filters: filters.concat(savedFilters).filter(f => !f.meta.disabled), }); // No need to call the response handler when there have been no data nor has been there changes