Skip to content

Commit

Permalink
Fix formatter on range aggregation (#58651) (#60920)
Browse files Browse the repository at this point in the history
* Fix formatter on range aggregation

* Fix test that was using unformatted byte ranges

* Fix test

Co-authored-by: Elastic Machine <[email protected]>

Co-authored-by: Elastic Machine <[email protected]>
  • Loading branch information
Wylie Conlon and elasticmachine authored Mar 23, 2020
1 parent 5f52be4 commit fbe3637
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion src/plugins/data/public/field_formats/utils/deserialize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ export const deserializeFieldFormat: FormatFactory = function(
const { id } = mapping;
if (id === 'range') {
const RangeFormat = FieldFormat.from((range: any) => {
const format = getFieldFormat(this, id, mapping.params);
const nestedFormatter = mapping.params as SerializedFieldFormat;
const format = getFieldFormat(this, nestedFormatter.id, nestedFormatter.params);
const gte = '\u2265';
const lt = '\u003c';
return i18n.translate('data.aggTypes.buckets.ranges.rangesFormatMessage', {
Expand Down
12 changes: 6 additions & 6 deletions test/functional/apps/visualize/_data_table.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ export default function({ getService, getPageObjects }) {
async function expectValidTableData() {
const data = await PageObjects.visChart.getTableVisData();
expect(data.trim().split('\n')).to.be.eql([
'≥ 0 and < 1000',
'≥ 0B and < 1,000B',
'1,351 64.7%',
'≥ 1000 and < 2000',
'≥ 1,000B and < 1.953KB',
'737 35.3%',
]);
}
Expand Down Expand Up @@ -144,9 +144,9 @@ export default function({ getService, getPageObjects }) {

const data = await PageObjects.visChart.getTableVisData();
expect(data.trim().split('\n')).to.be.eql([
'≥ 0 and < 1000',
'≥ 0B and < 1,000B',
'344.094B',
'≥ 1000 and < 2000',
'≥ 1,000B and < 1.953KB',
'1.697KB',
]);
});
Expand Down Expand Up @@ -248,9 +248,9 @@ export default function({ getService, getPageObjects }) {
await PageObjects.visEditor.clickGo();
const data = await PageObjects.visChart.getTableVisData();
expect(data.trim().split('\n')).to.be.eql([
'≥ 0 and < 1000',
'≥ 0B and < 1,000B',
'1,351',
'≥ 1000 and < 2000',
'≥ 1,000B and < 1.953KB',
'737',
]);
});
Expand Down

0 comments on commit fbe3637

Please sign in to comment.