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

Jump to bottom

Fix formatter on range aggregation #58651

Merged
merged 9 commits into from
Mar 23, 2020
Merged

Fix formatter on range aggregation #58651

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9f36ad8
Fix formatter on range aggregation
wylieconlon Feb 26, 2020
07507e4
Fix test that was using unformatted byte ranges
wylieconlon Feb 26, 2020
df01934
Merge branch 'master' into fix-range-format
elasticmachine Feb 27, 2020
df62842
Merge branch 'master' into fix-range-format
elasticmachine Mar 3, 2020
c3b5e4d
Merge branch 'master' into fix-range-format
elasticmachine Mar 3, 2020
e53f365
Merge remote-tracking branch 'origin/master' into fix-range-format
wylieconlon Mar 20, 2020
56d6582
Fix test
wylieconlon Mar 20, 2020
142e3bd
Merge remote-tracking branch 'fork/fix-range-format' into fix-range-f…
wylieconlon Mar 20, 2020
f420d1a
Merge branch 'master' into fix-range-format
elasticmachine Mar 23, 2020
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
3 changes: 2 additions & 1 deletion src/plugins/data/public/field_formats/utils/deserialize.ts
View file
Open in desktop
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
View file
Open in desktop
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