maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[courier] translate filters and filter aggs to work with es master

Browse source
This commit is contained in:
spalger 2016-02-05 10:25:29 -07:00
parent 15c94b4eea
commit 7aee4a552f
2 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/ui/public/courier/data_source/_abstract.js
View file

@ -311,6 +311,21 @@ define(function (require) {
return _.omit(filter, ['meta']);
};
/**
* Translate a filter into a query to support es 3+
* @param {Object} filter - The fitler to translate
* @return {Object} the query version of that filter
*/
var translateToQuery = function (filter) {
if (!filter) return;
if (filter.query) {
return filter.query;
}
return filter;
};
// switch to filtered query if there are filters
if (flatState.filters) {
if (flatState.filters.length) {
@ -326,12 +341,14 @@ define(function (require) {
[flatState.body.query].concat(
(flatState.filters || [])
.filter(filterNegate(false))
.map(translateToQuery)
.map(cleanFilter)
)
),
must_not: (
(flatState.filters || [])
.filter(filterNegate(true))
.map(translateToQuery)
.map(cleanFilter)
)
}
@ -339,6 +356,25 @@ define(function (require) {
}
delete flatState.filters;
}
// 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 = agg.filters.filters;
Object.keys(filters).forEach(function (filterId) {
filters[filterId] = translateToQuery(filters[filterId]);
});
}
recurse(agg.aggs);
});
}(flatState.body.aggs || flatState.body.aggregations));
}
return flatState;

1
src/ui/public/courier/data_source/_decorate_query.js
View file

@ -17,4 +17,3 @@ define(function (require) {
};
};
});