refactored the pickColors method

1 files changed, 18 insertions, 15 deletions

diff --git a/app/assets/javascripts/monitoring/utils/multiple_time_series.js b/app/assets/javascripts/monitoring/utils/multiple_time_series.js
index 9845fd53222..17e5eb79816 100644
--- a/app/assets/javascripts/monitoring/utils/multiple_time_series.js
+++ b/app/assets/javascripts/monitoring/utils/multiple_time_series.js
@@ -10,25 +10,27 @@ const defaultColorPalette = {
 };
 
 const defaultColorOrder = ['blue', 'orange', 'red', 'green', 'purple'];
-let usedColors = [];
-function pickColor(name) {
-  let pick;
-  if (name && defaultColorPalette[name]) {
-    pick = name;
-  } else {
-    const unusedColors = _.difference(defaultColorOrder, usedColors);
-    if (unusedColors.length > 0) {
-      pick = unusedColors[0];
+
+export default function createTimeSeries(queryData, graphWidth, graphHeight, graphHeightOffset) {
+  let usedColors = [];
+
+  function pickColor(name) {
+    let pick;
+    if (name && defaultColorPalette[name]) {
+      pick = name;
     } else {
-      usedColors = [];
-      pick = defaultColorOrder[0];
+      const unusedColors = _.difference(defaultColorOrder, usedColors);
+      if (unusedColors.length > 0) {
+        pick = unusedColors[0];
+      } else {
+        usedColors = [];
+        pick = defaultColorOrder[0];
+      }
     }
+    usedColors.push(pick);
+    return defaultColorPalette[pick];
   }
-  usedColors.push(pick);
-  return defaultColorPalette[pick];
-}
 
-export default function createTimeSeries(queryData, graphWidth, graphHeight, graphHeightOffset) {
   const maxValues = queryData.result.map((timeSeries, index) => {
     const maxValue = d3.max(timeSeries.values.map(d => d.value));
     return {
@@ -45,6 +47,7 @@ export default function createTimeSeries(queryData, graphWidth, graphHeight, gra
     let metricTag = '';
     let lineColor = '#1f78d1';
     let areaColor = '#8fbce8';
+
     const timeSeriesScaleX = d3.time.scale()
       .range([0, graphWidth - 70]);