fixup! fix pie chart multiple colors changed (re getredash#242)

washort · Dec 15, 2017 · 748f834 · 748f834
1 parent 2f9fcc7
commit 748f834
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/client/app/visualizations/chart/plotly.js b/client/app/visualizations/chart/plotly.js
@@ -269,7 +269,7 @@ const PlotlyChart = () => {
               labels: [],
               type: 'pie',
               hole: 0.4,
-              marker: { colors: ColorPaletteArray },
+              marker: { colors: ColorPaletteArray.slice() },
               text: series.name,
               textposition: 'inside',
               name: series.name,
@@ -279,15 +279,11 @@ const PlotlyChart = () => {
               },
             };
 
-            series.data.forEach((row) => {
+            each(series.data, (row, rowIdx) => {
               plotlySeries.values.push(row.y);
               plotlySeries.labels.push(hasX ? row.x.toString().substr(0, xAxisLabelLength) : `Slice ${index}`);
-              if (scope.options.seriesOptions[hasX ? row.x.toString().substr(0, xAxisLabelLength) : `Slice ${index}`] === undefined) {
-                plotlySeries.marker.colors.push(getColor(index));
-                index += 1;
-              } else {
-                plotlySeries.marker.colors.push(scope.options.seriesOptions[hasX ? row.x.toString().substr(0, xAxisLabelLength) : `Slice ${index}`].color);
-              }
+              const rowOpts = scope.options.seriesOptions[hasX ? row.x.toString().substr(0, xAxisLabelLength) : `Slice ${index}`];
+              plotlySeries.marker.colors[rowIdx] = rowOpts ? rowOpts.color : getColor(rowIdx);
             });
 
             scope.data.push(plotlySeries);