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

Update existing filters when negated via a visualization (#10849)

Browse source 
Backports PR #10778

**Commit 1:**
Handle single filter scenario

* Original sha: ccd24cb9bd
* Authored by Matthew Bargar <mbargar@gmail.com> on 2017-03-16T21:03:42Z

**Commit 2:**
Handle the multi filter scenario

* Original sha: c90535d28d
* Authored by Matthew Bargar <mbargar@gmail.com> on 2017-03-16T21:26:28Z
This commit is contained in:
jasper 2017-03-22 14:09:11 -04:00 • committed by Matt Bargar
parent 9111e6220b
commit d96da0fb17
2 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/ui/public/filter_bar/filter_bar.js
View file

@ -8,6 +8,7 @@ import FilterBarLibExtractTimeFilterProvider from 'ui/filter_bar/lib/extract_tim
import FilterBarLibFilterOutTimeBasedFilterProvider from 'ui/filter_bar/lib/filter_out_time_based_filter';
import FilterBarLibChangeTimeFilterProvider from 'ui/filter_bar/lib/change_time_filter';
import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
import compareFilters from './lib/compare_filters';
import uiModules from 'ui/modules';
const module = uiModules.get('kibana');
@ -52,8 +53,7 @@ module.directive('filterBar', function (Private, Promise, getAppState) {
};
$scope.applyFilters = function (filters) {
// add new filters
$scope.addFilters(filterAppliedAndUnwrap(filters));
addAndInvertFilters(filterAppliedAndUnwrap(filters));
$scope.newFilters = [];
// change time filter
@ -128,10 +128,27 @@ module.directive('filterBar', function (Private, Promise, getAppState) {
return filters;
})
.then(filterOutTimeBasedFilter)
.then($scope.addFilters);
.then(addAndInvertFilters);
}
});
function addAndInvertFilters(filters) {
const existingFilters = queryFilter.getFilters();
const inversionFilters = _.filter(existingFilters, (existingFilter) => {
const newMatchingFilter = _.find(filters, _.partial(compareFilters, existingFilter));
return newMatchingFilter
&& newMatchingFilter.meta
&& existingFilter.meta
&& existingFilter.meta.negate !== newMatchingFilter.meta.negate;
});
const newFilters = _.reject(filters, (filter) => {
return _.find(inversionFilters, _.partial(compareFilters, filter));
});
_.forEach(inversionFilters, $scope.invertFilter);
$scope.addFilters(newFilters);
}
function convertToEditableFilter(filter) {
return _.omit(_.cloneDeep(filter), function (val, key) {
return key.match(privateFilterFieldRegex);

2
src/ui/public/filter_bar/filter_bar_click_handler.js
View file

@ -56,7 +56,7 @@ export default function (Notifier) {
});
}
filters = dedupFilters($state.filters, uniqFilters(filters));
filters = dedupFilters($state.filters, uniqFilters(filters), { negate: true });
// We need to add a bunch of filter deduping here.
if (!simulate) {
$state.$newFilters = filters;