Approve organization account #11208

divbzero · 2022-04-18T20:25:19Z

Add new organization list page for administrators.
Add new organization detail page for administrators.
Add form to approve/decline organization to organization detail page.
Record events for new organization approve/decline.
Send emails to user and admins for new organization approve/decline.
Closes Approve account #11087.
Closes List pending organization requests #11287.

Testing Setup

make serve to run locally.
make initdb to initialize database.
Uncheck and save the disable-organizations admin flag at http://localhost/admin/flags/.
Submit the Create new organization form at http://localhost/manage/organizations/.
Open the request notification email to admins using the maildev interface at http://localhost:1080/.

Testing Steps

Follow the approval link from the notification email to open the organization detail page.
Alternatively, open the detail page from the list page at http://localhost/admin/organizations/.
Click Approve/Decline and follow prompts to approve/decline the new organization.

Expected Behavior

Approve/decline fails if the confirmation prompts are not followed.
Organization approval page indicates when organization is approved/declined.
Approval notification emails to admins and the requesting user appear in the maildev interface at http://localhost:1080/.

divbzero · 2022-04-18T20:37:20Z

@ewdurbin This pull request is fully working and tested and is ready for review as soon as we merge #11184.

divbzero · 2022-04-20T19:43:02Z

Rebased against main to incorporate recent changes:

Events now use Organization.Event and record user.id for additional data.

Realized that translations for admin-* emails don't really make sense. Similar to commit bec7058.

- admin-new-organization-approved - admin-new-organization-declined - new-organization-approved - new-organization-declined

@ewdurbin

As @ewdurbin pointed out, the approve organziation form in the admin interface should use the same design as the rest of the admin interface: - Changed style to AdminLTE theme. - Moved *Approve* or *Decline* dialog to *Actions* box. - Added confirmation modals for *Approve* or *Decline*. - Added *type orgnization name to confirm* to confirmation modals. The *Actions* box and confirmation modals follow the same patterns used in the user detail admin page.

@sterbo

Used Organization.events relationship per @sterbo's suggestion.

- Add "Approval Status" to "Organization Request" details - Allow admin to change approval decision - Disable "Approve" button if already approved - Disable "Decline" button if already declined

`Organization.Event` with tag: - organization.approve - organization.decline

divbzero · 2022-04-26T20:07:47Z

Rebased against main to include all changes since #11184.

ewdurbin

One request, but it can be addressed later. @s-mm can we ensure we capture the requested feature (list view for organization requests) somewhere?

ewdurbin · 2022-04-21T10:41:05Z

warehouse/admin/templates/admin/organizations/detail.html

+{% block title %}{{ organization.name }}{% endblock %}
+
+{% block breadcrumb %}
+  {# TODO: <li><a href="{{ request.route_path('admin.organization.list') }}">Organizations</a></li> #}


I'd prefer if we included the list view as part of this PR 1) so we don't forget 2) so admins can view/process requests in bulk rather than having to go email by email link by link.

Ideally this would by default only show requests that have not been acted on, but have the option to display "approved", "declined", "submitted"

ewdurbin · 2022-04-28T09:42:28Z

@divbzero if you don't respond saying "oh that's easy I'll add the list admin view real quick" I'll merge this later today.

divbzero · 2022-04-28T16:23:14Z

@ewdurbin It would be a bit more than “real quick” to make sure I do it right so maybe I can address this in another PR? I will be adding a list of pending organization requests for both users and admins.

divbzero · 2022-04-28T16:55:06Z

@ewdurbin I’ve created #11287 to track. This will be top of my list of things to do.

Show only if `AdminFlagValue.DISABLE_ORGANIZATIONS` is unchecked.

404 Not Found for "Organizations" admin if `disable-organizations` admin flag is checked.

ewdurbin · 2022-04-29T19:05:22Z

Thank you so much @divbzero

ewdurbin · 2022-04-29T19:18:15Z

