Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix mislabeled range filters with scripted fields #4708

Closed
wants to merge 1 commit into from
Closed

Fix mislabeled range filters with scripted fields #4708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/ui/public/filter_bar/__tests__/mapRange.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,14 @@ describe('Filter Bar Directive', function () {
$rootScope.$apply();
});

it('should return a value for a scripted range', (done) => {
let filter = {meta: {index: 'logstash-*'}, field: 'script number', script: {params: {gte: 0, lt: 500}}};
mapRange(filter).then((result) => {
expect(result).to.have.property('value', '0 to 500');
done();
});
$rootScope.$apply();
});

});
});
11 changes: 8 additions & 3 deletions src/ui/public/filter_bar/lib/mapRange.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,20 @@ define(function (require) {
var {has} = require('lodash');
return function mapRangeProvider(Promise, courier) {
return function (filter) {
if (!filter.range) return Promise.reject(filter);
var rangeObj = filter.range;
if (filter.script) {
var params = filter.script.params;
if (params && (params.gte || params.gt || params.lte || params.lt)) rangeObj = {[filter.meta.field]: params};
}
if (!rangeObj) return Promise.reject(filter);

return courier
.indexPatterns
.get(filter.meta.index)
.then(function (indexPattern) {
var key = Object.keys(filter.range)[0];
var key = Object.keys(rangeObj)[0];
var convert = indexPattern.fields.byName[key].format.getConverterFor('text');
var range = filter.range[key];
var range = rangeObj[key];

var left = has(range, 'gte') ? range.gte : range.gt;
if (left == null) left = -Infinity;
Expand Down