Org admin enhancements (#17701)

* surface role and organization invitations throughout user/org/project admin

* admin: default organization application view to submitted only

* admin: organization applications, use datatables for pagination

* orgs admin: surface all user email addresses and confliting applications

Author: ewdurbin

tests/unit/admin/views/test_organizations.py

@@ -419,46 +419,21 @@ class TestOrganizationApplicationList:
     def test_no_query(self, db_request):
         organization_applications = sorted(
             OrganizationApplicationFactory.create_batch(30),
-            key=lambda o: o.normalized_name,
-        )
-        result = views.organization_applications_list(db_request)
-
-        assert result == {
-            "organization_applications": organization_applications[:25],
-            "query": "",
-            "terms": [],
-        }
-
-    @pytest.mark.usefixtures("_enable_organizations")
-    def test_with_page(self, db_request):
-        organization_applications = sorted(
-            OrganizationApplicationFactory.create_batch(30),
-            key=lambda o: o.normalized_name,
+            key=lambda o: o.submitted,
         )
-        db_request.GET["page"] = "2"
         result = views.organization_applications_list(db_request)
 
         assert result == {
-            "organization_applications": organization_applications[25:],
+            "organization_applications": organization_applications,
             "query": "",
             "terms": [],
         }
 
-    @pytest.mark.usefixtures("_enable_organizations")
-    def test_with_invalid_page(self):
-        request = pretend.stub(
-            flags=pretend.stub(enabled=lambda *a: False),
-            params={"page": "not an integer"},
-        )
-
-        with pytest.raises(HTTPBadRequest):
-            views.organization_applications_list(request)
-
     @pytest.mark.usefixtures("_enable_organizations")
     def test_basic_query(self, db_request):
         organization_applications = sorted(
             OrganizationApplicationFactory.create_batch(5),
-            key=lambda o: o.normalized_name,
+            key=lambda o: o.submitted,
         )
         db_request.GET["q"] = organization_applications[0].name
         result = views.organization_applications_list(db_request)
@@ -471,7 +446,7 @@ def test_basic_query(self, db_request):
     def test_name_query(self, db_request):
         organization_applications = sorted(
             OrganizationApplicationFactory.create_batch(5),
-            key=lambda o: o.normalized_name,
+            key=lambda o: o.submitted,
         )
         db_request.GET["q"] = f"name:{organization_applications[0].name}"
         result = views.organization_applications_list(db_request)
@@ -484,7 +459,7 @@ def test_name_query(self, db_request):
     def test_organization_application_query(self, db_request):
         organization_applications = sorted(
             OrganizationApplicationFactory.create_batch(5),
-            key=lambda o: o.normalized_name,
+            key=lambda o: o.submitted,
         )
         db_request.GET["q"] = (
             f"organization:{organization_applications[0].display_name}"
@@ -504,7 +479,7 @@ def test_organization_application_query(self, db_request):
     def test_url_query(self, db_request):
         organization_applications = sorted(
             OrganizationApplicationFactory.create_batch(5),
-            key=lambda o: o.normalized_name,
+            key=lambda o: o.submitted,
         )
         db_request.GET["q"] = f"url:{organization_applications[0].link_url}"
         result = views.organization_applications_list(db_request)
@@ -517,7 +492,7 @@ def test_url_query(self, db_request):
     def test_description_query(self, db_request):
         organization_applications = sorted(
             OrganizationApplicationFactory.create_batch(5),
-            key=lambda o: o.normalized_name,
+            key=lambda o: o.submitted,
         )
         db_request.GET["q"] = (
             f"description:'{organization_applications[0].description}'"
@@ -537,7 +512,7 @@ def test_description_query(self, db_request):
     def test_is_approved_query(self, db_request):
         organization_applications = sorted(
             OrganizationApplicationFactory.create_batch(5),
-            key=lambda o: o.normalized_name,
+            key=lambda o: o.submitted,
         )
         organization_applications[0].is_approved = True
         organization_applications[1].is_approved = True
@@ -557,7 +532,7 @@ def test_is_approved_query(self, db_request):
     def test_is_declined_query(self, db_request):
         organization_applications = sorted(
             OrganizationApplicationFactory.create_batch(5),
-            key=lambda o: o.normalized_name,
+            key=lambda o: o.submitted,
         )
         organization_applications[0].is_approved = True
         organization_applications[1].is_approved = True
@@ -577,7 +552,7 @@ def test_is_declined_query(self, db_request):
     def test_is_submitted_query(self, db_request):
         organization_applications = sorted(
             OrganizationApplicationFactory.create_batch(5),
-            key=lambda o: o.normalized_name,
+            key=lambda o: o.submitted,
         )
         organization_applications[0].is_approved = True
         organization_applications[1].is_approved = True
@@ -638,163 +613,84 @@ def test_invalid_type_query(self, db_request):
     def test_is_invalid_query(self, db_request):
         organization_applications = sorted(
             OrganizationApplicationFactory.create_batch(5),
-            key=lambda o: o.normalized_name,
+            key=lambda o: o.submitted,
         )
         db_request.GET["q"] = "is:not-actually-a-valid-query"
         result = views.organization_applications_list(db_request)
 
         assert result == {
-            "organization_applications": organization_applications[:25],
+            "organization_applications": organization_applications,
             "query": "is:not-actually-a-valid-query",
             "terms": ["is:not-actually-a-valid-query"],
         }
 
 
 class TestOrganizationApplicationDetail:
     @pytest.mark.usefixtures("_enable_organizations")
-    def test_detail(self):
-        admin = pretend.stub(
-            id="admin-id",
-            username="admin",
-            name="Admin",
-            public_email="[email protected]",
+    def test_detail(self, db_request):
+        organization_application = OrganizationApplicationFactory.create()
+        db_request.matchdict["organization_application_id"] = (
+            organization_application.id
         )
-        user = pretend.stub(
-            id="user-id",
-            username="example",
-            name="Example",
-            public_email="[email protected]",
-        )
-        user_service = pretend.stub(
-            get_user=lambda userid, **kw: {admin.id: admin, user.id: user}[userid],
-        )
-        organization_application = pretend.stub(
-            id=pretend.stub(),
-            name="example",
-            display_name="Example",
-            orgtype=pretend.stub(name="Company"),
-            link_url="https://www.example.com/",
-            description=(
-                "This company is for use in illustrative examples in documents "
-                "You may use this company in literature without prior "
-                "coordination or asking for permission."
-            ),
-            is_approved=None,
-            submitted_by_id=user.id,
-            submitted_by=user,
-        )
-        organization_service = pretend.stub(
-            get_organization_application=lambda *a, **kw: organization_application,
-        )
-        request = pretend.stub(
-            flags=pretend.stub(enabled=lambda *a: False),
-            find_service=lambda iface, **kw: {
-                IUserService: user_service,
-                IOrganizationService: organization_service,
-            }[iface],
-            matchdict={"organization_application_id": pretend.stub()},
-        )
-
-        assert views.organization_application_detail(request) == {
-            "user": user,
+        assert views.organization_application_detail(db_request) == {
+            "user": organization_application.submitted_by,
+            "conflicting_applications": [],
             "organization_application": organization_application,
         }
 
     @pytest.mark.usefixtures("_enable_organizations")
-    def test_detail_is_approved_true(self):
-        admin = pretend.stub(
-            id="admin-id",
-            username="admin",
-            name="Admin",
-            public_email="[email protected]",
-        )
-        user = pretend.stub(
-            id="user-id",
-            username="example",
-            name="Example",
-            public_email="[email protected]",
+    def test_detail_is_approved_true(self, db_request):
+        organization_application = OrganizationApplicationFactory.create(
+            is_approved=True
         )
-        user_service = pretend.stub(
-            get_user=lambda userid, **kw: {admin.id: admin, user.id: user}[userid],
+        db_request.matchdict["organization_application_id"] = (
+            organization_application.id
         )
-        organization_application = pretend.stub(
-            id=pretend.stub(),
-            name="example",
-            display_name="Example",
-            orgtype=pretend.stub(name="Company"),
-            link_url="https://www.example.com/",
-            description=(
-                "This company is for use in illustrative examples in documents "
-                "You may use this company in literature without prior "
-                "coordination or asking for permission."
-            ),
-            is_approved=True,
-            submitted_by_id=user.id,
-            submitted_by=user,
-        )
-        organization_service = pretend.stub(
-            get_organization_application=lambda *a, **kw: organization_application,
-        )
-        request = pretend.stub(
-            flags=pretend.stub(enabled=lambda *a: False),
-            find_service=lambda iface, **kw: {
-                IUserService: user_service,
-                IOrganizationService: organization_service,
-            }[iface],
-            matchdict={"organization_application_id": pretend.stub()},
-        )
-
-        assert views.organization_application_detail(request) == {
-            "user": user,
+        assert views.organization_application_detail(db_request) == {
+            "user": organization_application.submitted_by,
+            "conflicting_applications": [],
             "organization_application": organization_application,
         }
 
     @pytest.mark.usefixtures("_enable_organizations")
-    def test_detail_is_approved_false(self):
-        admin = pretend.stub(
-            id="admin-id",
-            username="admin",
-            name="Admin",
-            public_email="[email protected]",
-        )
-        user = pretend.stub(
-            id="user-id",
-            username="example",
-            name="Example",
-            public_email="[email protected]",
+    def test_detail_is_approved_false(self, db_request):
+        organization_application = OrganizationApplicationFactory.create(
+            is_approved=False
         )
-        user_service = pretend.stub(
-            get_user=lambda userid, **kw: {admin.id: admin, user.id: user}[userid],
-        )
-        organization_application = pretend.stub(
-            id=pretend.stub(),
-            name="example",
-            display_name="Example",
-            orgtype=pretend.stub(name="Company"),
-            link_url="https://www.example.com/",
-            description=(
-                "This company is for use in illustrative examples in documents "
-                "You may use this company in literature without prior "
-                "coordination or asking for permission."
-            ),
-            is_approved=False,
-            submitted_by_id=user.id,
-            submitted_by=user,
-        )
-        organization_service = pretend.stub(
-            get_organization_application=lambda *a, **kw: organization_application,
-        )
-        request = pretend.stub(
-            flags=pretend.stub(enabled=lambda *a: False),
-            find_service=lambda iface, **kw: {
-                IUserService: user_service,
-                IOrganizationService: organization_service,
-            }[iface],
-            matchdict={"organization_application_id": pretend.stub()},
+        db_request.matchdict["organization_application_id"] = (
+            organization_application.id
         )
+        assert views.organization_application_detail(db_request) == {
+            "user": organization_application.submitted_by,
+            "conflicting_applications": [],
+            "organization_application": organization_application,
+        }
 
-        assert views.organization_application_detail(request) == {
-            "user": user,
+    @pytest.mark.usefixtures("_enable_organizations")
+    @pytest.mark.parametrize(
+        ("name", "conflicts"),
+        [
+            ("pypi", ["PyPI", "pypi"]),
+            ("py-pi", ["Py-PI", "PY-PI"]),
+        ],
+    )
+    def test_detail_conflicting_applications(self, db_request, name, conflicts):
+        organization_application = OrganizationApplicationFactory.create(
+            name=name, is_approved=False
+        )
+        conflicting_applications = sorted(
+            [
+                OrganizationApplicationFactory.create(name=conflict)
+                for conflict in conflicts
+            ],
+            key=lambda o: o.submitted,
+        )
+        db_request.matchdict["organization_application_id"] = (
+            organization_application.id
+        )
+        assert views.organization_application_detail(db_request) == {
+            "user": organization_application.submitted_by,
+            "conflicting_applications": conflicting_applications,
             "organization_application": organization_application,
         }
 

warehouse/admin/static/js/warehouse.js

@@ -198,6 +198,19 @@ if (malwareReportsTable.length) {
   table.buttons().container().appendTo($(".col-md-6:eq(0)", table.table().container()));
 }
 
+// Organization Applications
+let OrganizationApplicationsTable = $("#organization-applications");
+if (OrganizationApplicationsTable.length) {
+  let table = OrganizationApplicationsTable.DataTable({
+    displayLength: 25,
+    lengthChange: true,
+    order: [[4, "asc"], [0, "asc"]],  // created, alpha name
+    responsive: true,
+  });
+  new $.fn.dataTable.Buttons(table, {buttons: ["copy", "csv", "colvis"]});
+  table.buttons().container().appendTo($(".col-md-6:eq(0)", table.table().container()));
+}
+
 // Link Checking
 const links = document.querySelectorAll("a[data-check-link-url]");
 links.forEach(function(link){

warehouse/admin/templates/admin/base.html

@@ -119,7 +119,7 @@
             </a>
           </li>
           <li class="nav-item">
-            <a href="{{ request.route_path('admin.organization_application.list') }}" class="nav-link">
+            <a href="{{ request.route_path('admin.organization_application.list') }}?q=is%3Asubmitted" class="nav-link">
               <i class="fa fa-sitemap nav-icon"></i> <p>Organization Applications</p>
             </a>
           </li>

warehouse/admin/templates/admin/organization_applications/detail.html

@@ -171,7 +171,9 @@ <h3 class="card-title">Organization Request</h3>
               <div class="col-sm-7">
                 {% if user %}
                 <a href="{{ request.route_url('admin.user.detail', username=user.username) }}" title="{{ user.username }}">{{ user.username }}</a><br>
-                <a href="mailto:{{ user.email }}">{{ user.email }} <i class="fa-solid fa-envelope"></i></a>
+                {% for email in user.emails %}
+                <a href="mailto:{{ email.email }}">{{ email.email }}</a> {% if email.primary %}(primary){% endif %} {% if email.verified %}<i class="fa fa-check text-green"></i>{% else %}<i class="fa fa-times text-red"></i>{% endif %}
+                {% endfor %}
                 {% else %}
                 <i>n/a</i>
                 {% endif %}
@@ -185,6 +187,25 @@ <h3 class="card-title">Organization Request</h3>
                 <input class="form-control" value="{{ organization_application.name }}" readonly>
               </div>
             </div>
+            {% if conflicting_applications %}
+            <div class="form-group">
+              <label class="col-sm-5 control-label">
+                Conflicting Applications <i class="fa fa-scale-unbalanced text-red"></i>
+              </label>
+              <div class="col-sm-7">
+                <table class="table">
+                  <tr><th>Application</th><th>Submitted</th><th>Requestor</th></tr>
+                  {% for application in conflicting_applications %}
+                    <tr>
+                      <td><a target="_blank" href="{{ request.route_url('admin.organization_application.detail', organization_application_id=application.id) }}">{{ application.name }}</a></td>
+                      <td>{{ application.submitted|format_date() }}</td>
+                      <td><a target="_blank" href="{{ request.route_url('admin.user.detail', username=application.submitted_by.username) }}">{{ application.submitted_by.username }}</a></td>
+                    </tr>
+                  {% endfor %}
+                </table>
+              </div>
+            </div>
+            {% endif %}
             <div class="form-group">
               <label class="col-sm-5 control-label">
                 Organization Name