merge main

.github/workflows/security-check.yaml

@@ -2,17 +2,9 @@ name: Security checks
 
 on:
   push:
-    paths-ignore:
-      - 'docs/**'
-      - '**.md'
-      - '.gitignore'
     branches:
       - main
   pull_request:
-    paths-ignore:
-      - 'docs/**'
-      - '**.md'
-      - '.gitignore'
     branches:
       - main
 

.github/workflows/test.yaml

@@ -3,10 +3,6 @@ name: Testing
 
 on:
   push:
-    paths-ignore:
-      - 'docs/**'
-      - '**.md'
-      - '.gitignore'
     branches:
       - main
   pull_request:

docs/operations/data_migration.md

@@ -953,3 +953,40 @@ To create a specific portfolio:
 
 #### Step 1: Running the script
 ```docker-compose exec app ./manage.py patch_suborganizations```
+
+
+## Remove Non-whitelisted Portfolios
+This script removes Portfolio entries from the database that are not part of a predefined list of allowed portfolios (`ALLOWED_PORTFOLIOS`).
+It performs the following actions:
+1. Prompts the user for confirmation before proceeding with deletions.
+2. Updates related objects such as `DomainInformation`, `Domain`, and `DomainRequest` to set their `portfolio` field to `None` to prevent integrity errors.
+3. Deletes associated objects such as `PortfolioInvitation`, `UserPortfolioPermission`, and `Suborganization`.
+4. Logs a detailed summary of all cascading deletions and orphaned objects.
+
+### Running on sandboxes
+
+#### Step 1: Login to CloudFoundry
+```cf login -a api.fr.cloud.gov --sso```
+
+#### Step 2: SSH into your environment
+```cf ssh getgov-{space}```
+
+Example: `cf ssh getgov-nl`
+
+#### Step 3: Create a shell instance
+```/tmp/lifecycle/shell```
+
+#### Step 4: Running the script
+To remove portfolios: 
+```./manage.py remove_unused_portfolios```
+
+If you wish to enable debug mode for additional logging: 
+```./manage.py remove_unused_portfolios --debug```
+
+### Running locally
+
+#### Step 1: Running the script
+```docker-compose exec app ./manage.py remove_unused_portfolios```
+
+To enable debug mode locally:
+```docker-compose exec app ./manage.py remove_unused_portfolios --debug```

src/package-lock.json

@@ -7074,9 +7074,9 @@
       }
     },
     "node_modules/undici": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-6.21.0.tgz",