It looks like a test is broken after rebase, or may be flaky.

- Avoid unstable sort using `.normalized_name.lower()` as key - Avoid unreliable comparison of `paginate.Page` and `list`

divbzero · 2022-04-29T20:50:52Z

@ewdurbin Thanks, looks like my tests were flaky due to a bad sort key and unreliable comparison of paginate.Page and list. Should be stable now 🤞

* 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>

@ewdurbin

* admin-new-organization-approved email template * admin-new-organization-declined email template * new-organization-approved email template * new-organization-declined email template * Remove translations from admin-* emails Realized that translations for admin-* emails don't really make sense. Similar to commit bec7058. * Test *new-organization-{approved,declined} emails - admin-new-organization-approved - admin-new-organization-declined - new-organization-approved - new-organization-declined * Mockup of approve organization form for admin * Add message textarea to approve organization form * Add more context to approve organization form * Rename view admin.organization.{approve => detail} * Implement GET approve organization form * Revamp UX for approve organization form As @ewdurbin pointed out, the approve organziation form in the admin interface should use the same design as the rest of the admin interface: - Changed style to AdminLTE theme. - Moved *Approve* or *Decline* dialog to *Actions* box. - Added confirmation modals for *Approve* or *Decline*. - Added *type orgnization name to confirm* to confirmation modals. The *Actions* box and confirmation modals follow the same patterns used in the user detail admin page. * Implement POST approve organization form * Get requesting user for approve organization form Used Organization.events relationship per @sterbo's suggestion. * Handle status in approve organization form - Add "Approval Status" to "Organization Request" details - Allow admin to change approval decision - Disable "Approve" button if already approved - Disable "Decline" button if already declined * Store id instead of username in new events `Organization.Event` with tag: - organization.approve - organization.decline * GET /admin/organizations/ to list organizations * Add "Organizations" to admin sidebar Show only if `AdminFlagValue.DISABLE_ORGANIZATIONS` is unchecked. * Test GET /admin/organizations/ * NFC: Rename tests *_{disallow => disable}_organizations * "Organizations" admin 404 if disable-organizations 404 Not Found for "Organizations" admin if `disable-organizations` admin flag is checked. * NFC: `organization_*` prefix for admin org views * GET /admin/organizations/?q=... faceted search * GET /admin/organizations?q=... improved search UI * Update tests for GET /admin/organizations/ * Link breadcrumb to GET /admin/organizations/ * Fix flaky tests for /admin/organizations/ - Avoid unstable sort using `.normalized_name.lower()` as key - Avoid unreliable comparison of `paginate.Page` and `list` Co-authored-by: Ee Durbin <ewdurbin@gmail.com>

divbzero mentioned this pull request Apr 18, 2022

Request organization account #11184

Merged

divbzero marked this pull request as draft April 18, 2022 20:36

divbzero force-pushed the feature/approve-organization-account branch 2 times, most recently from 281f7b3 to 55ef819 Compare April 20, 2022 19:38

divbzero marked this pull request as ready for review April 20, 2022 19:52

divbzero requested a review from ewdurbin April 20, 2022 19:52

divbzero added 16 commits April 26, 2022 13:02

admin-new-organization-approved email template

62eee27

admin-new-organization-declined email template

6a6c065

new-organization-approved email template

5141190

new-organization-declined email template

8a20535

Remove translations from admin-* emails

850a3de

Realized that translations for admin-* emails don't really make sense. Similar to commit bec7058.

Test *new-organization-{approved,declined} emails

e20c083

- admin-new-organization-approved - admin-new-organization-declined - new-organization-approved - new-organization-declined

Mockup of approve organization form for admin

fe81c2a

Add message textarea to approve organization form

3bfa12b

Add more context to approve organization form

4201be6

Rename view admin.organization.{approve => detail}

e7de080

Implement GET approve organization form

685341c

Implement POST approve organization form

