github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-25 02:09:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

Ensure saved filters from searchSource are always passed to response handlers (#33074) (#33317)

Browse source
This commit is contained in:
Luke Elmers 2019-03-15 15:26:33 -06:00 • committed by GitHub
parent c4e62fd4f4
commit bfdd11681f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/ui/public/visualize/loader/visualize_data_loader.ts
View file

@ -80,6 +80,12 @@ export class VisualizeDataLoader {
typeof this.vis.params.showMetricsAtAllLevels !== 'undefined' typeof this.vis.params.showMetricsAtAllLevels !== 'undefined'
? !this.vis.params.showMetricsAtAllLevels ? !this.vis.params.showMetricsAtAllLevels
: !this.vis.isHierarchical(); : !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 // searchSource is only there for courier request handler
const requestHandlerResponse = await this.requestHandler({ const requestHandlerResponse = await this.requestHandler({
partialRows: this.vis.type.requiresPartialRows || this.vis.params.showPartialRows, partialRows: this.vis.type.requiresPartialRows || this.vis.params.showPartialRows,
@ -87,9 +93,8 @@ export class VisualizeDataLoader {
metricsAtAllLevels: this.vis.isHierarchical(), metricsAtAllLevels: this.vis.isHierarchical(),
visParams: this.vis.params, visParams: this.vis.params,
...params, ...params,
filters: params.filters query,
? params.filters.filter(filter => !filter.meta.disabled) filters: filters.concat(savedFilters).filter(f => !f.meta.disabled),
: undefined,
}); });
// No need to call the response handler when there have been no data nor has been there changes // No need to call the response handler when there have been no data nor has been there changes