Closes-Bug:#1581650

Storage donut chart color issue: In monitor infra config node summary page for read and write donut charts we are passing the colors in chart options and setting to chartModel which is causing issues in storage donut charts, now changed such a way colors are passed along with the data and removed in chartOptions. Change-Id: I6cd4b7ac1e4ddcf7a0cb203ef65aab5a3857a0c1
Juniper · Jun 1, 2016 · 6bae886 · 6bae886
1 parent 3465ac9
commit 6bae886
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/webroot/monitor/infrastructure/common/ui/js/utils/monitor.infra.parsers.js b/webroot/monitor/infrastructure/common/ui/js/utils/monitor.infra.parsers.js
@@ -899,7 +899,10 @@ define(
 
                 };
                 this.parseConfigNodeRequestForDonutChart = function (apiStats, reqType) {
-                    var cf = crossfilter(apiStats), parsedData = [];
+                    var cf = crossfilter(apiStats),
+                        parsedData = [],
+                        colors = monitorInfraConstants.CONFIGNODE_COLORS;
+
                     if (!$.isArray(reqType)) {
                         reqType = [reqType];
                     }
@@ -916,7 +919,8 @@ define(
                     $.each(sourceGrpData, function (key, value){
                         parsedData.push({
                             label: value['key'],
-                            value: value['value']
+                            value: value['value'],
+                            color: colors[key]
                         });
                     });
                     return parsedData;

diff --git a/webroot/monitor/infrastructure/common/ui/js/views/ConfigNodeDonutChartView.js b/webroot/monitor/infrastructure/common/ui/js/views/ConfigNodeDonutChartView.js
@@ -34,7 +34,6 @@ define(['underscore', 'contrail-view'],function(_, ContrailView){
                             },
                             chartOptions: {
                                 height: 160,
-                                color: monitorInfraConstants.CONFIGNODE_COLORS,
                                 margin: {
                                     bottom: 10,
                                     top: 10
@@ -55,7 +54,6 @@ define(['underscore', 'contrail-view'],function(_, ContrailView){
                             },
                             chartOptions: {
                                 height: 160,
-                                color: monitorInfraConstants.CONFIGNODE_COLORS,
                                 margin: {
                                     top: 10,
                                     bottom: 10