Merge pull request #3570 from PaulL1/treebase

Various fixes

misc/tutorial/103_filtering.ngdoc

@@ -139,7 +139,8 @@ Refer the {@link 499_FAQ FAQ}, it is possible to implement this using a rowsProc
           { field: 'age', filters: [
             {
               condition: uiGridConstants.filter.GREATER_THAN,
-              placeholder: 'greater than'
+              placeholder: 'greater than',
+              term: 30
             },
             {
               condition: uiGridConstants.filter.LESS_THAN,

misc/tutorial/320_complex_grouping.ngdoc

@@ -7,10 +7,13 @@ We create a custom columnsProcessor to override the default aggregation that gro
 setting a custom aggregation function so that we can aggregate data from a different column than the
 one we're on.
 
+We turn on the ability to select group headers, and write a callback on the selection event to select all
+children of the selected rowHeader.
+
 @example
 <example module="app">
   <file name="app.js">
-    var app = angular.module('app', ['ngAnimate', 'ngTouch', 'ui.grid', 'ui.grid.grouping', 'ui.grid.edit' ]);
+    var app = angular.module('app', ['ngAnimate', 'ngTouch', 'ui.grid', 'ui.grid.grouping', 'ui.grid.edit', 'ui.grid.selection' ]);
 
     app.controller('MainCtrl', ['$scope', '$http', '$interval', 'uiGridGroupingConstants', '$filter', function ($scope, $http, $interval, uiGridGroupingConstants, $filter ) {
       var setGroupValues = function( columns, rows ) {
@@ -39,6 +42,7 @@ one we're on.
 
       $scope.gridOptions = {
         enableFiltering: true,
+        enableGroupHeaderSelection: true,
         columnDefs: [
           { name: 'name', width: '30%' },
           { name: 'gender', grouping: { groupPriority: 1 }, sort: { priority: 1, direction: 'asc' }, editableCellTemplate: 'ui-grid/dropdownEditor', width: '20%',
@@ -57,6 +61,19 @@ one we're on.
         onRegisterApi: function( gridApi ) {
           $scope.gridApi = gridApi;
           $scope.gridApi.grid.registerColumnsProcessor( setGroupValues, 410 );
+          $scope.gridApi.selection.on.rowSelectionChanged( $scope, function ( rowChanged ) {
+            if ( typeof(rowChanged.treeLevel) !== 'undefined' && rowChanged.treeLevel > -1 ) {
+              // this is a group header
+              children = $scope.gridApi.treeBase.getRowChildren( rowChanged );
+              children.forEach( function ( child ) {
+                if ( rowChanged.isSelected ) {
+                  $scope.gridApi.selection.selectRow( child.entity );
+                } else {
+                  $scope.gridApi.selection.unSelectRow( child.entity );
+                }
+              });
+            }
+          });
         }
       };
 
@@ -96,7 +113,7 @@ one we're on.
 
   <file name="index.html">
     <div ng-controller="MainCtrl">
-      <div id="grid1" ui-grid="gridOptions" ui-grid-grouping ui-grid-edit class="grid"></div>
+      <div id="grid1" ui-grid="gridOptions" ui-grid-grouping ui-grid-edit ui-grid-selection class="grid"></div>
     </div>
   </file>
 

src/features/exporter/test/exporter.spec.js

@@ -44,6 +44,7 @@ describe('ui.grid.exporter uiGridExporterService', function () {
     grid.rows[1].visible = false;
     grid.columns[2].visible = false;
     grid.setVisibleRows(grid.rows);
+    grid.setVisibleColumns(grid.columns);
 
     grid.api.selection.clearSelectedRows();
     grid.api.selection.selectRow(grid.rows[0].entity);

src/features/grouping/js/grouping.js

@@ -333,6 +333,15 @@
          *  <br/>Defaults to "Null"
          */
         gridOptions.groupingNullLabel = gridOptions.groupingNullLabel || 'Null';
+
+        /**
+         *  @ngdoc object
+         *  @name enableGroupHeaderSelection
+         *  @propertyOf  ui.grid.grouping.api:GridOptions
+         *  @description Allows group header rows to be selected.  
+         *  <br/>Defaults to false
+         */
+        gridOptions.enableGroupHeaderSelection = gridOptions.enableGroupHeaderSelection === true;
       },
 
 
@@ -1001,7 +1010,7 @@
         headerRow.groupHeader = true;
         headerRow.internalRow = true;
         headerRow.enableCellEdit = false;
-        headerRow.enableSelection = false;
+        headerRow.enableSelection = grid.options.enableGroupHeaderSelection;
         processingState[stateIndex].initialised = true;
         processingState[stateIndex].currentValue = newValue;
         processingState[stateIndex].currentRow = headerRow;

src/features/grouping/test/grouping.spec.js

@@ -1,4 +1,4 @@
-ddescribe('ui.grid.grouping uiGridGroupingService', function () {
+describe('ui.grid.grouping uiGridGroupingService', function () {
   var uiGridGroupingService;
   var uiGridGroupingConstants;
   var gridClassFactory;
@@ -295,7 +295,7 @@ ddescribe('ui.grid.grouping uiGridGroupingService', function () {
   });
 
 
-  ddescribe('getGrouping via api (returns colName)', function() {
+  describe('getGrouping via api (returns colName)', function() {
     it('should find no grouping', function() {
       expect(grid.api.grouping.getGrouping( true )).toEqual({
         grouping: [],

src/features/row-edit/js/gridRowEdit.js

@@ -71,7 +71,7 @@
                  * </pre>
                  * and somewhere within the event handler:
                  * <pre>
-                 *      gridApi.rowEdit.setSavePromise( grid, rowEntity, savePromise)
+                 *      gridApi.rowEdit.setSavePromise( rowEntity, savePromise)
                  * </pre>
                  * @param {object} rowEntity the options.data element that was edited
                  * @returns {promise} Your saveRow method should return a promise, the
@@ -91,7 +91,7 @@
                  * @description Sets the promise associated with the row save, mandatory that
                  * the saveRow event handler calls this method somewhere before returning.
                  * <pre>
-                 *      gridApi.rowEdit.setSavePromise(grid, rowEntity)
+                 *      gridApi.rowEdit.setSavePromise(rowEntity, savePromise)
                  * </pre>
                  * @param {object} rowEntity a data row from the grid for which a save has
                  * been initiated

src/features/tree-base/js/tree-base.js

@@ -397,6 +397,21 @@
                */
               setTreeState: function ( config ) {
                 service.setTreeState( grid, config );
+              },
+
+              /**
+               * @ngdoc function
+               * @name getRowChildren
+               * @methodOf  ui.grid.treeBase.api:PublicApi
+               * @description Get the children of the specified row
+               * @param {GridRow} row the row you want the children of
+               * @returns {Array} array of children of this row, the children
+               * are all gridRows
+               */
+              getRowChildren: function ( row ){
+                return row.treeNode.children.map( function( childNode ){ 
+                  return childNode.row; 
+                });
               }
             }
           }

src/features/tree-base/test/tree-base.spec.js

@@ -1,4 +1,4 @@
-ddescribe('ui.grid.treeBase uiGridTreeBaseService', function () {
+describe('ui.grid.treeBase uiGridTreeBaseService', function () {
   var uiGridTreeBaseService;
   var uiGridTreeBaseConstants;
   var gridClassFactory;
@@ -158,6 +158,13 @@ ddescribe('ui.grid.treeBase uiGridTreeBaseService', function () {
       expect( treeRows.length ).toEqual( 2, 'only level 0 is visible' );
       expect( collapseCount ).toEqual( 10 );
     });
+
+    it( 'getRowChildren', function() {
+      expect( treeRows.length ).toEqual( 2, 'only the level 0 rows are visible' );
+
+      treeRows = uiGridTreeBaseService.treeRows.call( grid, grid.rows.slice(0) );
+      expect( grid.api.treeBase.getRowChildren( grid.rows[7] ).length ).toEqual(2);
+    });
   });
 
 

src/js/core/services/rowSearcher.js

@@ -214,7 +214,7 @@ module.service('rowSearcher', ['gridUtil', 'uiGridConstants', function (gridUtil
       return !regex.exec(value);
     }
 
-    if (typeof(value) === 'number'){
+    if (typeof(value) === 'number' && typeof(term) === 'string' ){
       // if the term has a decimal in it, it comes through as '9\.4', we need to take out the \
       // the same for negative numbers
       // TODO: I suspect the right answer is to look at escapeRegExp at the top of this code file, maybe it's not needed?