From 98206310bd90a06cc6550c101e7d22f66f94eb5a Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Thu, 18 Aug 2016 15:59:00 -0400 Subject: [PATCH 1/4] Extract the add repo permissions UI into its own directive --- .../directives/ui/add-repo-permissions.css | 35 ++++ static/directives/add-repo-permissions.html | 69 +++++++ static/directives/create-entity-dialog.html | 79 +------- .../js/directives/ui/add-repo-permissions.js | 188 ++++++++++++++++++ .../js/directives/ui/create-entity-dialog.js | 139 ++----------- 5 files changed, 323 insertions(+), 187 deletions(-) create mode 100644 static/css/directives/ui/add-repo-permissions.css create mode 100644 static/directives/add-repo-permissions.html create mode 100644 static/js/directives/ui/add-repo-permissions.js diff --git a/static/css/directives/ui/add-repo-permissions.css b/static/css/directives/ui/add-repo-permissions.css new file mode 100644 index 000000000..dbab124da --- /dev/null +++ b/static/css/directives/ui/add-repo-permissions.css @@ -0,0 +1,35 @@ +.add-repo-permissions-element label { + margin-top: 4px; +} + +.add-repo-permissions-element .co-table { + margin-top: 20px; +} + +.add-repo-permissions-element .fa-hdd-o { + margin-right: 4px; + vertical-align: middle; +} + +.add-repo-permissions-element .co-filter-box { + display: block; + float: right; + margin-bottom: 20px; +} + +.add-repo-permissions-element .co-filter-box .filter-message { + left: -180px; + top: 4px; +} + +.add-repo-permissions-element .co-filter-box input { + width: 100%; + padding-top: 2px; + padding-bottom: 2px; + height: 28px; +} + +.add-repo-permissions-element label .avatar { + vertical-align: text-bottom; + margin-left: 4px; +} \ No newline at end of file diff --git a/static/directives/add-repo-permissions.html b/static/directives/add-repo-permissions.html new file mode 100644 index 000000000..6257915ab --- /dev/null +++ b/static/directives/add-repo-permissions.html @@ -0,0 +1,69 @@ +
+ + + Showing {{ orderedRepositories.entries.length }} of {{ repositories.length }} repositories + + + + + + + + + + + + + + + + + + + + +
+ +
+ All Repositories +
+
+ No Repositories +
+
+ Missing Permissions +
+ + 		+ Repository Name + Permission + Last Updated +
+ + + + + + + + + {{ repo.last_modified * 1000 | amCalendar }} + + (Empty Repository) +
+ +
+
No matching repositories found.
+
Try expanding your filtering terms.
+
+
\ No newline at end of file diff --git a/static/directives/create-entity-dialog.html b/static/directives/create-entity-dialog.html index 90d59f959..af655928b 100644 --- a/static/directives/create-entity-dialog.html +++ b/static/directives/create-entity-dialog.html @@ -16,73 +16,16 @@
- - - Showing {{ orderedRepositories.entries.length }} of {{ repositories.length }} repositories - - - - - - - - - - - - - - - - - - - - -
- -
- All Repositories -
-
- No Repositories -
-
- Missing Permissions -
- - 		- Repository Name - Permission - Last Updated -
- - - - - - - - - {{ repo.last_modified * 1000 | amCalendar }} - - (Empty Repository) -
- -
-
No matching repositories found.
-
Try expanding your filtering terms.
-
+
@@ -96,7 +39,7 @@
+ ng-show="context.hasCheckedRepositories">Add permissions
diff --git a/static/js/directives/ui/add-repo-permissions.js b/static/js/directives/ui/add-repo-permissions.js new file mode 100644 index 000000000..a63dfc14b --- /dev/null +++ b/static/js/directives/ui/add-repo-permissions.js @@ -0,0 +1,188 @@ +/** + * An element which displays a table for adding permissions for an entity to repositories under + * a namespace. + */ +angular.module('quay').directive('addRepoPermissions', function () { + var directiveDefinitionObject = { + priority: 0, + templateUrl: '/static/directives/add-repo-permissions.html', + replace: false, + transclude: true, + restrict: 'C', + scope: { + 'namespace': '=namespace', + 'entityName': '=entityName', + 'entityKind': '=entityKind', + + 'checkedRepository': '=checkedRepository', + + 'addPermissions': '=addPermissions', + + 'hasCheckedRepositories': '=hasCheckedRepositories', + + 'repositoriesLoaded': '&repositoriesLoaded', + 'addingPermissions': '&addingPermissions', + 'permissionsAdded': '&permissionsAdded', + }, + + controller: function($scope, $element, ApiService, UIService, TableService, RolesService) { + $scope.TableService = TableService; + + $scope.options = { + 'predicate': 'last_modified_datetime', + 'reverse': false, + 'filter': '' + }; + + $scope.repositories = null; + $scope.currentNamespace = null; + + var handleRepoCheckChange = function() { + $scope.repositories.forEach(function(repo) { + if ($scope.checkedRepos.isChecked(repo)) { + if (repo['permission'] == 'none') { + repo['permission'] = 'read'; + } + } else { + repo['permission'] = 'none'; + } + }); + + $scope.hasCheckedRepositories = !!$scope.checkedRepos.checked.length; + }; + + var setRepoState = function() { + if (!$scope.repositories) { + return; + } + + $scope.orderedRepositories = TableService.buildOrderedItems( + $scope.repositories, $scope.options, + ['name', 'permission'], + ['last_modified_datetime']); + }; + + var loadRepositories = function() { + if (!$scope.namespace || !$scope.entityName || !$scope.entityKind) { + return; + } + + if ($scope.namespace == $scope.currentNamespace) { + return; + } + + // Load the repositories under the entity's namespace. + var params = { + 'namespace': $scope.namespace, + 'last_modified': true + }; + + ApiService.listRepos(null, params).then(function(resp) { + $scope.currentNamespace = $scope.namespace; + + var repos = []; + resp['repositories'].forEach(function(repo) { + repos.push({ + 'namespace': repo.namespace, + 'name': repo.name, + 'last_modified': repo.last_modified, + 'last_modified_datetime': TableService.getReversedTimestamp(repo.last_modified), + 'permission': 'none' + }); + }); + + if (repos.length == 0) { + $scope.repositoriesLoaded({'repositories': repos}); + return; + } + + $scope.repositories = repos; + $scope.checkedRepos = UIService.createCheckStateController($scope.repositories, 'name'); + $scope.checkedRepos.listen(handleRepoCheckChange); + + if ($scope.checkedRepository) { + repos.forEach(function(repo) { + if (repo['namespace'] == $scope.checkedRepository.namespace && + repo['name'] == $scope.checkedRepository.name) { + $scope.checkedRepos.checkItem(repo); + $scope.options.filter = $scope.checkedRepository.name; + } + }); + } + + setRepoState(); + $scope.repositoriesLoaded({'repositories': repos}); + }, ApiService.errorDisplay('Could not load repositories')); + }; + + var addPermissions = function() { + if (!$scope.checkedRepos || !$scope.namespace || !$scope.repositories) { + return; + } + + $scope.addingPermissions(); + + var repos = $scope.checkedRepos.checked; + var counter = 0; + + var addPerm = function() { + if (counter >= repos.length) { + $scope.permissionsAdded(); + return; + } + + var repo = repos[counter]; + RolesService.setRepositoryRole(repo, repo.permission, $scope.entityKind, + $scope.entityName, + function(status) { + if (status) { + counter++; + addPerm(); + } else { + $scope.permissionsAdded(); + } + }); + }; + + addPerm(); + }; + + $scope.setRole = function(role, repo) { + repo['permission'] = role; + + if (role == 'none') { + $scope.checkedRepos.uncheckItem(repo); + } else { + $scope.checkedRepos.checkItem(repo); + } + }; + + $scope.allRepositoriesFilter = function(item) { + return true; + }; + + $scope.noRepositoriesFilter = function(item) { + return false; + }; + + $scope.missingPermsRepositoriesFilter = function(item) { + return !item.perm; + }; + + $scope.$watch('options.predicate', setRepoState); + $scope.$watch('options.reverse', setRepoState); + $scope.$watch('options.filter', setRepoState); + + $scope.$watch('namespace', loadRepositories); + $scope.$watch('entityName', loadRepositories); + $scope.$watch('entityKind', loadRepositories); + + $scope.$watch('addPermissions', function(value) { + if (value) { + addPermissions(); + } + }); + } + }; + return directiveDefinitionObject; +}); \ No newline at end of file diff --git a/static/js/directives/ui/create-entity-dialog.js b/static/js/directives/ui/create-entity-dialog.js index c70a2128c..df44b8e41 100644 --- a/static/js/directives/ui/create-entity-dialog.js +++ b/static/js/directives/ui/create-entity-dialog.js @@ -20,25 +20,9 @@ angular.module('quay').directive('createEntityDialog', function () { 'entityCreateCompleted': '&entityCreateCompleted' }, - controller: function($scope, $element, ApiService, UIService, TableService, RolesService, UserService) { - $scope.TableService = TableService; - - $scope.options = { - 'predicate': 'last_modified_datetime', - 'reverse': false, - 'filter': '' - }; - - var handleRepoCheckChange = function() { - $scope.repositories.forEach(function(repo) { - if ($scope.checkedRepos.isChecked(repo)) { - if (repo['permission'] == 'none') { - repo['permission'] = 'read'; - } - } else { - repo['permission'] = 'none'; - } - }); + controller: function($scope, $element, ApiService, UIService, UserService) { + $scope.context = { + 'addPermissionsCounter': 0 }; $scope.$on('$destroy', function() { @@ -47,16 +31,6 @@ angular.module('quay').directive('createEntityDialog', function () { } }); - $scope.setRole = function(role, repo) { - repo['permission'] = role; - - if (role == 'none') { - $scope.checkedRepos.uncheckItem(repo); - } else { - $scope.checkedRepos.checkItem(repo); - } - }; - $scope.hide = function() { $element.find('.modal').modal('hide'); if ($scope.entity) { @@ -68,6 +42,7 @@ angular.module('quay').directive('createEntityDialog', function () { $scope.show = function() { $scope.entityName = null; $scope.entity = null; + $scope.entityForPermissions = null; $scope.creating = false; $scope.view = 'enterName'; $scope.enterNameForm.$setPristine(true); @@ -79,92 +54,13 @@ angular.module('quay').directive('createEntityDialog', function () { document.body.appendChild($element[0]); }; - var setRepoState = function() { - if (!$scope.repositories) { - return; - } - - $scope.orderedRepositories = TableService.buildOrderedItems($scope.repositories, $scope.options, - ['name', 'permission'], - ['last_modified_datetime']); - }; - var entityCreateCallback = function(entity) { + $scope.entity = entity; + if (!entity || $scope.info.skip_permissions) { - $scope.entity = entity; $scope.hide(); return; } - - // Load the repositories under the entity's namespace. - var params = { - 'namespace': $scope.info.namespace, - 'last_modified': true - }; - - ApiService.listRepos(null, params).then(function(resp) { - $scope.view = 'addperms'; - $scope.entity = entity; - - var repos = []; - resp['repositories'].forEach(function(repo) { - repos.push({ - 'namespace': repo.namespace, - 'name': repo.name, - 'last_modified': repo.last_modified, - 'last_modified_datetime': TableService.getReversedTimestamp(repo.last_modified), - 'permission': 'none' - }); - }); - - if (repos.length == 0) { - $scope.hide(); - return; - } - - $scope.repositories = repos; - $scope.checkedRepos = UIService.createCheckStateController($scope.repositories, 'name'); - $scope.checkedRepos.listen(handleRepoCheckChange); - - if ($scope.info.repository) { - repos.forEach(function(repo) { - if (repo['namespace'] == $scope.info.repository.namespace && - repo['name'] == $scope.info.repository.name) { - $scope.checkedRepos.checkItem(repo); - $scope.options.filter = $scope.info.repository.name; - } - }); - } - - setRepoState(); - }, ApiService.errorDisplay('Could not load repositories')); - }; - - $scope.addPermissions = function() { - $scope.view = 'addingperms'; - - var repos = $scope.checkedRepos.checked; - var counter = 0; - - var addPerm = function() { - if (counter >= repos.length) { - $scope.hide(); - return; - } - - var repo = repos[counter]; - RolesService.setRepositoryRole(repo, repo.permission, $scope.entityKind, $scope.entity.name, - function(status) { - if (status) { - counter++; - addPerm(); - } else { - $scope.hide(); - } - }); - }; - - addPerm(); }; $scope.createEntity = function() { @@ -175,21 +71,26 @@ angular.module('quay').directive('createEntityDialog', function () { }); }; - $scope.allRepositoriesFilter = function(item) { - return true; + $scope.permissionsAdded = function() { + $scope.hide(); }; - $scope.noRepositoriesFilter = function(item) { - return false; + $scope.addingPermissions = function() { + $scope.view = 'addingperms'; }; - $scope.missingPermsRepositoriesFilter = function(item) { - return !item.perm; + $scope.addPermissions = function() { + $scope.context.addPermissionsCounter++; }; - $scope.$watch('options.predicate', setRepoState); - $scope.$watch('options.reverse', setRepoState); - $scope.$watch('options.filter', setRepoState); + $scope.repositoriesLoaded = function(repositories) { + if (repositories && !repositories.length) { + $scope.hide(); + return; + } + + $scope.view = 'addperms'; + }; $scope.$watch('entityNameRegex', function(r) { if (r) { From 6ebb4179233f63ddd0698c7073bd3fd623c42623 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Thu, 18 Aug 2016 17:44:36 -0400 Subject: [PATCH 2/4] Redesign the teams page to use a table Allows for faster loading and easier viewing of important information about teams --- data/model/team.py | 31 ++++- endpoints/api/organization.py | 17 ++- .../directives/ui/create-entity-dialog.css | 36 ----- static/css/directives/ui/teams-manager.css | 34 ++++- static/css/quay.css | 7 - static/directives/add-repo-permissions.html | 6 +- static/directives/create-entity-dialog.html | 2 +- static/directives/teams-manager.html | 129 ++++++++++-------- .../js/directives/ui/add-repo-permissions.js | 6 +- .../js/directives/ui/create-entity-dialog.js | 3 +- static/js/directives/ui/teams-manager.js | 91 ++++++------ 11 files changed, 194 insertions(+), 168 deletions(-) diff --git a/data/model/team.py b/data/model/team.py index ce1f782b4..1fffa5dbf 100644 --- a/data/model/team.py +++ b/data/model/team.py @@ -1,7 +1,9 @@ -from data.database import Team, TeamMember, TeamRole, User, TeamMemberInvite +from data.database import Team, TeamMember, TeamRole, User, TeamMemberInvite, RepositoryPermission from data.model import (DataModelException, InvalidTeamException, UserAlreadyInTeam, InvalidTeamMemberException, user, _basequery) from util.validation import validate_username +from peewee import fn, JOIN_LEFT_OUTER +from util.morecollections import AttrDict def create_team(name, org_obj, team_role_name, description=''): @@ -186,7 +188,32 @@ def get_matching_teams(team_prefix, organization): def get_teams_within_org(organization): - return Team.select().where(Team.organization == organization) + """ Returns a AttrDict of team info (id, name, description), its role under the org, + the number of repositories on which it has permission, and the number of members. + """ + query = (Team.select(Team.id, Team.name, Team.description, TeamRole.name, + fn.Count(RepositoryPermission.id), fn.Count(TeamMember.id)) + .where(Team.organization == organization) + .join(TeamRole) + .switch(Team) + .join(RepositoryPermission, JOIN_LEFT_OUTER) + .switch(Team) + .join(TeamMember, JOIN_LEFT_OUTER) + .group_by(Team.id) + .tuples()) + + def _team_view(team_tuple): + return AttrDict({ + 'id': team_tuple[0], + 'name': team_tuple[1], + 'description': team_tuple[2], + 'role_name': team_tuple[3], + + 'repo_count': team_tuple[4], + 'member_count': team_tuple[5], + }) + + return [_team_view(team_tuple) for team_tuple in query] def get_user_teams_within_org(username, organization): diff --git a/endpoints/api/organization.py b/endpoints/api/organization.py index 5629ce879..685094d87 100644 --- a/endpoints/api/organization.py +++ b/endpoints/api/organization.py @@ -8,13 +8,12 @@ import features from app import billing as stripe, avatar from endpoints.api import (resource, nickname, ApiResource, validate_json_request, request_error, - related_user_resource, internal_only, require_user_admin, log_action, + related_user_resource, internal_only, require_user_admin, log_action, show_if, path_param, require_scope) from endpoints.exception import Unauthorized, NotFound -from endpoints.api.team import team_view from endpoints.api.user import User, PrivateRepositories from auth.permissions import (AdministerOrganizationPermission, OrganizationMemberPermission, - CreateRepositoryPermission) + CreateRepositoryPermission, ViewTeamPermission) from auth.auth_context import get_authenticated_user from auth import scopes from data import model @@ -24,6 +23,18 @@ from data.billing import get_plan logger = logging.getLogger(__name__) +def team_view(orgname, team): + return { + 'name': team.name, + 'description': team.description, + 'role': team.role_name, + 'avatar': avatar.get_data_for_team(team), + 'can_view': ViewTeamPermission(orgname, team.name).can(), + + 'repo_count': team.repo_count, + 'member_count': team.member_count, + } + def org_view(o, teams): is_admin = AdministerOrganizationPermission(o.username).can() diff --git a/static/css/directives/ui/create-entity-dialog.css b/static/css/directives/ui/create-entity-dialog.css index f7eb3fc9f..59b598b97 100644 --- a/static/css/directives/ui/create-entity-dialog.css +++ b/static/css/directives/ui/create-entity-dialog.css @@ -15,39 +15,3 @@ margin-left: 4px; margin-right: 4px; } - -.create-entity-dialog-element label { - margin-top: 4px; -} - -.create-entity-dialog-element .co-table { - margin-top: 20px; -} - -.create-entity-dialog-element .fa-hdd-o { - margin-right: 4px; - vertical-align: middle; -} - -.create-entity-dialog-element .co-filter-box { - display: block; - float: right; - margin-bottom: 20px; -} - -.create-entity-dialog-element .co-filter-box .filter-message { - left: -180px; - top: 4px; -} - -.create-entity-dialog-element .co-filter-box input { - width: 100%; - padding-top: 2px; - padding-bottom: 2px; - height: 28px; -} - -.create-entity-dialog-element label .avatar { - vertical-align: text-bottom; - margin-left: 4px; -} \ No newline at end of file diff --git a/static/css/directives/ui/teams-manager.css b/static/css/directives/ui/teams-manager.css index 5d6f74a04..a93a844ac 100644 --- a/static/css/directives/ui/teams-manager.css +++ b/static/css/directives/ui/teams-manager.css @@ -1,5 +1,19 @@ -.teams-manager .popup-input-button { +.teams-manager .co-filter-box { + display: block; float: right; + margin-bottom: 20px; +} + +.teams-manager.co-filter-box .filter-message { + left: -180px; + top: 4px; +} + +.teams-manager .co-filter-box input { + width: 100%; + padding-top: 2px; + padding-bottom: 2px; + height: 28px; } .teams-manager .manager-header { @@ -20,6 +34,10 @@ color: #ccc; } +.teams-manager .co-table .avatar { + margin-right: 6px; +} + .teams-manager .cor-confirm-dialog .entity-reference .avatar { margin-left: 4px; margin-right: 0px; @@ -36,14 +54,20 @@ } @media (max-width: 767px) { - .teams-manager .control-col { - padding-left: 55px; - padding-bottom: 10px; + .teams-manager .co-filter-box { + display: block; + float: none; } } -.teams-manager .header-col .info-icon { +.teams-manager .info-icon { + margin-left: 4px; +} + +.teams-manager .popover-content { + color: black; font-size: 16px; + text-transform: none; } .teams-manager .header-col .header-text { diff --git a/static/css/quay.css b/static/css/quay.css index fa9fb3d91..0088fda4f 100644 --- a/static/css/quay.css +++ b/static/css/quay.css @@ -634,13 +634,6 @@ i.toggle-icon:hover { padding: 6px; } -.info-icon { - display: inline-block; - float: right; - vertical-align: middle; - font-size: 20px; -} - .accordion-toggle { cursor: pointer; text-decoration: none !important; diff --git a/static/directives/add-repo-permissions.html b/static/directives/add-repo-permissions.html index 6257915ab..972763066 100644 --- a/static/directives/add-repo-permissions.html +++ b/static/directives/add-repo-permissions.html @@ -1,4 +1,4 @@ -
+
Showing {{ orderedRepositories.entries.length }} of {{ repositories.length }} repositories @@ -8,11 +8,11 @@ - +
- + - - - - + + - + + - - - - - - + + Delete Robot {{ robotInfo.name }} + + + +
diff --git a/static/directives/create-entity-dialog.html b/static/directives/create-entity-dialog.html index af655928b..6447e99c3 100644 --- a/static/directives/create-entity-dialog.html +++ b/static/directives/create-entity-dialog.html @@ -23,7 +23,7 @@ has-checked-repositories="context.hasCheckedRepositories" repositories-loaded="repositoriesLoaded(repositories)" adding-permissions="addingPermissions()" - permissions-added="permissionsAdded()" + permissions-added="permissionsAdded(repositories)" add-permissions="context.addPermissionsCounter" ng-if="entity"> diff --git a/static/directives/teams-manager.html b/static/directives/teams-manager.html index e17a938a8..68013d1a7 100644 --- a/static/directives/teams-manager.html +++ b/static/directives/teams-manager.html @@ -1,6 +1,14 @@
+
+ +
+
Robot Account Name TeamsDirect Repository PermissionsRepositories
- - - - - - - No teams - - - - - - +
+ + + + + + + No teams + + + + + - - - + + + + + No repositories - + + - - - - - - - - - repository - repositories - + + + {{ robotInfo.repositories.length }} + repository + repositories + + + + + + View Credentials - - - - View Credentials - - - Delete Robot {{ robotInfo.name }} - + + Set Repository Permissions -
- -
- - - - - - - - - - -
RepositoryPermission
- - {{ getPrefix(robotInfo.name) }}/{{ permission.repository.name }} - -
- -
-
-
-
+ +
+
diff --git a/static/directives/set-repo-permissions-dialog.html b/static/directives/set-repo-permissions-dialog.html new file mode 100644 index 000000000..1f40780ad --- /dev/null +++ b/static/directives/set-repo-permissions-dialog.html @@ -0,0 +1,35 @@ +
+
+
+
+
+ +

+ Set permissions for {{ info.entityName }} +

+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+
\ No newline at end of file diff --git a/static/directives/add-repo-permissions.html b/static/directives/set-repo-permissions.html similarity index 98% rename from static/directives/add-repo-permissions.html rename to static/directives/set-repo-permissions.html index 972763066..296fbef4a 100644 --- a/static/directives/add-repo-permissions.html +++ b/static/directives/set-repo-permissions.html @@ -1,4 +1,4 @@ -
+
Showing {{ orderedRepositories.entries.length }} of {{ repositories.length }} repositories diff --git a/static/directives/teams-manager.html b/static/directives/teams-manager.html index 722a33564..714b5711a 100644 --- a/static/directives/teams-manager.html +++ b/static/directives/teams-manager.html @@ -81,19 +81,31 @@ - repositories + + + No repositories + + + + + + {{ team.repo_count }} + repository + repositories + + - + Manage Team Members - - Add Repository Permissions + + Set Repository Permissions Delete Team {{ team.name }} @@ -169,8 +181,13 @@
+
+ +
+
= repos.length) { - $scope.permissionsAdded({'repositories': repos}); + $scope.permissionsSet({'repositories': $scope.checkedRepos.checked}); + $scope.checkedRepos.setChecked([]); return; } var repo = repos[counter]; + if (repo['permission'] == repo['original_permission']) { + // Skip changing it. + counter++; + setPerm(); + return; + } + RolesService.setRepositoryRole(repo, repo.permission, $scope.entityKind, - $scope.entityName, - function(status) { - if (status) { - counter++; - addPerm(); - } else { - $scope.permissionsAdded(); - } - }); + $scope.entityName, function(status) { + if (status) { + counter++; + setPerm(); + } + }); }; - addPerm(); + setPerm(); }; $scope.setRole = function(role, repo) { @@ -157,6 +200,8 @@ angular.module('quay').directive('addRepoPermissions', function () { } else { $scope.checkedRepos.checkItem(repo); } + + checkForChanges(); }; $scope.allRepositoriesFilter = function(item) { @@ -175,13 +220,13 @@ angular.module('quay').directive('addRepoPermissions', function () { $scope.$watch('options.reverse', setRepoState); $scope.$watch('options.filter', setRepoState); - $scope.$watch('namespace', loadRepositories); - $scope.$watch('entityName', loadRepositories); - $scope.$watch('entityKind', loadRepositories); + $scope.$watch('namespace', loadRepositoriesAndPermissions); + $scope.$watch('entityName', loadRepositoriesAndPermissions); + $scope.$watch('entityKind', loadRepositoriesAndPermissions); - $scope.$watch('addPermissions', function(value) { + $scope.$watch('setPermissions', function(value) { if (value) { - addPermissions(); + setPermissions(); } }); } diff --git a/static/js/directives/ui/teams-manager.js b/static/js/directives/ui/teams-manager.js index 69c752c3f..7235c91f2 100644 --- a/static/js/directives/ui/teams-manager.js +++ b/static/js/directives/ui/teams-manager.js @@ -196,6 +196,20 @@ angular.module('quay').directive('teamsManager', function () { $scope.removeMemberInfo = $.extend({}, memberInfo); }; + $scope.setRepoPermissions = function(teamName) { + $scope.setRepoPermissionsInfo = { + 'namespace': $scope.organization.name, + 'entityName': teamName, + 'entityKind': 'team', + 'entityIcon': 'fa-group' + }; + }; + + $scope.handlePermissionsSet = function(info, repositories) { + var team = $scope.organization.teams[info.entityName]; + team['repo_count'] = repositories.length; + }; + $scope.$watch('organization', setTeamsState); $scope.$watch('isEnabled', setTeamsState); diff --git a/static/js/services/roles-service.js b/static/js/services/roles-service.js index 27a258598..89def37ab 100644 --- a/static/js/services/roles-service.js +++ b/static/js/services/roles-service.js @@ -1,7 +1,8 @@ /** * Service which defines the various role groups. */ -angular.module('quay').factory('RolesService', ['UtilService', 'Restangular', 'ApiService', function(UtilService, Restangular, ApiService) { +angular.module('quay').factory('RolesService', ['UtilService', 'Restangular', 'ApiService', 'UserService', + function(UtilService, Restangular, ApiService, UserService) { var roleService = {}; roleService.repoRolesOrNone = [ @@ -20,14 +21,22 @@ angular.module('quay').factory('RolesService', ['UtilService', 'Restangular', 'A { 'id': 'admin', 'title': 'Admin', 'kind': 'primary', 'description': 'Full admin access to the organization' } ]; - var getPermissionEndpoint = function(repository, entityName, kind) { + var getPermissionEndpoint = function(repository, entityName, entityKind) { + if (entityKind == 'robot') { + entityKind = 'user'; + } + var namespace = repository.namespace; var name = repository.name; - var url = UtilService.getRestUrl('repository', namespace, name, 'permissions', kind, entityName); + var url = UtilService.getRestUrl('repository', namespace, name, 'permissions', entityKind, entityName); return Restangular.one(url); }; roleService.deleteRepositoryRole = function(repository, entityKind, entityName, callback) { + if (entityKind == 'robot') { + entityKind = 'user'; + } + var errorDisplay = ApiService.errorDisplay('Cannot change permission', function(resp) { callback(false); }); @@ -39,6 +48,15 @@ angular.module('quay').factory('RolesService', ['UtilService', 'Restangular', 'A }; roleService.setRepositoryRole = function(repository, role, entityKind, entityName, callback) { + if (role == 'none') { + roleService.deleteRepositoryRole(repository, entityKind, entityName, callback); + return; + } + + if (entityKind == 'robot') { + entityKind = 'user'; + } + var errorDisplay = ApiService.errorDisplay('Cannot change permission', function(resp) { callback(false); }); @@ -53,5 +71,30 @@ angular.module('quay').factory('RolesService', ['UtilService', 'Restangular', 'A }, errorDisplay); }; + roleService.getRepoPermissions = function(namespace, entityKind, entityName, callback) { + var errorHandler = ApiService.errorDisplay('Could not load permissions', callback); + + if (entityKind == 'team') { + var params = { + 'orgname': namespace, + 'teamname': entityName + }; + + ApiService.getTeamPermissions(null, params).then(function(resp) { + callback(resp.permissions); + }, errorHandler); + } else if (entityKind == 'robot') { + var parts = entityName.split('+'); + var shortName = parts[1]; + + var orgname = UserService.isOrganization(namespace) ? namespace : null; + ApiService.getRobotPermissions(orgname, null, {'robot_shortname': shortName}).then(function(resp) { + callback(resp.permissions); + }, errorHandler); + } else { + throw Error('Unknown entity kind ' + entityKind); + } + }; + return roleService; }]); diff --git a/test/test_api_security.py b/test/test_api_security.py index 258efde7d..17e46f74d 100644 --- a/test/test_api_security.py +++ b/test/test_api_security.py @@ -10,7 +10,8 @@ from data import model from initdb import setup_database_for_testing, finished_database_for_testing from endpoints.api import api_bp, api -from endpoints.api.team import TeamMember, TeamMemberList, OrganizationTeam, TeamMemberInvite +from endpoints.api.team import (TeamMember, TeamMemberList, OrganizationTeam, TeamMemberInvite, + TeamPermissions) from endpoints.api.tag import RepositoryTagImages, RepositoryTag, ListRepositoryTags, RevertTag from endpoints.api.search import EntitySearch from endpoints.api.image import RepositoryImage, RepositoryImageList @@ -678,6 +679,24 @@ class TestTeamMemberBuynlargeDevtableOwners(ApiTestCase): self._run_test('DELETE', 400, 'devtable', None) +class TestTeamPermissionsBuynlarge(ApiTestCase): + def setUp(self): + ApiTestCase.setUp(self) + self._set_url(TeamPermissions, orgname="buynlarge", teamname="readers") + + def test_get_anonymous(self): + self._run_test('GET', 401, None, None) + + def test_get_freshuser(self): + self._run_test('GET', 403, 'freshuser', None) + + def test_get_reader(self): + self._run_test('GET', 403, 'reader', None) + + def test_get_devtable(self): + self._run_test('GET', 200, 'devtable', None) + + class TestTeamMemberListBuynlargeReaders(ApiTestCase): def setUp(self): ApiTestCase.setUp(self) diff --git a/test/test_api_usage.py b/test/test_api_usage.py index f7a8dcb16..69fed58bb 100644 --- a/test/test_api_usage.py +++ b/test/test_api_usage.py @@ -27,7 +27,8 @@ from data import database, model from data.database import RepositoryActionCount, Repository as RepositoryTable from test.helpers import assert_action_logged -from endpoints.api.team import TeamMember, TeamMemberList, TeamMemberInvite, OrganizationTeam +from endpoints.api.team import (TeamMember, TeamMemberList, TeamMemberInvite, OrganizationTeam, + TeamPermissions) from endpoints.api.tag import RepositoryTagImages, RepositoryTag, RevertTag, ListRepositoryTags from endpoints.api.search import EntitySearch, ConductSearch from endpoints.api.image import RepositoryImage, RepositoryImageList @@ -1155,6 +1156,16 @@ class TestDeleteOrganizationTeam(ApiTestCase): self.assertEquals(msg, data['message']) +class TestTeamPermissions(ApiTestCase): + def test_team_permissions(self): + self.login(ADMIN_ACCESS_USER) + + resp = self.getJsonResponse(TeamPermissions, + params=dict(orgname=ORGANIZATION, teamname='readers')) + + self.assertEquals(1, len(resp['permissions'])) + + class TestGetOrganizationTeamMembers(ApiTestCase): def test_invalidteam(self): self.login(ADMIN_ACCESS_USER)