ISPN-6079 - Searching nodes in management console by IP address doesn…

…'t work
infinispan · May 3, 2016 · c3eaea3 · c3eaea3
1 parent 18d5996
commit c3eaea3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 21 deletions.
diff --git a/src/main/webapp/cluster-nodes/cluster-nodes.controller.js b/src/main/webapp/cluster-nodes/cluster-nodes.controller.js
@@ -134,32 +134,16 @@ angular.module('managementConsole')
           scope: $scope
         });
       };
-    }]).filter('inetAddressFilter', function (){
-    return function (serverNodes, query) {
-      var validQuery = !(query === undefined || query === null) && query.length > 0;
-      //is it a number?
-      if (validQuery && !isNaN(query)) {
-        var nodes = [];
-        angular.forEach(serverNodes, function (serverNode) {
-          var address = serverNode.getInetAddress();
-          if (address.indexOf(query) > -1) {
-            nodes.push(serverNode);
-          }
-        });
-        return nodes;
-      } else {
-        return serverNodes;
-      }
-    };
-  }).filter('nameFilter', function (){
+    }]).filter('nameFilter', function (){
     return function (serverNodes, query) {
       var validQuery = !(query === undefined || query === null) && query.length > 0;
       //is it a leter?
-      if (validQuery && isNaN(query)) {
+      if (validQuery ) {
         var nodes = [];
         angular.forEach(serverNodes, function (serverNode) {
           var name = serverNode.getName();
-          if (name.indexOf(query) > -1) {
+          var address = serverNode.getInetAddress();
+          if (name.indexOf(query) > -1 || address.indexOf(query) > -1 ) {
             nodes.push(serverNode);
           }
         });

diff --git a/src/main/webapp/cluster-nodes/cluster-nodes.html b/src/main/webapp/cluster-nodes/cluster-nodes.html
@@ -65,7 +65,7 @@ <h2 class="card-pf-title">Add Node
         </a>
       </div>
       <div class="col-xs-6 col-sm-4 col-md-2" ng-repeat="server in filtered = (getServersInCluster()
-      | inetAddressFilter:searchNameQuery | nameFilter:searchNameQuery)" ng-show="server.show" on-finish-render="matchHeight()">
+      | nameFilter:searchNameQuery)" ng-show="server.show" on-finish-render="matchHeight()">
         <a ui-sref="nodeStatus({
             clusterName:cluster.name,
             nodeName:server.name,