Merge pull request ManageIQ#2291 from PanSpagetka/no-type-chart

Chart data returns empty chart for unknown chart types
mzazrivec · Oct 5, 2017 · 3b5612c · 3b5612c
2 parents 3f8969f + 757ba69
commit 3b5612c
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/app/assets/javascripts/miq_application.js b/app/assets/javascripts/miq_application.js
@@ -1535,8 +1535,19 @@ function rbacGroupLoadTab(id) {
 }
 
 function chartData(type, data, data2) {
+  var empty = {
+    data: {
+      columns: [],
+    },
+  };
+
   if (type === undefined) {
-    return;
+    return empty;
+  }
+
+  var config = _.cloneDeep(ManageIQ.charts.c3config[type]);
+  if (config === undefined) {
+    return empty;
   }
 
   if (_.isObject(data.miq)) {
@@ -1607,7 +1618,7 @@ function chartData(type, data, data2) {
     };
   }
 
-  var config = _.cloneDeep(ManageIQ.charts.c3config[type]);
+
   // some PatternFly default configs define contents function, but it breaks formatting
   if (_.isObject(config.tooltip)) {
     config.tooltip.contents = undefined;