-
Notifications
You must be signed in to change notification settings - Fork 987
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
Navigation for managing organizations #11261
Merged
ewdurbin
merged 25 commits into
pypi:main
from
divbzero:feature/manage-organizations-navigation
May 10, 2022
Merged
Navigation for managing organizations #11261
ewdurbin
merged 25 commits into
pypi:main
from
divbzero:feature/manage-organizations-navigation
May 10, 2022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
divbzero
force-pushed
the
feature/manage-organizations-navigation
branch
2 times, most recently
from
April 26, 2022 21:37
ed2aac8
to
9449e3c
Compare
Depends on #11208. Wait until that’s in before merging this PR. |
divbzero
force-pushed
the
feature/manage-organizations-navigation
branch
3 times, most recently
from
May 1, 2022 13:57
20ec570
to
b2da684
Compare
|
vrodou
referenced
this pull request
May 2, 2022
* tests, warehouse: validate job_workflow_ref Add a bunch of counterexample tests to be certain. * oidc/models: wrap `re.match` to make mypy happy * tests/oidc: update * warehouse, tests: fix `job_workflow_ref` regex * tests, warehouse: refactor `job_workflow_ref` again * warehouse, tests: refactor `job_workflow_ref` verification again Co-authored-by: Dustin Ingram <di@users.noreply.github.com>
divbzero
force-pushed
the
feature/manage-organizations-navigation
branch
2 times, most recently
from
May 4, 2022 19:36
d8b46e5
to
2048322
Compare
Borrowing styles from list of projects for now.
Use the same gradient of grays as white-cube.svg.
- {.package-snippet__project-badge => .package-snippet__badge} - {.package-snippet__released => .package-snippet__created}
Cards with similar styling but different icons: - .organization-snippet - .package-snippet
"Manage" link for each organization listed on /manage/organizations/ navigates to a "Collaborators" management page for the organization.
Discussed with @s-mm and renaming to differentiate "people" in organizations from "collaborators" in projects.
I already added "Your organizations" to the sidebar for desktop but forgot to add it for mobile.
Status badges: - "Request Submitted" if still awaiting approve/decline - "Inactive" if declined or inactive for other reasons Role badges: - "Manager" for organization manager - "Owner" for organization owner - "Billing Manager" for billing manager
This is my third attempt at stabilizing these tests but I finally see the light of what I was doing wrong. I should not rely on probabilistic tests at all even if the probability is "very very very low". @sterbo actually suggested this earlier but it didn't fully click in my head until now. Co-authored-by: sterbo <matt.sterba@gmail.com>
divbzero
force-pushed
the
feature/manage-organizations-navigation
branch
from
May 5, 2022 21:21
2048322
to
43cd066
Compare
ewdurbin
approved these changes
May 10, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A couple suggested changes.
Probably the only important ones are to use the font-awesome Users icon instead of adding a new one, and the deduplication of DB queries one.
domdfcoding
pushed a commit
to domdfcoding/warehouse
that referenced
this pull request
Jun 7, 2022
* Added three get organizations variations * List organizations on /manage/organizations/ page Borrowing styles from list of projects for now. * Add SVG of `fa-users` from Font Awesome 5.13.0 https://github.com/FortAwesome/Font-Awesome/blob/4e6402443679e0a9d12c7401ac8783ef4646657f/js-packages/%40fortawesome/free-solid-svg-icons/faUsers.js * Convert users.svg to light gray * 3 shades of gray for users.svg Use the same gradient of grays as white-cube.svg. * Darker shades of gray for users.svg * Add Font Awesome 5.13.0 attribution to users.svg * Resize users.svg to match size of white-cube.svg * Convert {users.svg => users.png} * NFC: Rename {_package-snippet => _snippet}.scss * NFC: Rename .package-snippet__* classes - {.package-snippet__project-badge => .package-snippet__badge} - {.package-snippet__released => .package-snippet__created} * `snippet` mixin for organizations and packages Cards with similar styling but different icons: - .organization-snippet - .package-snippet * Add "Your organizations" to "Your account" sidebar * Display callout block if user has no organizations * NFC: Use for..else Jinja2 syntax for projects.html * "Manage" collaborators for each organization "Manage" link for each organization listed on /manage/organizations/ navigates to a "Collaborators" management page for the organization. * Add sidebar for managing "Your organizations" * Clean up SCSS imports to fix `bin/static_lint` * Rename {Collaborators => People} for organizations Discussed with @s-mm and renaming to differentiate "people" in organizations from "collaborators" in projects. * Update "Your account" sidebar for mobile I already added "Your organizations" to the sidebar for desktop but forgot to add it for mobile. * Add status/role badges for /manage/organizations/ Status badges: - "Request Submitted" if still awaiting approve/decline - "Inactive" if declined or inactive for other reasons Role badges: - "Manager" for organization manager - "Owner" for organization owner - "Billing Manager" for billing manager * admin: Fix table spacing for cells with long text * admin: Stabilize /admin/organizations/ tests more This is my third attempt at stabilizing these tests but I finally see the light of what I was doing wrong. I should not rely on probabilistic tests at all even if the probability is "very very very low". @sterbo actually suggested this earlier but it didn't fully click in my head until now. Co-authored-by: sterbo <matt.sterba@gmail.com> * Apply suggestions from code review Co-authored-by: sterbo <matt.sterba@gmail.com> Co-authored-by: Ee Durbin <ewdurbin@gmail.com>
This comment was marked as spam.
This comment was marked as spam.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Navigation from managing "Your account" to managing an organization:
Navigation for managing each organization:
Together this glues together two pages needed for managing members of an organization (#11076, #11077, #11078, #11081) and accepting/declining an organization invite (#11083).