Merge pull request #447 from bleathem/branch-4.0-dev

Branch 4.0 dev

Author: dgutride

index.js

@@ -3,6 +3,7 @@ require('angular-animate');
 require('angular-sanitize');
 require('angular-ui-bootstrap');
 require('lodash');
+require('angular-drag-and-drop-lists');
 require('patternfly/dist/js/patternfly-settings.min');
 require('./dist/angular-patternfly');
 module.exports = 'angular-patternfly';

src/charts/c3/c3-chart.component.js

@@ -85,8 +85,9 @@
     controller: function ($timeout, $attrs) {
       var ctrl = this, prevConfig;
 
+      // store the chart object
+      var chart;
       ctrl.generateChart = function () {
-        var chart;
         var chartData;
 
         // Need to deep watch changes in chart config
@@ -96,7 +97,12 @@
           chartData = ctrl.config;
           if (chartData) {
             chartData.bindto = '#' + $attrs.id;
-            chart = c3.generate(chartData);
+            if (!chart) {
+              chart = c3.generate(chartData);
+            } else {
+              //if it is created, then, we only need to load changes
+              chart.load(scope.config.data);
+            }
             ctrl.getChartCallback(chart);
             prevConfig = angular.copy(ctrl.config);
           }

src/views/listview/list-view.component.js

@@ -29,7 +29,7 @@
  * <li>.onCheckBoxChange       - ( function(item) ) Called to notify when a checkbox selection changes, default is none
  * <li>.onSelect               - ( function(item, event) ) Called to notify of item selection, default is none
  * <li>.onSelectionChange      - ( function(items) ) Called to notify when item selections change, default is none
- * <li>.onClick                - ( function(item, event) ) Called to notify when an item is clicked, default is none
+ * <li>.onClick                - ( function(item, event) ) Called to notify when an item is clicked, default is none. Note: row expansion is the default behavior after onClick performed, but user can stop such default behavior by adding the sentence "return false;" to the end of onClick function body
  * <li>.onDblClick             - ( function(item, event) ) Called to notify when an item is double clicked, default is none
  * </ul>
  * @param {array} actionButtons List of action buttons in each row
@@ -582,6 +582,7 @@ angular.module('patternfly.views').component('pfListView', {
       var alreadySelected;
       var selectionChanged = false;
       var continueEvent = true;
+      var enableRowExpansion = ctrl.config && ctrl.config.useExpandingRows && item && !item.disableRowExpansion;
 
       // Ignore disabled item clicks completely
       if (ctrl.checkDisabled(item)) {
@@ -624,7 +625,11 @@ angular.module('patternfly.views').component('pfListView', {
         }
       }
       if (ctrl.config.onClick) {
-        ctrl.config.onClick(item, e);
+        if (ctrl.config.onClick(item, e) !== false && enableRowExpansion) {
+          ctrl.toggleItemExpansion(item);
+        }
+      } else if (enableRowExpansion) {
+        ctrl.toggleItemExpansion(item);
       }
 
       return continueEvent;

test/views/listview/list-view.spec.js

@@ -514,7 +514,7 @@ describe('Component:  pfDataList', function () {
     expect(alteredKebab.length).toBe(1);
   });
 
-  it('should allow expanding rows', function () {
+  it('should allow expanding rows by clicking the caret icon', function () {
     var items;
     $scope.listConfig.useExpandingRows = true;
     $scope.$digest();
@@ -528,6 +528,19 @@ describe('Component:  pfDataList', function () {
     expect(openItem.length).toBe(1);
   });
 
+  it('should allow expanding rows by clicking the main-info section', function () {
+    var items;
+    $scope.listConfig.useExpandingRows = true;
+
+    $scope.$digest();
+
+    items = element.find('.list-view-pf-main-info');
+    eventFire(items[0], 'click');
+
+    var openItem = element.find('.list-group-item-container');
+    expect(openItem.length).toBe(1);
+  });
+
   it('should allow expanding rows to disable individual expansion', function () {
     $scope.systemModel[0].disableRowExpansion = true;
     $scope.listConfig.useExpandingRows = true;