From fbe3637e840100b720d5c9a7fac8ae4f181c7d8f Mon Sep 17 00:00:00 2001
From: Wylie Conlon <william.conlon@elastic.co>
Date: Mon, 23 Mar 2020 13:22:37 -0400
Subject: [PATCH] Fix formatter on range aggregation (#58651) (#60920)

* Fix formatter on range aggregation

* Fix test that was using unformatted byte ranges

* Fix test

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../data/public/field_formats/utils/deserialize.ts   |  3 ++-
 test/functional/apps/visualize/_data_table.js        | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/plugins/data/public/field_formats/utils/deserialize.ts b/src/plugins/data/public/field_formats/utils/deserialize.ts
index c735ad196fbee..840e023a11589 100644
--- a/src/plugins/data/public/field_formats/utils/deserialize.ts
+++ b/src/plugins/data/public/field_formats/utils/deserialize.ts
@@ -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', {
diff --git a/test/functional/apps/visualize/_data_table.js b/test/functional/apps/visualize/_data_table.js
index 0a9ff1e77a2ef..a6305e158007d 100644
--- a/test/functional/apps/visualize/_data_table.js
+++ b/test/functional/apps/visualize/_data_table.js
@@ -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%',
         ]);
       }
@@ -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',
       ]);
     });
@@ -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',
       ]);
     });