Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Closed
wants to merge 1 commit into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 4 additions & 20 deletions src/main/webapp/cluster-nodes/cluster-nodes.controller.js
View file
Open in desktop
Expand Up @@ -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);
}
});
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/cluster-nodes/cluster-nodes.html
View file
Open in desktop
Expand Up @@ -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,
Expand Down