mirror of
https://github.com/elastic/kibana.git
synced 2025-04-24 17:59:23 -04:00
Closes #2328 - Added uniqFilters() to the filterBarClickHandler()
This commit is contained in:
parent
5bb57dd4ab
commit
6976f0e4ba
3 changed files with 30 additions and 0 deletions
|
@ -1,6 +1,7 @@
|
|||
define(function (require) {
|
||||
var _ = require('lodash');
|
||||
var dedupFilters = require('./lib/dedupFilters');
|
||||
var uniqFilters = require('./lib/uniqFilters');
|
||||
|
||||
return function (Notifier) {
|
||||
return function ($state) {
|
||||
|
@ -28,6 +29,7 @@ define(function (require) {
|
|||
|
||||
if (!filters.length) return;
|
||||
|
||||
filters = uniqFilters(filters);
|
||||
filters = dedupFilters($state.filters, filters);
|
||||
// We need to add a bunch of filter deduping here.
|
||||
$state.$newFilters = filters;
|
||||
|
|
11
src/kibana/components/filter_bar/lib/uniqFilters.js
Normal file
11
src/kibana/components/filter_bar/lib/uniqFilters.js
Normal file
|
@ -0,0 +1,11 @@
|
|||
define(function (require) {
|
||||
var _ = require('lodash');
|
||||
var dedupFilters = require('components/filter_bar/lib/dedupFilters');
|
||||
return function (filters) {
|
||||
var results = [];
|
||||
_.each(filters, function (filter) {
|
||||
results = _.union(results, dedupFilters(results, [filter]));
|
||||
});
|
||||
return results;
|
||||
};
|
||||
});
|
17
test/unit/specs/components/filter_bar/uniqFilters.js
Normal file
17
test/unit/specs/components/filter_bar/uniqFilters.js
Normal file
|
@ -0,0 +1,17 @@
|
|||
define(function (require) {
|
||||
var uniqFilters = require('components/filter_bar/lib/uniqFilters');
|
||||
describe('Filter Bar Directive', function () {
|
||||
describe('uniqFilter', function () {
|
||||
|
||||
it('should filter out dups', function () {
|
||||
var before = [
|
||||
{ query: { _type: { match: { query: 'apache', type: 'phrase' } } } },
|
||||
{ query: { _type: { match: { query: 'apache', type: 'phrase' } } } }
|
||||
];
|
||||
var results = uniqFilters(before);
|
||||
expect(results).to.have.length(1);
|
||||
});
|
||||
|
||||
});
|
||||
});
|
||||
});
|
Loading…
Add table
Add a link
Reference in a new issue