Skip to content

Add sole owner badge on lists of projects #4970

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.

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

Merged
merged 18 commits into from
Oct 28, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions tests/unit/manage/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def test_active_projects(self, db_request):

# A project with a sole owner that is not the user
not_an_owner = ProjectFactory.create()
RoleFactory.create(user=user, project=not_an_owner, role_name="Maintatiner")
RoleFactory.create(user=user, project=not_an_owner, role_name="Maintainer")
RoleFactory.create(user=another_user, project=not_an_owner, role_name="Owner")

view = views.ManageAccountViews(db_request)
Expand Down Expand Up @@ -683,7 +683,12 @@ def test_manage_projects(self, db_request):
older_project_with_no_releases,
]
)
user_second_owner = UserFactory(
projects=[project_with_older_release, older_project_with_no_releases]
)
RoleFactory.create(user=db_request.user, project=project_with_newer_release)
RoleFactory.create(user=db_request.user, project=newer_project_with_no_releases)
RoleFactory.create(user=user_second_owner, project=project_with_newer_release)

assert views.manage_projects(db_request) == {
"projects": [
Expand All @@ -692,7 +697,11 @@ def test_manage_projects(self, db_request):
older_project_with_no_releases,
project_with_older_release,
],
"projects_owned": {project_with_newer_release.name},
"projects_owned": {
project_with_newer_release.name,
newer_project_with_no_releases.name,
},
"projects_sole_owned": {newer_project_with_no_releases.name},
}


Expand Down
63 changes: 33 additions & 30 deletions warehouse/manage/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,32 @@
from warehouse.utils.project import confirm_project, destroy_docs, remove_project


def user_projects(request):
""" Return all the projects for which the user is a sole owner """
projects_owned = (
request.db.query(Project)
.join(Role.project)
.filter(Role.role_name == "Owner", Role.user == request.user)
.subquery()
)

with_sole_owner = (
request.db.query(Role.package_name)
.join(projects_owned)
.filter(Role.role_name == "Owner")
.group_by(Role.package_name)
.having(func.count(Role.package_name) == 1)
.subquery()
)

return {
"projects_owned": request.db.query(projects_owned).all(),
"projects_sole_owned": (
request.db.query(Project).join(with_sole_owner).order_by(Project.name).all()
),
}


@view_defaults(
route_name="manage.account",
renderer="manage/account.html",
Expand All @@ -57,29 +83,7 @@ def __init__(self, request):

@property
def active_projects(self):
""" Return all the projects for with the user is a sole owner """
projects_owned = (
self.request.db.query(Project)
.join(Role.project)
.filter(Role.role_name == "Owner", Role.user == self.request.user)
.subquery()
)

with_sole_owner = (
self.request.db.query(Role.package_name)
.join(projects_owned)
.filter(Role.role_name == "Owner")
.group_by(Role.package_name)
.having(func.count(Role.package_name) == 1)
.subquery()
)

return (
self.request.db.query(Project)
.join(with_sole_owner)
.order_by(Project.name)
.all()
)
return user_projects(request=self.request)["projects_sole_owned"]

@property
def default_response(self):
Expand Down Expand Up @@ -287,19 +291,18 @@ def _key(project):
return project.releases[0].created
return project.created

all_user_projects = user_projects(request)
projects_owned = set(
project.name
for project in (
request.db.query(Project.name)
.join(Role.project)
.filter(Role.role_name == "Owner", Role.user == request.user)
.all()
)
project.name for project in all_user_projects["projects_owned"]
)
projects_sole_owned = set(
project.name for project in all_user_projects["projects_sole_owned"]
)

return {
"projects": sorted(request.user.projects, key=_key, reverse=True),
"projects_owned": projects_owned,
"projects_sole_owned": projects_sole_owned,
}


Expand Down
4 changes: 4 additions & 0 deletions warehouse/static/sass/blocks/_package-snippet.scss
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@
font-size: 1rem;
}

&__sole-owner-badge {
margin-left: 4px;
}

&__buttons {
width: 165px;

Expand Down
8 changes: 7 additions & 1 deletion warehouse/templates/manage/projects.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,13 @@ <h1 class="page-title">Your projects ({{ projects|length }})</h1>
<div class="package-snippet">
<div class="split-layout split-layout--table split-layout--wrap-on-tablet">
<div>
<h3 class="package-snippet__title">{{ project.name }}</h3>
<h3 class="package-snippet__title">{{ project.name }}
{% if project.name in projects_sole_owned %}
<a href="{{ request.route_path('manage.project.roles', project_name=project.normalized_name) }}">
<span class="badge package-snippet__sole-owner-badge">Sole owner</span>
</a>
{% endif %}
</h3>
{% if release %}
<p class="package-snippet__meta">
Last released on {{ release.created|format_date() }}
Expand Down