added support for filtering sub-nodes in the tree

Author: yoavaa

README.md

@@ -127,6 +127,8 @@ Attributes of angular treecontrol
     - `labelSelected` : inject classes into the div element around the label only when the node is selected
 - `order-by` : value for ng-repeat to use for ordering sibling nodes
 - `reverse-order` : whether or not to reverse the ordering of sibling nodes based on the value of `order-by`
+- `filter-expression` : value for ng-repeat to use for filtering the sibling nodes
+- `filter-comparator` : value for ng-repeat to use for comparing nodes with the filter expression
 
 ### The tree labels
 

angular-tree-control.js

@@ -35,7 +35,9 @@
                     onNodeToggle: "&",
                     options: "=?",
                     orderBy: "@",
-                    reverseOrder: "@"
+                    reverseOrder: "@",
+                    filterExpression: "=?",
+                    filterComparator: "=?"
                 },
                 controller: ['$scope', function( $scope ) {
 
@@ -149,7 +151,7 @@
                     //tree template
                     var template =
                         '<ul '+classIfDefined($scope.options.injectClasses.ul, true)+'>' +
-                            '<li ng-repeat="node in node.' + $scope.options.nodeChildren + ' | orderBy:orderBy:reverseOrder" ng-class="headClass(node)" '+classIfDefined($scope.options.injectClasses.li, true)+'>' +
+                            '<li ng-repeat="node in node.' + $scope.options.nodeChildren + ' | filter:filterExpression:filterComparator | orderBy:orderBy:reverseOrder" ng-class="headClass(node)" '+classIfDefined($scope.options.injectClasses.li, true)+'>' +
                             '<i class="tree-branch-head" ng-class="iBranchClass()" ng-click="selectNodeHead(node)"></i>' +
                             '<i class="tree-leaf-head '+classIfDefined($scope.options.injectClasses.iLeaf, false)+'"></i>' +
                             '<div class="tree-label '+classIfDefined($scope.options.injectClasses.label, false)+'" ng-class="selectedClass()" ng-click="selectNodeLabel(node)" tree-transclude></div>' +

test/angular-tree-control-test.js

@@ -354,6 +354,82 @@ describe('treeControl', function() {
             expect(element.find('li:eq(0) .tree-branch-head').hasClass('expandcls')).toBeTruthy();
             expect(element.find('li:eq(1) .tree-branch-head').hasClass('collapsecls')).toBeTruthy();
         });
+
+        it('should filter sibling nodes based on filter expression which is a string', function() {
+            $rootScope.treedata = [
+                { label: "a", children: [] },
+                { label: "c", children: [] },
+                { label: "b", children: [] }
+            ];
+            $rootScope.predicate = 'b';
+            element = $compile('<treecontrol tree-model="treedata" filter-expression="predicate">{{node.label}}</treecontrol>')($rootScope);
+            $rootScope.$digest();
+            expect(element.find('li:eq(0)').text()).toBe('b');
+            expect(element.find('li').length).toBe(1);
+        });
+
+        it('should filter sibling nodes based on filter expression which is an object', function() {
+            $rootScope.treedata = [
+                { label: "a", age: 12, children: [] },
+                { label: "c", age: 12, children: [] },
+                { label: "b", age: 14, children: [] }
+            ];
+            $rootScope.predicate = {age:12};
+            element = $compile('<treecontrol tree-model="treedata" filter-expression="predicate">{{node.label}}</treecontrol>')($rootScope);
+            $rootScope.$digest();
+            expect(element.find('li:eq(0)').text()).toBe('a');
+            expect(element.find('li:eq(1)').text()).toBe('c');
+            expect(element.find('li').length).toBe(2);
+        });
+
+        it('should filter sibling nodes based on filter expression which is a function', function() {
+            $rootScope.treedata = [
+                { label: "a", age: 12, children: [] },
+                { label: "c", age: 12, children: [] },
+                { label: "b", age: 14, children: [] }
+            ];
+            $rootScope.predicate = function(node) {
+                return node.age == 12;
+            };
+            element = $compile('<treecontrol tree-model="treedata" filter-expression="predicate">{{node.label}}</treecontrol>')($rootScope);
+            $rootScope.$digest();
+            expect(element.find('li:eq(0)').text()).toBe('a');
+            expect(element.find('li:eq(1)').text()).toBe('c');
+            expect(element.find('li').length).toBe(2);
+        });
+
+        it('should filter sibling nodes based on filter expression in non prefix match', function() {
+            $rootScope.treedata = [
+                { label: "abcd", age: 12, children: [] },
+                { label: "abef", age: 12, children: [] },
+                { label: "bcde", age: 14, children: [] }
+            ];
+            $rootScope.predicate = "ab";
+            $rootScope.comparator = false;
+            element = $compile('<treecontrol tree-model="treedata" filter-expression="predicate" filter-comparator="comparator">{{node.label}}</treecontrol>')($rootScope);
+            $rootScope.$digest();
+            expect(element.find('li:eq(0)').text()).toBe('abcd');
+            expect(element.find('li:eq(1)').text()).toBe('abef');
+            expect(element.find('li').length).toBe(2);
+        });
+
+        it('should filter sibling nodes based on filter expression in non prefix match', function() {
+            $rootScope.treedata = [
+                { label: "abcd", age: 12, children: [] },
+                { label: "abef", age: 12, children: [] },
+                { label: "bcde", age: 14, children: [] }
+            ];
+            $rootScope.predicate = "ab";
+            $rootScope.comparator = true;
+            element = $compile('<treecontrol tree-model="treedata" filter-expression="predicate" filter-comparator="comparator">{{node.label}}</treecontrol>')($rootScope);
+            $rootScope.$digest();
+            expect(element.find('li').length).toBe(0);
+
+            $rootScope.predicate = "abcd";
+            $rootScope.$digest();
+            expect(element.find('li:eq(0)').text()).toBe('abcd');
+            expect(element.find('li').length).toBe(1);
+        });
     });
 
     describe('customizations', function () {