Manage organization "Teams" #11665

divbzero · 2022-06-23T17:31:27Z

Closes Create a new Team #11073.
Closes Rename a Team #11074.
Closes Delete a Team #11075.
Closes Add Member to a Team #11079.
Closes Remove Member from a Team #11080.
Closes Assign manage/upload permission #11082.
Closes Dashboard to see Members, Teams, permission status, and projects #11084.

divbzero · 2022-06-28T17:56:05Z

@ewdurbin When I was adding journal entries/events, I came across a few inconsistencies in action/tag names that I tried to reconcile with commit 2264221. Please let me know —

Do those changes make sense?
If yes, should I remove that commit from this PR and create a separate PR with those changes?

ewdurbin · 2022-07-05T15:15:06Z

@ewdurbin When I was adding journal entries/events, I came across a few inconsistencies in action/tag names that I tried to reconcile with commit 2264221. Please let me know —

Do those changes make sense?

If yes, should I remove that commit from this PR and create a separate PR with those changes?

A separate PR is probably best.

ewdurbin

A few minor things caught in review and some comments on TODO.

Overall this functions as expected. I believe user-testing will expose some specific user experience concerns, but I can't predict them at this time.

warehouse/organizations/models.py

warehouse/templates/manage/organization/teams.html

divbzero · 2022-07-08T07:10:58Z

A separate PR is probably best.

Created separate PR #11779 to update project role journal entries and events.

ewdurbin

The only outstanding change that needs to be addressed before this is mergable is that we should not change the current "Owner" and "Maintainer" role names for non-org projects.

Not only due to confusion in the UI, but also due to existing documentation, our own FAQ/help page, and 3rd party docs that reference these names.

ewdurbin · 2022-07-19T15:32:14Z

warehouse/manage/forms.py

