Merge branch 'main' into za/1848-copy-contact-email-to-clipboard

docs/operations/runbooks/downtime_incident_management.md

@@ -16,12 +16,14 @@ The following set of rules should be followed while an incident is in progress.
   - If downtime occurs outside of working hours, team members who are off for the day may still be pinged and called but are not required to join if unavailable to do so.
 - Uncomment the [banner on get.gov](https://github.com/cisagov/get.gov/blob/0365d3d34b041cc9353497b2b5f81b6ab7fe75a9/_includes/header.html#L9), so it is transparent to users that we know about the issue on manage.get.gov.
   - Designers or Developers should be able to make this change; if designers are online and can help with this task, that will allow developers to focus on fixing the bug.
+- If the issue persists for three hours or more, follow the [instructions for enabling/disabling a redirect to get.gov](https://docs.google.com/document/d/1PiWXpjBzbiKsSYqEo9Rkl72HMytMp7zTte9CI-vvwYw/edit).
 
 ## Post Incident
 
 The following checklist should be followed after the site is back up and running.
 
-- [ ] Message in #dotgov-announce with an @here saying the issue is resolved
+- [ ] Message in #dotgov-announce with an @here saying the issue is resolved.
+- [ ] If the redirect was used, refer to the [instructions for enabling/disabling a redirect to get.gov](https://docs.google.com/document/d/1PiWXpjBzbiKsSYqEo9Rkl72HMytMp7zTte9CI-vvwYw/edit) to turn off this redirect. Double-check in the browser that this redirect is no longer occurring (the change may take a few minutes to take full effect).
 - [ ] Remove the [banner on get.gov](https://github.com/cisagov/get.gov/blob/0365d3d34b041cc9353497b2b5f81b6ab7fe75a9/_includes/header.html#L9) by commenting it out.
 - [ ] Write up what happened and when; if the cause is already known, write that as well. This is a draft for internal communications and not for any public facing site and can be as simple as using bullet points.
 - [ ] If the cause is not known yet, developers should investigate the issue as the highest priority task.

src/registrar/admin.py

@@ -900,13 +900,21 @@ class DomainInformationAdmin(ListHeaderAdmin):
                 "fields": [
                     "generic_org_type",
                     "is_election_board",
+                ]
+            },
+        ),
+        (
+            "More details",
+            {
+                "classes": ["collapse"],
+                "fields": [
                     "federal_type",
                     "federal_agency",
                     "tribe_name",
                     "federally_recognized_tribe",
                     "state_recognized_tribe",
                     "about_your_organization",
-                ]
+                ],
             },
         ),
         (
@@ -915,12 +923,20 @@ class DomainInformationAdmin(ListHeaderAdmin):
                 "fields": [
                     "organization_name",
                     "state_territory",
+                ]
+            },
+        ),
+        (
+            "More details",
+            {
+                "classes": ["collapse"],
+                "fields": [
                     "address_line1",
                     "address_line2",
                     "city",
                     "zipcode",
                     "urbanization",
-                ]
+                ],
             },
         ),
     ]
@@ -1112,13 +1128,21 @@ class DomainRequestAdmin(ListHeaderAdmin):
                 "fields": [
                     "generic_org_type",
                     "is_election_board",
+                ]
+            },
+        ),
+        (
+            "More details",
+            {
+                "classes": ["collapse"],
+                "fields": [
                     "federal_type",
                     "federal_agency",
                     "tribe_name",
                     "federally_recognized_tribe",
                     "state_recognized_tribe",
                     "about_your_organization",
-                ]
+                ],
             },
         ),
         (
@@ -1127,12 +1151,20 @@ class DomainRequestAdmin(ListHeaderAdmin):
                 "fields": [
                     "organization_name",
                     "state_territory",
+                ]
+            },
+        ),
+        (
+            "More details",
+            {
+                "classes": ["collapse"],
+                "fields": [
                     "address_line1",
                     "address_line2",
                     "city",
                     "zipcode",
                     "urbanization",
-                ]
+                ],
             },
         ),
     ]

src/registrar/assets/sass/_theme/_admin.scss

@@ -424,6 +424,21 @@ address.dja-address-contact-list {
     border: 1px solid var(--error-fg) !important;
 }
 
+.module.collapse {
+    margin-top: -35px;
+    padding-top: 0;
+    border: none;
+    h2 {
+        background: none;
+        color: var(--body-fg)!important;
+        text-transform: none;
+    }
+    a {
+        color: var(--link-fg);
+    }
+}
+
+
 // Make the clipboard button "float" inside of the input box
 .admin-icon-group {
     position: relative;

src/registrar/fixtures_users.py

@@ -93,6 +93,12 @@ class UserFixture:
             "last_name": "Chin",
             "email": "szu.chin@associates.cisa.dhs.gov",
         },
+        {
+            "username": "012f844d-8a0f-4225-9d82-cbf87bff1d3e",
+            "first_name": "Riley",
+            "last_name": "Orr",
+            "email": "riley+320@truss.works",
+        },
     ]
 
     STAFF = [
@@ -169,6 +175,12 @@ class UserFixture:
             "last_name": "Mcelya-Analyst",
             "email": "ALEXANDER.MCELYA@cisa.dhs.gov",
         },
+        {
+            "username": "082a066f-e0a4-45f6-8672-4343a1208a36",
+            "first_name": "Riley-Analyst",
+            "last_name": "Orr-Analyst",
+            "email": "riley+321@truss.works",
+        },
     ]
 
     def load_users(cls, users, group_name):

src/registrar/templates/domain_request_status.html

@@ -41,8 +41,7 @@
       </div>
     </div>
     <br>
-    <p> <b class="review__step__name">Last updated:</b> {{DomainRequest.updated_at|date:"F j, Y"}}<br>
+    <p> <b class="review__step__name">Last updated:</b> {{DomainRequest.updated_at|date:"F j, Y"}}<br></p>
-    <b class="review__step__name">Request #:</b> {{DomainRequest.id}}</p>
     <p>{% include "includes/domain_request.html" %}</p>
     <p><a href="{% url 'domain-request-withdraw-confirmation' pk=DomainRequest.id %}" class="usa-button usa-button--outline withdraw_outline">
       Withdraw request</a>

src/registrar/views/utility/mixins.py

@@ -307,7 +307,12 @@ class UserDeleteDomainRolePermission(PermissionsLoginMixin):
             domain=domain_pk,
             domain__permissions__user=self.request.user,
         ).exists()
-        if not has_delete_permission:
+
+        user_is_analyst_or_superuser = self.request.user.has_perm(
+            "registrar.analyst_access_permission"
+        ) or self.request.user.has_perm("registrar.full_access_permission")
+
+        if not (has_delete_permission or user_is_analyst_or_superuser):
             return False
 
         # Check if more than one manager exists on the domain.