vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2250 from coreos-inc/STORY-133211327-SSU-pagination

Browse source 
feat(super-users): paginate user tab
This commit is contained in:
Erica 2016-12-28 10:50:45 -05:00 • committed by GitHub
commit 4c7445db81
4 changed files with 116 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

41
static/js/directives/ui/manage-user-tab.js
View file

@ -9,30 +9,61 @@ angular.module('quay').directive('manageUserTab', function () {
transclude: true,
restrict: 'C',
scope: {
'isEnabled': '=isEnabled'
'isEnabled': '=isEnabled'
},
controller: function ($scope, $timeout, $location, $element, ApiService, UserService) {
controller: function ($scope, $timeout, $location, $element, ApiService, UserService, TableService) {
$scope.user = UserService.currentUser();
$scope.users = null;
$scope.orderedUsers = [];
$scope.usersPerPage = 10;
$scope.newUser = {};
$scope.createdUser = null;
$scope.takeOwnershipInfo = null;
$scope.options = {
'predicate': 'username',
'reverse': false,
'filter': null,
'page': 0
};
$scope.showCreateUser = function () {
$scope.createdUser = null;
$('#createUserModal').modal('show');
};
var sortUsers = function() {
if (!$scope.users) {return;}
$scope.orderedUsers = TableService.buildOrderedItems($scope.users, $scope.options,
['username', 'email'], []);
};
var loadUsersInternal = function () {
ApiService.listAllUsers().then(function (resp) {
$scope.users = resp['users'];
sortUsers();
$scope.showInterface = true;
}, function (resp) {
$scope.users = [];
$scope.usersError = ApiService.getErrorMessage(resp);
});
};
$scope.tablePredicateClass = function(name, predicate, reverse) {
if (name != predicate) {
return '';
}
return 'current ' + (reverse ? 'reversed' : '');
};
$scope.orderBy = function(predicate) {
if (predicate == $scope.options.predicate) {
$scope.options.reverse = !$scope.options.reverse;
return;
}
$scope.options.reverse = false;
$scope.options.predicate = predicate;
};
$scope.createUser = function () {
$scope.creatingUser = true;
$scope.createdUser = null;
@ -224,6 +255,10 @@ angular.module('quay').directive('manageUserTab', function () {
loadUsersInternal();
}
});
$scope.$watch('options.predicate', sortUsers);
$scope.$watch('options.reverse', sortUsers);
$scope.$watch('options.filter', sortUsers);
}
};
return directiveDefinitionObject;

36
static/js/pages/superuser.js
View file

@ -10,7 +10,7 @@
})
}]);
function SuperuserCtrl($scope, ApiService, Features, UserService, ContainerService, AngularPollChannel, CoreDialog) {
function SuperuserCtrl($scope, ApiService, Features, UserService, ContainerService, AngularPollChannel, CoreDialog, TableService) {
if (!Features.SUPER_USERS) {
return;
}
@ -31,6 +31,14 @@
$scope.serviceKeysActive = false;
$scope.globalMessagesActive = false;
$scope.manageUsersActive = false;
$scope.orderedOrgs = [];
$scope.orgsPerPage = 10;
$scope.options = {
'predicate': 'name',
'reverse': false,
'filter': null,
'page': 0,
}
$scope.loadMessageOfTheDay = function () {
$scope.globalMessagesActive = true;
@ -106,9 +114,16 @@
$scope.loadOrganizationsInternal();
};
var sortOrgs = function() {
if (!$scope.organizations) {return;}
$scope.orderedOrgs = TableService.buildOrderedItems($scope.organizations, $scope.options,
['name', 'email'], []);
};
$scope.loadOrganizationsInternal = function() {
$scope.organizationsResource = ApiService.listAllOrganizationsAsResource().get(function(resp) {
$scope.organizations = resp['organizations'];
sortOrgs();
return $scope.organizations;
});
};
@ -117,6 +132,21 @@
$scope.manageUsersActive = true;
};
$scope.tablePredicateClass = function(name, predicate, reverse) {
if (name != predicate) {
return '';
}
return 'current ' + (reverse ? 'reversed' : '');
};
$scope.orderBy = function(predicate) {
if (predicate == $scope.options.predicate) {
$scope.options.reverse = !$scope.options.reverse;
return;
}
$scope.options.reverse = false;
$scope.options.predicate = predicate;
};
$scope.askDeleteOrganization = function(org) {
bootbox.confirm('Are you sure you want to delete this organization? Its data will be deleted with it.',
function(result) {
@ -185,5 +215,9 @@
// Load the initial status.
$scope.checkStatus();
$scope.$watch('options.predicate', sortOrgs);
$scope.$watch('options.reverse', sortOrgs);
$scope.$watch('options.filter', sortOrgs);
}
}());