@@ -36,7 +40,17 @@ class RoleNameMixin:

    role_name = wtforms.SelectField(
        "Select role",
-        choices=[("", "Select role"), ("Maintainer", "Maintainer"), ("Owner", "Owner")],
+        choices=[("", "Select role"), ("Maintainer", "Upload"), ("Owner", "Admin")],


We should leave the labels for existing non-org projects as Maintainer and Owner until further notice, as merging this would change these labels and cause confusion for users.

Fixed with commit 26bbc2e.

ewdurbin · 2022-07-19T15:39:28Z

@divbzero note that this branch was rebased off of main to resolve translations merge conflicts that weren't auto-resolvable by GitHub

Organization and project names correspond to public URLs and require stricter naming constraints. In contrast, team names are used internally within organizations so we can relax the constraint to allow non-ASCII international names.

SVG of `fa-sitemap` from Font Awesome 5.13.0: https://github.com/FortAwesome/Font-Awesome/blob/4e6402443679e0a9d12c7401ac8783ef4646657f/js-packages/%40fortawesome/free-solid-svg-icons/faSitemap.js Resized, recolored light gray, and converted to PNG.

- `fa-sitemap` for organizations - `fa-users` for teams - `fa-user` for collaborators/members/people

Similar to fixes in pypi#11378.

This reverts commit 2264221. The change will be included in separate pull request pypi#11779.

@ewdurbin

- {Admin => Owner} - {Upload => Maintainer} As @ewdurbin described in pypi#11665 we want to keep the original project roles "Owner" and "Maintainer" for individual users in projects, and use the new permissions "Administer" and "Upload" for teams in projects.

divbzero · 2022-07-20T22:34:07Z

@ewdurbin I’ve reverted the roles for individual users back to Maintainer and Owner, renamed permissions from Admin to Administer, and updated the project Collaborators page to clarify the distinction between roles and permissions.

- Add team projects to list of user projects - Add team projects with Administer permissions to projects owned

- Add links to organization for projects in organizations - Add links to organization for teams in organizations - Add display name to organization snippets - Add member count to team snippets These tweaks should make navigation easier and more intuitive.

divbzero · 2022-07-21T05:49:23Z

Fixed a few things that would have come up during user testing:

Tweaked navigation for organizations and teams (commits 1c00802 and 61e41b8).
Fixed issue where teams with Administer permissions could’t actually administer the project (commit 3bce85c).

Things should be cleaner now so users can focus on other usability issues.

@ewdurbin I think this pull request should be all set for merging. Please let me know if you spot anything else.

ewdurbin

This is working as expected and is ready for user testing.

@ewdurbin

* Create initial models for Teams * Add services for Teams to do all the things * Add tests for the Teams services * Add "Teams" to manage organization menu * Template for manage organization "Teams" * Grant "manage:team" permissions to org Owner * Relax Team name constraint and add normalized_name Organization and project names correspond to public URLs and require stricter naming constraints. In contrast, team names are used internally within organizations so we can relax the constraint to allow non-ASCII international names. * `find_teamid` by organization ID and team name * View and form for manage organization "Teams" * .team-snippet style * sitemap.{png,svg} SVG of `fa-sitemap` from Font Awesome 5.13.0: https://github.com/FortAwesome/Font-Awesome/blob/4e6402443679e0a9d12c7401ac8783ef4646657f/js-packages/%40fortawesome/free-solid-svg-icons/faSitemap.js Resized, recolored light gray, and converted to PNG. * Tests for manage organization "Teams" * Emails for manage organization "Teams" * Base template for manage team pages * Switch icons for organizations and teams - `fa-sitemap` for organizations - `fa-users` for teams - `fa-user` for collaborators/members/people * Template for manage team "Projects" * View for manage team "Projects" * Tests for manage team "Projects" * `TeamRoleType` and `TeamProjectRoleType` enums * Template for manage team "Members" * View and form for manage team "Members" * Tests for manage team "Members" * Template for manage team "Settings" * View and form for manage team "Settings" * Tests for manage team "Settings" * Fix typo in "added-as-organization-member" email * Fix typo in "organization-member-removed" email * Emails for manage team "Members" * Emails for manage team "Settings" * Update Alembic revisions after merge branch 'main' * Update template for internal project collaborators * Views and forms for internal project collaborators * Update project role journal entries and events - Standardize journal entry action to be "add {role_name} {username}" - Standardize project event tag to be "project:role:create" - Standardize user event tag to be "account:role:create" * Tests for internal project collaborators * Emails for internal project collaborators * List org owners as internal project collaborators * Restore 2FA column for project collaborators * Fix redirect after removing team member * Fix redirect after renaming team * Enable events for `Team` * Record events for `Team` * Rename {Team.users => Team.members} * Fix tests after merge branch 'main' * Fix SQLAlchemy warnings for `Team` Similar to fixes in pypi#11378. * Revert "Update project role journal entries and events" This reverts commit 2264221. The change will be included in separate pull request pypi#11779. * Update Alembic revisions after rebase 'main' * Revert renaming of roles for individual users - {Admin => Owner} - {Upload => Maintainer} As @ewdurbin described in pypi#11665 we want to keep the original project roles "Owner" and "Maintainer" for individual users in projects, and use the new permissions "Administer" and "Upload" for teams in projects. * Rename permissions for teams {Admin => Administer} * Clarify in emails that teams have "permissions" * Clarify in templates that teams have "permissions" * Include team projects in user's list of projects - Add team projects to list of user projects - Add team projects with Administer permissions to projects owned * Fix left align in "People" and "Members" tables * Tweak navigation for organizations and teams - Add links to organization for projects in organizations - Add links to organization for teams in organizations - Add display name to organization snippets - Add member count to team snippets These tweaks should make navigation easier and more intuitive. * Grant project permissions to team members * re-order migrations Co-authored-by: sterbo <[email protected]> Co-authored-by: Ee Durbin <[email protected]>

@ewdurbin

* Create initial models for Teams * Add services for Teams to do all the things * Add tests for the Teams services * Add "Teams" to manage organization menu * Template for manage organization "Teams" * Grant "manage:team" permissions to org Owner * Relax Team name constraint and add normalized_name Organization and project names correspond to public URLs and require stricter naming constraints. In contrast, team names are used internally within organizations so we can relax the constraint to allow non-ASCII international names. * `find_teamid` by organization ID and team name * View and form for manage organization "Teams" * .team-snippet style * sitemap.{png,svg} SVG of `fa-sitemap` from Font Awesome 5.13.0: https://github.com/FortAwesome/Font-Awesome/blob/4e6402443679e0a9d12c7401ac8783ef4646657f/js-packages/%40fortawesome/free-solid-svg-icons/faSitemap.js Resized, recolored light gray, and converted to PNG. * Tests for manage organization "Teams" * Emails for manage organization "Teams" * Base template for manage team pages * Switch icons for organizations and teams - `fa-sitemap` for organizations - `fa-users` for teams - `fa-user` for collaborators/members/people * Template for manage team "Projects" * View for manage team "Projects" * Tests for manage team "Projects" * `TeamRoleType` and `TeamProjectRoleType` enums * Template for manage team "Members" * View and form for manage team "Members" * Tests for manage team "Members" * Template for manage team "Settings" * View and form for manage team "Settings" * Tests for manage team "Settings" * Fix typo in "added-as-organization-member" email * Fix typo in "organization-member-removed" email * Emails for manage team "Members" * Emails for manage team "Settings" * Update Alembic revisions after merge branch 'main' * Update template for internal project collaborators * Views and forms for internal project collaborators * Update project role journal entries and events - Standardize journal entry action to be "add {role_name} {username}" - Standardize project event tag to be "project:role:create" - Standardize user event tag to be "account:role:create" * Tests for internal project collaborators * Emails for internal project collaborators * List org owners as internal project collaborators * Restore 2FA column for project collaborators * Fix redirect after removing team member * Fix redirect after renaming team * Enable events for `Team` * Record events for `Team` * Rename {Team.users => Team.members} * Fix tests after merge branch 'main' * Fix SQLAlchemy warnings for `Team` Similar to fixes in pypi#11378. * Revert "Update project role journal entries and events" This reverts commit 2264221. The change will be included in separate pull request pypi#11779. * Update Alembic revisions after rebase 'main' * Revert renaming of roles for individual users - {Admin => Owner} - {Upload => Maintainer} As @ewdurbin described in pypi#11665 we want to keep the original project roles "Owner" and "Maintainer" for individual users in projects, and use the new permissions "Administer" and "Upload" for teams in projects. * Rename permissions for teams {Admin => Administer} * Clarify in emails that teams have "permissions" * Clarify in templates that teams have "permissions" * Include team projects in user's list of projects - Add team projects to list of user projects - Add team projects with Administer permissions to projects owned * Fix left align in "People" and "Members" tables * Tweak navigation for organizations and teams - Add links to organization for projects in organizations - Add links to organization for teams in organizations - Add display name to organization snippets - Add member count to team snippets These tweaks should make navigation easier and more intuitive. * Grant project permissions to team members * re-order migrations Co-authored-by: sterbo <[email protected]> Co-authored-by: Ee Durbin <[email protected]>

divbzero force-pushed the feature/manage-organization-teams branch from 10b6bc5 to 81e638c Compare June 23, 2022 18:11

divbzero requested a review from ewdurbin June 23, 2022 18:26

ewdurbin requested a review from a team as a code owner July 5, 2022 15:15

ewdurbin reviewed Jul 5, 2022

View reviewed changes

warehouse/organizations/models.py Outdated Show resolved Hide resolved

warehouse/organizations/models.py Outdated Show resolved Hide resolved

warehouse/templates/manage/organization/teams.html Show resolved Hide resolved

divbzero requested a review from ewdurbin July 7, 2022 07:54

stephenfin mentioned this pull request Jul 11, 2022

Support Groups/Organizations #201

Closed

ewdurbin force-pushed the feature/manage-organization-teams branch from 33cb034 to 0a08955 Compare July 19, 2022 15:26

ewdurbin requested changes Jul 19, 2022

View reviewed changes

sterbo and others added 18 commits July 20, 2022 10:15

Create initial models for Teams

512d0ea

Add services for Teams to do all the things

3276bf8

Add tests for the Teams services

d06236a

Add "Teams" to manage organization menu

6a5175a

Template for manage organization "Teams"

e9f5839

Grant "manage:team" permissions to org Owner

8988cbd

Relax Team name constraint and add normalized_name

c997d82

Organization and project names correspond to public URLs and require stricter naming constraints. In contrast, team names are used internally within organizations so we can relax the constraint to allow non-ASCII international names.

find_teamid by organization ID and team name

5177cf7

View and form for manage organization "Teams"

25d8797

.team-snippet style

714cff3

sitemap.{png,svg}

e1ec25d

SVG of `fa-sitemap` from Font Awesome 5.13.0: https://github.com/FortAwesome/Font-Awesome/blob/4e6402443679e0a9d12c7401ac8783ef4646657f/js-packages/%40fortawesome/free-solid-svg-icons/faSitemap.js Resized, recolored light gray, and converted to PNG.

Tests for manage organization "Teams"

ef665ae

Emails for manage organization "Teams"

2225805

Base template for manage team pages

1826188

Switch icons for organizations and teams

444246e

- `fa-sitemap` for organizations - `fa-users` for teams - `fa-user` for collaborators/members/people

Template for manage team "Projects"

514768e

View for manage team "Projects"

dbf2959

Tests for manage team "Projects"

7110d08

divbzero added 12 commits July 20, 2022 10:22

Fix redirect after removing team member

caba60b

Fix redirect after renaming team

2a42e66

Enable events for Team

f39057d

Record events for Team

c52dc88

Rename {Team.users => Team.members}

b43a5ba

Fix tests after merge branch 'main'

f8bd8c1

Fix SQLAlchemy warnings for Team

9fb9595

Similar to fixes in pypi#11378.

Revert "Update project role journal entries and events"

b88657c

This reverts commit 2264221. The change will be included in separate pull request pypi#11779.

Update Alembic revisions after rebase 'main'

ef5cda6

Rename permissions for teams {Admin => Administer}

189b4b5

Clarify in emails that teams have "permissions"

90f1d9a

divbzero force-pushed the feature/manage-organization-teams branch from b98b784 to faa9acc Compare July 20, 2022 22:27

Clarify in templates that teams have "permissions"

ca4807c

divbzero force-pushed the feature/manage-organization-teams branch from faa9acc to 7211a16 Compare July 21, 2022 05:27

divbzero added 4 commits July 20, 2022 22:40

Include team projects in user's list of projects

1c00802

- Add team projects to list of user projects - Add team projects with Administer permissions to projects owned

Fix left align in "People" and "Members" tables

98a6853

Grant project permissions to team members

3bce85c

divbzero force-pushed the feature/manage-organization-teams branch from 7211a16 to 3bce85c Compare July 21, 2022 05:43

divbzero requested a review from ewdurbin July 21, 2022 19:19

ewdurbin added 2 commits July 26, 2022 09:23

Merge branch 'main' into feature/manage-organization-teams

d605b2f

re-order migrations

6fdfa29

ewdurbin approved these changes Jul 26, 2022

View reviewed changes

ewdurbin merged commit a3d6221 into pypi:main Jul 26, 2022

divbzero added the organizations label Sep 13, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Manage organization "Teams" #11665

Manage organization "Teams" #11665

Uh oh!

divbzero commented Jun 23, 2022 •

edited

Loading

Uh oh!

divbzero commented Jun 28, 2022

Uh oh!

ewdurbin commented Jul 5, 2022

Uh oh!

ewdurbin left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

divbzero commented Jul 8, 2022

Uh oh!

ewdurbin left a comment

Uh oh!

ewdurbin Jul 19, 2022

Uh oh!

divbzero Jul 21, 2022

Uh oh!

ewdurbin commented Jul 19, 2022

Uh oh!

divbzero commented Jul 20, 2022

Uh oh!

divbzero commented Jul 21, 2022

Uh oh!

ewdurbin left a comment

Uh oh!

Uh oh!

Manage organization "Teams" #11665

Manage organization "Teams" #11665

Uh oh!

Conversation

divbzero commented Jun 23, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

divbzero commented Jun 28, 2022

Uh oh!

ewdurbin commented Jul 5, 2022

Uh oh!

ewdurbin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

divbzero commented Jul 8, 2022

Uh oh!

ewdurbin left a comment

Choose a reason for hiding this comment

Uh oh!

ewdurbin Jul 19, 2022

Choose a reason for hiding this comment

Uh oh!

divbzero Jul 21, 2022

Choose a reason for hiding this comment

Uh oh!

ewdurbin commented Jul 19, 2022

Uh oh!

divbzero commented Jul 20, 2022

Uh oh!

divbzero commented Jul 21, 2022

Uh oh!

ewdurbin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

divbzero commented Jun 23, 2022 •

edited

Loading