removed all usage of ui-select template functions

This commit is contained in:
Erik Jan de Wit 2022-07-12 11:17:36 +02:00 committed by Bruno Oliveira da Silva
parent 9c007e3779
commit 6416db2d67
4 changed files with 89 additions and 100 deletions

View file

@ -258,9 +258,8 @@ module.controller('ResourceServerResourceDetailCtrl', function($scope, $http, $r
delay: 500,
allowClear: true,
query: function (query) {
var data = {results: []};
if ('' == query.term.trim()) {
query.callback(data);
query.callback({ results: [] });
return;
}
$scope.query = {
@ -271,16 +270,14 @@ module.controller('ResourceServerResourceDetailCtrl', function($scope, $http, $r
max : 20,
first : 0
};
ResourceServerScope.query($scope.query, function(response) {
data.results = response;
query.callback(data);
ResourceServerScope.query($scope.query, function (response) {
query.callback({
results: response.map(function (resource) {
resource.text = resource.name;
return resource;
})
});
});
},
formatResult: function(object, container, query) {
return object.name;
},
formatSelection: function(object, container, query) {
return object.name;
}
};
@ -939,14 +936,11 @@ function ResourceServerPolicyCommonHandler($scope, $route, $location, realm, cli
resourceScope => resourceScope.name.toLowerCase().includes(
query.term.trim().toLowerCase())
);
var data = {results: []};
data.results = filteredScopes;
query.callback(data);
query.callback({ results: filteredScopes });
} else {
// if no resource is selected, all the scopes are allowed.
var data = {results: []};
if ('' == query.term.trim()) {
query.callback(data);
query.callback({results: []});
return;
}
$scope.query = {
@ -957,15 +951,15 @@ function ResourceServerPolicyCommonHandler($scope, $route, $location, realm, cli
max : 20,
first : 0
};
ResourceServerScope.query($scope.query, function(response) {
data.results = response;
query.callback(data);
ResourceServerScope.query($scope.query, function (response) {
query.callback({
result: response.map(function (scope) {
scope.text = scope.name;
return scope;
})
});
});
}
},
formatResult: function(object, container, query) {
object.text = object.name;
return object.name;
}
};
}
@ -976,9 +970,8 @@ function ResourceServerPolicyCommonHandler($scope, $route, $location, realm, cli
allowClear: true,
id: function(resource){ return resource._id; },
query: function (query) {
var data = {results: []};
if ('' == query.term.trim()) {
query.callback(data);
query.callback({results: []});
return;
}
$scope.query = {
@ -989,14 +982,14 @@ function ResourceServerPolicyCommonHandler($scope, $route, $location, realm, cli
max : 20,
first : 0
};
ResourceServerResource.query($scope.query, function(response) {
data.results = response;
query.callback(data);
ResourceServerResource.query($scope.query, function (response) {
query.callback({
result: response.map(function (resource) {
resource.text = resource.name;
return resource;
})
});
});
},
formatResult: function(object, container, query) {
object.text = object.name;
return object.name;
}
};
@ -1005,9 +998,8 @@ function ResourceServerPolicyCommonHandler($scope, $route, $location, realm, cli
delay: 500,
allowClear: true,
query: function (query) {
var data = {results: []};
if ('' == query.term.trim()) {
query.callback(data);
query.callback({ results: [] });
return;
}
$scope.query = {
@ -1018,14 +1010,14 @@ function ResourceServerPolicyCommonHandler($scope, $route, $location, realm, cli
max : 20,
first : 0
};
ResourceServerPermission.searchPolicies($scope.query, function(response) {
data.results = response;
query.callback(data);
ResourceServerPermission.searchPolicies($scope.query, function (response) {
query.callback({
results: response.map(function (policy) {
policy.text = policy.name;
return policy;
})
});
});
},
formatResult: function(object, container, query) {
object.text = object.name;
return object.name;
}
};
@ -1233,18 +1225,18 @@ module.controller('ResourceServerPolicyUserDetailCtrl', function($scope, $route,
delay: 500,
allowClear: true,
query: function (query) {
var data = {results: []};
if ('' == query.term.trim()) {
query.callback(data);
query.callback({ results: [] });
return;
}
User.query({realm: $route.current.params.realm, search: query.term.trim(), max: 20}, function(response) {
data.results = response;
query.callback(data);
User.query({ realm: $route.current.params.realm, search: query.term.trim(), max: 20 }, function (response) {
query.callback({
results: response.map(function (user) {
user.text = user.username;
return user;
})
});
});
},
formatResult: function(object, container, query) {
return object.username;
}
};
@ -1824,9 +1816,8 @@ module.controller('ResourceServerPolicyAggregateDetailCtrl', function($scope, $r
delay: 500,
allowClear: true,
query: function (query) {
var data = {results: []};
if ('' == query.term.trim()) {
query.callback(data);
query.callback({ results: [] });
return;
}
$scope.query = {
@ -1837,14 +1828,14 @@ module.controller('ResourceServerPolicyAggregateDetailCtrl', function($scope, $r
max : 20,
first : 0
};
ResourceServerPolicy.query($scope.query, function(response) {
data.results = response;
query.callback(data);
ResourceServerPolicy.query($scope.query, function (response) {
query.callback({
results: response.map(function (policy) {
policy.text = policy.name;
return policy;
})
});
});
},
formatResult: function(object, container, query) {
object.text = object.name;
return object.name;
}
};
},
@ -2623,19 +2614,18 @@ module.controller('PolicyEvaluateCtrl', function($scope, $http, $route, $locatio
delay: 500,
allowClear: true,
query: function (query) {
var data = {results: []};
if ('' == query.term.trim()) {
query.callback(data);
query.callback({ results: [] });
return;
}
User.query({realm: $route.current.params.realm, search: query.term.trim(), max: 20}, function(response) {
data.results = response;
query.callback(data);
User.query({ realm: $route.current.params.realm, search: query.term.trim(), max: 20 }, function (response) {
query.callback({
results: response.map(function (user) {
user.text = user.username;
return user;
})
});
});
},
formatResult: function(object, container, query) {
object.text = object.username;
return object.username;
}
};
@ -2645,9 +2635,8 @@ module.controller('PolicyEvaluateCtrl', function($scope, $http, $route, $locatio
allowClear: true,
id: function(resource){ return resource._id; },
query: function (query) {
var data = {results: []};
if ('' == query.term.trim()) {
query.callback(data);
query.callback({ results: [] });
return;
}
$scope.query = {
@ -2658,14 +2647,14 @@ module.controller('PolicyEvaluateCtrl', function($scope, $http, $route, $locatio
max : 20,
first : 0
};
ResourceServerResource.query($scope.query, function(response) {
data.results = response;
query.callback(data);
ResourceServerResource.query($scope.query, function (response) {
query.callback({
results: response.map(function (resource) {
resource.text = resource.name;
return resource;
})
});
});
},
formatResult: function(object, container, query) {
object.text = object.name;
return object.name;
}
};
@ -2674,9 +2663,8 @@ module.controller('PolicyEvaluateCtrl', function($scope, $http, $route, $locatio
delay: 500,
allowClear: true,
query: function (query) {
var data = {results: []};
if ('' == query.term.trim()) {
query.callback(data);
query.callback({ results: [] });
return;
}
$scope.query = {
@ -2687,14 +2675,14 @@ module.controller('PolicyEvaluateCtrl', function($scope, $http, $route, $locatio
max : 20,
first : 0
};
ResourceServerScope.query($scope.query, function(response) {
data.results = response;
query.callback(data);
ResourceServerScope.query($scope.query, function (response) {
query.callback({
result: response.map(function (scope) {
scope.text = scope.name;
return scope;
})
});
});
},
formatResult: function(object, container, query) {
object.text = object.name;
return object.name;
}
};

View file

@ -3027,17 +3027,17 @@ module.controller('ClientClientScopesEvaluateCtrl', function($scope, Realm, User
query: function (query) {
var data = {results: []};
if ('' == query.term.trim()) {
query.callback(data);
query.callback({ results: [] });
return;
}
User.query({realm: $route.current.params.realm, search: query.term.trim(), max: 20}, function(response) {
data.results = response;
query.callback(data);
User.query({ realm: $route.current.params.realm, search: query.term.trim(), max: 20 }, function (response) {
query.callback({
results: response.map(function (user) {
user.text = user.username;
return user;
})
});
});
},
formatResult: function(object, container, query) {
object.text = object.username;
return object.username;
}
};

View file

@ -594,13 +594,12 @@ module.controller('UserDetailCtrl', function($scope, realm, user, BruteForceUser
first : 0
};
Groups.query($scope.query, function(response) {
data.results = filterSearchedGroups(flattenGroups(response), query.term.trim(), $scope.selectedGroups);
data.results = filterSearchedGroups(flattenGroups(response), query.term.trim(), $scope.selectedGroups).map(function(group) {
group.text = group.path;
return group;
});
query.callback(data);
});
},
formatResult: function(object, container, query) {
object.text = object.path;
return object.path;
}
};

View file

@ -959,8 +959,10 @@ function clientSelectControl($scope, realm, Client) {
query: function (query) {
Client.query({realm: realm, search: true, clientId: query.term.trim(), max: 20}, function(response) {
query.callback({ results: response.map(function (client) {
return { id: client.id, text: client.clientId }
})});
client.text = client.clientId;
return client;
})
});
});
}
};