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

washort · Dec 12, 2017 · 15104f8 · 15104f8
1 parent 546a7b5
commit 15104f8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/client/app/visualizations/chart/chart-editor.html b/client/app/visualizations/chart/chart-editor.html
@@ -283,7 +283,7 @@ <h4>{{$index == 0 ? 'Left' : 'Right'}} Y Axis</h4>
       <th>Color</th>
       </thead>
       <tbody ui-sortable ng-model="form.colorsList">
-      <tr ng-repeat="name in form.colorsList">
+      <tr ng-repeat="name in form.colorsList track by name">
         <td style="cursor: move;"><i class="fa fa-arrows-v"></i> <span
           ng-bind="options.seriesOptions[name].zIndex + 1"></span>
         </td>

diff --git a/client/app/visualizations/chart/plotly.js b/client/app/visualizations/chart/plotly.js
@@ -275,7 +275,11 @@ const PlotlyChart = () => {
             series.data.forEach((row) => {
               plotlySeries.values.push(row.y);
               plotlySeries.labels.push(hasX ? row.x : `Slice ${index}`);
-              plotlySeries.marker.colors.push(scope.options.seriesOptions[hasX ? row.x : `Slice ${index}`].color);
+              if (scope.options.seriesOptions[hasX ? row.x : `Slice ${index}`] === undefined) {
+                plotlySeries.marker.colors.push(getColor(index));
+                index += 1;
+              } else {
+                plotlySeries.marker.colors.push(scope.options.seriesOptions[hasX ? row.x : `Slice ${index}`].color);
             });
 
             scope.data.push(plotlySeries);