logitude-dashboard-library 3.2.24 → 3.2.25

package/dist/index.js

@@ -2076,9 +2076,48 @@ function buildDataSource(values, widget) {
   return data;
 }
 
+var reorder = function reorder(values, referenceOrder) {
+  return referenceOrder.map(function (groupById) {
+    return values.find(function (v) {
+      return v.GroupById === groupById;
+    }) || {
+      GroupById: groupById,
+      Value: 0
+    };
+  });
+};
+
+var getOrderedSeriesMeasures = function getOrderedSeriesMeasures(seriesMeasures, widget) {
+  if (!seriesMeasures || seriesMeasures.length < 2) {
+    return seriesMeasures;
+  }
+
+  var referenceOrder;
+
+  if (widget.SortBy == 1) {
+    referenceOrder = seriesMeasures[0].Values.map(function (v) {
+      return v.Label;
+    });
+    seriesMeasures[1].Values = reorder(seriesMeasures[1].Values, referenceOrder);
+  } else if (widget.SortBy == 2) {
+    referenceOrder = seriesMeasures[1].Values.map(function (v) {
+      return v.Label;
+    });
+    seriesMeasures[0].Values = reorder(seriesMeasures[0].Values, referenceOrder);
+  } else {
+    referenceOrder = seriesMeasures[0].Values.map(function (v) {
+      return v.GroupById;
+    });
+    seriesMeasures[1].Values = reorder(seriesMeasures[1].Values, referenceOrder);
+  }
+
+  return seriesMeasures;
+};
+
 function buildDataSet(seriesMeasures, widget) {
   var dataSet = [];
-  seriesMeasures.forEach(function (seriesMeasure) {
+  var orderedSeriesMeasures = getOrderedSeriesMeasures(seriesMeasures, widget);
+  orderedSeriesMeasures.forEach(function (seriesMeasure) {
     var datas = seriesMeasure.Values.map(function (e, index) {
       return {
         value: e.Value,