adding order buckets by value option to point series charts

ppisljar · ppisljar · commit c03bc99be505 · 2016-11-08T11:03:46.000+01:00
diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series_options.html b/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series_options.html
@@ -45,5 +45,11 @@
         Scale Y-Axis to Data Bounds
       </label>
     </div>
+    <div class="vis-option-item">
+      <label>
+        <input type="checkbox" ng-model="vis.params.sortBuckets">
+        Sort buckets by value
+      </label>
+    </div>
   </div>
 </div>
diff --git a/src/ui/public/vislib/__tests__/components/zero_injection.js b/src/ui/public/vislib/__tests__/components/zero_injection.js
@@ -408,6 +408,22 @@ describe('Vislib Zero Injection Module Test Suite', function () {
     });
 
     it('should return an array of values in the correct order', function () {
+      expect(results[0]).to.be('1');
+      expect(results[1]).to.be('2');
+      expect(results[2]).to.be('3');
+      expect(results[3]).to.be('4');
+      expect(results[4]).to.be('5');
+      expect(numberedResults[0]).to.be(1);
+      expect(numberedResults[1]).to.be(2);
+      expect(numberedResults[2]).to.be(3);
+      expect(numberedResults[3]).to.be(4);
+      expect(numberedResults[4]).to.be(5);
+    });
+
+    it('should return an array of values in the correct order when orderBuckets is set', function () {
+      let orderBuckets = true;
+      results = orderXValues(multiSeriesData, orderBuckets);
+
       expect(results[0]).to.be('3');
       expect(results[1]).to.be('1');
       expect(results[2]).to.be('4');
diff --git a/src/ui/public/vislib/components/zero_injection/inject_zeros.js b/src/ui/public/vislib/components/zero_injection/inject_zeros.js
@@ -29,12 +29,12 @@ export default function ZeroInjectionUtilService(Private) {
     }
   }
 
-  return function (obj) {
+  return function (obj, sortBuckets = false) {
     if (!_.isObject(obj) || !obj.rows && !obj.columns && !obj.series) {
       throw new TypeError('ZeroInjectionUtilService expects an object with a series, rows, or columns key');
     }
 
-    const keys = orderXValues(obj);
+    const keys = orderXValues(obj, sortBuckets);
     const arr = getDataArray(obj);
 
     arr.forEach(function (object) {
diff --git a/src/ui/public/vislib/components/zero_injection/ordered_x_keys.js b/src/ui/public/vislib/components/zero_injection/ordered_x_keys.js
@@ -11,7 +11,7 @@ export default function OrderedXKeysUtilService(Private) {
    * else values sorted by index
    */
 
-  return function (obj) {
+  return function (obj, sortBuckets = false) {
     if (!_.isObject(obj)) {
       throw new Error('OrderedXKeysUtilService expects an object');
     }
@@ -27,7 +27,7 @@ export default function OrderedXKeysUtilService(Private) {
       if (d[1].isDate || d[1].isOrdered) {
         return +d[0];
       }
-      return -d[1].sum;
+      return sortBuckets ? -d[1].sum : d[1].index;
     })
     .map(function (d, i, list) {
       if (!d[1].isNumber) return d[0];
diff --git a/src/ui/public/vislib/lib/data.js b/src/ui/public/vislib/lib/data.js
@@ -601,7 +601,7 @@ export default function DataFactory(Private) {
      * @returns {Array} Array of x axis values
      */
     xValues() {
-      return orderKeys(this.data);
+      return orderKeys(this.data, this._attr.sortBuckets);
     };
 
     /**
diff --git a/src/ui/public/vislib/lib/handler/types/point_series.js b/src/ui/public/vislib/lib/handler/types/point_series.js
@@ -19,7 +19,7 @@ export default function ColumnHandler(Private) {
 
   function getData(vis, opts) {
     if (opts.zeroFill) {
-      return new Data(injectZeros(vis.data), vis._attr, vis.uiState);
+      return new Data(injectZeros(vis.data, vis._attr.sortBuckets), vis._attr, vis.uiState);
     } else {
       return new Data(vis.data, vis._attr, vis.uiState);
     }

Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,12 @@ export default function ZeroInjectionUtilService(Private) {`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`32`		`- return function (obj) {`
	`32`	`+ return function (obj, sortBuckets = false) {`
`33`	`33`	`if (!_.isObject(obj) \|\| !obj.rows && !obj.columns && !obj.series) {`
`34`	`34`	`throw new TypeError('ZeroInjectionUtilService expects an object with a series, rows, or columns key');`
`35`	`35`	`}`
`36`	`36`
`37`		`- const keys = orderXValues(obj);`
	`37`	`+ const keys = orderXValues(obj, sortBuckets);`
`38`	`38`	`const arr = getDataArray(obj);`
`39`	`39`
`40`	`40`	`arr.forEach(function (object) {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ export default function ColumnHandler(Private) {`
`19`	`19`
`20`	`20`	`function getData(vis, opts) {`
`21`	`21`	`if (opts.zeroFill) {`
`22`		`- return new Data(injectZeros(vis.data), vis._attr, vis.uiState);`
	`22`	`+ return new Data(injectZeros(vis.data, vis._attr.sortBuckets), vis._attr, vis.uiState);`
`23`	`23`	`} else {`
`24`	`24`	`return new Data(vis.data, vis._attr, vis.uiState);`
`25`	`25`	`}`