-      "integrity": "sha512-BUgJXc752Kou3oOIuU1i+yZZypyZRqNPW0vqoMPl8VaoalSfeR0D8/t4iAS3yirs79SSMTxTag+ZC86uswv+Cw==",
+      "version": "6.21.1",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-6.21.1.tgz",
+      "integrity": "sha512-q/1rj5D0/zayJB2FraXdaWxbhWiNKDvu8naDT2dl1yTlvJp4BLtOcp2a5BvgGNQpYYJzau7tf1WgKv3b+7mqpQ==",
       "license": "MIT",
       "engines": {
         "node": ">=18.17"

src/registrar/admin.py

@@ -1222,9 +1222,9 @@ class ContactAdmin(ListHeaderAdmin, ImportExportModelAdmin):
 class SeniorOfficialAdmin(ListHeaderAdmin):
     """Custom Senior Official Admin class."""
 
-    search_fields = ["first_name", "last_name", "email"]
+    search_fields = ["first_name", "last_name", "email", "federal_agency__agency"]
     search_help_text = "Search by first name, last name or email."
-    list_display = ["first_name", "last_name", "email", "federal_agency"]
+    list_display = ["federal_agency", "first_name", "last_name", "email"]
 
     # this ordering effects the ordering of results
     # in autocomplete_fields for Senior Official
@@ -1678,22 +1678,25 @@ class DomainInformationAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         parameter_name = "converted_generic_orgs"
 
         def lookups(self, request, model_admin):
-            converted_generic_orgs = set()
+            # Annotate the queryset to avoid Python-side iteration
+            queryset = (
+                DomainInformation.objects.annotate(
+                    converted_generic_org=Case(
+                        When(portfolio__organization_type__isnull=False, then="portfolio__organization_type"),
+                        When(portfolio__isnull=True, generic_org_type__isnull=False, then="generic_org_type"),
+                        default=Value(""),
+                        output_field=CharField(),
+                    )
+                )
+                .values_list("converted_generic_org", flat=True)
+                .distinct()
+            )
 
-            # Populate the set with tuples of (value, display value)
-            for domain_info in DomainInformation.objects.all():
-                converted_generic_org = domain_info.converted_generic_org_type  # Actual value
-                converted_generic_org_display = domain_info.converted_generic_org_type_display  # Display value
+            # Filter out empty results and return sorted list of unique values
+            return sorted([(org, DomainRequest.OrganizationChoices.get_org_label(org)) for org in queryset if org])
 
-                if converted_generic_org:
-                    converted_generic_orgs.add((converted_generic_org, converted_generic_org_display))  # Value, Display
-
-            # Sort the set by display value
-            return sorted(converted_generic_orgs, key=lambda x: x[1])  # x[1] is the display value
-
-        # Filter queryset
         def queryset(self, request, queryset):
-            if self.value():  # Check if a generic org is selected in the filter
+            if self.value():
                 return queryset.filter(
                     Q(portfolio__organization_type=self.value())
                     | Q(portfolio__isnull=True, generic_org_type=self.value())
@@ -2031,22 +2034,25 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         parameter_name = "converted_generic_orgs"
 
         def lookups(self, request, model_admin):
-            converted_generic_orgs = set()
+            # Annotate the queryset to avoid Python-side iteration
+            queryset = (
+                DomainRequest.objects.annotate(
+                    converted_generic_org=Case(
+                        When(portfolio__organization_type__isnull=False, then="portfolio__organization_type"),
+                        When(portfolio__isnull=True, generic_org_type__isnull=False, then="generic_org_type"),
+                        default=Value(""),
+                        output_field=CharField(),
+                    )
+                )
+                .values_list("converted_generic_org", flat=True)
+                .distinct()
+            )
 
-            # Populate the set with tuples of (value, display value)
-            for domain_request in DomainRequest.objects.all():
-                converted_generic_org = domain_request.converted_generic_org_type  # Actual value
-                converted_generic_org_display = domain_request.converted_generic_org_type_display  # Display value
+            # Filter out empty results and return sorted list of unique values
+            return sorted([(org, DomainRequest.OrganizationChoices.get_org_label(org)) for org in queryset if org])
 
-                if converted_generic_org:
-                    converted_generic_orgs.add((converted_generic_org, converted_generic_org_display))  # Value, Display
-
-            # Sort the set by display value
-            return sorted(converted_generic_orgs, key=lambda x: x[1])  # x[1] is the display value
-
-        # Filter queryset
         def queryset(self, request, queryset):
-            if self.value():  # Check if a generic org is selected in the filter
+            if self.value():
                 return queryset.filter(
                     Q(portfolio__organization_type=self.value())
                     | Q(portfolio__isnull=True, generic_org_type=self.value())
@@ -2062,24 +2068,39 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         parameter_name = "converted_federal_types"
 
         def lookups(self, request, model_admin):
-            converted_federal_types = set()
-
-            # Populate the set with tuples of (value, display value)
-            for domain_request in DomainRequest.objects.all():
-                converted_federal_type = domain_request.converted_federal_type  # Actual value
-                converted_federal_type_display = domain_request.converted_federal_type_display  # Display value
-
-                if converted_federal_type:
-                    converted_federal_types.add(
-                        (converted_federal_type, converted_federal_type_display)  # Value, Display
+            # Annotate the queryset for efficient filtering
+            queryset = (
+                DomainRequest.objects.annotate(
+                    converted_federal_type=Case(
+                        When(
+                            portfolio__isnull=False,
+                            portfolio__federal_agency__federal_type__isnull=False,
+                            then="portfolio__federal_agency__federal_type",
+                        ),
+                        When(
+                            portfolio__isnull=True,
+                            federal_agency__federal_type__isnull=False,
+                            then="federal_agency__federal_type",
+                        ),
+                        default=Value(""),
+                        output_field=CharField(),
                     )
+                )
+                .values_list("converted_federal_type", flat=True)
+                .distinct()
+            )
 
-            # Sort the set by display value
-            return sorted(converted_federal_types, key=lambda x: x[1])  # x[1] is the display value
+            # Filter out empty values and return sorted unique entries
+            return sorted(
+                [
+                    (federal_type, BranchChoices.get_branch_label(federal_type))
+                    for federal_type in queryset
+                    if federal_type
+                ]
+            )
 
-        # Filter queryset
         def queryset(self, request, queryset):
-            if self.value():  # Check if a federal type is selected in the filter
+            if self.value():
                 return queryset.filter(
                     Q(portfolio__federal_agency__federal_type=self.value())
                     | Q(portfolio__isnull=True, federal_type=self.value())
@@ -3226,59 +3247,86 @@ class DomainAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         parameter_name = "converted_generic_orgs"
 
         def lookups(self, request, model_admin):
-            converted_generic_orgs = set()
+            # Annotate the queryset to avoid Python-side iteration
+            queryset = (
+                Domain.objects.annotate(
+                    converted_generic_org=Case(
+                        When(
+                            domain_info__isnull=False,
+                            domain_info__portfolio__organization_type__isnull=False,
+                            then="domain_info__portfolio__organization_type",
+                        ),
+                        When(
+                            domain_info__isnull=False,
+                            domain_info__portfolio__isnull=True,
+                            domain_info__generic_org_type__isnull=False,
+                            then="domain_info__generic_org_type",
+                        ),
+                        default=Value(""),
+                        output_field=CharField(),
+                    )
+                )
+                .values_list("converted_generic_org", flat=True)
+                .distinct()
+            )
 
-            # Populate the set with tuples of (value, display value)
-            for domain_info in DomainInformation.objects.all():
-                converted_generic_org = domain_info.converted_generic_org_type  # Actual value
-                converted_generic_org_display = domain_info.converted_generic_org_type_display  # Display value
+            # Filter out empty results and return sorted list of unique values
+            return sorted([(org, DomainRequest.OrganizationChoices.get_org_label(org)) for org in queryset if org])
 
-                if converted_generic_org:
-                    converted_generic_orgs.add((converted_generic_org, converted_generic_org_display))  # Value, Display
-
-            # Sort the set by display value
-            return sorted(converted_generic_orgs, key=lambda x: x[1])  # x[1] is the display value
-
-        # Filter queryset
         def queryset(self, request, queryset):
-            if self.value():  # Check if a generic org is selected in the filter
+            if self.value():
                 return queryset.filter(
                     Q(domain_info__portfolio__organization_type=self.value())
                     | Q(domain_info__portfolio__isnull=True, domain_info__generic_org_type=self.value())
                 )
-
             return queryset
 
     class FederalTypeFilter(admin.SimpleListFilter):
         """Custom Federal Type filter that accomodates portfolio feature.
         If we have a portfolio, use the portfolio's federal type.  If not, use the
-        federal type in the Domain Information object."""
+        organization in the Domain Request object."""
 
         title = "federal type"
         parameter_name = "converted_federal_types"
 
         def lookups(self, request, model_admin):
-            converted_federal_types = set()
-
-            # Populate the set with tuples of (value, display value)
-            for domain_info in DomainInformation.objects.all():
-                converted_federal_type = domain_info.converted_federal_type  # Actual value
-                converted_federal_type_display = domain_info.converted_federal_type_display  # Display value
-
-                if converted_federal_type:
-                    converted_federal_types.add(
-                        (converted_federal_type, converted_federal_type_display)  # Value, Display
+            # Annotate the queryset for efficient filtering
+            queryset = (
+                Domain.objects.annotate(
+                    converted_federal_type=Case(
+                        When(
+                            domain_info__isnull=False,
+                            domain_info__portfolio__isnull=False,
+                            then=F("domain_info__portfolio__federal_agency__federal_type"),
+                        ),
+                        When(
+                            domain_info__isnull=False,
+                            domain_info__portfolio__isnull=True,
+                            domain_info__federal_type__isnull=False,
+                            then="domain_info__federal_agency__federal_type",
+                        ),
+                        default=Value(""),
+                        output_field=CharField(),
                     )
+                )
+                .values_list("converted_federal_type", flat=True)
+                .distinct()
+            )
 
-            # Sort the set by display value
-            return sorted(converted_federal_types, key=lambda x: x[1])  # x[1] is the display value
+            # Filter out empty values and return sorted unique entries
+            return sorted(
+                [
+                    (federal_type, BranchChoices.get_branch_label(federal_type))
+                    for federal_type in queryset
+                    if federal_type
+                ]
+            )
 
-        # Filter queryset
         def queryset(self, request, queryset):
-            if self.value():  # Check if a federal type is selected in the filter
+            if self.value():
                 return queryset.filter(
-                    Q(domain_info__portfolio__federal_agency__federal_type=self.value())
-                    | Q(domain_info__portfolio__isnull=True, domain_info__federal_agency__federal_type=self.value())
+                    Q(domain_info__portfolio__federal_type=self.value())
+                    | Q(domain_info__portfolio__isnull=True, domain_info__federal_type=self.value())
                 )
             return queryset
 

src/registrar/assets/src/js/getgov/table-edit-member-domains.js

@@ -259,7 +259,7 @@ export class EditMemberDomainsTable extends BaseTable {
     // Append unassigned domains section
     if (this.removedDomains.length) {
       const unassignedHeader = document.createElement('h3');
-      unassignedHeader.classList.add('header--body', 'text-primary', 'margin-bottom-1');
+      unassignedHeader.classList.add('margin-bottom-1');
       unassignedHeader.textContent = 'Unassigned domains';
       domainAssignmentSummary.appendChild(unassignedHeader);
       domainAssignmentSummary.appendChild(unassignedDomainsList);
@@ -268,7 +268,7 @@ export class EditMemberDomainsTable extends BaseTable {
     // Append assigned domains section
     if (this.addedDomains.length) {
       const assignedHeader = document.createElement('h3');
-      assignedHeader.classList.add('header--body', 'text-primary', 'margin-bottom-1');
+      assignedHeader.classList.add('margin-bottom-1');
       assignedHeader.textContent = 'Assigned domains';
       domainAssignmentSummary.appendChild(assignedHeader);
       domainAssignmentSummary.appendChild(assignedDomainsList);
@@ -276,7 +276,7 @@ export class EditMemberDomainsTable extends BaseTable {
 
     // Append total assigned domains section
     const totalHeader = document.createElement('h3');
-    totalHeader.classList.add('header--body', 'text-primary', 'margin-bottom-1');
+    totalHeader.classList.add('margin-bottom-1');
     totalHeader.textContent = 'Total assigned domains';
     domainAssignmentSummary.appendChild(totalHeader);
     const totalCount = document.createElement('p');

src/registrar/assets/src/js/getgov/table-members.js

@@ -245,7 +245,7 @@ export class MembersTable extends BaseTable {
     // Only generate HTML if the member has one or more assigned domains
     if (num_domains > 0) {
       domainsHTML += "<div class='desktop:grid-col-5 margin-bottom-2 desktop:margin-bottom-0'>";
-      domainsHTML += "<h4 class='margin-y-0 text-primary'>Domains assigned</h4>";
+      domainsHTML += "<h4 class='margin-y-0'>Domains assigned</h4>";
       domainsHTML += `<p class='margin-y-0'>This member is assigned to ${num_domains} domains:</p>`;
       domainsHTML += "<ul class='usa-list usa-list--unstyled margin-y-0'>";
 
@@ -405,7 +405,7 @@ export class MembersTable extends BaseTable {
     }
 
     // Add a permissions header and wrap the entire output in a container
-    permissionsHTML = "<div class='desktop:grid-col-7'><h4 class='margin-y-0 text-primary'>Additional permissions for this member</h4>" + permissionsHTML + "</div>";
+    permissionsHTML = "<div class='desktop:grid-col-7'><h4 class='margin-y-0'>Additional permissions for this member</h4>" + permissionsHTML + "</div>";
     
     return permissionsHTML;
   }

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

@@ -188,7 +188,7 @@ html[data-theme="dark"] {
 }
 
 #branding h1,
-h1, h2, h3,
+.dashboard h1, .dashboard h2, .dashboard h3,
 .module h2 {
     font-weight: font-weight('bold');
 }
@@ -516,10 +516,6 @@ input[type=submit].button--dja-toolbar:focus, input[type=submit].button--dja-too
     max-width: 68ex;
 }
 
-.usa-summary-box__dhs-color {
-    color: $dhs-blue-70;
-}
-
 details.dja-detail-table {
     display: inline-table;
     background-color: var(--body-bg);
@@ -812,18 +808,6 @@ div.dja__model-description{
     text-decoration: underline !important;
 }
 
-//-- Override some styling for the USWDS summary box (per design quidance for ticket #2055
-.usa-summary-box {
-    background: #{$dhs-blue-10};
-    border-color: #{$dhs-blue-30};
-    max-width: 72ex;
-    word-wrap: break-word;
-}
-
-.usa-summary-box h3 {
-    color: #{$dhs-blue-60};
-}
-
 .module caption, .inline-group h2 {
     text-transform: capitalize;
 }
@@ -929,14 +913,6 @@ ul.add-list-reset {
     font-size: 14px;
 }
 
-.domain-name-wrap {
-    white-space: normal;
-    word-wrap: break-word;
-    overflow: visible; 
-    word-break: break-all;
-    max-width: 100%; 
-}
-
 .organization-admin-label {
     font-weight: 600;
     font-size: .8125rem;

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

@@ -59,7 +59,6 @@ body {
   }
 
   h2 {
-    color: color('primary-dark');
     margin-top: units(2);
     margin-bottom: units(2);
   }
@@ -130,16 +129,6 @@ grid column to the max-width of the searchbar, which was calculated to be 33rem.
   word-break: break-word;
 }
 
-.dotgov-status-box {
-  background-color: color('primary-lightest'); 
-  border-color: color('accent-cool-lighter');
-}
-
-.dotgov-status-box--action-need {
-  background-color: color('warning-lighter'); 
-  border-color: color('warning');
-}
-
 footer {
   border-top: 1px solid color('primary-darker');
 }
@@ -228,14 +217,6 @@ abbr[title] {
   max-width: 23ch;
 }
 
-.ellipsis--30 {
-  max-width: 30ch;
-}
-
-.ellipsis--50 {
-  max-width: 50ch;
-}
-
 .vertical-align-middle {
   vertical-align: middle;
 }
@@ -272,6 +253,14 @@ abbr[title] {
   word-break: break-word;
 }
 
+.string-wrap {
+  white-space: normal;
+  word-wrap: break-word;
+  overflow: visible; 
+  word-break: break-all;
+  max-width: 100%; 
+}
+
 //Icon size adjustment used by buttons and form errors
 .usa-icon.usa-icon--large {
   margin: 0;
@@ -285,4 +274,4 @@ abbr[title] {
 
 .width-quarter {
   width: 25%;
-}
+}

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

@@ -236,13 +236,6 @@ a.withdraw_outline:active {
     align-items: center;
 }
 
-.dotgov-table a
-a .usa-icon,
-.usa-button--with-icon .usa-icon {
-  height: 1.3em;
-  width: 1.3em;
-}
-
 // Red, for delete buttons
 // Used on: All delete buttons
 // Note: Can be simplified by adding text-secondary to delete anchors in tables

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

@@ -1,7 +1,14 @@
 @use "uswds-core" as *;
 @use "cisa_colors" as *;
-@use "typography" as *;
 
+// Normalize typography in forms
+.usa-form,
+.usa-form fieldset {
+  font-size: 1rem;
+  .usa-legend {
+    font-size: 1rem;
+  }
+}
 .usa-form .usa-button {
   margin-top: units(3);
 }
@@ -69,16 +76,6 @@ legend.float-left-tablet + button.float-right-tablet {
   }
 }
 
-.read-only-label {
-  @extend .h4--sm-05;
-  font-weight: bold;
-  color: color('primary-dark');
-}
-
-.read-only-value {
-  margin-top: units(0);
-}
-
 .bg-gray-1 .usa-radio {
   background: color('gray-1');
 }

src/registrar/assets/src/sass/_theme/_register-form.scss

@@ -1,5 +1,4 @@
 @use "uswds-core" as *;
-@use "typography" as *;
 
 .register-form-step > h1 {
   //align to top of sidebar on first page of the form
@@ -12,11 +11,7 @@
   margin-top: units(1);
 }
 
-// header--body is used on the summary page and
-// should not be styled like the register form headers
-.register-form-step h3 {
-  color: color('primary-dark');
-  letter-spacing: $letter-space--xs;
+.register-form-step h3:not(.margin-top-05) {
   margin-top: units(3);
   margin-bottom: 0;
 
@@ -64,26 +59,10 @@
   margin-top: units(3);
 }
 
-  .summary-item hr,
+.summary-item hr,
 .review__step hr {
   border: none; //reset
   border-top: 1px solid color('primary-dark');
   margin-top: 0;
   margin-bottom: units(0.5);
 }
-
-.review__step__title a:visited {
-  color: color('primary');
-}
-
-.review__step__name {
-  color: color('primary-dark');
-  font-weight: font-weight('semibold');
-  margin-bottom: units(0.5);
-}
-
-.review__step__subheading {
-  color: color('primary-dark');
-  font-weight: font-weight('semibold');
-  margin-bottom: units(0.5);
-}

src/registrar/assets/src/sass/_theme/_summary-box.scss

@@ -0,0 +1,15 @@
+@use "uswds-core" as *;
+
+.usa-summary-box {
+    background-color: color('primary-lightest'); 
+    border-color: color('accent-cool-lighter');
+}
+  
+.usa-summary-box--action-needed {
+    background-color: color('warning-lighter'); 
+    border-color: color('warning');
+}
+
+.usa-summary-box__heading {
+    font-weight: bold;
+}

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

@@ -71,4 +71,4 @@
       width: 70vw;
     }
   }
-}
+}

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

@@ -10,41 +10,35 @@ address,
   max-width: measure(5);
 }
 
-h1 {
+h1:not(.usa-alert__heading),
+h2:not(.usa-alert__heading),
+h3:not(.usa-alert__heading),
+h4:not(.usa-alert__heading),
+h5:not(.usa-alert__heading),
+h6:not(.usa-alert__heading) {
+  color: color('primary-darker');
+}
+
+h1, .h1 {
+  font-size: 2.125rem;
   @include typeset('sans', '2xl', 2);
   margin: 0 0 units(2);
-  color: color('primary-darker');
 }
 
-h2 {
-  font-weight: font-weight('semibold');
-  line-height: line-height('heading', 3);
+h2, .h2 {
+  line-height: 1.3;
   margin: units(4) 0 units(1);
-  color: color('primary-darker');
 }
 
-.header--body {
-  margin-top: units(2);
+h3, .h3 {
+  font-size: 1.25rem;
   font-weight: font-weight('semibold');
-  // The units mixin can only get us close, so it's between 
-  // hardcoding the value and using in markup
-  font-size: 16.96px;
 }
 
-.h4--sm-05 {
-  font-size: size('body', 'sm');
-  font-weight: normal;
-  color: color('primary');
-  margin-bottom: units(0.5);
-}
-
-// Normalize typography in forms
-.usa-form,
-.usa-form fieldset {
-  font-size: 1rem;
-  .usa-legend {
-    font-size: 1rem;
-  }
+h4, .h4 {
+  font-size: 1.125rem;
+  line-height: 1.25;
+  font-weight: font-weight('semibold');
 }
 
 .p--blockquote {

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

@@ -17,6 +17,7 @@
 @forward "forms";
 @forward "search";
 @forward "tooltips";
+@forward "summary-box";
 @forward "fieldsets";
 @forward "alerts";
 @forward "tables";

src/registrar/fixtures/fixtures_requests.py

@@ -323,22 +323,50 @@ class DomainRequestFixture:
             cls._create_domain_requests(users)
 
     @classmethod
-    def _create_domain_requests(cls, users):
+    def _create_domain_requests(cls, users):  # noqa: C901
         """Creates DomainRequests given a list of users."""
+        total_domain_requests_to_make = len(users)  # 100000
+
+        # Check if the database is already populated with the desired
+        # number of entries.
+        # (Prevents re-adding more entries to an already populated database,
+        # which happens when restarting Docker src)
+        domain_requests_already_made = DomainRequest.objects.count()
+
         domain_requests_to_create = []
-        for user in users:
-            for request_data in cls.DOMAINREQUESTS:
-                # Prepare DomainRequest objects
-                try:
-                    domain_request = DomainRequest(
-                        creator=user,
-                        organization_name=request_data["organization_name"],
-                    )
-                    cls._set_non_foreign_key_fields(domain_request, request_data)
-                    cls._set_foreign_key_fields(domain_request, request_data, user)
-                    domain_requests_to_create.append(domain_request)
-                except Exception as e:
-                    logger.warning(e)
+        if domain_requests_already_made < total_domain_requests_to_make:
+            for user in users:
+                for request_data in cls.DOMAINREQUESTS:
+                    # Prepare DomainRequest objects
+                    try:
+                        domain_request = DomainRequest(
+                            creator=user,
+                            organization_name=request_data["organization_name"],
+                        )
+                        cls._set_non_foreign_key_fields(domain_request, request_data)
+                        cls._set_foreign_key_fields(domain_request, request_data, user)
+                        domain_requests_to_create.append(domain_request)
+                    except Exception as e:
+                        logger.warning(e)
+
+            num_additional_requests_to_make = (
+                total_domain_requests_to_make - domain_requests_already_made - len(domain_requests_to_create)
+            )
+            if num_additional_requests_to_make > 0:
+                for _ in range(num_additional_requests_to_make):
+                    random_user = random.choice(users)  # nosec
+                    try:
+                        random_request_type = random.choice(cls.DOMAINREQUESTS)  # nosec
+                        # Prepare DomainRequest objects
+                        domain_request = DomainRequest(
+                            creator=random_user,
+                            organization_name=random_request_type["organization_name"],
+                        )
+                        cls._set_non_foreign_key_fields(domain_request, random_request_type)
+                        cls._set_foreign_key_fields(domain_request, random_request_type, random_user)
+                        domain_requests_to_create.append(domain_request)
+                    except Exception as e:
+                        logger.warning(f"Error creating random domain request: {e}")
 
         # Bulk create domain requests
         cls._bulk_create_requests(domain_requests_to_create)

src/registrar/forms/domain_request_wizard.py

@@ -462,6 +462,7 @@ class CurrentSitesForm(RegistrarForm):
         error_messages={
             "invalid": ("Enter your organization's current website in the required format, like example.com.")
         },
+        widget=forms.URLInput(attrs={"aria-labelledby": "id_current_sites_header id_current_sites_body"}),
     )
 
 

src/registrar/management/commands/remove_unused_portfolios.py

@@ -0,0 +1,238 @@
+import argparse
+import logging
+
+from django.core.management.base import BaseCommand
+from django.db import IntegrityError
+from django.db import transaction
+from registrar.management.commands.utility.terminal_helper import (
+    TerminalColors,
+    TerminalHelper,
+)
+from registrar.models import (
+    Portfolio,
+    DomainGroup,
+    DomainInformation,
+    DomainRequest,
+    PortfolioInvitation,
+    Suborganization,
+    UserPortfolioPermission,
+)
+
+logger = logging.getLogger(__name__)
+
+ALLOWED_PORTFOLIOS = [
+    "Department of Veterans Affairs",
+    "Department of the Treasury",
+    "National Archives and Records Administration",
+    "Department of Defense",
+    "Office of Personnel Management",
+    "National Aeronautics and Space Administration",
+    "City and County of San Francisco",
+    "State of Arizona, Executive Branch",
+    "Department of the Interior",
+    "Department of State",
+    "Department of Justice",
+    "Capitol Police",
+    "Administrative Office of the Courts",
+    "Supreme Court of the United States",
+]
+
+
+class Command(BaseCommand):
+    help = "Remove all Portfolio entries with names not in the allowed list."
+
+    def add_arguments(self, parser):
+        """
+        OPTIONAL ARGUMENTS:
+        --debug
+        A boolean (default to true), which activates additional print statements
+        """
+        parser.add_argument("--debug", action=argparse.BooleanOptionalAction)
+
+    def prompt_delete_entries(self, portfolios_to_delete, debug_on):
+        """Brings up a prompt in the terminal asking
+        if the user wishes to delete data in the
+        Portfolio table.  If the user confirms,
+        deletes the data in the Portfolio table"""
+
+        entries_to_remove_by_name = list(portfolios_to_delete.values_list("organization_name", flat=True))
+        formatted_entries = "\n\t\t".join(entries_to_remove_by_name)
+        confirm_delete = TerminalHelper.query_yes_no(
+            f"""
+            {TerminalColors.FAIL}
+            WARNING: You are about to delete the following portfolios:
+
+                {formatted_entries}
+
+            Are you sure you want to continue?{TerminalColors.ENDC}"""
+        )
+        if confirm_delete:
+            logger.info(
+                f"""{TerminalColors.YELLOW}
+            ----------Deleting entries----------
+            (please wait)
+            {TerminalColors.ENDC}"""
+            )
+            self.delete_entries(portfolios_to_delete, debug_on)
+        else:
+            logger.info(
+                f"""{TerminalColors.OKCYAN}
+            ----------No entries deleted----------
+            (exiting script)
+            {TerminalColors.ENDC}"""
+            )
+
+    def delete_entries(self, portfolios_to_delete, debug_on):  # noqa: C901
+        # Log the number of entries being removed
+        count = portfolios_to_delete.count()
+        if count == 0:
+            logger.info(
+                f"""{TerminalColors.OKCYAN}
+                No entries to remove.
+                {TerminalColors.ENDC}
+                """
+            )
+            return
+
+        # If debug mode is on, print out entries being removed
+        if debug_on:
+            entries_to_remove_by_name = list(portfolios_to_delete.values_list("organization_name", flat=True))
+            formatted_entries = ", ".join(entries_to_remove_by_name)
+            logger.info(
+                f"""{TerminalColors.YELLOW}
+                Entries to be removed: {formatted_entries}
+                {TerminalColors.ENDC}
+                """
+            )
+
+        # Check for portfolios with non-empty related objects
+        # (These will throw integrity errors if they are not updated)
+        portfolios_with_assignments = []
+        for portfolio in portfolios_to_delete:
+            has_assignments = any(
+                [
+                    DomainGroup.objects.filter(portfolio=portfolio).exists(),
+                    DomainInformation.objects.filter(portfolio=portfolio).exists(),
+                    DomainRequest.objects.filter(portfolio=portfolio).exists(),
+                    PortfolioInvitation.objects.filter(portfolio=portfolio).exists(),
+                    Suborganization.objects.filter(portfolio=portfolio).exists(),
+                    UserPortfolioPermission.objects.filter(portfolio=portfolio).exists(),
+                ]
+            )
+            if has_assignments:
+                portfolios_with_assignments.append(portfolio)
+
+        if portfolios_with_assignments:
+            formatted_entries = "\n\t\t".join(
+                f"{portfolio.organization_name}" for portfolio in portfolios_with_assignments
+            )
+            confirm_cascade_delete = TerminalHelper.query_yes_no(
+                f"""
+                {TerminalColors.FAIL}
+                WARNING: these entries have related objects.
+
+                    {formatted_entries}
+
+                Deleting them will update any associated domains / domain requests to have no portfolio
+                and will cascade delete any associated portfolio invitations, portfolio permissions, domain groups,
+                and suborganizations.  Any suborganizations that get deleted will also orphan (not delete) their
+                associated domains / domain requests.
+
+                Are you sure you want to continue?{TerminalColors.ENDC}"""
+            )
+            if not confirm_cascade_delete:
+                logger.info(
+                    f"""{TerminalColors.OKCYAN}
+                    Operation canceled by the user.
+                    {TerminalColors.ENDC}
+                    """
+                )
+                return
+
+        with transaction.atomic():
+            # Try to delete the portfolios
+            try:
+                summary = []
+                for portfolio in portfolios_to_delete:
+                    portfolio_summary = [f"---- CASCADE SUMMARY for {portfolio.organization_name} -----"]
+                    if portfolio in portfolios_with_assignments:
+                        domain_groups = DomainGroup.objects.filter(portfolio=portfolio)
+                        domain_informations = DomainInformation.objects.filter(portfolio=portfolio)
+                        domain_requests = DomainRequest.objects.filter(portfolio=portfolio)
+                        portfolio_invitations = PortfolioInvitation.objects.filter(portfolio=portfolio)
+                        suborganizations = Suborganization.objects.filter(portfolio=portfolio)
+                        user_permissions = UserPortfolioPermission.objects.filter(portfolio=portfolio)
+
+                        if domain_groups.exists():
+                            formatted_groups = "\n".join([str(group) for group in domain_groups])
+                            portfolio_summary.append(f"{len(domain_groups)} Deleted DomainGroups:\n{formatted_groups}")
+                            domain_groups.delete()
+
+                        if domain_informations.exists():
+                            formatted_domain_infos = "\n".join([str(info) for info in domain_informations])
+                            portfolio_summary.append(
+                                f"{len(domain_informations)} Orphaned DomainInformations:\n{formatted_domain_infos}"
+                            )
+                            domain_informations.update(portfolio=None)
+
+                        if domain_requests.exists():
+                            formatted_domain_reqs = "\n".join([str(req) for req in domain_requests])
+                            portfolio_summary.append(
+                                f"{len(domain_requests)} Orphaned DomainRequests:\n{formatted_domain_reqs}"
+                            )
+                            domain_requests.update(portfolio=None)
+
+                        if portfolio_invitations.exists():
+                            formatted_portfolio_invitations = "\n".join([str(inv) for inv in portfolio_invitations])
+                            portfolio_summary.append(
+                                f"{len(portfolio_invitations)} Deleted PortfolioInvitations:\n{formatted_portfolio_invitations}"  # noqa
+                            )
+                            portfolio_invitations.delete()
+
+                        if user_permissions.exists():
+                            formatted_user_list = "\n".join(
+                                [perm.user.get_formatted_name() for perm in user_permissions]
+                            )
+                            portfolio_summary.append(
+                                f"Deleted UserPortfolioPermissions for the following users:\n{formatted_user_list}"
+                            )
+                            user_permissions.delete()
+
+                        if suborganizations.exists():
+                            portfolio_summary.append("Cascade Deleted Suborganizations:")
+                            for suborg in suborganizations:
+                                DomainInformation.objects.filter(sub_organization=suborg).update(sub_organization=None)
+                                DomainRequest.objects.filter(sub_organization=suborg).update(sub_organization=None)
+                                portfolio_summary.append(f"{suborg.name}")
+                                suborg.delete()
+
+                    portfolio.delete()
+                    summary.append("\n\n".join(portfolio_summary))
+                    summary_string = "\n\n".join(summary)
+
+                # Output a success message with detailed summary
+                logger.info(
+                    f"""{TerminalColors.OKCYAN}
+                    Successfully removed {count} portfolios.
+
+                    The following portfolio deletions had cascading effects;
+
+                    {summary_string}
+                    {TerminalColors.ENDC}
+                    """
+                )
+
+            except IntegrityError as e:
+                logger.info(
+                    f"""{TerminalColors.FAIL}
+                    Could not delete some portfolios due to integrity constraints:
+                    {e}
+                    {TerminalColors.ENDC}
+                    """
+                )
+
+    def handle(self, *args, **options):
+        # Get all Portfolio entries not in the allowed portfolios list
+        portfolios_to_delete = Portfolio.objects.exclude(organization_name__in=ALLOWED_PORTFOLIOS)
+
+        self.prompt_delete_entries(portfolios_to_delete, options.get("debug"))

src/registrar/models/domain_information.py

@@ -101,7 +101,6 @@ class DomainInformation(TimeStampedModel):
         verbose_name="election office",
     )
 
-    # TODO - Ticket #1911: stub this data from DomainRequest
     organization_type = models.CharField(
         max_length=255,
         choices=DomainRequest.OrgChoicesElectionOffice.choices,

src/registrar/models/domain_request.py

@@ -9,6 +9,7 @@ from django.utils import timezone
 from registrar.models.domain import Domain
 from registrar.models.federal_agency import FederalAgency
 from registrar.models.utility.generic_helper import CreateOrUpdateOrganizationTypeHelper
+from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices
 from registrar.utility.errors import FSMDomainRequestError, FSMErrorCodes
 from registrar.utility.constants import BranchChoices
 from auditlog.models import LogEntry
@@ -903,6 +904,7 @@ class DomainRequest(TimeStampedModel):
         email_template,
         email_template_subject,
         bcc_address="",
+        cc_addresses: list[str] = [],
         context=None,
         send_email=True,
         wrap_email=False,
@@ -955,12 +957,20 @@ class DomainRequest(TimeStampedModel):
 
             if custom_email_content:
                 context["custom_email_content"] = custom_email_content
+
+            if self.requesting_entity_is_portfolio() or self.requesting_entity_is_suborganization():
+                portfolio_view_requests_users = self.portfolio.portfolio_users_with_permissions(  # type: ignore
+                    permissions=[UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS], include_admin=True
+                )
+                cc_addresses = list(portfolio_view_requests_users.values_list("email", flat=True))
+
             send_templated_email(
                 email_template,
                 email_template_subject,
                 recipient.email,
                 context=context,
                 bcc_address=bcc_address,
+                cc_addresses=cc_addresses,
                 wrap_email=wrap_email,
             )
             logger.info(f"The {new_status} email sent to: {recipient.email}")

src/registrar/models/portfolio.py

@@ -4,6 +4,7 @@ from registrar.models.domain_request import DomainRequest
 from registrar.models.federal_agency import FederalAgency
 from registrar.models.user import User
 from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices
+from django.db.models import Q
 
 from .utility.time_stamped_model import TimeStampedModel
 
@@ -122,6 +123,16 @@ class Portfolio(TimeStampedModel):
         if self.state_territory != self.StateTerritoryChoices.PUERTO_RICO and self.urbanization:
             self.urbanization = None
 
+        # If the org type is federal, and org federal agency is not blank, and is a federal agency
+        # overwrite the organization name with the federal agency's agency
+        if (
+            self.organization_type == self.OrganizationChoices.FEDERAL
+            and self.federal_agency
+            and self.federal_agency != FederalAgency.get_non_federal_agency()
+            and self.federal_agency.agency
+        ):
+            self.organization_name = self.federal_agency.agency
+
         super().save(*args, **kwargs)
 
     @property
@@ -144,6 +155,25 @@ class Portfolio(TimeStampedModel):
         ).values_list("user__id", flat=True)
         return User.objects.filter(id__in=admin_ids)
 
+    def portfolio_users_with_permissions(self, permissions=[], include_admin=False):
+        """Gets all users with specified additional permissions for this particular portfolio.
+        Returns a queryset of User."""
+        portfolio_users = self.portfolio_users
+        if permissions:
+            if include_admin:
+                portfolio_users = portfolio_users.filter(
+                    Q(additional_permissions__overlap=permissions)
+                    | Q(
+                        roles__overlap=[
+                            UserPortfolioRoleChoices.ORGANIZATION_ADMIN,
+                        ]
+                    ),
+                )
+            else:
+                portfolio_users = portfolio_users.filter(additional_permissions__overlap=permissions)
+        user_ids = portfolio_users.values_list("user__id", flat=True)
+        return User.objects.filter(id__in=user_ids)
+
     # == Getters for domains == #
     def get_domains(self, order_by=None):
         """Returns all DomainInformations associated with this portfolio"""

src/registrar/models/senior_official.py

@@ -55,7 +55,9 @@ class SeniorOfficial(TimeStampedModel):
         return " ".join(names) if names else "Unknown"
 
     def __str__(self):
-        if self.first_name or self.last_name:
+        if self.federal_agency and (self.first_name or self.last_name):
+            return self.get_formatted_name() + " of " + self.federal_agency.__str__()
+        elif self.first_name or self.last_name:
             return self.get_formatted_name()
         elif self.pk:
             return str(self.pk)

src/registrar/models/utility/domain_helper.py

@@ -15,9 +15,11 @@ class DomainHelper:
 
     # a domain name is alphanumeric or hyphen, up to 63 characters, doesn't
     # begin or end with a hyphen, followed by a TLD of 2-6 alphabetic characters
-    DOMAIN_REGEX = re.compile(r"^(?!-)[A-Za-z0-9-]{1,63}(?<!-)\.[A-Za-z]{2,6}$")
+    DOMAIN_REGEX = re.compile(r"^(?!-)[A-Za-z0-9-]{1,200}(?<!-)\.[A-Za-z]{2,6}$")
 
     # a domain can be no longer than 253 characters in total
+    # NOTE: the domain name is limited by the DOMAIN_REGEX above
+    # to 200 characters (not including the .gov at the end)
     MAX_LENGTH = 253
 
     @classmethod

src/registrar/templates/admin/transfer_user.html

@@ -154,7 +154,7 @@
                         <dd>{{ current_user.email }}</dd>
                         <dt>Phone:</dt>
                         <dd>{{ current_user.phone }}</dd>
-                        <h3 class="font-heading-md" aria-label="Data that will added to:">&nbsp;</h3>
+                        <h3 class="font-heading-md" aria-label="Data that will be added to:">&nbsp;</h3>
                         <dt>Domains:</dt>
                         <dd>
                             {% if current_user_domains %}

src/registrar/templates/django/admin/domain_delete_confirmation.html

@@ -8,7 +8,7 @@
     aria-labelledby="summary-box-description"
     >
         <div class="usa-summary-box__body">
-            <h3 class="usa-summary-box__heading usa-summary-box__dhs-color" id="summary-box-description">
+            <h3 class="usa-summary-box__heading" id="summary-box-description">
             When a domain is deleted:
             </h3>
             <div class="usa-summary-box__text">

src/registrar/templates/django/admin/domain_delete_selected_confirmation.html

@@ -9,7 +9,7 @@
     aria-labelledby="summary-box-description"
     >
         <div class="usa-summary-box__body">
-            <h3 class="usa-summary-box__heading usa-summary-box__dhs-color" id="summary-box-description">
+            <h3 class="usa-summary-box__heading">
             When a domain is deleted:
             </h3>
             <div class="usa-summary-box__text">

src/registrar/templates/domain_add_user.html

@@ -4,6 +4,9 @@
 {% block title %}Add a domain manager | {% endblock %}
 
 {% block domain_content %}
+
+  {% include "includes/form_errors.html" with form=form %}
+
   {% block breadcrumb %}
     {% if portfolio %}
     <!-- Navigation breadcrumbs -->
@@ -38,8 +41,6 @@
     {% endif %}
   {% endblock breadcrumb %}
 
-  {% include "includes/form_errors.html" with form=form %}
-
   <h1>Add a domain manager</h1>
 {% if has_organization_feature_flag %}
   <p>

src/registrar/templates/domain_base.html

@@ -11,7 +11,7 @@
   <div class="grid-row grid-gap {% if not is_widescreen_centered %}max-width--grid-container{% endif %}">
     <div class="tablet:grid-col-3 ">
       <p class="font-body-md margin-top-0 margin-bottom-2
-                text-primary-darker text-semibold domain-name-wrap"
+                text-primary-darker text-semibold string-wrap"
       >
         <span class="usa-sr-only"> Domain name:</span> {{ domain.name }}
       </p>
@@ -26,7 +26,7 @@
       {% if not domain.domain_info %}
         <div class="usa-alert usa-alert--error margin-bottom-2">
           <div class="usa-alert__body">
-            <h4 class="usa-alert__heading larger-font-sizing">Domain missing domain information</h4>
+            <h4 class="usa-alert__heading">Domain missing domain information</h4>
             <p class="usa-alert__text ">
               You are attempting to manage a domain, {{ domain.name }}, which does not have a domain information object. Please correct this in the admin by editing the domain, and adding domain information, as appropriate.
             </p>
@@ -36,7 +36,7 @@
         {% if is_analyst_or_superuser and analyst_action == 'edit' and analyst_action_location == domain.pk %}
         <div class="usa-alert usa-alert--warning margin-bottom-2">
           <div class="usa-alert__body">
-            <h4 class="usa-alert__heading larger-font-sizing">Attention!</h4>
+            <h4 class="usa-alert__heading">Attention!</h4>
             <p class="usa-alert__text ">
               You are making changes to a registrant’s domain. When finished making changes, close this tab and inform the registrant of your updates.
             </p>

src/registrar/templates/domain_detail.html

@@ -21,21 +21,17 @@
 
   {{ block.super }}
   <div class="margin-top-4 tablet:grid-col-10">
-    <h2 class="text-bold text-primary-dark domain-name-wrap">{{ domain.name }}</h2>
+    <h2 class="string-wrap">{{ domain.name }}</h2>
     <div
-        class="usa-summary-box dotgov-status-box padding-bottom-0 margin-top-3 padding-left-2{% if not domain.is_expired %}{% if domain.state == domain.State.UNKNOWN or domain.state == domain.State.DNS_NEEDED %} dotgov-status-box--action-need{% endif %}{% endif %}"
+        class="usa-summary-box padding-y-2 margin-bottom-1"
         role="region"
         aria-labelledby="summary-box-key-information"
     >
       <div class="usa-summary-box__body">
-        <p class="usa-summary-box__heading font-sans-md margin-bottom-0" 
-          id="summary-box-key-information"
+        <div class="usa-summary-box__text padding-top-0"
         > 
-          <span class="text-bold text-primary-darker">
-            Status:
-          </span>
-          <span class="text-primary-darker">
-
+          <p class="font-sans-md margin-top-0 margin-bottom-05 text-primary-darker">
+            <strong>Status:</strong>
             {# UNKNOWN domains would not have an expiration date and thus would show 'Expired' #}
             {% if domain.is_expired and domain.state != domain.State.UNKNOWN %}
               Expired
@@ -46,9 +42,10 @@
             {% else %}
               {{ domain.state|title }}
             {% endif %}
-          </span>
+          </p>
+
           {% if domain.get_state_help_text %}
-            <div class="padding-top-1 text-primary-darker">
+            <p class="margin-y-0 text-primary-darker">
               {% if has_domain_renewal_flag and domain.is_expired and is_domain_manager %}
                 This domain has expired, but it is still online. 
                 {% url 'domain-renewal' pk=domain.id as url %}
@@ -64,13 +61,11 @@
               {% else %}
                 {{ domain.get_state_help_text }}
               {% endif %}
-            </div>
+            </p>
           {% endif %}
-        </p>
+          </div>
       </div>
-    </div>
-    <br>
-    
+    </div>    
 
     {% include "includes/domain_dates.html" %}
 

src/registrar/templates/domain_dnssec.html

@@ -35,21 +35,23 @@
     {% csrf_token %}
     {% if has_dnssec_records %}
     <div
-        class="usa-summary-box dotgov-status-box padding-top-0" 
+        class="usa-summary-box " 
         role="region"
         aria-labelledby="Important notes on disabling DNSSEC"
     >
       <div class="usa-summary-box__body">
-        <p class="usa-summary-box__heading font-sans-md margin-bottom-0" 
-           id="summary-box-key-information"
-        >
-        <h2>To fully disable DNSSEC </h2>
-        <ul class="usa-list">
-          <li>Click “Disable DNSSEC”  below.</li>
-          <li>Wait until the Time to Live (TTL) expires on your DNSSEC records managed by your DNS hosting provider. This is often less than 24 hours, but confirm with your provider.</li>
-          <li>After the TTL expiration, disable DNSSEC at your DNS hosting provider. </li>
-        </ul>
-        <p><strong>Warning:</strong> If you disable DNSSEC at your DNS hosting provider before TTL expiration, this may cause your domain to appear offline.</p>
+        <h2 class="usa-summary-box__heading"
+        >To fully disable DNSSEC</h2>
+
+        <div class="usa-summary-box__text">
+          <ul class="usa-list">
+            <li>Click “Disable DNSSEC”  below.</li>
+            <li>Wait until the Time to Live (TTL) expires on your DNSSEC records managed by your DNS hosting provider. This is often less than 24 hours, but confirm with your provider.</li>
+            <li>After the TTL expiration, disable DNSSEC at your DNS hosting provider. </li>
+          </ul>
+          <p><strong>Warning:</strong> If you disable DNSSEC at your DNS hosting provider before TTL expiration, this may cause your domain to appear offline.</p>
+        </div>
+        
       </div>
     </div>
     <h2>DNSSEC is enabled on your domain</h2>

src/registrar/templates/domain_dsdata.html

@@ -5,6 +5,10 @@
 
 {% block domain_content %}
 
+  {% for form in formset %}
+    {% include "includes/form_errors.html" with form=form %}
+  {% endfor %}
+
   {% block breadcrumb %}
   {% if portfolio %}
   <!-- Navigation breadcrumbs -->
@@ -38,10 +42,6 @@
   </div>
   {% endif %}
 
-  {% for form in formset %}
-    {% include "includes/form_errors.html" with form=form %}
-  {% endfor %}
-
   <h1 id="domain-dsdata">DS data</h1>
 
   <p>In order to enable DNSSEC, you must first configure it with your DNS hosting service.</p>

src/registrar/templates/domain_nameservers.html

@@ -4,6 +4,12 @@
 {% block title %}DNS name servers | {{ domain.name }} | {% endblock %}
 
 {% block domain_content %}
+
+  {# this is right after the messages block in the parent template #}
+  {% for form in formset %}
+    {% include "includes/form_errors.html" with form=form %}
+  {% endfor %}
+  
   {% block breadcrumb %}
   {% if portfolio %}
   <!-- Navigation breadcrumbs -->
@@ -26,11 +32,6 @@
   {% endif %}
   {% endblock breadcrumb %}
 
-  {# this is right after the messages block in the parent template #}
-  {% for form in formset %}
-    {% include "includes/form_errors.html" with form=form %}
-  {% endfor %}
-
   <h1>DNS name servers</h1>
 
   <p>Before your domain can be used we’ll need information about your domain name servers. Name server records indicate which DNS server is authoritative for your domain.</p>

src/registrar/templates/domain_renewal.html

@@ -37,7 +37,7 @@
 
   {{ block.super }}
   <div class="margin-top-4 tablet:grid-col-10">
-    <h2 class="text-bold text-primary-dark domain-name-wrap">Confirm the following information for accuracy</h2>
+    <h2 class="domain-name-wrap">Confirm the following information for accuracy</h2>
     <p>Review these details below. We <a href="https://get.gov/domains/requirements/#what-.gov-domain-registrants-must-do" class="usa-link">
       require</a> that you maintain accurate information for the domain.
       The details you provide will only be used to support the administration of .gov and won't be made public.

src/registrar/templates/domain_request_current_sites.html

@@ -3,8 +3,8 @@
 
 {% block form_instructions %}
   <p>We can better evaluate your request if we know about domains you’re already using.</p>
-  <h2>What are the current websites for your organization?</h2>
-  <p>Enter your organization’s current public websites. If you already have a .gov domain, include that in your list. This question is optional.</p>
+  <h2 id="id_current_sites_header">What are the current websites for your organization?</h2>
+  <p id="id_current_sites_body">Enter your organization’s current public websites. If you already have a .gov domain, include that in your list. This question is optional.</p>
 {% endblock %}
 
 {% block form_required_fields_help_text %}
@@ -20,7 +20,7 @@
   {% endwith %} 
   {% endfor %}
 
-  <button type="submit" name="submit_button" value="save" class="usa-button usa-button--unstyled">
+  <button type="submit" name="submit_button" value="save" class="usa-button usa-button--with-icon usa-button--unstyled">
     <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24" height="24">
       <use xlink:href="{%static 'img/sprite.svg'%}#add_circle"></use>
     </svg><span class="margin-left-05">Add another site</span>

src/registrar/templates/domain_request_dotgov_domain.html

@@ -44,7 +44,7 @@
 
     <p id="domain_instructions" class="margin-top-05">After you enter your domain, we’ll make sure it’s available and that it meets some of our naming requirements. If your domain passes these initial checks, we’ll verify that it meets all our requirements after you complete the rest of this form.</p>
 
-    {% with attr_aria_describedby="domain_instructions domain_instructions2" %}
+    {% with attr_aria_labelledby="domain_instructions domain_instructions2" attr_aria_describedby="id_dotgov_domain-requested_domain--toast" %}
       {# attr_validate / validate="domain" invokes code in getgov.min.js #}
       {% with append_gov=True attr_validate="domain" add_label_class="usa-sr-only" %}
         {% input_with_errors forms.0.requested_domain %}
@@ -67,18 +67,20 @@
     <p id="alt_domain_instructions" class="margin-top-05">Are there other domains you’d like if we can’t give
     you your first choice?</p>
 
-    {% with attr_aria_describedby="alt_domain_instructions" %}
+    {% with attr_aria_labelledby="alt_domain_instructions" %}
       {# Will probably want to remove blank-ok and do related cleanup when we implement delete #}
       {% with attr_validate="domain" append_gov=True add_label_class="usa-sr-only" add_class="blank-ok alternate-domain-input" %}
         {% for form in forms.1 %}
           <div class="repeatable-form">
-            {% input_with_errors form.alternative_domain %}
+            {% with attr_aria_describedby=form.alternative_domain.auto_id|stringformat:"s"|add:"--toast" %}
+              {% input_with_errors form.alternative_domain %}
+            {% endwith %}
           </div>
         {% endfor %}
       {% endwith %}
     {% endwith %}
 
-    <button type="button" value="save" class="usa-button usa-button--unstyled" id="add-form">
+    <button type="button" value="save" class="usa-button usa-button--unstyled usa-button--with-icon" id="add-form">
       <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24" height="24">
         <use xlink:href="{%static 'img/sprite.svg'%}#add_circle"></use>
       </svg><span class="margin-left-05">Add another alternative</span>

src/registrar/templates/domain_request_other_contacts.html

@@ -31,13 +31,13 @@
             <fieldset class="usa-fieldset repeatable-form padding-y-1">
             
               <legend class="float-left-tablet">
-                  <h2 class="margin-top-1">Organization contact {{ forloop.counter }}</h2>
+                  <h3 class="margin-top-05">Organization contact {{ forloop.counter }}</h2>
               </legend>
 
-              <button type="button" class="usa-button usa-button--unstyled display-block float-right-tablet delete-record margin-bottom-2 text-secondary line-height-sans-5">
+              <button type="button" class="usa-button usa-button--unstyled display-block float-right-tablet delete-record margin-top-1 text-secondary line-height-sans-5 usa-button--with-icon">
                   <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24" height="24">
                   <use xlink:href="{%static 'img/sprite.svg'%}#delete"></use>
-                  </svg><span class="margin-left-05">Delete</span>
+                  </svg>Delete
               </button>
 
 
@@ -70,7 +70,7 @@
             </fieldset>
         {% endfor %}
 
-        <button type="button" class="usa-button usa-button--unstyled" id="add-form">
+        <button type="button" class="usa-button usa-button--unstyled usa-button--with-icon" id="add-form">
             <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24" height="24">
             <use xlink:href="{%static 'img/sprite.svg'%}#add_circle"></use>
             </svg><span class="margin-left-05">Add another contact</span>

src/registrar/templates/domain_security_email.html

@@ -4,6 +4,9 @@
 {% block title %}Security email | {{ domain.name }} | {% endblock %}
 
 {% block domain_content %}
+
+  {% include "includes/form_errors.html" with form=form %}
+
   {% block breadcrumb %}
   {% if portfolio %}
   <!-- Navigation breadcrumbs -->
@@ -23,8 +26,6 @@
   {% endif %}
   {% endblock breadcrumb %}
 
-  {% include "includes/form_errors.html" with form=form %}
-
   <h1>Security email</h1>
 
   <p>We strongly recommend that you provide a security email. This email will allow the  public to report observed or suspected security issues on your domain. Security emails are made public and included in the <a class="usa-link" rel="noopener noreferrer" target="_blank" href="{% public_site_url 'about/data/' %}">.gov domain data</a> we provide.</p>

src/registrar/templates/domain_suborganization.html

@@ -5,6 +5,8 @@
 
 {% block domain_content %}
 
+    {% include "includes/form_errors.html" with form=form %}
+
     {% block breadcrumb %}
     {% if portfolio %}
     <!-- Navigation breadcrumbs -->
@@ -24,10 +26,6 @@
     {% endif %}
     {% endblock breadcrumb %}
 
-    {# this is right after the messages block in the parent template #}
-    {% include "includes/form_errors.html" with form=form %}
-
-
     <h1>Suborganization</h1>
 
     <p>

src/registrar/templates/domain_users.html

@@ -51,7 +51,7 @@
   {% if domain_manager_roles %}
   <section class="section-outlined" id="domain-managers">
   <table class="usa-table usa-table--borderless usa-table--stacked dotgov-table--stacked dotgov-table">
-    <h2 class> Domain managers </h2>
+    <h2> Domain managers </h2>
     <caption class="sr-only">Domain managers</caption>
     <thead>
       <tr>
@@ -123,7 +123,7 @@
       ></div>
   {% endif %}
 
-  <a class="usa-button usa-button--unstyled" href="{% url 'domain-users-add' pk=domain.id %}">
+  <a class="usa-button usa-button--unstyled usa-button--with-icon" href="{% url 'domain-users-add' pk=domain.id %}">
     <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24" height="24">
       <use xlink:href="{%static 'img/sprite.svg'%}#add_circle"></use>
     </svg><span class="margin-left-05">Add a domain manager</span>

src/registrar/templates/emails/action_needed_reasons/already_has_a_domain.txt

@@ -4,6 +4,7 @@ Hi, {{ recipient.first_name }}.
 We've identified an action that you’ll need to complete before we continue reviewing your .gov domain request.
 
 DOMAIN REQUESTED: {{ domain_request.requested_domain.name }}
+REQUESTED BY: {{ domain_request.creator.email }}
 REQUEST RECEIVED ON: {{ domain_request.last_submitted_date|date }}
 STATUS: Action needed
 

src/registrar/templates/emails/action_needed_reasons/bad_name.txt

@@ -4,6 +4,7 @@ Hi, {{ recipient.first_name }}.
 We've identified an action that you’ll need to complete before we continue reviewing your .gov domain request.
 
 DOMAIN REQUESTED: {{ domain_request.requested_domain.name }}
+REQUESTED BY: {{ domain_request.creator.email }}
 REQUEST RECEIVED ON: {{ domain_request.last_submitted_date|date }}
 STATUS: Action needed
 

src/registrar/templates/emails/action_needed_reasons/eligibility_unclear.txt

@@ -4,6 +4,7 @@ Hi, {{ recipient.first_name }}.
 We've identified an action that you’ll need to complete before we continue reviewing your .gov domain request.
 
 DOMAIN REQUESTED: {{ domain_request.requested_domain.name }}
+REQUESTED BY: {{ domain_request.creator.email }}
 REQUEST RECEIVED ON: {{ domain_request.last_submitted_date|date }}
 STATUS: Action needed
 

src/registrar/templates/emails/action_needed_reasons/questionable_senior_official.txt

@@ -4,6 +4,7 @@ Hi, {{ recipient.first_name }}.
 We've identified an action that you’ll need to complete before we continue reviewing your .gov domain request.
 
 DOMAIN REQUESTED: {{ domain_request.requested_domain.name }}
+REQUESTED BY: {{ domain_request.creator.email }}
 REQUEST RECEIVED ON: {{ domain_request.last_submitted_date|date }}
 STATUS: Action needed
 

src/registrar/templates/emails/domain_manager_notification.txt

@@ -2,27 +2,23 @@
 Hi,{% if domain_manager and domain_manager.first_name %} {{ domain_manager.first_name }}.{% endif %}
 
 A domain manager was invited to {{ domain.name }}.
-DOMAIN: {{ domain.name }}
+
 INVITED BY: {{ requestor_email }}
 INVITED ON: {{date}}
 MANAGER INVITED: {{ invited_email_address }}
 
-
 ----------------------------------------------------------------
 
-
 NEXT STEPS
-
 The person who received the invitation will become a domain manager once they log in to the
 .gov registrar. They'll need to access the registrar using a Login.gov account that's
 associated with the invited email address.
 
-If you need to cancel this invitation or remove the domain manager (because they've already
-logged in), you can do that by going to this domain in the .gov registrar <https://manage.get.gov/>.
+If you need to cancel this invitation or remove the domain manager, you can do that by going to 
+this domain in the .gov registrar <https://manage.get.gov/>.
 
 
 WHY DID YOU RECEIVE THIS EMAIL? 
-
 You’re listed as a domain manager for {{ domain.name }}, so you’ll receive a notification whenever
 someone is invited to manage that domain.
 

src/registrar/templates/emails/domain_request_withdrawn.txt

@@ -4,6 +4,7 @@ Hi, {{ recipient.first_name }}.
 Your .gov domain request has been withdrawn and will not be reviewed by our team.
 
 DOMAIN REQUESTED: {{ domain_request.requested_domain.name }}
+REQUESTED BY: {{ domain_request.creator.email }}
 REQUEST RECEIVED ON: {{ domain_request.last_submitted_date|date }}
 STATUS: Withdrawn
 

src/registrar/templates/emails/status_change_approved.txt

@@ -4,6 +4,7 @@ Hi, {{ recipient.first_name }}.
 Congratulations! Your .gov domain request has been approved.
 
 DOMAIN REQUESTED: {{ domain_request.requested_domain.name }}
+REQUESTED BY: {{ domain_request.creator.email }}
 REQUEST RECEIVED ON: {{ domain_request.last_submitted_date|date }}
 STATUS: Approved
 

src/registrar/templates/emails/status_change_rejected.txt

@@ -4,6 +4,7 @@ Hi, {{ recipient.first_name }}.
 Your .gov domain request has been rejected.
 
 DOMAIN REQUESTED: {{ domain_request.requested_domain.name }}
+REQUESTED BY: {{ domain_request.creator.email }}
 REQUEST RECEIVED ON: {{ domain_request.last_submitted_date|date }}
 STATUS: Rejected
 

src/registrar/templates/emails/submission_confirmation.txt

@@ -4,6 +4,7 @@ Hi, {{ recipient.first_name }}.
 We received your .gov domain request.
 
 DOMAIN REQUESTED: {{ domain_request.requested_domain.name }}
+REQUESTED BY: {{ domain_request.creator.email }}
 REQUEST RECEIVED ON: {{ domain_request.last_submitted_date|date }}
 STATUS: Submitted
 
@@ -11,13 +12,15 @@ STATUS: Submitted
 
 NEXT STEPS
 We’ll review your request. This review period can take 30 business days. Due to the volume of requests, the wait time is longer than usual. We appreciate your patience.  
-
+{% if is_org_user %}
+During our review we’ll verify that your requested domain meets our naming requirements.
+{% else %}
 During our review, we’ll verify that:
 - Your organization is eligible for a .gov domain
 - You work at the organization and/or can make requests on its behalf 
 - Your requested domain meets our naming requirements 
-
-We’ll email you if we have questions. We’ll also email you as soon as we complete our review. You can check the status of your request at any time on the registrar. <https://manage.get.gov>
+{% endif %}
+We’ll email you if we have questions. We’ll also email you as soon as we complete our review. You can check the status of your request at any time on the registrar. <https://manage.get.gov>.
 
 
 NEED TO MAKE CHANGES?

src/registrar/templates/includes/domain_dates.html

@@ -1,5 +1,5 @@
 {% if domain.expiration_date or domain.created_at %}
-  <p class="margin-y-0">
+  <p>
     {% if domain.expiration_date %}
     <strong class="text-primary-dark">Expires:</strong> 
     {{ domain.expiration_date|date }}

src/registrar/templates/includes/domain_request_awaiting_review.html

@@ -1,12 +1,12 @@
 {% load url_helpers %}
 
-<h2 class="margin-top-0 margin-bottom-2 text-primary-darker text-semibold" > 
+<h2> 
   Next steps in this process
 </h2>
 <p>We received your .gov domain request. Our next step is to review your request. This usually takes 30 business days. We’ll email you if we have questions and when we complete our review. <a class="usa-link" rel="noopener noreferrer" target="_blank" href="{% public_site_url 'contact' %}">Contact us with any questions</a>.</p>
 
 {% if show_withdraw_text %}
-  <h2 class="margin-top-0 margin-bottom-2 text-primary-darker text-semibold">
+  <h2>
     Need to make changes?
   </h2>
 

src/registrar/templates/includes/input_read_only.html

@@ -3,7 +3,7 @@ Template include for read-only form fields
 {% endcomment %}
 
 
-<h4 class="read-only-label">{{ field.label }}</h4>
+<h4 class="margin-bottom-05">{{ field.label }}</h4>
 {% if label_description %}
     <p class="usa-hint margin-top-0 margin-bottom-05">{{ label_description }}</p>
 {% endif %}
@@ -11,4 +11,4 @@ Template include for read-only form fields
 This allows us to customize the displayed value. 
 For instance, Select fields will display the id by default. 
 {% endcomment %}
-<p class="read-only-value">{{ value|default:field.value }}</p>
+<p class="margin-top-0">{{ value|default:field.value }}</p>

src/registrar/templates/includes/member_domain_management.html

@@ -1,4 +1,4 @@
-<h4 class="margin-bottom-0 text-primary">Assigned domains</h4>
+<h4 class="margin-bottom-0">Assigned domains</h4>
 {% if domain_count > 0 %}
     <p class="margin-top-0">{{domain_count}}</p>
 {% else %}

src/registrar/templates/includes/member_permissions.html

@@ -1,4 +1,4 @@
-<h4 class="margin-bottom-0 text-primary">Member access</h4>
+<h4 class="margin-bottom-0">Member access</h4>
 {% if permissions.roles and 'organization_admin' in permissions.roles %}
     <p class="margin-top-0">Admin access</p>
 {% elif permissions.roles and 'organization_member' in permissions.roles %}
@@ -7,7 +7,7 @@
     <p class="margin-top-0">⎯</p>
 {% endif %}
 
-<h4 class="margin-bottom-0 text-primary">Organization domain requests</h4>
+<h4 class="margin-bottom-0">Organization domain requests</h4>
 {% if member_has_edit_request_portfolio_permission %}
     <p class="margin-top-0">View all requests plus create requests</p>
 {% elif member_has_view_all_requests_portfolio_permission %}
@@ -16,7 +16,7 @@
     <p class="margin-top-0">No access</p>
 {% endif %}
 
-<h4 class="margin-bottom-0 text-primary">Organization members</h4>
+<h4 class="margin-bottom-0">Organization members</h4>
 {% if member_has_edit_members_portfolio_permission %}
     <p class="margin-top-0">View all members plus manage members</p>
 {% elif member_has_view_members_portfolio_permission %}

src/registrar/templates/includes/modal.html

@@ -6,7 +6,7 @@
         <h2 class="usa-modal__heading">
             {{ modal_heading }}
             {%if domain_name_modal is not None %}
-                <span class="domain-name-wrap">           
+                <span class="string-wrap">           
                     {{ domain_name_modal }}
                 </span>
             {%endif%}

src/registrar/templates/includes/portfolio_request_review_steps.html

@@ -46,7 +46,7 @@
         {% endwith %}
 
         {% if domain_request.alternative_domains.all %}
-            <h3 class="header--body text-primary-dark margin-bottom-0">Alternative domains</h3>
+            <h4>Alternative domains</h4>
             <ul class="usa-list usa-list--unstyled margin-top-0">
             {% for site in domain_request.alternative_domains.all %}
                 <li>{{ site.website }}</li>

src/registrar/templates/includes/profile_information.html

@@ -12,7 +12,7 @@
       Your contact information
     </h3>
     <div class="usa-summary-box__text">
-      <ul>
+      <ul class="usa-list">
         <li>Full name: <b>{{ user.get_formatted_name }}</b></li>
         <li>Organization email: <b>{{ user.email }}</b></li>
         <li>Title or role in your organization: <b>{{ user.title }}</b></li>

src/registrar/templates/includes/request_review_steps.html

@@ -88,7 +88,7 @@
         {% endwith %}
 
         {% if domain_request.alternative_domains.all %}
-            <h3 class="header--body text-primary-dark margin-bottom-0">Alternative domains</h3>
+            <h4>Alternative domains</h4>
             <ul class="usa-list usa-list--unstyled margin-top-0">
             {% for site in domain_request.alternative_domains.all %}
                 <li>{{ site.website }}</li>
@@ -132,8 +132,8 @@
         {% with title=form_titles|get_item:step %}
             {% if domain_request.has_additional_details %}
                 {% include "includes/summary_item.html" with title="Additional Details" value=" " heading_level=heading_level editable=is_editable edit_link=domain_request_url %}
-                <h3 class="header--body text-primary-dark margin-bottom-0">CISA Regional Representative</h3>
-                <ul class="usa-list usa-list--unstyled margin-top-0">
+                <h4 class="margin-bottom-0">CISA Regional Representative</h4>
+                <ul class="usa-list usa-list--unstyled margin-top-05">
                     {% if domain_request.cisa_representative_first_name %}
                         <li>{{domain_request.cisa_representative_first_name}} {{domain_request.cisa_representative_last_name}}</li>
                     {% if domain_request.cisa_representative_email %}
@@ -144,8 +144,8 @@
                     {% endif %}
                 </ul>
 
-            <h3 class="header--body text-primary-dark margin-bottom-0">Anything else</h3>
-            <ul class="usa-list usa-list--unstyled margin-top-0">
+            <h4 class="margin-bottom-0">Anything else</h4>
+            <ul class="usa-list usa-list--unstyled margin-top-05">
                 {% if domain_request.anything_else %}
                     {{domain_request.anything_else}}
                 {% else %}

src/registrar/templates/includes/request_status_manage.html

@@ -39,34 +39,32 @@
 
             {% block status_summary %}
             <div
-                class="usa-summary-box dotgov-status-box margin-top-3 padding-left-2" 
+                class="usa-summary-box margin-top-3 padding-y-2 margin-bottom-1" 
                 role="region"
                 aria-labelledby="summary-box-key-information"
             >
-            <div class="usa-summary-box__body">
-                <p class="usa-summary-box__heading font-sans-md margin-bottom-0" 
-                    id="summary-box-key-information"
-                > 
-                <span class="text-bold text-primary-darker">
-                    Status:
-                </span>
-                {{ DomainRequest.get_status_display|default:"ERROR Please contact technical support/dev" }}
-                </p>
+                <div class="usa-summary-box__body">
+                    <div class="usa-summary-box__text padding-top-0" 
+                    > 
+                        <p class="font-sans-md margin-y-0 text-primary-darker">
+                            <strong>Status:</strong>
+                            {{ DomainRequest.get_status_display|default:"ERROR Please contact technical support/dev" }}
+                        </p>
+                    </div>
+                </div>
             </div>
-            </div>
-            <br>
             {% endblock status_summary %}
             
             {% block status_metadata %}
 
             {% if portfolio %}
                 {% if DomainRequest.creator %}
-                <p class="margin-top-1 margin-bottom-1">
-                    <b class="review__step__name">Created by:</b> {{DomainRequest.creator.email|default:DomainRequest.creator.get_formatted_name }}
+                <p>
+                    <strong class="text-primary-dark">Created by:</strong> {{DomainRequest.creator.email|default:DomainRequest.creator.get_formatted_name }}
                 </p>
                 {% else %}
-                <p class="margin-top-1 margin-bottom-1">
-                    <b class="review__step__name">No creator found:</b> this is an error, please email <a href="mailto:help@get.gov" class="usa-link">help@get.gov</a>.
+                <p>
+                    <strong class="text-primary-dark">No creator found:</strong> this is an error, please email <a href="mailto:help@get.gov" class="usa-link">help@get.gov</a>.
                 </p>
                 {% endif %}
             {% endif %}
@@ -77,49 +75,32 @@
             There is some code repetition, but it gives us more flexibility rather than a dense reduction. 
             Leave it this way until we've solidified our requirements.
             {% endcomment %}
-            {% if DomainRequest.status == statuses.STARTED %}
-            {% with first_started_date=DomainRequest.get_first_status_started_date|date:"F j, Y" %}
-            <p class="margin-top-1">
+            
+            <p>
+                {% if DomainRequest.status == statuses.STARTED %}
+                {% with first_started_date=DomainRequest.get_first_status_started_date|date:"F j, Y" %}
                 {% comment %} 
                 A newly created domain request will not have a value for last_status update.
                 This is because the status never really updated. 
                 However, if this somehow goes back to started we can default to displaying that new date.
                 {% endcomment %}
-                <b class="review__step__name">Started on:</b> {{last_status_update|default:first_started_date}}
-            </p>
-            {% endwith %}
-            {% elif DomainRequest.status == statuses.SUBMITTED %}
-            <p class="margin-top-1 margin-bottom-1">
-                <b class="review__step__name">Submitted on:</b> {{last_submitted|default:first_submitted }}
-            </p>
-            <p class="margin-top-1">
-                <b class="review__step__name">Last updated on:</b> {{DomainRequest.updated_at|date:"F j, Y"}}
-            </p>
-            {% elif DomainRequest.status == statuses.ACTION_NEEDED %}
-            <p class="margin-top-1 margin-bottom-1">
-                <b class="review__step__name">Submitted on:</b> {{last_submitted|default:first_submitted }}
-            </p>
-            <p class="margin-top-1">
-                <b class="review__step__name">Last updated on:</b> {{DomainRequest.updated_at|date:"F j, Y"}}
-            </p>
-            {% elif DomainRequest.status == statuses.REJECTED %}
-            <p class="margin-top-1 margin-bottom-1">
-                <b class="review__step__name">Submitted on:</b> {{last_submitted|default:first_submitted }}
-            </p>
-            <p class="margin-top-1">
-                <b class="review__step__name">Rejected on:</b> {{last_status_update}}
-            </p>
-            {% elif DomainRequest.status == statuses.WITHDRAWN %}
-            <p class="margin-top-1 margin-bottom-1">
-                <b class="review__step__name">Submitted on:</b> {{last_submitted|default:first_submitted }}
-            </p>
-            <p class="margin-top-1">
-                <b class="review__step__name">Withdrawn on:</b> {{last_status_update}}
-            </p>
-            {% else %}
-            {% comment %} Shown for in_review, approved, ineligible {% endcomment %}
-            <p class="margin-top-1">
-                <b class="review__step__name">Last updated on:</b> {{DomainRequest.updated_at|date:"F j, Y"}}
+                    <strong class="text-primary-dark">Started on:</strong> {{last_status_update|default:first_started_date}}
+                {% endwith %}
+                {% elif DomainRequest.status == statuses.SUBMITTED %}
+                    <strong class="text-primary-dark">Submitted on:</strong> {{last_submitted|default:first_submitted }}<br>
+                    <strong class="text-primary-dark">Last updated on:</strong> {{DomainRequest.updated_at|date:"F j, Y"}}
+                {% elif DomainRequest.status == statuses.ACTION_NEEDED %}
+                    <strong class="text-primary-dark">Submitted on:</strong> {{last_submitted|default:first_submitted }}<br>
+                    <strong class="text-primary-dark">Last updated on:</strong> {{DomainRequest.updated_at|date:"F j, Y"}}
+                {% elif DomainRequest.status == statuses.REJECTED %}
+                    <strong class="text-primary-dark">Submitted on:</strong> {{last_submitted|default:first_submitted }}<br>
+                    <strong class="text-primary-dark">Rejected on:</strong> {{last_status_update}}
+                {% elif DomainRequest.status == statuses.WITHDRAWN %}
+                    <strong class="text-primary-dark">Submitted on:</strong> {{last_submitted|default:first_submitted }}<br>
+                    <strong class="text-primary-dark">Withdrawn on:</strong> {{last_status_update}}
+                {% else %}
+                {% comment %} Shown for in_review, approved, ineligible {% endcomment %}
+                    <strong class="text-primary-dark">Last updated on:</strong> {{DomainRequest.updated_at|date:"F j, Y"}}
             </p>
             {% endif %}
             {% endwith %}
@@ -127,7 +108,7 @@
 
             {% block status_blurb %}
             {% if DomainRequest.is_awaiting_review %}
-                <p>{% include "includes/domain_request_awaiting_review.html" with show_withdraw_text=DomainRequest.is_withdrawable %}</p>
+                {% include "includes/domain_request_awaiting_review.html" with show_withdraw_text=DomainRequest.is_withdrawable %}
             {% endif %}
             {% endblock status_blurb %}
 
@@ -142,20 +123,19 @@
 
         <div class="grid-col maxw-fit-content desktop:grid-offset-2 ">
             {% block request_summary_header %}
-            <h2 class="text-primary-darker"> Summary of your domain request </h2> 
+            <h2> Summary of your domain request </h2> 
             {% endblock request_summary_header%}
 
             {% block request_summary %}
             {% if portfolio %}
                 {% include "includes/portfolio_request_review_steps.html" with is_editable=False domain_request=DomainRequest %}
             {% else %}
-                {% with heading_level='h3' %}
                 {% with org_type=DomainRequest.get_generic_org_type_display %}
-                {% include "includes/summary_item.html" with title='Type of organization' value=org_type heading_level=heading_level %}
+                {% include "includes/summary_item.html" with title='Type of organization' value=org_type %}
                 {% endwith %}
 
                 {% if DomainRequest.tribe_name %}
-                    {% include "includes/summary_item.html" with title='Tribal government' value=DomainRequest.tribe_name heading_level=heading_level %}
+                    {% include "includes/summary_item.html" with title='Tribal government' value=DomainRequest.tribe_name %}
 
                     {% if DomainRequest.federally_recognized_tribe %}
                         <p>Federally-recognized tribe</p>
@@ -168,56 +148,56 @@
                 {% endif %}
 
                 {% if DomainRequest.get_federal_type_display %}
-                    {% include "includes/summary_item.html" with title='Federal government branch' value=DomainRequest.get_federal_type_display heading_level=heading_level %}
+                    {% include "includes/summary_item.html" with title='Federal government branch' value=DomainRequest.get_federal_type_display %}
                 {% endif %}
 
                 {% if DomainRequest.is_election_board %}
                     {% with value=DomainRequest.is_election_board|yesno:"Yes,No,Incomplete" %}
-                        {% include "includes/summary_item.html" with title='Election office' value=value heading_level=heading_level %}
+                        {% include "includes/summary_item.html" with title='Election office' value=value %}
                     {% endwith %}
                 {% endif %}
 
                 {% if DomainRequest.organization_name %}
-                    {% include "includes/summary_item.html" with title='Organization' value=DomainRequest  address='true' heading_level=heading_level %}
+                    {% include "includes/summary_item.html" with title='Organization' value=DomainRequest  address='true' %}
                 {% endif %}
 
                 {% if DomainRequest.about_your_organization %}
-                    {% include "includes/summary_item.html" with title='About your organization' value=DomainRequest.about_your_organization heading_level=heading_level %}
+                    {% include "includes/summary_item.html" with title='About your organization' value=DomainRequest.about_your_organization %}
                 {% endif %}
 
                 {% if DomainRequest.senior_official %}
-                    {% include "includes/summary_item.html" with title='Senior official' value=DomainRequest.senior_official contact='true' heading_level=heading_level %}
+                    {% include "includes/summary_item.html" with title='Senior official' value=DomainRequest.senior_official contact='true' %}
                 {% endif %}
 
                 {% if DomainRequest.current_websites.all %}
-                    {% include "includes/summary_item.html" with title='Current websites' value=DomainRequest.current_websites.all list='true' heading_level=heading_level %}
+                    {% include "includes/summary_item.html" with title='Current websites' value=DomainRequest.current_websites.all list='true' %}
                 {% endif %}
 
                 {% if DomainRequest.requested_domain %}
-                    {% include "includes/summary_item.html" with title='.gov domain' value=DomainRequest.requested_domain heading_level=heading_level %}
+                    {% include "includes/summary_item.html" with title='.gov domain' value=DomainRequest.requested_domain %}
                 {% endif %}
 
                 {% if DomainRequest.alternative_domains.all %}
-                    {% include "includes/summary_item.html" with title='Alternative domains' value=DomainRequest.alternative_domains.all list='true' heading_level=heading_level %}
+                    {% include "includes/summary_item.html" with title='Alternative domains' value=DomainRequest.alternative_domains.all list='true' %}
                 {% endif %}
 
                 {% if DomainRequest.purpose %}
-                    {% include "includes/summary_item.html" with title='Purpose of your domain' value=DomainRequest.purpose heading_level=heading_level %}
+                    {% include "includes/summary_item.html" with title='Purpose of your domain' value=DomainRequest.purpose %}
                 {% endif %}
 
                 {% if DomainRequest.creator %}
-                    {% include "includes/summary_item.html" with title='Your contact information' value=DomainRequest.creator contact='true' heading_level=heading_level %}
+                    {% include "includes/summary_item.html" with title='Your contact information' value=DomainRequest.creator contact='true' %}
                 {% endif %}
 
                 {% if DomainRequest.other_contacts.all %}
-                    {% include "includes/summary_item.html" with title='Other employees from your organization' value=DomainRequest.other_contacts.all contact='true' list='true' heading_level=heading_level %}
+                    {% include "includes/summary_item.html" with title='Other employees from your organization' value=DomainRequest.other_contacts.all contact='true' list='true' %}
                 {% else %}
-                    {% include "includes/summary_item.html" with title='Other employees from your organization' value=DomainRequest.no_other_contacts_rationale heading_level=heading_level %}
+                    {% include "includes/summary_item.html" with title='Other employees from your organization' value=DomainRequest.no_other_contacts_rationale %}
                 {% endif %}
 
             {# We always show this field even if None #}
             {% if DomainRequest %}
-                <h3 class="header--body text-primary-dark margin-bottom-0">CISA Regional Representative</h3>
+                <h4 class="margin-bottom-0">CISA Regional Representative</h4>
                 <ul class="usa-list usa-list--unstyled margin-top-0">
                     {% if DomainRequest.cisa_representative_first_name %}
                     {{ DomainRequest.get_formatted_cisa_rep_name }}
@@ -225,7 +205,7 @@
                     No
                     {% endif %}
                 </ul>
-                <h3 class="header--body text-primary-dark margin-bottom-0">Anything else</h3>
+                <h4 class="margin-bottom-0">Anything else</h4>
                 <ul class="usa-list usa-list--unstyled margin-top-0">
                     {% if DomainRequest.anything_else %}
                     {{DomainRequest.anything_else}}
@@ -234,7 +214,6 @@
                     {% endif %}
                 </ul>
             {% endif %}
-        {% endwith %}
     {% endif %}
     {% endblock request_summary%}
         </div>

src/registrar/templates/includes/summary_item.html

@@ -9,10 +9,7 @@
     {% else %} 
       <h3
     {% endif %} 
-      class="summary-item__title
-             font-sans-md
-             text-primary-dark text-semibold
-             margin-top-0 margin-bottom-05
+      class="margin-top-0 margin-bottom-05
              padding-right-1"
       >
         {{ title }}
@@ -22,7 +19,7 @@
       </h3>
     {% endif %}
       {% if sub_header_text %}
-        <h4 class="header--body text-primary-dark margin-bottom-0">{{ sub_header_text }}</h4>
+        <h4 class="margin-bottom-0">{{ sub_header_text }}</h4>
       {% endif %}
       {% if permissions %}
         {% include "includes/member_permissions.html" with permissions=value %}
@@ -40,9 +37,7 @@
                 {% for item in value %}
                   <dt>
                   
-                 <h4 class="summary-item__title
-             font-sans-md
-             text-primary-dark text-semibold
+                 <h4 class="
              margin-bottom-05
              padding-right-1">
                       Contact {{forloop.counter}}
@@ -119,7 +114,7 @@
           {% endif %}
         {% endif %}
         {% if value.invitations.all %}
-          <h4 class="h4--sm-05">Invited domain managers</h4>
+          <h4 class="margin-bottom-05">Invited domain managers</h4>
           <ul class="usa-list usa-list--unstyled margin-top-0">
           {% for item in value.invitations.all %}
             <li>{{ item.email }}</li>
@@ -143,7 +138,7 @@
       <div class="text-right">
       <a
           href="{{ edit_link }}"
-          class="usa-link usa-link--icon font-sans-sm line-height-sans-5"
+          class="usa-link usa-link--icon font-sans-sm line-height-sans-4"
       >
         <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24">
           <use xlink:href="{% static 'img/sprite.svg' %}#{% if manage_button %}settings{% elif view_button %}visibility{% else %}edit{% endif %}"></use>

src/registrar/templates/portfolio_member_domains_edit.html

@@ -76,7 +76,7 @@
     <section id="domain-assignments-readonly-view" class="display-none">
         <h1 class="margin-bottom-3">Review domain assignments</h1>
 
-        <h2 class="text-primary-dark">Would you like to continue with the following domain assignment changes for 
+        <h2>Would you like to continue with the following domain assignment changes for 
             {% if member %}
                 {{ member.email }}
             {% else %}
@@ -88,13 +88,13 @@
 
         <div id="domain-assignments-summary" class="margin-bottom-2">
              <!-- AJAX will populate this summary -->
-              <h3 class="header--body text-primary margin-bottom-1">Unassigned domains</h3>
+              <h3 class="margin-bottom-1">Unassigned domains</h3>
               <ul class="usa-list usa-list--unstyled">
                 <li>item1</li>
                 <li>item2</li>
               </ul>
 
-              <h3 class="header--body text-primary-dark margin-bottom-0">Assigned domains</h3>
+              <h3 class="margin-bottom-0">Assigned domains</h3>
               <ul class="usa-list usa-list--unstyled">
                 <li>item1</li>
                 <li>item2</li>

src/registrar/templates/portfolio_member_permissions.html

@@ -9,7 +9,6 @@
 {% endblock %}
 
 {% block portfolio_content %}
-{% include "includes/form_errors.html" with form=form %}
 
 <div id="main-content" class=" {% if not is_widescreen_centered %}desktop:grid-offset-2{% endif %}">
   <!-- Form messages -->
@@ -95,17 +94,15 @@
       <h2>Admin access permissions</h2>
       <p>Member permissions available for admin-level acccess.</p>
 
-    <h3 class="summary-item__title
-    text-primary-dark
+    <h3 class="
     margin-bottom-0">Organization domain requests</h3>
     {% with group_classes="usa-form-editable usa-form-editable--no-border bg-gray-1 padding-top-0" %}
       {% input_with_errors form.domain_request_permission_admin %}
     {% endwith %}
 
-    <h3 class="summary-item__title
-    text-primary-dark
+    <h3 class="
     margin-bottom-0
-    margin-top-3">Organization members</h3>
+    margin-top-4">Organization members</h3>
     {% with group_classes="usa-form-editable usa-form-editable--no-border bg-gray-1 padding-top-0" %}
       {% input_with_errors form.member_permission_admin %}
     {% endwith %}
@@ -116,7 +113,7 @@
         <h2>Basic member permissions</h2>
         <p>Member permissions available for basic-level acccess.</p>
 
-      <h3 class="margin-bottom-0 summary-item__title text-primary-dark">Organization domain requests</h3>
+      <h3 class="margin-bottom-0">Organization domain requests</h3>
       {% with group_classes="usa-form-editable usa-form-editable--no-border bg-gray-1 padding-top-0" %}
         {% input_with_errors form.domain_request_permission_member %}
       {% endwith %}

src/registrar/templates/portfolio_members_add_new.html

@@ -68,17 +68,15 @@
       <h2>Admin access permissions</h2>
       <p>Member permissions available for admin-level acccess.</p>
 
-    <h3 class="summary-item__title
-    text-primary-dark
+    <h3 class="
     margin-bottom-0">Organization domain requests</h3>
     {% with group_classes="usa-form-editable usa-form-editable--no-border bg-gray-1 padding-top-0" %}
       {% input_with_errors form.domain_request_permission_admin %}
     {% endwith %}
 
-    <h3 class="summary-item__title
-    text-primary-dark
+    <h3 class="
     margin-bottom-0
-    margin-top-3">Organization members</h3>
+    margin-top-4">Organization members</h3>
     {% with group_classes="usa-form-editable usa-form-editable--no-border bg-gray-1 padding-top-0" %}
       {% input_with_errors form.member_permission_admin %}
     {% endwith %}
@@ -127,37 +125,34 @@
             <h2 class="usa-modal__heading" id="invite-member-heading">
                 Invite this member to the organization?
             </h2>
-            <h3 class="summary-item__title
-            text-primary-dark">Member information and permissions</h3>
-            <div class="usa-prose">
-                <!-- Display email as a header and access level -->
-                <h4 class="text-primary">Email</h4>
-                <p class="margin-top-0" id="modalEmail"></p>
+            <h3>Member information and permissions</h3>
+            <!-- Display email as a header and access level -->
+            <h4 class="margin-bottom-0">Email</h4>
+            <p class="margin-top-0" id="modalEmail"></p>
 
-                  <h4 class="text-primary">Member Access</h4>
-                  <p class="margin-top-0" id="modalAccessLevel"></p>
+            <h4 class="margin-bottom-0">Member Access</h4>
+            <p class="margin-top-0" id="modalAccessLevel"></p>
 
-                  <!-- Dynamic Permissions Details -->
-                  <div id="permission_details"></div>
-              </div>
+            <!-- Dynamic Permissions Details -->
+            <div id="permission_details"></div>
 
-              <div class="usa-modal__footer">
-                  <ul class="usa-button-group">
-                      <li class="usa-button-group__item">
-                          <button id="confirm_new_member_submit" type="submit" class="usa-button">Yes, invite member</button>
-                      </li>
-                      <li class="usa-button-group__item">
-                          <button
-                              type="button"
-                              class="usa-button usa-button--unstyled"
-                              data-close-modal
-                              onclick="closeModal()"
-                          >
-                              Cancel
-                          </button>
-                      </li>
-                  </ul>
-              </div>
+            <div class="usa-modal__footer">
+                <ul class="usa-button-group">
+                    <li class="usa-button-group__item">
+                        <button id="confirm_new_member_submit" type="submit" class="usa-button">Yes, invite member</button>
+                    </li>
+                    <li class="usa-button-group__item">
+                        <button
+                            type="button"
+                            class="usa-button usa-button--unstyled"
+                            data-close-modal
+                            onclick="closeModal()"
+                        >
+                            Cancel
+                        </button>
+                    </li>
+                </ul>
+            </div>
           </div>
           <button
               type="button"

src/registrar/templates/portfolio_organization.html

@@ -37,8 +37,8 @@
             {% include "includes/required_fields.html" %}
             <form class="usa-form usa-form--large desktop:margin-top-4" method="post" novalidate>
                 {% csrf_token %}
-                <h4 class="read-only-label">Organization name</h4>
-                <p class="read-only-value">
+                <h4 class="margin-bottom-05">Organization name</h4>
+                <p class="margin-top-0">
                     {{ portfolio.federal_agency }}
                 </p>
                 {% input_with_errors form.address_line1 %}
@@ -53,8 +53,8 @@
                 </button>
             </form>
         {% else %}
-            <h4 class="read-only-label">Organization name</h4>
-            <p class="read-only-value">
+            <h4 class="margin-bottom-05">Organization name</h4>
+            <p class="margin-top-0">
                 {{ portfolio.federal_agency }}
             </p>
             {% if form.address_line1.value is not None %}

src/registrar/tests/test_admin_domain.py

@@ -779,7 +779,7 @@ class TestDomainAdminWithClient(TestCase):
         response = self.client.get("/admin/registrar/domain/")
         # There are 4 template references to Federal (4) plus four references in the table
         # for our actual domain_request
-        self.assertContains(response, "Federal", count=57)
+        self.assertContains(response, "Federal", count=56)
         # This may be a bit more robust
         self.assertContains(response, '<td class="field-converted_generic_org_type">Federal</td>', count=1)
         # Now let's make sure the long description does not exist

src/registrar/tests/test_admin_request.py

@@ -662,7 +662,7 @@ class TestDomainRequestAdmin(MockEppLib):
         response = self.client.get("/admin/registrar/domainrequest/?generic_org_type__exact=federal")
         # There are 2 template references to Federal (4) and two in the results data
         # of the request
-        self.assertContains(response, "Federal", count=55)
+        self.assertContains(response, "Federal", count=54)
         # This may be a bit more robust
         self.assertContains(response, '<td class="field-converted_generic_org_type">Federal</td>', count=1)
         # Now let's make sure the long description does not exist

src/registrar/tests/test_management_scripts.py

@@ -3,7 +3,10 @@ import boto3_mocking  # type: ignore
 from datetime import date, datetime, time
 from django.core.management import call_command
 from django.test import TestCase, override_settings
+from registrar.models.domain_group import DomainGroup
+from registrar.models.portfolio_invitation import PortfolioInvitation
 from registrar.models.senior_official import SeniorOfficial
+from registrar.models.user_portfolio_permission import UserPortfolioPermission
 from registrar.utility.constants import BranchChoices
 from django.utils import timezone
 from django.utils.module_loading import import_string
@@ -2167,3 +2170,116 @@ class TestPatchSuborganizations(MockDbForIndividualTests):
         self.assertEqual(self.domain_information_1.sub_organization, keep_org)
         self.assertEqual(self.domain_request_2.sub_organization, unrelated_org)
         self.assertEqual(self.domain_information_2.sub_organization, unrelated_org)
+
+
+class TestRemovePortfolios(TestCase):
+    """Test the remove_unused_portfolios command"""
+
+    def setUp(self):
+        self.user = User.objects.create(username="testuser")
+
+        self.logger_patcher = patch("registrar.management.commands.export_tables.logger")
+        self.logger_mock = self.logger_patcher.start()
+
+        # Create mock database objects
+        self.portfolio_ok = Portfolio.objects.create(
+            organization_name="Department of Veterans Affairs", creator=self.user
+        )
+        self.unused_portfolio_with_related_objects = Portfolio.objects.create(
+            organization_name="Test with orphaned objects", creator=self.user
+        )
+        self.unused_portfolio_with_suborgs = Portfolio.objects.create(
+            organization_name="Test with suborg", creator=self.user
+        )
+
+        # Create related objects for unused_portfolio_with_related_objects
+        self.domain_information = DomainInformation.objects.create(
+            portfolio=self.unused_portfolio_with_related_objects, creator=self.user
+        )
+        self.domain_request = DomainRequest.objects.create(
+            portfolio=self.unused_portfolio_with_related_objects, creator=self.user
+        )
+        self.inv = PortfolioInvitation.objects.create(portfolio=self.unused_portfolio_with_related_objects)
+        self.group = DomainGroup.objects.create(
+            portfolio=self.unused_portfolio_with_related_objects, name="Test Domain Group"
+        )
+        self.perm = UserPortfolioPermission.objects.create(
+            portfolio=self.unused_portfolio_with_related_objects, user=self.user
+        )
+
+        # Create a suborganization and suborg related objects for unused_portfolio_with_suborgs
+        self.suborganization = Suborganization.objects.create(
+            portfolio=self.unused_portfolio_with_suborgs, name="Test Suborg"
+        )
+        self.suborg_domain_information = DomainInformation.objects.create(
+            sub_organization=self.suborganization, creator=self.user
+        )
+
+    def tearDown(self):
+        self.logger_patcher.stop()
+        DomainInformation.objects.all().delete()
+        DomainRequest.objects.all().delete()
+        Suborganization.objects.all().delete()
+        Portfolio.objects.all().delete()
+        User.objects.all().delete()
+
+    @patch("registrar.management.commands.utility.terminal_helper.TerminalHelper.query_yes_no")
+    def test_delete_unlisted_portfolios(self, mock_query_yes_no):
+        """Test that portfolios not on the allowed list are deleted."""
+        mock_query_yes_no.return_value = True
+
+        # Ensure all portfolios exist before running the command
+        self.assertEqual(Portfolio.objects.count(), 3)
+
+        # Run the command
+        call_command("remove_unused_portfolios", debug=False)
+
+        # Check that the unlisted portfolio was removed
+        self.assertEqual(Portfolio.objects.count(), 1)
+        self.assertFalse(Portfolio.objects.filter(organization_name="Test with orphaned objects").exists())
+        self.assertFalse(Portfolio.objects.filter(organization_name="Test with suborg").exists())
+        self.assertTrue(Portfolio.objects.filter(organization_name="Department of Veterans Affairs").exists())
+
+    @patch("registrar.management.commands.utility.terminal_helper.TerminalHelper.query_yes_no")
+    def test_delete_entries_with_related_objects(self, mock_query_yes_no):
+        """Test deletion with related objects being handled properly."""
+        mock_query_yes_no.return_value = True
+
+        # Ensure related objects exist before running the command
+        self.assertEqual(DomainInformation.objects.count(), 2)
+        self.assertEqual(DomainRequest.objects.count(), 1)
+
+        # Run the command
+        call_command("remove_unused_portfolios", debug=False)
+
+        # Check that related objects were updated
+        self.assertEqual(
+            DomainInformation.objects.filter(portfolio=self.unused_portfolio_with_related_objects).count(), 0
+        )
+        self.assertEqual(DomainRequest.objects.filter(portfolio=self.unused_portfolio_with_related_objects).count(), 0)
+        self.assertEqual(DomainInformation.objects.filter(portfolio=None).count(), 2)
+        self.assertEqual(DomainRequest.objects.filter(portfolio=None).count(), 1)
+
+        # Check that the portfolio was deleted
+        self.assertFalse(Portfolio.objects.filter(organization_name="Test with orphaned objects").exists())
+
+    @patch("registrar.management.commands.utility.terminal_helper.TerminalHelper.query_yes_no")
+    def test_delete_entries_with_suborganizations(self, mock_query_yes_no):
+        """Test that suborganizations and their related objects are deleted along with the portfolio."""
+        mock_query_yes_no.return_value = True
+
+        # Ensure suborganization and related objects exist before running the command
+        self.assertEqual(Suborganization.objects.count(), 1)
+        self.assertEqual(DomainInformation.objects.filter(sub_organization=self.suborganization).count(), 1)
+
+        # Run the command
+        call_command("remove_unused_portfolios", debug=False)
+
+        # Check that the suborganization was deleted
+        self.assertEqual(Suborganization.objects.filter(portfolio=self.unused_portfolio_with_suborgs).count(), 0)
+
+        # Check that deletion of suborganization had cascading effects (orphaned DomainInformation)
+        self.assertEqual(DomainInformation.objects.filter(sub_organization=self.suborganization).count(), 0)
+
+        # Check that the portfolio was deleted
+        self.assertFalse(Portfolio.objects.filter(organization_name="Test with suborg").exists())

src/registrar/tests/test_models.py

@@ -2073,13 +2073,18 @@ class TestPortfolio(TestCase):
         self.user, _ = User.objects.get_or_create(
             username="intern@igorville.com", email="intern@igorville.com", first_name="Lava", last_name="World"
         )
+        self.non_federal_agency, _ = FederalAgency.objects.get_or_create(agency="Non-Federal Agency")
+        self.federal_agency, _ = FederalAgency.objects.get_or_create(agency="Federal Agency")
         super().setUp()
 
     def tearDown(self):
         super().tearDown()
         Portfolio.objects.all().delete()
+        self.federal_agency.delete()
+        # not deleting non_federal_agency so as not to interfere potentially with other tests
         User.objects.all().delete()
 
+    @less_console_noise_decorator
     def test_urbanization_field_resets_when_not_puetro_rico(self):
         """The urbanization field should only be populated when the state is puetro rico.
         Otherwise, this field should be empty."""
@@ -2100,6 +2105,7 @@ class TestPortfolio(TestCase):
         self.assertEqual(portfolio.urbanization, None)
         self.assertEqual(portfolio.state_territory, DomainRequest.StateTerritoryChoices.ALABAMA)
 
+    @less_console_noise_decorator
     def test_can_add_urbanization_field(self):
         """Ensures that you can populate the urbanization field when conditions are right"""
         # Create a portfolio that cannot have this field
@@ -2121,6 +2127,32 @@ class TestPortfolio(TestCase):
         self.assertEqual(portfolio.urbanization, "test123")
         self.assertEqual(portfolio.state_territory, DomainRequest.StateTerritoryChoices.PUERTO_RICO)
 
+    @less_console_noise_decorator
+    def test_organization_name_updates_for_federal_agency(self):
+        # Create a Portfolio instance with a federal agency
+        portfolio = Portfolio(
+            creator=self.user,
+            organization_type=DomainRequest.OrganizationChoices.FEDERAL,
+            federal_agency=self.federal_agency,
+        )
+        portfolio.save()
+
+        # Assert that organization_name is updated to the federal agency's name
+        self.assertEqual(portfolio.organization_name, "Federal Agency")
+
+    @less_console_noise_decorator
+    def test_organization_name_does_not_update_for_non_federal_agency(self):
+        # Create a Portfolio instance with a non-federal agency
+        portfolio = Portfolio(
+            creator=self.user,
+            organization_type=DomainRequest.OrganizationChoices.FEDERAL,
+            federal_agency=self.non_federal_agency,
+        )
+        portfolio.save()
+
+        # Assert that organization_name remains None
+        self.assertIsNone(portfolio.organization_name)
+
 
 class TestAllowedEmail(TestCase):
     """Tests our allowed email whitelist"""

src/registrar/tests/test_models_requests.py

@@ -16,7 +16,9 @@ from registrar.models import (
     AllowedEmail,
     Portfolio,
     Suborganization,
+    UserPortfolioPermission,
 )
+from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices
 
 import boto3_mocking
 from registrar.utility.constants import BranchChoices
@@ -46,6 +48,14 @@ class TestDomainRequest(TestCase):
         self.dummy_user_2, _ = User.objects.get_or_create(
             username="intern@igorville.com", email="intern@igorville.com", first_name="Lava", last_name="World"
         )
+
+        self.dummy_user_3, _ = User.objects.get_or_create(
+            username="portfolioadmin@igorville.com",
+            email="portfolioadmin@igorville.com",
+            first_name="Portfolio",
+            last_name="Admin",
+        )
+
         self.started_domain_request = completed_domain_request(
             status=DomainRequest.DomainRequestStatus.STARTED,
             name="started.gov",
@@ -273,7 +283,14 @@ class TestDomainRequest(TestCase):
         self.assertEqual(domain_request.status, domain_request.DomainRequestStatus.SUBMITTED)
 
     def check_email_sent(
-        self, domain_request, msg, action, expected_count, expected_content=None, expected_email="mayor@igorville.com"
+        self,
+        domain_request,
+        msg,
+        action,
+        expected_count,
+        expected_content=None,
+        expected_email="mayor@igorville.com",
+        expected_cc=[],
     ):
         """Check if an email was sent after performing an action."""
         email_allowed, _ = AllowedEmail.objects.get_or_create(email=expected_email)
@@ -292,6 +309,11 @@ class TestDomainRequest(TestCase):
             ]
             self.assertEqual(len(sent_emails), expected_count)
 
+            if expected_cc:
+                sent_cc_adddresses = sent_emails[0]["kwargs"]["Destination"]["CcAddresses"]
+                for cc_address in expected_cc:
+                    self.assertIn(cc_address, sent_cc_adddresses)
+
             if expected_content:
                 email_content = sent_emails[0]["kwargs"]["Content"]["Simple"]["Body"]["Text"]["Data"]
                 self.assertIn(expected_content, email_content)
@@ -1074,6 +1096,36 @@ class TestDomainRequest(TestCase):
         self.assertEqual(domain_request2.generic_org_type, domain_request2.converted_generic_org_type)
         self.assertEqual(domain_request2.federal_agency, domain_request2.converted_federal_agency)
 
+    @less_console_noise_decorator
+    def test_portfolio_domain_requests_cc_requests_viewers(self):
+        """test that portfolio domain request emails cc portfolio members who have read requests access"""
+        fed_agency = FederalAgency.objects.filter(agency="Non-Federal Agency").first()
+        portfolio = Portfolio.objects.create(
+            organization_name="Test Portfolio",
+            creator=self.dummy_user_2,
+            federal_agency=fed_agency,
+            organization_type=DomainRequest.OrganizationChoices.FEDERAL,
+        )
+        user_portfolio_permission = UserPortfolioPermission.objects.create(  # noqa: F841
+            user=self.dummy_user_3, portfolio=portfolio, roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+        )
+        # Adds cc'ed email in this test's allow list
+        AllowedEmail.objects.create(email="portfolioadmin@igorville.com")
+
+        msg = "Create a domain request and submit it and see if email cc's portfolio admin and members who can view \
+            requests."
+        domain_request = completed_domain_request(
+            name="test.gov", user=self.dummy_user_2, portfolio=portfolio, organization_name="Test Portfolio"
+        )
+        self.check_email_sent(
+            domain_request,
+            msg,
+            "submit",
+            1,
+            expected_email="intern@igorville.com",
+            expected_cc=["portfolioadmin@igorville.com"],
+        )
+
 
 class TestDomainRequestSuborganization(TestCase):
     """Tests for the suborganization fields on domain requests"""

src/registrar/tests/test_reports.py

@@ -255,10 +255,10 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
             "Organization name,City,State,SO,SO email,"
             "Security contact email,Domain managers,Invited domain managers\n"
             "adomain2.gov,Dns needed,(blank),(blank),Federal - Executive,"
-            "Portfolio 1 Federal Agency,,,, ,,(blank),"
+            "Portfolio 1 Federal Agency,Portfolio 1 Federal Agency,,, ,,(blank),"
             "meoward@rocks.com,squeaker@rocks.com\n"
             "defaultsecurity.gov,Ready,2023-11-01,(blank),Federal - Executive,"
-            "Portfolio 1 Federal Agency,,,, ,,(blank),"
+            "Portfolio 1 Federal Agency,Portfolio 1 Federal Agency,,, ,,(blank),"
             '"big_lebowski@dude.co, info@example.com, meoward@rocks.com",woofwardthethird@rocks.com\n'
             "cdomain11.gov,Ready,2024-04-02,(blank),Federal - Executive,"
             "World War I Centennial Commission,,,, ,,(blank),"
@@ -280,6 +280,7 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
         # spaces and leading/trailing whitespace
         csv_content = csv_content.replace(",,", "").replace(",", "").replace(" ", "").replace("\r\n", "\n").strip()
         expected_content = expected_content.replace(",,", "").replace(",", "").replace(" ", "").strip()
+        self.maxDiff = None
         self.assertEqual(csv_content, expected_content)
 
     @less_console_noise_decorator
@@ -316,9 +317,11 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
         expected_content = (
             "Domain name,Status,First ready on,Expiration date,Domain type,Agency,Organization name,"
             "City,State,SO,SO email,Security contact email,Domain managers,Invited domain managers\n"
-            "adomain2.gov,Dns needed,(blank),(blank),Federal - Executive,Portfolio 1 Federal Agency,,,, ,,(blank),"
+            "adomain2.gov,Dns needed,(blank),(blank),Federal - Executive,Portfolio 1 Federal Agency,"
+            "Portfolio 1 Federal Agency,,, ,,(blank),"
             '"info@example.com, meoward@rocks.com",squeaker@rocks.com\n'
-            "defaultsecurity.gov,Ready,2023-11-01,(blank),Federal - Executive,Portfolio 1 Federal Agency,,,, ,,(blank),"
+            "defaultsecurity.gov,Ready,2023-11-01,(blank),Federal - Executive,Portfolio 1 Federal Agency,"
+            "Portfolio 1 Federal Agency,,, ,,(blank),"
             '"big_lebowski@dude.co, info@example.com, meoward@rocks.com",woofwardthethird@rocks.com\n'
         )
 
@@ -326,6 +329,7 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
         # spaces and leading/trailing whitespace
         csv_content = csv_content.replace(",,", "").replace(",", "").replace(" ", "").replace("\r\n", "\n").strip()
         expected_content = expected_content.replace(",,", "").replace(",", "").replace(" ", "").strip()
+        self.maxDiff = None
         self.assertEqual(csv_content, expected_content)
 
     @less_console_noise_decorator
@@ -587,7 +591,7 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
                 expected_content = (
                     "Domain name,Domain type,Agency,Organization name,City,"
                     "State,Status,Expiration date, Deleted\n"
-                    "cdomain1.gov,Federal-Executive,Portfolio1FederalAgency,Ready,(blank)\n"
+                    "cdomain1.gov,Federal-Executive,Portfolio1FederalAgency,Portfolio1FederalAgency,Ready,(blank)\n"
                     "adomain10.gov,Federal,ArmedForcesRetirementHome,Ready,(blank)\n"
                     "cdomain11.gov,Federal-Executive,WorldWarICentennialCommission,Ready,(blank)\n"
                     "zdomain12.gov,Interstate,Ready,(blank)\n"
@@ -601,6 +605,7 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
                     csv_content.replace(",,", "").replace(",", "").replace(" ", "").replace("\r\n", "\n").strip()
                 )
                 expected_content = expected_content.replace(",,", "").replace(",", "").replace(" ", "").strip()
+                self.maxDiff = None
                 self.assertEqual(csv_content, expected_content)
 
     @less_console_noise_decorator
@@ -780,9 +785,11 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
                 "city5.gov,Approved,Federal,No,Executive,,Testorg,N/A,,NY,2,requested_suborg,SanFran,CA,,,,,1,0,"
                 "city1.gov,Testy,Tester,testy@town.com,Chief Tester,Purpose of the site,There is more,"
                 "Testy Tester testy2@town.com,,city.com,\n"
-                "city2.gov,In review,Federal,Yes,Executive,Portfolio 1 Federal Agency,,N/A,,,2,SubOrg 1,,,,,,,0,"
-                "1,city1.gov,,,,,Purpose of the site,There is more,Testy Tester testy2@town.com,,city.com,\n"
-                "city3.gov,Submitted,Federal,Yes,Executive,Portfolio 1 Federal Agency,,N/A,,,2,,,,,,,,0,1,"
+                "city2.gov,In review,Federal,Yes,Executive,Portfolio 1 Federal Agency,Portfolio 1 Federal Agency,"
+                "N/A,,,2,SubOrg 1,,,,,,,0,1,city1.gov,,,,,Purpose of the site,There is more,"
+                "Testy Tester testy2@town.com,,city.com,\n"
+                "city3.gov,Submitted,Federal,Yes,Executive,Portfolio 1 Federal Agency,Portfolio 1 Federal Agency,"
+                "N/A,,,2,,,,,,,,0,1,"
                 '"cheeseville.gov, city1.gov, igorville.gov",,,,,Purpose of the site,CISA-first-name CISA-last-name | '
                 'There is more,"Meow Tester24 te2@town.com, Testy1232 Tester24 te2@town.com, '
                 'Testy Tester testy2@town.com",'
@@ -792,9 +799,9 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
                 "Chief Tester,Purpose of the site,CISA-first-name CISA-last-name | There is more,"
                 "Testy Tester testy2@town.com,"
                 "cisaRep@igorville.gov,city.com,\n"
-                "city6.gov,Submitted,Federal,Yes,Executive,Portfolio 1 Federal Agency,,N/A,,,2,,,,,,,,0,1,city1.gov,"
-                ",,,,Purpose of the site,CISA-first-name CISA-last-name | There is more,Testy Tester testy2@town.com,"
-                "cisaRep@igorville.gov,city.com,\n"
+                "city6.gov,Submitted,Federal,Yes,Executive,Portfolio 1 Federal Agency,Portfolio 1 Federal Agency,N/A,"
+                ",,2,,,,,,,,0,1,city1.gov,,,,,Purpose of the site,CISA-first-name CISA-last-name | There is more,"
+                "Testy Tester testy2@town.com,cisaRep@igorville.gov,city.com,\n"
             )
 
             # Normalize line endings and remove commas,

src/registrar/tests/test_views_portfolio.py

@@ -211,11 +211,11 @@ class TestPortfolio(WebTest):
             # Assert the response is a 200
             self.assertEqual(response.status_code, 200)
             # The label for Federal agency will always be a h4
-            self.assertContains(response, '<h4 class="read-only-label">Organization name</h4>')
+            self.assertContains(response, '<h4 class="margin-bottom-05">Organization name</h4>')
             # The read only label for city will be a h4
-            self.assertContains(response, '<h4 class="read-only-label">City</h4>')
+            self.assertContains(response, '<h4 class="margin-bottom-05">City</h4>')
             self.assertNotContains(response, 'for="id_city"')
-            self.assertContains(response, '<p class="read-only-value">Los Angeles</p>')
+            self.assertContains(response, '<p class="margin-top-0">Los Angeles</p>')
 
     @less_console_noise_decorator
     def test_portfolio_organization_page_edit_access(self):
@@ -236,10 +236,10 @@ class TestPortfolio(WebTest):
             # Assert the response is a 200
             self.assertEqual(response.status_code, 200)
             # The label for Federal agency will always be a h4
-            self.assertContains(response, '<h4 class="read-only-label">Organization name</h4>')
+            self.assertContains(response, '<h4 class="margin-bottom-05">Organization name</h4>')
             # The read only label for city will be a h4
-            self.assertNotContains(response, '<h4 class="read-only-label">City</h4>')
-            self.assertNotContains(response, '<p class="read-only-value">Los Angeles</p>')
+            self.assertNotContains(response, '<h4 class="margin-bottom-05">City</h4>')
+            self.assertNotContains(response, '<p class="margin-top-0">Los Angeles</p>')
             self.assertContains(response, 'for="id_city"')
 
     @less_console_noise_decorator

src/registrar/utility/email.py

@@ -36,7 +36,7 @@ def send_templated_email(  # noqa
 
     to_address and bcc_address currently only support single addresses.
 
-    cc_address is a list and can contain many addresses. Emails not in the
+    cc_addresses is a list and can contain many addresses. Emails not in the
     whitelist (if applicable) will be filtered out before sending.
 
     template_name and subject_template_name are relative to the same template