d98e49e

Get requesting user for approve organization form

e1b647e

Used Organization.events relationship per @sterbo's suggestion.

Handle status in approve organization form

20f2e66

- Add "Approval Status" to "Organization Request" details - Allow admin to change approval decision - Disable "Approve" button if already approved - Disable "Decline" button if already declined

Store id instead of username in new events

4995dec

`Organization.Event` with tag: - organization.approve - organization.decline

divbzero force-pushed the feature/approve-organization-account branch from 55ef819 to 4995dec Compare April 26, 2022 20:03

divbzero mentioned this pull request Apr 26, 2022

Navigation for managing organizations #11261

Merged

divbzero added the organizations label Apr 26, 2022

Merge branch 'main' into feature/approve-organization-account

e33d46c

ewdurbin approved these changes Apr 28, 2022

View reviewed changes

divbzero mentioned this pull request Apr 28, 2022

List pending organization requests #11287

Closed

divbzero and others added 11 commits April 28, 2022 14:28

GET /admin/organizations/ to list organizations

b75e3f8

Add "Organizations" to admin sidebar

0f27f52

Show only if `AdminFlagValue.DISABLE_ORGANIZATIONS` is unchecked.

Test GET /admin/organizations/

84c9185

NFC: Rename tests *_{disallow => disable}_organizations

e16ded3

"Organizations" admin 404 if disable-organizations

05d1363

404 Not Found for "Organizations" admin if `disable-organizations` admin flag is checked.

NFC: organization_* prefix for admin org views

19bb64d

GET /admin/organizations/?q=... faceted search

d8adcea

GET /admin/organizations?q=... improved search UI

f3d85f5

Update tests for GET /admin/organizations/

8deca2c

Link breadcrumb to GET /admin/organizations/

2141a7a

Merge branch 'main' into feature/approve-organization-account

eed246f

ewdurbin enabled auto-merge (squash) April 29, 2022 19:05

auto-merge was automatically disabled April 29, 2022 20:05
Head branch was pushed to by a user without write access

divbzero force-pushed the feature/approve-organization-account branch from 33fdfec to ce90357 Compare April 29, 2022 20:37

Fix flaky tests for /admin/organizations/

1bccec9

- Avoid unstable sort using `.normalized_name.lower()` as key - Avoid unreliable comparison of `paginate.Page` and `list`

divbzero force-pushed the feature/approve-organization-account branch from ce90357 to 1bccec9 Compare April 29, 2022 20:39

ewdurbin merged commit ad9eb8f into pypi:main May 1, 2022

stephenfin mentioned this pull request Jul 11, 2022

Support Groups/Organizations #201

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Approve organization account #11208

Approve organization account #11208

divbzero commented Apr 18, 2022 •

edited

Loading

divbzero commented Apr 18, 2022

divbzero commented Apr 20, 2022

divbzero commented Apr 26, 2022

ewdurbin left a comment

ewdurbin Apr 21, 2022

ewdurbin commented Apr 28, 2022

divbzero commented Apr 28, 2022

divbzero commented Apr 28, 2022

ewdurbin commented Apr 29, 2022

ewdurbin commented Apr 29, 2022

divbzero commented Apr 29, 2022

Approve organization account #11208

Approve organization account #11208

Conversation

divbzero commented Apr 18, 2022 • edited Loading

divbzero commented Apr 18, 2022

divbzero commented Apr 20, 2022

divbzero commented Apr 26, 2022

ewdurbin left a comment

Choose a reason for hiding this comment

ewdurbin Apr 21, 2022

Choose a reason for hiding this comment

ewdurbin commented Apr 28, 2022

divbzero commented Apr 28, 2022

divbzero commented Apr 28, 2022

ewdurbin commented Apr 29, 2022

ewdurbin commented Apr 29, 2022

divbzero commented Apr 29, 2022

divbzero commented Apr 18, 2022 •

edited

Loading