switch back to "x to y" format for ranges

w33ble · Aug 12, 2015 · 0bbfc6c · 0bbfc6c
1 parent cf45558
commit 0bbfc6c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/ui/public/agg_types/__tests__/buckets/_range.js b/src/ui/public/agg_types/__tests__/buckets/_range.js
@@ -49,9 +49,9 @@ describe('Range Agg', function () {
       var format = function (val) {
         return agg.fieldFormatter()(agg.getKey(val));
       };
-      expect(format(buckets[0])).to.be('[-∞, 1 KB)');
-      expect(format(buckets[1])).to.be('[1 KB, 2.5 KB)');
-      expect(format(buckets[2])).to.be('[2.5 KB, +∞)');
+      expect(format(buckets[0])).to.be('-∞ to 1 KB');
+      expect(format(buckets[1])).to.be('1 KB to 2.5 KB');
+      expect(format(buckets[2])).to.be('2.5 KB to +∞');
 
     });
   });

diff --git a/src/ui/public/agg_types/buckets/range.js b/src/ui/public/agg_types/buckets/range.js
@@ -26,7 +26,7 @@ define(function (require) {
 
         var RangeFormat = FieldFormat.from(function (range) {
           var format = agg.fieldOwnFormatter();
-          return `[${format(range.gte)}, ${format(range.lt)})`;
+          return `${format(range.gte)} to ${format(range.lt)}`;
         });
 
         return (this.$$rangeAggTypeFormat = new RangeFormat());

diff --git a/src/ui/public/filter_bar/__tests__/mapAndFlattenFilters.js b/src/ui/public/filter_bar/__tests__/mapAndFlattenFilters.js
@@ -46,7 +46,7 @@ describe('Filter Bar Directive', function () {
         expect(results[2].meta).to.have.property('key', 'query');
         expect(results[2].meta).to.have.property('value', 'foo:bar');
         expect(results[3].meta).to.have.property('key', 'bytes');
-        expect(results[3].meta).to.have.property('value', '[1,024, 2,048)');
+        expect(results[3].meta).to.have.property('value', '1,024 to 2,048');
         expect(results[4].meta).to.have.property('key', '_type');
         expect(results[4].meta).to.have.property('value', 'apache');
         done();

diff --git a/src/ui/public/filter_bar/__tests__/mapRange.js b/src/ui/public/filter_bar/__tests__/mapRange.js
@@ -24,7 +24,7 @@ describe('Filter Bar Directive', function () {
       var filter = { meta: { index: 'logstash-*' }, range: { bytes: { lt: 2048, gt: 1024 } } };
       mapRange(filter).then(function (result) {
         expect(result).to.have.property('key', 'bytes');
-        expect(result).to.have.property('value', '[1,024, 2,048)');
+        expect(result).to.have.property('value', '1,024 to 2,048');
         done();
       });
       $rootScope.$apply();
@@ -34,7 +34,7 @@ describe('Filter Bar Directive', function () {
       var filter = { meta: { index: 'logstash-*' }, range: { bytes: { lte: 2048, gte: 1024 } } };
       mapRange(filter).then(function (result) {
         expect(result).to.have.property('key', 'bytes');
-        expect(result).to.have.property('value', '[1,024, 2,048)');
+        expect(result).to.have.property('value', '1,024 to 2,048');
         done();
       });
       $rootScope.$apply();

diff --git a/src/ui/public/filter_bar/lib/mapRange.js b/src/ui/public/filter_bar/lib/mapRange.js
@@ -20,7 +20,7 @@ define(function (require) {
 
         return {
           key: key,
-          value: `[${convert(left)}, ${convert(right)})`
+          value: `${convert(left)} to ${convert(right)}`
         };
       });