From 61b1ceeb9ce6c68d38de4e3ee7f31dccb1e33755 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 24 Sep 2024 14:22:25 -0600
Subject: [PATCH 001/142] Refactor

---
 src/registrar/admin.py                        |  67 +++--
 src/registrar/assets/js/get-gov-admin.js      | 276 ++++++++++++------
 src/registrar/models/domain_request.py        |  49 ++--
 .../custom_email.txt                          |   0
 .../emails/includes/email_footer.txt          |  10 +
 .../status_change_rejected_header.txt         |   8 +
 .../contacts_not_verified.txt                 |   8 +
 .../rejection_reasons/naming_not_met.txt      |  15 +
 .../rejection_reasons/org_has_domain.txt      |  15 +
 .../rejection_reasons/org_not_eligible.txt    |  14 +
 .../emails/rejection_reasons/other.txt        |  15 +
 .../rejection_reasons/purpose_not_met.txt     |  15 +
 .../requestor_not_eligible.txt                |  14 +
 ..._subject.txt => status_change_subject.txt} |   0
 src/registrar/utility/admin_helpers.py        |  65 ++++-
 src/registrar/views/utility/api_views.py      |   2 +-
 16 files changed, 435 insertions(+), 138 deletions(-)
 rename src/registrar/templates/emails/{action_needed_reasons => includes}/custom_email.txt (100%)
 create mode 100644 src/registrar/templates/emails/includes/email_footer.txt
 create mode 100644 src/registrar/templates/emails/includes/status_change_rejected_header.txt
 create mode 100644 src/registrar/templates/emails/rejection_reasons/contacts_not_verified.txt
 create mode 100644 src/registrar/templates/emails/rejection_reasons/naming_not_met.txt
 create mode 100644 src/registrar/templates/emails/rejection_reasons/org_has_domain.txt
 create mode 100644 src/registrar/templates/emails/rejection_reasons/org_not_eligible.txt
 create mode 100644 src/registrar/templates/emails/rejection_reasons/other.txt
 create mode 100644 src/registrar/templates/emails/rejection_reasons/purpose_not_met.txt
 create mode 100644 src/registrar/templates/emails/rejection_reasons/requestor_not_eligible.txt
 rename src/registrar/templates/emails/{status_change_rejected_subject.txt => status_change_subject.txt} (100%)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 15f1ccb79..b524f9d0a 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -21,7 +21,12 @@ from epplibwrapper.errors import ErrorCode, RegistryError
 from registrar.models.user_domain_role import UserDomainRole
 from waffle.admin import FlagAdmin
 from waffle.models import Sample, Switch
-from registrar.utility.admin_helpers import get_all_action_needed_reason_emails, get_action_needed_reason_default_email
+from registrar.utility.admin_helpers import (
+    get_all_action_needed_reason_emails, 
+    get_action_needed_reason_default_email,
+    get_all_rejection_reason_emails,
+    get_rejection_reason_default_email,
+)
 from registrar.models import Contact, Domain, DomainRequest, DraftDomain, User, Website, SeniorOfficial
 from registrar.utility.constants import BranchChoices
 from registrar.utility.errors import FSMDomainRequestError, FSMErrorCodes
@@ -234,6 +239,7 @@ class DomainRequestAdminForm(forms.ModelForm):
         }
         labels = {
             "action_needed_reason_email": "Email",
+            "rejection_reason_email": "Email",
         }
 
     def __init__(self, *args, **kwargs):
@@ -1755,6 +1761,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
                     "status_history",
                     "status",
                     "rejection_reason",
+                    "rejection_reason_email",
                     "action_needed_reason",
                     "action_needed_reason_email",
                     "investigator",
@@ -1938,24 +1945,16 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         original_obj = models.DomainRequest.objects.get(pk=obj.pk)
 
         # == Handle action_needed_reason == #
+        action_needed_reason_changed = obj.action_needed_reason != original_obj.action_needed_reason
+        if action_needed_reason_changed:
+            obj = self._handle_action_needed_reason(request, obj, original_obj)
 
-        reason_changed = obj.action_needed_reason != original_obj.action_needed_reason
-        if reason_changed:
-            # Track the fact that we sent out an email
-            request.session["action_needed_email_sent"] = True
-
-            # Set the action_needed_reason_email to the default if nothing exists.
-            # Since this check occurs after save, if the user enters a value then we won't update.
-
-            default_email = get_action_needed_reason_default_email(request, obj, obj.action_needed_reason)
-            if obj.action_needed_reason_email:
-                emails = get_all_action_needed_reason_emails(request, obj)
-                is_custom_email = obj.action_needed_reason_email not in emails.values()
-                if not is_custom_email:
-                    obj.action_needed_reason_email = default_email
-            else:
-                obj.action_needed_reason_email = default_email
+        # == Handle rejection_reason == #
+        rejection_reason_changed = obj.rejection_reason != original_obj.rejection_reason
+        if rejection_reason_changed:
+            obj = self._handle_rejection_reason(request, obj, original_obj)
 
+        # == Handle allowed emails == #
         if obj.status in DomainRequest.get_statuses_that_send_emails() and not settings.IS_PRODUCTION:
             self._check_for_valid_email(request, obj)
 
@@ -1971,6 +1970,40 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
             if should_save:
                 return super().save_model(request, obj, form, change)
 
+    def _handle_action_needed_reason(self, request, obj, original_obj):
+        # Track the fact that we sent out an email
+        request.session["action_needed_email_sent"] = True
+
+        # Set the action_needed_reason_email to the default if nothing exists.
+        # Since this check occurs after save, if the user enters a value then we won't update.
+
+        default_email = get_action_needed_reason_default_email(obj, obj.action_needed_reason)
+        if obj.action_needed_reason_email:
+            emails = get_all_action_needed_reason_emails(obj)
+            is_custom_email = obj.action_needed_reason_email not in emails.values()
+            if not is_custom_email:
+                obj.action_needed_reason_email = default_email
+        else:
+                obj.action_needed_reason_email = default_email
+        return obj
+
+    def _handle_rejection_reason(self, request, obj, original_obj):
+        # Track the fact that we sent out an email
+        request.session["rejection_reason_email_sent"] = True
+
+        # Set the rejection_reason_email to the default if nothing exists.
+        # Since this check occurs after save, if the user enters a value then we won't update.
+
+        default_email = get_rejection_reason_default_email(obj, obj.action_needed_reason)
+        if obj.rejection_reason_email:
+            emails = get_all_rejection_reason_emails(obj)
+            is_custom_email = obj.rejection_reason_email not in emails.values()
+            if not is_custom_email:
+                obj.rejection_reason_email = default_email
+        else:
+            obj.rejection_reason_email = default_email
+        return obj
+
     def _check_for_valid_email(self, request, obj):
         """Certain emails are whitelisted in non-production environments,
         so we should display that information using this function.
diff --git a/src/registrar/assets/js/get-gov-admin.js b/src/registrar/assets/js/get-gov-admin.js
index 7e3c086c4..7a7b63ba4 100644
--- a/src/registrar/assets/js/get-gov-admin.js
+++ b/src/registrar/assets/js/get-gov-admin.js
@@ -500,83 +500,41 @@ function initializeWidgetOnList(list, parentId) {
     }
 })();
 
+class CustomizableEmailBase {
+    constructor(dropdown, textarea, textareaPlaceholder, directEditButton, modalTrigger, modalConfirm, formLabel, lastSentEmailContent, apiUrl) {
+        this.dropdown = dropdown;
+        this.textarea = textarea;
+        this.textareaPlaceholder = textareaPlaceholder;
+        this.directEditButton = directEditButton;
+        this.modalTrigger = modalTrigger;
+        this.modalConfirm = modalConfirm;
+        this.formLabel = formLabel;
+        this.lastSentEmailContent = lastSentEmailContent;
+        this.apiUrl = apiUrl;
 
-/** An IIFE that hooks to the show/hide button underneath action needed reason.
- * This shows the auto generated email on action needed reason.
-*/
-document.addEventListener('DOMContentLoaded', function() {
-    const dropdown = document.getElementById("id_action_needed_reason");
-    const textarea = document.getElementById("id_action_needed_reason_email")
-    const domainRequestId = dropdown ? document.getElementById("domain_request_id").value : null
-    const textareaPlaceholder = document.querySelector(".field-action_needed_reason_email__placeholder");
-    const directEditButton = document.querySelector('.field-action_needed_reason_email__edit');
-    const modalTrigger = document.querySelector('.field-action_needed_reason_email__modal-trigger');
-    const modalConfirm = document.getElementById('confirm-edit-email');
-    const formLabel = document.querySelector('label[for="id_action_needed_reason_email"]');
-    let lastSentEmailContent = document.getElementById("last-sent-email-content");
-    const initialDropdownValue = dropdown ? dropdown.value : null;
-    const initialEmailValue = textarea.value;
+        this.domainRequestId = this.dropdown ? document.getElementById("domain_request_id").value : null
+        this.initialDropdownValue = this.dropdown ? this.dropdown.value : null;
+        this.initialEmailValue = this.textarea ? this.textarea.value : null;
 
-    // We will use the const to control the modal
-    let isEmailAlreadySentConst = lastSentEmailContent.value.replace(/\s+/g, '') === textarea.value.replace(/\s+/g, '');
-    // We will use the function to control the label and help
-    function isEmailAlreadySent() {
-        return lastSentEmailContent.value.replace(/\s+/g, '') === textarea.value.replace(/\s+/g, '');
-    }
-
-    if (!dropdown || !textarea || !domainRequestId || !formLabel || !modalConfirm) return;
-    const apiUrl = document.getElementById("get-action-needed-email-for-user-json").value;
-
-    function updateUserInterface(reason) {
-        if (!reason) {
-            // No reason selected, we will set the label to "Email", show the "Make a selection" placeholder, hide the trigger, textarea, hide the help text
-            formLabel.innerHTML = "Email:";
-            textareaPlaceholder.innerHTML = "Select an action needed reason to see email";
-            showElement(textareaPlaceholder);
-            hideElement(directEditButton);
-            hideElement(modalTrigger);
-            hideElement(textarea);
-        } else if (reason === 'other') {
-            // 'Other' selected, we will set the label to "Email", show the "No email will be sent" placeholder, hide the trigger, textarea, hide the help text
-            formLabel.innerHTML = "Email:";
-            textareaPlaceholder.innerHTML = "No email will be sent";
-            showElement(textareaPlaceholder);
-            hideElement(directEditButton);
-            hideElement(modalTrigger);
-            hideElement(textarea);
-        } else {
-            // A triggering selection is selected, all hands on board:
-            textarea.setAttribute('readonly', true);
-            showElement(textarea);
-            hideElement(textareaPlaceholder);
-
-            if (isEmailAlreadySentConst) {
-                hideElement(directEditButton);
-                showElement(modalTrigger);
-            } else {
-                showElement(directEditButton);
-                hideElement(modalTrigger);
-            }
-            if (isEmailAlreadySent()) {
-                formLabel.innerHTML = "Email sent to creator:";
-            } else {
-                formLabel.innerHTML = "Email:";
-            }
+        this.isEmailAlreadySentConst;
+        if (lastSentEmailContent && textarea) {
+            this.isEmailAlreadySentConst = lastSentEmailContent.value.replace(/\s+/g, '') === textarea.value.replace(/\s+/g, '');
         }
     }
 
-    // Initialize UI
-    updateUserInterface(dropdown.value);
-
-    dropdown.addEventListener("change", function() {
-        const reason = dropdown.value;
-        // Update the UI
-        updateUserInterface(reason);
-        if (reason && reason !== "other") {
-            // If it's not the initial value
-            if (initialDropdownValue !== dropdown.value || initialEmailValue !== textarea.value) {
+    initializeDropdown(errorMessage) {
+        this.dropdown.addEventListener("change", () => {
+            console.log(this.dropdown)
+            let reason = this.dropdown.value;
+            if (this.initialDropdownValue !== this.dropdown.value || this.initialEmailValue !== this.textarea.value) {
+                let searchParams = new URLSearchParams(
+                    {
+                        "reason": reason,
+                        "domain_request_id": this.domainRequestId,
+                    }
+                );
                 // Replace the email content
-                fetch(`${apiUrl}?reason=${reason}&domain_request_id=${domainRequestId}`)
+                fetch(`${this.apiUrl}?${searchParams.toString()}`)
                 .then(response => {
                     return response.json().then(data => data);
                 })
@@ -584,30 +542,174 @@ document.addEventListener('DOMContentLoaded', function() {
                     if (data.error) {
                         console.error("Error in AJAX call: " + data.error);
                     }else {
-                        textarea.value = data.action_needed_email;
+                        this.textarea.value = data.action_needed_email;
                     }
-                    updateUserInterface(reason);
+                    this.updateUserInterface(reason);
                 })
                 .catch(error => {
-                    console.error("Error action needed email: ", error)
+                    console.error(errorMessage, error)
                 });
             }
+        });
+    }
+
+    initializeModalConfirm() {
+        this.modalConfirm.addEventListener("click", () => {
+            this.textarea.removeAttribute('readonly');
+            this.textarea.focus();
+            hideElement(this.directEditButton);
+            hideElement(this.modalTrigger);  
+        });
+    }
+
+    initializeDirectEditButton() {
+        this.directEditButton.addEventListener("click", () => {
+            this.textarea.removeAttribute('readonly');
+            this.textarea.focus();
+            hideElement(this.directEditButton);
+            hideElement(this.modalTrigger);  
+        });
+    }
+
+    isEmailAlreadySent() {
+        return this.lastSentEmailContent.value.replace(/\s+/g, '') === this.textarea.value.replace(/\s+/g, '');
+    }
+
+    updateUserInterface(reason) {
+        if (!reason) {
+            // No reason selected, we will set the label to "Email", show the "Make a selection" placeholder, hide the trigger, textarea, hide the help text
+            this.showPlaceholder("Email:", "Select an action needed reason to see email");
+        } else if (reason === 'other') {
+            // 'Other' selected, we will set the label to "Email", show the "No email will be sent" placeholder, hide the trigger, textarea, hide the help text
+            this.showPlaceholder("Email:", "No email will be sent");
+        } else {
+            // A triggering selection is selected, all hands on board:
+            this.textarea.setAttribute('readonly', true);
+            showElement(this.textarea);
+            hideElement(this.textareaPlaceholder);
+
+            if (this.isEmailAlreadySentConst) {
+                hideElement(this.directEditButton);
+                showElement(this.modalTrigger);
+            } else {
+                showElement(this.directEditButton);
+                hideElement(this.modalTrigger);
+            }
+
+            if (this.isEmailAlreadySent()) {
+                this.formLabel.innerHTML = "Email sent to creator:";
+            } else {
+                this.formLabel.innerHTML = "Email:";
+            }
         }
+    }
 
-    });
+    showPlaceholder(formLabelText, placeholderText) {
+        this.formLabel.innerHTML = formLabelText;
+        this.textareaPlaceholder.innerHTML = placeholderText;
+        showElement(this.textareaPlaceholder);
+        hideElement(this.directEditButton);
+        hideElement(this.modalTrigger);
+        hideElement(this.textarea);
+    }
+}
 
-    modalConfirm.addEventListener("click", () => {
-        textarea.removeAttribute('readonly');
-        textarea.focus();
-        hideElement(directEditButton);
-        hideElement(modalTrigger);  
-    });
-    directEditButton.addEventListener("click", () => {
-        textarea.removeAttribute('readonly');
-        textarea.focus();
-        hideElement(directEditButton);
-        hideElement(modalTrigger);  
-    });
+
+
+class customActionNeededEmail extends CustomizableEmailBase {
+    constructor() {
+        const dropdown = document.getElementById("id_action_needed_reason");
+        const textarea = document.getElementById("id_action_needed_reason_email")
+        const textareaPlaceholder = document.querySelector(".field-action_needed_reason_email__placeholder");
+        const directEditButton = document.querySelector('.field-action_needed_reason_email__edit');
+        const modalTrigger = document.querySelector('.field-action_needed_reason_email__modal-trigger');
+        const modalConfirm = document.getElementById('confirm-edit-email');
+        const formLabel = document.querySelector('label[for="id_action_needed_reason_email"]');
+        const lastSentEmailContent = document.getElementById("last-sent-email-content");
+
+        let apiContainer = document.getElementById("get-action-needed-email-for-user-json")
+        const apiUrl = apiContainer ? apiContainer.value : null;
+        super(
+            dropdown, 
+            textarea, 
+            textareaPlaceholder, 
+            directEditButton, 
+            modalTrigger, 
+            modalConfirm, 
+            formLabel, 
+            lastSentEmailContent, 
+            apiUrl
+        );
+    }
+
+    loadActionNeededEmail() {
+        this.updateUserInterface(this.dropdown.value);
+        this.initializeDropdown("Error when attempting to grab action needed email: ")
+        this.initializeModalConfirm()
+        this.initializeDirectEditButton()
+    }
+}
+
+/** An IIFE that hooks to the show/hide button underneath action needed reason.
+ * This shows the auto generated email on action needed reason.
+*/
+document.addEventListener('DOMContentLoaded', function() {
+    const customEmail = new customActionNeededEmail();
+    if (!customEmail.dropdown || !customEmail.textarea || !customEmail.domainRequestId || !customEmail.formLabel || !customEmail.modalConfirm){
+        return;
+    }
+
+    // Initialize UI
+    customEmail.loadActionNeededEmail()
+});
+
+
+class customRejectedEmail extends CustomizableEmailBase {
+    constructor() {
+        const dropdown = document.getElementById("id_rejection_reason");
+        const textarea = document.getElementById("id_rejection_reason_email")
+        const textareaPlaceholder = document.querySelector(".field-rejection_reason_email__placeholder");
+        const directEditButton = document.querySelector('.field-rejection_reason_email__edit');
+        const modalTrigger = document.querySelector('.field-rejection_reason_email__modal-trigger');
+        const modalConfirm = document.getElementById('confirm-edit-email');
+        const formLabel = document.querySelector('label[for="id_rejection_reason_email"]');
+        const lastSentEmailContent = document.getElementById("last-sent-email-content");
+
+        let apiContainer = document.getElementById("get-rejection-reason-email-for-user-json")
+        const apiUrl = apiContainer ? apiContainer.value : null;
+        super(
+            dropdown, 
+            textarea, 
+            textareaPlaceholder, 
+            directEditButton, 
+            modalTrigger, 
+            modalConfirm, 
+            formLabel, 
+            lastSentEmailContent, 
+            apiUrl
+        );
+    }
+
+    loadRejectedEmail() {
+        this.updateUserInterface(this.dropdown.value);
+        this.initializeDropdown("Error when attempting to grab rejected email: ")
+        this.initializeModalConfirm()
+        this.initializeDirectEditButton()
+    }
+}
+
+
+/** An IIFE that hooks to the show/hide button underneath rejected reason.
+ * This shows the auto generated email on action needed reason.
+*/
+document.addEventListener('DOMContentLoaded', function() {
+    const customEmail = new customRejectedEmail();
+    if (!customEmail.dropdown || !customEmail.textarea || !customEmail.domainRequestId || !customEmail.formLabel || !customEmail.modalConfirm){
+        return;
+    }
+
+    // Initialize UI
+    customEmail.loadRejectedEmail()
 });
 
 
diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index bb8693ac1..b1cc00bde 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -300,6 +300,11 @@ class DomainRequest(TimeStampedModel):
         blank=True,
     )
 
+    rejection_reason_email = models.TextField(
+        null=True,
+        blank=True,
+    )
+
     action_needed_reason = models.TextField(
         choices=ActionNeededReasons.choices,
         null=True,
@@ -798,6 +803,21 @@ class DomainRequest(TimeStampedModel):
         except EmailSendingError:
             logger.warning("Failed to send confirmation email", exc_info=True)
 
+    def _send_custom_status_update_email(self, email_content):
+        """Wrapper for `_send_status_update_email` that bcc's help@get.gov
+        and sends an email equivalent to the 'email_content' variable."""
+        if settings.IS_PRODUCTION:
+            bcc_address = settings.DEFAULT_FROM_EMAIL
+
+        self._send_status_update_email(
+            new_status="action needed",
+            email_template=f"emails/includes/custom_email.txt",
+            email_template_subject=f"emails/status_change_subject.txt",
+            bcc_address=bcc_address,
+            custom_email_content=email_content,
+            wrap_email=True,
+        )
+
     def investigator_exists_and_is_staff(self):
         """Checks if the current investigator is in a valid state for a state transition"""
         is_valid = True
@@ -901,7 +921,7 @@ class DomainRequest(TimeStampedModel):
         target=DomainRequestStatus.ACTION_NEEDED,
         conditions=[domain_is_not_active, investigator_exists_and_is_staff],
     )
-    def action_needed(self, send_email=True):
+    def action_needed(self):
         """Send back an domain request that is under investigation or rejected.
 
         This action is logged.
@@ -924,27 +944,7 @@ class DomainRequest(TimeStampedModel):
         # Send out an email if an action needed reason exists
         if self.action_needed_reason and self.action_needed_reason != self.ActionNeededReasons.OTHER:
             email_content = self.action_needed_reason_email
-            self._send_action_needed_reason_email(send_email, email_content)
-
-    def _send_action_needed_reason_email(self, send_email=True, email_content=None):
-        """Sends out an automatic email for each valid action needed reason provided"""
-
-        email_template_name = "custom_email.txt"
-        email_template_subject_name = f"{self.action_needed_reason}_subject.txt"
-
-        bcc_address = ""
-        if settings.IS_PRODUCTION:
-            bcc_address = settings.DEFAULT_FROM_EMAIL
-
-        self._send_status_update_email(
-            new_status="action needed",
-            email_template=f"emails/action_needed_reasons/{email_template_name}",
-            email_template_subject=f"emails/action_needed_reasons/{email_template_subject_name}",
-            send_email=send_email,
-            bcc_address=bcc_address,
-            custom_email_content=email_content,
-            wrap_email=True,
-        )
+            self._send_custom_status_update_email(email_content)
 
     @transition(
         field="status",
@@ -1051,6 +1051,11 @@ class DomainRequest(TimeStampedModel):
             "emails/status_change_rejected_subject.txt",
         )
 
+        # Send out an email if a rejection reason exists
+        if self.rejection_reason:
+            email_content = self.rejection_reason_email
+            self._send_custom_status_update_email(email_content)
+
     @transition(
         field="status",
         source=[
diff --git a/src/registrar/templates/emails/action_needed_reasons/custom_email.txt b/src/registrar/templates/emails/includes/custom_email.txt
similarity index 100%
rename from src/registrar/templates/emails/action_needed_reasons/custom_email.txt
rename to src/registrar/templates/emails/includes/custom_email.txt
diff --git a/src/registrar/templates/emails/includes/email_footer.txt b/src/registrar/templates/emails/includes/email_footer.txt
new file mode 100644
index 000000000..f10d82a91
--- /dev/null
+++ b/src/registrar/templates/emails/includes/email_footer.txt
@@ -0,0 +1,10 @@
+THANK YOU
+.Gov helps the public identify official, trusted information. Thank you for requesting a .gov domain.
+
+----------------------------------------------------------------
+
+The .gov team
+Contact us: <https://get.gov/contact/>
+Learn about .gov <https://get.gov>
+
+The .gov registry is a part of the Cybersecurity and Infrastructure Security Agency (CISA) <https://cisa.gov/>
\ No newline at end of file
diff --git a/src/registrar/templates/emails/includes/status_change_rejected_header.txt b/src/registrar/templates/emails/includes/status_change_rejected_header.txt
new file mode 100644
index 000000000..16b7c73a9
--- /dev/null
+++ b/src/registrar/templates/emails/includes/status_change_rejected_header.txt
@@ -0,0 +1,8 @@
+Hi, {{ recipient.first_name }}.
+
+Your .gov domain request has been rejected.
+
+DOMAIN REQUESTED: {{ domain_request.requested_domain.name }}
+REQUEST RECEIVED ON: {{ domain_request.last_submitted_date|date }}
+STATUS: Rejected
+----------------------------------------------------------------
\ No newline at end of file
diff --git a/src/registrar/templates/emails/rejection_reasons/contacts_not_verified.txt b/src/registrar/templates/emails/rejection_reasons/contacts_not_verified.txt
new file mode 100644
index 000000000..c35c82c2b
--- /dev/null
+++ b/src/registrar/templates/emails/rejection_reasons/contacts_not_verified.txt
@@ -0,0 +1,8 @@
+{% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
+{% include "emails/includes/status_change_rejected_header.html" %}
+REJECTION REASON
+Your domain request was rejected because we could not verify the organizational 
+contacts you provided. If you have questions or comments, reply to this email.
+
+{% include "emails/includes/email_footer.html" %}
+{% endautoescape %}
\ No newline at end of file
diff --git a/src/registrar/templates/emails/rejection_reasons/naming_not_met.txt b/src/registrar/templates/emails/rejection_reasons/naming_not_met.txt
new file mode 100644
index 000000000..3e57d579d
--- /dev/null
+++ b/src/registrar/templates/emails/rejection_reasons/naming_not_met.txt
@@ -0,0 +1,15 @@
+{% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
+{% include "emails/includes/status_change_rejected_header.html" %}
+REJECTION REASON
+Your domain request was rejected because it does not meet our naming requirements. 
+Domains should uniquely identify a government organization and be clear to the 
+general public. Learn more about naming requirements for your type of organization 
+<https://get.gov/domains/choosing/>. 
+
+
+YOU CAN SUBMIT A NEW REQUEST
+We encourage you to request a domain that meets our requirements. If you have 
+questions or want to discuss potential domain names, reply to this email.
+
+{% include "emails/includes/email_footer.html" %}
+{% endautoescape %}
\ No newline at end of file
diff --git a/src/registrar/templates/emails/rejection_reasons/org_has_domain.txt b/src/registrar/templates/emails/rejection_reasons/org_has_domain.txt
new file mode 100644
index 000000000..26757efd6
--- /dev/null
+++ b/src/registrar/templates/emails/rejection_reasons/org_has_domain.txt
@@ -0,0 +1,15 @@
+{% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
+{% include "emails/includes/status_change_rejected_header.html" %}
+REJECTION REASON
+Your domain request was rejected because {{ domain_request.organization_name }} has a .gov domain. Our 
+practice is to approve one domain per online service per government organization. We 
+evaluate additional requests on a case-by-case basis. You did not provide sufficient 
+justification for an additional domain. 
+
+Read more about our practice of approving one domain per online service 
+<https://get.gov/domains/before/#one-domain-per-service>. 
+
+If you have questions or comments, reply to this email.
+
+{% include "emails/includes/email_footer.html" %}
+{% endautoescape %}
\ No newline at end of file
diff --git a/src/registrar/templates/emails/rejection_reasons/org_not_eligible.txt b/src/registrar/templates/emails/rejection_reasons/org_not_eligible.txt
new file mode 100644
index 000000000..3c7de3f42
--- /dev/null
+++ b/src/registrar/templates/emails/rejection_reasons/org_not_eligible.txt
@@ -0,0 +1,14 @@
+{% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
+{% include "emails/includes/status_change_rejected_header.html" %}
+REJECTION REASON
+Your domain request was rejected because we determined that {{ domain_request.organization_name }} is not 
+eligible for a .gov domain. .Gov domains are only available to official U.S.-based 
+government organizations. 
+
+Learn more about eligibility for .gov domains 
+<https://get.gov/domains/eligibility/>.
+
+If you have questions or comments, reply to this email.
+
+{% include "emails/includes/email_footer.html" %}
+{% endautoescape %}
\ No newline at end of file
diff --git a/src/registrar/templates/emails/rejection_reasons/other.txt b/src/registrar/templates/emails/rejection_reasons/other.txt
new file mode 100644
index 000000000..6835a45e0
--- /dev/null
+++ b/src/registrar/templates/emails/rejection_reasons/other.txt
@@ -0,0 +1,15 @@
+{% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
+{% include "emails/includes/status_change_rejected_header.html" %}
+YOU CAN SUBMIT A NEW REQUEST
+If your organization is eligible for a .gov domain and you meet our other requirements, you can submit a new request.
+
+Learn more about:
+- Eligibility for a .gov domain <https://get.gov/domains/eligibility>
+- Choosing a .gov domain name <https://get.gov/domains/choosing>
+
+
+NEED ASSISTANCE?
+If you have questions about this domain request or need help choosing a new domain name, reply to this email.
+
+{% include "emails/includes/email_footer.html" %}
+{% endautoescape %}
\ No newline at end of file
diff --git a/src/registrar/templates/emails/rejection_reasons/purpose_not_met.txt b/src/registrar/templates/emails/rejection_reasons/purpose_not_met.txt
new file mode 100644
index 000000000..57bce78f0
--- /dev/null
+++ b/src/registrar/templates/emails/rejection_reasons/purpose_not_met.txt
@@ -0,0 +1,15 @@
+{% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
+{% include "emails/includes/status_change_rejected_header.html" %}
+REJECTION REASON
+Your domain request was rejected because the purpose you provided did not meet our 
+requirements. You didn’t provide enough information about how you intend to use the 
+domain. 
+
+Learn more about:
+- Eligibility for a .gov domain <https://get.gov/domains/eligibility>
+- What you can and can’t do with .gov domains <https://get.gov/domains/requirements/>
+
+If you have questions or comments, reply to this email.
+
+{% include "emails/includes/email_footer.html" %}
+{% endautoescape %}
\ No newline at end of file
diff --git a/src/registrar/templates/emails/rejection_reasons/requestor_not_eligible.txt b/src/registrar/templates/emails/rejection_reasons/requestor_not_eligible.txt
new file mode 100644
index 000000000..7974c1690
--- /dev/null
+++ b/src/registrar/templates/emails/rejection_reasons/requestor_not_eligible.txt
@@ -0,0 +1,14 @@
+{% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
+{% include "emails/includes/status_change_rejected_header.html" %}
+REJECTION REASON
+Your domain request was rejected because we don’t believe you’re eligible to request a 
+.gov domain on behalf of {{ domain_request.organization_name }}. You must be a government employee, or be 
+working on behalf of a government organization, to request a .gov domain.
+
+
+DEMONSTRATE ELIGIBILITY
+If you can provide more information that demonstrates your eligibility, or you want to 
+discuss further, reply to this email.
+
+{% include "emails/includes/email_footer.html" %}
+{% endautoescape %}
\ No newline at end of file
diff --git a/src/registrar/templates/emails/status_change_rejected_subject.txt b/src/registrar/templates/emails/status_change_subject.txt
similarity index 100%
rename from src/registrar/templates/emails/status_change_rejected_subject.txt
rename to src/registrar/templates/emails/status_change_subject.txt
diff --git a/src/registrar/utility/admin_helpers.py b/src/registrar/utility/admin_helpers.py
index 0b99bba13..87edc2106 100644
--- a/src/registrar/utility/admin_helpers.py
+++ b/src/registrar/utility/admin_helpers.py
@@ -2,23 +2,66 @@ from registrar.models.domain_request import DomainRequest
 from django.template.loader import get_template
 
 
-def get_all_action_needed_reason_emails(request, domain_request):
+def get_all_action_needed_reason_emails(domain_request):
     """Returns a dictionary of every action needed reason and its associated email
     for this particular domain request."""
+    return _get_all_default_emails(
+        reasons=DomainRequest.ActionNeededReasons,
+        # Where the emails are stored. This assumes that it contains a list of .txt files with the reason. 
+        path_root="emails/action_needed_reasons",
+        # What reasons don't send out emails (none is handled automagically)
+        excluded_reasons=[DomainRequest.ActionNeededReasons.OTHER],
+        # Who to send it to, and from what domain request to reference
+        domain_request=domain_request
+    )
 
+
+def get_action_needed_reason_default_email(domain_request, action_needed_reason):
+    """Returns the default email associated with the given action needed reason"""
+    return _get_default_email(
+        domain_request, 
+        path_root="emails/rejection_reasons", 
+        reason=action_needed_reason, 
+        excluded_reasons=[DomainRequest.ActionNeededReasons.OTHER]
+    )
+
+
+def get_all_rejection_reason_emails(domain_request):
+    """Returns a dictionary of every rejection reason and its associated email
+    for this particular domain request."""
+    return _get_all_default_emails(
+        reasons=DomainRequest.RejectionReasons,
+        # Where the emails are stored. This assumes that it contains a list of .txt files with the reason.
+        path_root="emails/rejection_reasons",
+        # What reasons don't send out emails (none is handled automagically)
+        excluded_reasons=[DomainRequest.RejectionReasons.OTHER],
+        # Who to send it to, and from what domain request to reference
+        domain_request=domain_request
+    )
+
+
+def get_rejection_reason_default_email(domain_request, action_needed_reason):
+    """Returns the default email associated with the given rejection reason"""
+    return _get_default_email(
+        domain_request, 
+        path_root="emails/rejection_reasons", 
+        reason=action_needed_reason, 
+        excluded_reasons=[DomainRequest.RejectionReasons.OTHER]
+    )
+
+def _get_all_default_emails(reasons, path_root, excluded_reasons, domain_request):
     emails = {}
-    for action_needed_reason in domain_request.ActionNeededReasons:
-        # Map the action_needed_reason to its default email
-        emails[action_needed_reason.value] = get_action_needed_reason_default_email(
-            request, domain_request, action_needed_reason.value
+    for reason in reasons:
+        # Map the reason to its default email
+        emails[reason.value] = _get_default_email(
+            domain_request, path_root, reason, excluded_reasons
         )
 
-    return emails
+def _get_default_email(domain_request, path_root, reason, excluded_reasons=None):
+    if not reason:
+        return None
 
-
-def get_action_needed_reason_default_email(request, domain_request, action_needed_reason):
-    """Returns the default email associated with the given action needed reason"""
-    if not action_needed_reason or action_needed_reason == DomainRequest.ActionNeededReasons.OTHER:
+    if excluded_reasons and reason in excluded_reasons:
         return None
 
     recipient = domain_request.creator
@@ -26,7 +69,7 @@ def get_action_needed_reason_default_email(request, domain_request, action_neede
     context = {"domain_request": domain_request, "recipient": recipient}
 
     # Get the email body
-    template_path = f"emails/action_needed_reasons/{action_needed_reason}.txt"
+    template_path = f"{path_root}/{reason}.txt"
 
     email_body_text = get_template(template_path).render(context=context)
     email_body_text_cleaned = None
diff --git a/src/registrar/views/utility/api_views.py b/src/registrar/views/utility/api_views.py
index 6a6269baa..973f85855 100644
--- a/src/registrar/views/utility/api_views.py
+++ b/src/registrar/views/utility/api_views.py
@@ -90,5 +90,5 @@ def get_action_needed_email_for_user_json(request):
         return JsonResponse({"error": "No domain_request_id specified"}, status=404)
 
     domain_request = DomainRequest.objects.filter(id=domain_request_id).first()
-    emails = get_all_action_needed_reason_emails(request, domain_request)
+    emails = get_all_action_needed_reason_emails(domain_request)
     return JsonResponse({"action_needed_email": emails.get(reason)}, status=200)

From 48b9206ffc2ff992361c49f9a549defd37471057 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 27 Sep 2024 09:07:15 -0600
Subject: [PATCH 002/142] migration

---
 ...129_domainrequest_rejection_reason_email.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 src/registrar/migrations/0129_domainrequest_rejection_reason_email.py

diff --git a/src/registrar/migrations/0129_domainrequest_rejection_reason_email.py b/src/registrar/migrations/0129_domainrequest_rejection_reason_email.py
new file mode 100644
index 000000000..6aaef7f87
--- /dev/null
+++ b/src/registrar/migrations/0129_domainrequest_rejection_reason_email.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.10 on 2024-09-26 21:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("registrar", "0128_alter_domaininformation_state_territory_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="domainrequest",
+            name="rejection_reason_email",
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]

From 9b23262d61c094e307e2106e41e7f664f9fc0732 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 27 Sep 2024 11:34:45 -0600
Subject: [PATCH 003/142] Initial architecture for rejection reason

---
 src/registrar/admin.py                        |   2 +-
 src/registrar/assets/js/get-gov-admin.js      | 151 ++++++++++++++----
 src/registrar/config/urls.py                  |   6 +
 src/registrar/models/domain_request.py        |  54 +++++--
 .../admin/domain_request_change_form.html     |   2 +
 .../admin/includes/detail_table_fieldset.html |  88 ++++++++++
 .../contacts_not_verified.txt                 |   4 +-
 .../rejection_reasons/naming_not_met.txt      |   4 +-
 .../rejection_reasons/org_has_domain.txt      |   4 +-
 .../rejection_reasons/org_not_eligible.txt    |   4 +-
 .../emails/rejection_reasons/other.txt        |  15 --
 .../rejection_reasons/purpose_not_met.txt     |   4 +-
 .../requestor_not_eligible.txt                |   4 +-
 src/registrar/utility/admin_helpers.py        |  15 +-
 src/registrar/views/utility/api_views.py      |  31 +++-
 15 files changed, 306 insertions(+), 82 deletions(-)
 delete mode 100644 src/registrar/templates/emails/rejection_reasons/other.txt

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index b524f9d0a..a5066d3b0 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -1994,7 +1994,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         # Set the rejection_reason_email to the default if nothing exists.
         # Since this check occurs after save, if the user enters a value then we won't update.
 
-        default_email = get_rejection_reason_default_email(obj, obj.action_needed_reason)
+        default_email = get_rejection_reason_default_email(obj, obj.rejection_reason)
         if obj.rejection_reason_email:
             emails = get_all_rejection_reason_emails(obj)
             is_custom_email = obj.rejection_reason_email not in emails.values()
diff --git a/src/registrar/assets/js/get-gov-admin.js b/src/registrar/assets/js/get-gov-admin.js
index 7a7b63ba4..95b28660f 100644
--- a/src/registrar/assets/js/get-gov-admin.js
+++ b/src/registrar/assets/js/get-gov-admin.js
@@ -348,7 +348,7 @@ function initializeWidgetOnList(list, parentId) {
  * status select and to show/hide the rejection reason
 */
 (function (){
-    let rejectionReasonFormGroup = document.querySelector('.field-rejection_reason')
+    let rejectionReasonFormGroup = document.querySelector('.field-rejection_reason');
     // This is the "action needed reason" field
     let actionNeededReasonFormGroup = document.querySelector('.field-action_needed_reason');
     // This is the "Email" field
@@ -501,7 +501,7 @@ function initializeWidgetOnList(list, parentId) {
 })();
 
 class CustomizableEmailBase {
-    constructor(dropdown, textarea, textareaPlaceholder, directEditButton, modalTrigger, modalConfirm, formLabel, lastSentEmailContent, apiUrl) {
+    constructor(dropdown, textarea, textareaPlaceholder, directEditButton, modalTrigger, modalConfirm, formLabel, lastSentEmailContent, apiUrl, textAreaFormGroup, dropdownFormGroup) {
         this.dropdown = dropdown;
         this.textarea = textarea;
         this.textareaPlaceholder = textareaPlaceholder;
@@ -512,6 +512,11 @@ class CustomizableEmailBase {
         this.lastSentEmailContent = lastSentEmailContent;
         this.apiUrl = apiUrl;
 
+        // These fields are hidden on pageload
+        this.textAreaFormGroup = textAreaFormGroup;
+        this.dropdownFormGroup = dropdownFormGroup;
+        this.statusSelect = document.getElementById("id_status");
+
         this.domainRequestId = this.dropdown ? document.getElementById("domain_request_id").value : null
         this.initialDropdownValue = this.dropdown ? this.dropdown.value : null;
         this.initialEmailValue = this.textarea ? this.textarea.value : null;
@@ -520,11 +525,47 @@ class CustomizableEmailBase {
         if (lastSentEmailContent && textarea) {
             this.isEmailAlreadySentConst = lastSentEmailContent.value.replace(/\s+/g, '') === textarea.value.replace(/\s+/g, '');
         }
+
+    }
+
+    // Handle showing/hiding the related fields on page load.
+    initializeFormGroups(statusToCheck, sessionVariableName) {
+        let isStatus = statusSelect.value == statusToCheck;
+
+        // Initial handling of these groups.
+        updateFormGroupVisibility(isStatus, isStatus);
+
+        // Listen to change events and handle rejectionReasonFormGroup display, then save status to session storage
+        this.statusSelect.addEventListener('change', () => {
+            // Show the action needed field if the status is what we expect.
+            // Then track if its shown or hidden in our session cache.
+            isStatus = statusSelect.value == statusToCheck;
+            updateFormGroupVisibility(isStatus, isStatus);
+            addOrRemoveSessionBoolean(sessionVariableName, add=isStatus);
+        });
+        
+        // Listen to Back/Forward button navigation and handle rejectionReasonFormGroup display based on session storage
+        // When you navigate using forward/back after changing status but not saving, when you land back on the DA page the
+        // status select will say (for example) Rejected but the selected option can be something else. To manage the show/hide
+        // accurately for this edge case, we use cache and test for the back/forward navigation.
+        const observer = new PerformanceObserver((list) => {
+            list.getEntries().forEach((entry) => {
+            if (entry.type === "back_forward") {
+                let showTextAreaFormGroup = sessionStorage.getItem(sessionVariableName) !== null;
+                updateFormGroupVisibility(showTextAreaFormGroup, isStatus);
+            }
+            });
+        });
+        observer.observe({ type: "navigation" });
+    }
+
+    updateFormGroupVisibility(showTextAreaFormGroup, showdropDownFormGroup) {
+        showTextAreaFormGroup ? showElement(this.textAreaFormGroup) : hideElement(this.textAreaFormGroup);
+        showdropDownFormGroup ? showElement(this.dropdownFormGroup) : hideElement(this.dropdownFormGroup);
     }
 
     initializeDropdown(errorMessage) {
         this.dropdown.addEventListener("change", () => {
-            console.log(this.dropdown)
             let reason = this.dropdown.value;
             if (this.initialDropdownValue !== this.dropdown.value || this.initialEmailValue !== this.textarea.value) {
                 let searchParams = new URLSearchParams(
@@ -542,7 +583,7 @@ class CustomizableEmailBase {
                     if (data.error) {
                         console.error("Error in AJAX call: " + data.error);
                     }else {
-                        this.textarea.value = data.action_needed_email;
+                        this.textarea.value = data.email;
                     }
                     this.updateUserInterface(reason);
                 })
@@ -578,32 +619,47 @@ class CustomizableEmailBase {
     updateUserInterface(reason) {
         if (!reason) {
             // No reason selected, we will set the label to "Email", show the "Make a selection" placeholder, hide the trigger, textarea, hide the help text
-            this.showPlaceholder("Email:", "Select an action needed reason to see email");
+            this.showPlaceholderNoReason();
         } else if (reason === 'other') {
             // 'Other' selected, we will set the label to "Email", show the "No email will be sent" placeholder, hide the trigger, textarea, hide the help text
-            this.showPlaceholder("Email:", "No email will be sent");
+            this.showPlaceholderOtherReason();
         } else {
-            // A triggering selection is selected, all hands on board:
-            this.textarea.setAttribute('readonly', true);
-            showElement(this.textarea);
-            hideElement(this.textareaPlaceholder);
-
-            if (this.isEmailAlreadySentConst) {
-                hideElement(this.directEditButton);
-                showElement(this.modalTrigger);
-            } else {
-                showElement(this.directEditButton);
-                hideElement(this.modalTrigger);
-            }
-
-            if (this.isEmailAlreadySent()) {
-                this.formLabel.innerHTML = "Email sent to creator:";
-            } else {
-                this.formLabel.innerHTML = "Email:";
-            }
+            this.showReadonlyTextarea();
         }
     }
 
+    // Helper function that makes overriding the readonly textarea easy
+    showReadonlyTextarea() {
+        // A triggering selection is selected, all hands on board:
+        this.textarea.setAttribute('readonly', true);
+        showElement(this.textarea);
+        hideElement(this.textareaPlaceholder);
+
+        if (this.isEmailAlreadySentConst) {
+            hideElement(this.directEditButton);
+            showElement(this.modalTrigger);
+        } else {
+            showElement(this.directEditButton);
+            hideElement(this.modalTrigger);
+        }
+
+        if (this.isEmailAlreadySent()) {
+            this.formLabel.innerHTML = "Email sent to creator:";
+        } else {
+            this.formLabel.innerHTML = "Email:";
+        }
+    }
+
+    // Helper function that makes overriding the placeholder reason easy
+    showPlaceholderNoReason() {
+        this.showPlaceholder("Email:", "Select a reason to see email");
+    }
+
+    // Helper function that makes overriding the placeholder reason easy
+    showPlaceholderOtherReason() {
+        this.showPlaceholder("Email:", "No email will be sent");
+    }
+
     showPlaceholder(formLabelText, placeholderText) {
         this.formLabel.innerHTML = formLabelText;
         this.textareaPlaceholder.innerHTML = placeholderText;
@@ -629,6 +685,11 @@ class customActionNeededEmail extends CustomizableEmailBase {
 
         let apiContainer = document.getElementById("get-action-needed-email-for-user-json")
         const apiUrl = apiContainer ? apiContainer.value : null;
+
+        // These fields are hidden on pageload
+        const textAreaFormGroup = document.querySelector('.field-action_needed_reason');
+        const dropdownFormGroup = document.querySelector('.field-action_needed_reason_email');
+
         super(
             dropdown, 
             textarea, 
@@ -638,16 +699,32 @@ class customActionNeededEmail extends CustomizableEmailBase {
             modalConfirm, 
             formLabel, 
             lastSentEmailContent, 
-            apiUrl
+            apiUrl,
+            textAreaFormGroup,
+            dropdownFormGroup,
         );
+
     }
 
     loadActionNeededEmail() {
+        if (this.textAreaFormGroup && this.dropdownFormGroup) {
+            this.initializeFormGroups("action needed", "showActionNeededReason");
+        }
         this.updateUserInterface(this.dropdown.value);
         this.initializeDropdown("Error when attempting to grab action needed email: ")
         this.initializeModalConfirm()
         this.initializeDirectEditButton()
     }
+
+    // Overrides the placeholder text when no reason is selected
+    showPlaceholderNoReason() {
+        this.showPlaceholder("Email:", "Select an action needed reason to see email");
+    }
+
+    // Overrides the placeholder text when the reason other is selected
+    showPlaceholderOtherReason() {
+        this.showPlaceholder("Email:", "No email will be sent");
+    }
 }
 
 /** An IIFE that hooks to the show/hide button underneath action needed reason.
@@ -675,8 +752,13 @@ class customRejectedEmail extends CustomizableEmailBase {
         const formLabel = document.querySelector('label[for="id_rejection_reason_email"]');
         const lastSentEmailContent = document.getElementById("last-sent-email-content");
 
-        let apiContainer = document.getElementById("get-rejection-reason-email-for-user-json")
+        let apiContainer = document.getElementById("get-rejection-email-for-user-json");
         const apiUrl = apiContainer ? apiContainer.value : null;
+
+        // These fields are hidden on pageload
+        const textAreaFormGroup = document.querySelector('.field-rejection_reason');
+        const dropdownFormGroup = document.querySelector('.field-rejection_reason_email');
+
         super(
             dropdown, 
             textarea, 
@@ -686,16 +768,31 @@ class customRejectedEmail extends CustomizableEmailBase {
             modalConfirm, 
             formLabel, 
             lastSentEmailContent, 
-            apiUrl
+            apiUrl,
+            textAreaFormGroup,
+            dropdownFormGroup,
         );
     }
 
     loadRejectedEmail() {
+        if (this.textAreaFormGroup && this.dropdownFormGroup) {
+            this.initializeFormGroups("rejected", "showRejectionReason");
+        }
         this.updateUserInterface(this.dropdown.value);
         this.initializeDropdown("Error when attempting to grab rejected email: ")
         this.initializeModalConfirm()
         this.initializeDirectEditButton()
     }
+
+    // Overrides the placeholder text when no reason is selected
+    showPlaceholderNoReason() {
+        this.showPlaceholder("Email:", "Select a rejection reason to see email");
+    }
+
+    // Overrides the placeholder text when the reason other is selected
+    showPlaceholderOtherReason() {
+        this.showPlaceholder("Email:", "No email will be sent");
+    }
 }
 
 
diff --git a/src/registrar/config/urls.py b/src/registrar/config/urls.py
index 76c77955f..eace14d4a 100644
--- a/src/registrar/config/urls.py
+++ b/src/registrar/config/urls.py
@@ -29,6 +29,7 @@ from registrar.views.utility.api_views import (
     get_senior_official_from_federal_agency_json,
     get_federal_and_portfolio_types_from_federal_agency_json,
     get_action_needed_email_for_user_json,
+    get_rejection_email_for_user_json,
 )
 from registrar.views.domains_json import get_domains_json
 from registrar.views.utility import always_404
@@ -159,6 +160,11 @@ urlpatterns = [
         get_action_needed_email_for_user_json,
         name="get-action-needed-email-for-user-json",
     ),
+    path(
+        "admin/api/get-rejection-email-for-user-json/",
+        get_rejection_email_for_user_json,
+        name="get-rejection-email-for-user-json",
+    ),
     path("admin/", admin.site.urls),
     path(
         "reports/export_data_type_user/",
diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index b1cc00bde..c00953736 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -640,15 +640,16 @@ class DomainRequest(TimeStampedModel):
         # Actually updates the organization_type field
         org_type_helper.create_or_update_organization_type()
 
-    def _cache_status_and_action_needed_reason(self):
+    def _cache_status_and_status_reasons(self):
         """Maintains a cache of properties so we can avoid a DB call"""
         self._cached_action_needed_reason = self.action_needed_reason
+        self._cached_rejection_reason = self.rejection_reason
         self._cached_status = self.status
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         # Store original values for caching purposes. Used to compare them on save.
-        self._cache_status_and_action_needed_reason()
+        self._cache_status_and_status_reasons()
 
     def save(self, *args, **kwargs):
         """Save override for custom properties"""
@@ -662,21 +663,42 @@ class DomainRequest(TimeStampedModel):
 
         # Handle the action needed email.
         # An email is sent out when action_needed_reason is changed or added.
-        if self.action_needed_reason and self.status == self.DomainRequestStatus.ACTION_NEEDED:
-            self.sync_action_needed_reason()
+        if self.status == self.DomainRequestStatus.ACTION_NEEDED:
+            self.send_another_status_reason_email(
+                checked_status=self.DomainRequestStatus.ACTION_NEEDED,
+                old_reason=self._cached_action_needed_reason,
+                new_reason=self.action_needed_reason,
+                excluded_reasons=[DomainRequest.ActionNeededReasons.OTHER],
+                email_to_send=self.action_needed_reason_email
+            )
+        elif self.status == self.DomainRequestStatus.REJECTED:
+            self.send_another_status_reason_email(
+                checked_status=self.DomainRequestStatus.REJECTED,
+                old_reason=self._cached_rejection_reason,
+                new_reason=self.rejection_reason,
+                excluded_reasons=[DomainRequest.RejectionReasons.OTHER],
+                email_to_send=self.rejection_reason_email,
+            )
 
         # Update the cached values after saving
-        self._cache_status_and_action_needed_reason()
+        self._cache_status_and_status_reasons()
 
-    def sync_action_needed_reason(self):
-        """Checks if we need to send another action needed email"""
-        was_already_action_needed = self._cached_status == self.DomainRequestStatus.ACTION_NEEDED
-        reason_exists = self._cached_action_needed_reason is not None and self.action_needed_reason is not None
-        reason_changed = self._cached_action_needed_reason != self.action_needed_reason
-        if was_already_action_needed and reason_exists and reason_changed:
-            # We don't send emails out in state "other"
-            if self.action_needed_reason != self.ActionNeededReasons.OTHER:
-                self._send_action_needed_reason_email(email_content=self.action_needed_reason_email)
+    def send_another_status_reason_email(self, checked_status, old_reason, new_reason, excluded_reasons, email_to_send):
+        """Helper function to send out a second status email when the status remains the same,
+        but the reason has changed."""
+
+        # If the status itself changed, then we already sent out an email
+        if self._cached_status != checked_status or old_reason is None:
+            return
+
+        # We should never send an email if no reason was specified
+        # Additionally, Don't send out emails for reasons that shouldn't send them
+        if new_reason is None or self.action_needed_reason in excluded_reasons:
+            return 
+
+        # Only send out an email if the underlying email itself changed
+        if old_reason != new_reason:
+            self._send_custom_status_update_email(email_content=email_to_send)
 
     def sync_yes_no_form_fields(self):
         """Some yes/no forms use a db field to track whether it was checked or not.
@@ -806,9 +828,7 @@ class DomainRequest(TimeStampedModel):
     def _send_custom_status_update_email(self, email_content):
         """Wrapper for `_send_status_update_email` that bcc's help@get.gov
         and sends an email equivalent to the 'email_content' variable."""
-        if settings.IS_PRODUCTION:
-            bcc_address = settings.DEFAULT_FROM_EMAIL
-
+        bcc_address = settings.DEFAULT_FROM_EMAIL if settings.IS_PRODUCTION else ""
         self._send_status_update_email(
             new_status="action needed",
             email_template=f"emails/includes/custom_email.txt",
diff --git a/src/registrar/templates/django/admin/domain_request_change_form.html b/src/registrar/templates/django/admin/domain_request_change_form.html
index afdd9e6c2..8d58bc696 100644
--- a/src/registrar/templates/django/admin/domain_request_change_form.html
+++ b/src/registrar/templates/django/admin/domain_request_change_form.html
@@ -10,6 +10,8 @@
     <input id="has_audit_logs" class="display-none" value="{%if filtered_audit_log_entries %}true{% else %}false{% endif %}"/>
     {% url 'get-action-needed-email-for-user-json' as url %}
     <input id="get-action-needed-email-for-user-json" class="display-none" value="{{ url }}" />
+    {% url 'get-rejection-email-for-user-json' as url_2 %}
+    <input id="get-rejection-email-for-user-json" class="display-none" value="{{ url_2 }}" />
     {% for fieldset in adminform %}
         {% comment %}
         TODO: this will eventually need to be changed to something like this
diff --git a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
index 0540a7b60..8f4e65ddc 100644
--- a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
+++ b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
@@ -226,6 +226,94 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html)
         <input id="last-sent-email-content" class="display-none" value="None">
         {% endif %}
 
+    {% elif field.field.name == "rejection_reason_email" %}
+        <div class="margin-top-05 text-faded field-rejection_reason_email__placeholder">
+            &ndash;
+        </div>
+
+        {{ field.field }}
+
+        <button
+            aria-label="Edit email in textarea"
+            type="button"
+            class="usa-button usa-button--unstyled usa-button--dja-link-color usa-button__small-text margin-left-1 text-no-underline field-rejection_reason_email__edit flex-align-self-start"
+            ><img src="/public/admin/img/icon-changelink.svg" alt="Change"> Edit email</button
+        >
+        <a
+            href="#email-already-sent-modal"
+            class="usa-button usa-button--unstyled usa-button--dja-link-color usa-button__small-text text-no-underline margin-left-1 field-rejection_reason_email__modal-trigger flex-align-self-start"
+            aria-controls="email-already-sent-modal"
+            data-open-modal
+            ><img src="/public/admin/img/icon-changelink.svg" alt="Change"> Edit email</a
+        >
+        <div
+            class="usa-modal"
+            id="email-already-sent-modal"
+            aria-labelledby="Are you sure you want to edit this email?"
+            aria-describedby="The creator of this request already received an email"
+            >
+            <div class="usa-modal__content">
+                <div class="usa-modal__main">
+                    <h2 class="usa-modal__heading">
+                        Are you sure you want to edit this email?
+                    </h2>
+                    <div class="usa-prose">
+                        <p>
+                            The creator of this request already received an email for this status/reason: 
+                        </p>
+                        <ul>
+                            <li class="font-body-sm">Status: <b>Rejected</b></li>
+                            <li class="font-body-sm">Reason: <b>{{ original_object.get_rejection_reason_display }}</b></li>
+                        </ul>
+                        <p>
+                            If you edit this email's text, <b>the system will send another email</b> to
+                            the creator after you “save” your changes.  If you do not want to send another email, click “cancel” below.
+                        </p>
+                    </div>
+
+                    <div class="usa-modal__footer">
+                        <ul class="usa-button-group">
+                            <li class="usa-button-group__item">
+                                <button
+                                type="submit" 
+                                class="usa-button" 
+                                id="confirm-edit-email"
+                                data-close-modal
+                                >
+                                    Yes, continue editing
+                                </button>
+                            </li>
+                            <li class="usa-button-group__item">
+                                <button
+                                type="button"
+                                class="usa-button usa-button--unstyled padding-105 text-center"
+                                name="_cancel_edit_email"
+                                data-close-modal
+                                >
+                                    Cancel
+                                </button>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+                <button
+                type="button"
+                class="usa-button usa-modal__close"
+                aria-label="Close this window"
+                data-close-modal
+                >
+                    <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
+                        <use xlink:href="{%static 'img/sprite.svg'%}#close"></use>
+                    </svg>
+                </button>
+            </div>
+        </div>
+        
+        {% if original_object.rejection_reason_reason_email %}
+        <input id="last-sent-email-content" class="display-none" value="{{original_object.action_needed_reason_email}}">
+        {% else %}
+        <input id="last-sent-email-content" class="display-none" value="None">
+        {% endif %}
     {% else %}
         {{ field.field }}
     {% endif %}
diff --git a/src/registrar/templates/emails/rejection_reasons/contacts_not_verified.txt b/src/registrar/templates/emails/rejection_reasons/contacts_not_verified.txt
index c35c82c2b..525a3a00a 100644
--- a/src/registrar/templates/emails/rejection_reasons/contacts_not_verified.txt
+++ b/src/registrar/templates/emails/rejection_reasons/contacts_not_verified.txt
@@ -1,8 +1,8 @@
 {% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
-{% include "emails/includes/status_change_rejected_header.html" %}
+{% include "emails/includes/status_change_rejected_header.txt" %}
 REJECTION REASON
 Your domain request was rejected because we could not verify the organizational 
 contacts you provided. If you have questions or comments, reply to this email.
 
-{% include "emails/includes/email_footer.html" %}
+{% include "emails/includes/email_footer.txt" %}
 {% endautoescape %}
\ No newline at end of file
diff --git a/src/registrar/templates/emails/rejection_reasons/naming_not_met.txt b/src/registrar/templates/emails/rejection_reasons/naming_not_met.txt
index 3e57d579d..eb2e5e4c0 100644
--- a/src/registrar/templates/emails/rejection_reasons/naming_not_met.txt
+++ b/src/registrar/templates/emails/rejection_reasons/naming_not_met.txt
@@ -1,5 +1,5 @@
 {% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
-{% include "emails/includes/status_change_rejected_header.html" %}
+{% include "emails/includes/status_change_rejected_header.txt" %}
 REJECTION REASON
 Your domain request was rejected because it does not meet our naming requirements. 
 Domains should uniquely identify a government organization and be clear to the 
@@ -11,5 +11,5 @@ YOU CAN SUBMIT A NEW REQUEST
 We encourage you to request a domain that meets our requirements. If you have 
 questions or want to discuss potential domain names, reply to this email.
 
-{% include "emails/includes/email_footer.html" %}
+{% include "emails/includes/email_footer.txt" %}
 {% endautoescape %}
\ No newline at end of file
diff --git a/src/registrar/templates/emails/rejection_reasons/org_has_domain.txt b/src/registrar/templates/emails/rejection_reasons/org_has_domain.txt
index 26757efd6..175518ac3 100644
--- a/src/registrar/templates/emails/rejection_reasons/org_has_domain.txt
+++ b/src/registrar/templates/emails/rejection_reasons/org_has_domain.txt
@@ -1,5 +1,5 @@
 {% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
-{% include "emails/includes/status_change_rejected_header.html" %}
+{% include "emails/includes/status_change_rejected_header.txt" %}
 REJECTION REASON
 Your domain request was rejected because {{ domain_request.organization_name }} has a .gov domain. Our 
 practice is to approve one domain per online service per government organization. We 
@@ -11,5 +11,5 @@ Read more about our practice of approving one domain per online service
 
 If you have questions or comments, reply to this email.
 
-{% include "emails/includes/email_footer.html" %}
+{% include "emails/includes/email_footer.txt" %}
 {% endautoescape %}
\ No newline at end of file
diff --git a/src/registrar/templates/emails/rejection_reasons/org_not_eligible.txt b/src/registrar/templates/emails/rejection_reasons/org_not_eligible.txt
index 3c7de3f42..606184706 100644
--- a/src/registrar/templates/emails/rejection_reasons/org_not_eligible.txt
+++ b/src/registrar/templates/emails/rejection_reasons/org_not_eligible.txt
@@ -1,5 +1,5 @@
 {% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
-{% include "emails/includes/status_change_rejected_header.html" %}
+{% include "emails/includes/status_change_rejected_header.txt" %}
 REJECTION REASON
 Your domain request was rejected because we determined that {{ domain_request.organization_name }} is not 
 eligible for a .gov domain. .Gov domains are only available to official U.S.-based 
@@ -10,5 +10,5 @@ Learn more about eligibility for .gov domains
 
 If you have questions or comments, reply to this email.
 
-{% include "emails/includes/email_footer.html" %}
+{% include "emails/includes/email_footer.txt" %}
 {% endautoescape %}
\ No newline at end of file
diff --git a/src/registrar/templates/emails/rejection_reasons/other.txt b/src/registrar/templates/emails/rejection_reasons/other.txt
deleted file mode 100644
index 6835a45e0..000000000
--- a/src/registrar/templates/emails/rejection_reasons/other.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-{% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
-{% include "emails/includes/status_change_rejected_header.html" %}
-YOU CAN SUBMIT A NEW REQUEST
-If your organization is eligible for a .gov domain and you meet our other requirements, you can submit a new request.
-
-Learn more about:
-- Eligibility for a .gov domain <https://get.gov/domains/eligibility>
-- Choosing a .gov domain name <https://get.gov/domains/choosing>
-
-
-NEED ASSISTANCE?
-If you have questions about this domain request or need help choosing a new domain name, reply to this email.
-
-{% include "emails/includes/email_footer.html" %}
-{% endautoescape %}
\ No newline at end of file
diff --git a/src/registrar/templates/emails/rejection_reasons/purpose_not_met.txt b/src/registrar/templates/emails/rejection_reasons/purpose_not_met.txt
index 57bce78f0..d95a9e0b3 100644
--- a/src/registrar/templates/emails/rejection_reasons/purpose_not_met.txt
+++ b/src/registrar/templates/emails/rejection_reasons/purpose_not_met.txt
@@ -1,5 +1,5 @@
 {% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
-{% include "emails/includes/status_change_rejected_header.html" %}
+{% include "emails/includes/status_change_rejected_header.txt" %}
 REJECTION REASON
 Your domain request was rejected because the purpose you provided did not meet our 
 requirements. You didn’t provide enough information about how you intend to use the 
@@ -11,5 +11,5 @@ Learn more about:
 
 If you have questions or comments, reply to this email.
 
-{% include "emails/includes/email_footer.html" %}
+{% include "emails/includes/email_footer.txt" %}
 {% endautoescape %}
\ No newline at end of file
diff --git a/src/registrar/templates/emails/rejection_reasons/requestor_not_eligible.txt b/src/registrar/templates/emails/rejection_reasons/requestor_not_eligible.txt
index 7974c1690..deeb2d9da 100644
--- a/src/registrar/templates/emails/rejection_reasons/requestor_not_eligible.txt
+++ b/src/registrar/templates/emails/rejection_reasons/requestor_not_eligible.txt
@@ -1,5 +1,5 @@
 {% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
-{% include "emails/includes/status_change_rejected_header.html" %}
+{% include "emails/includes/status_change_rejected_header.txt" %}
 REJECTION REASON
 Your domain request was rejected because we don’t believe you’re eligible to request a 
 .gov domain on behalf of {{ domain_request.organization_name }}. You must be a government employee, or be 
@@ -10,5 +10,5 @@ DEMONSTRATE ELIGIBILITY
 If you can provide more information that demonstrates your eligibility, or you want to 
 discuss further, reply to this email.
 
-{% include "emails/includes/email_footer.html" %}
+{% include "emails/includes/email_footer.txt" %}
 {% endautoescape %}
\ No newline at end of file
diff --git a/src/registrar/utility/admin_helpers.py b/src/registrar/utility/admin_helpers.py
index 87edc2106..20760164e 100644
--- a/src/registrar/utility/admin_helpers.py
+++ b/src/registrar/utility/admin_helpers.py
@@ -19,9 +19,9 @@ def get_all_action_needed_reason_emails(domain_request):
 def get_action_needed_reason_default_email(domain_request, action_needed_reason):
     """Returns the default email associated with the given action needed reason"""
     return _get_default_email(
-        domain_request, 
-        path_root="emails/rejection_reasons", 
-        reason=action_needed_reason, 
+        domain_request,
+        path_root="emails/action_needed_reasons",
+        reason=action_needed_reason,
         excluded_reasons=[DomainRequest.ActionNeededReasons.OTHER]
     )
 
@@ -40,12 +40,12 @@ def get_all_rejection_reason_emails(domain_request):
     )
 
 
-def get_rejection_reason_default_email(domain_request, action_needed_reason):
+def get_rejection_reason_default_email(domain_request, rejection_reason):
     """Returns the default email associated with the given rejection reason"""
     return _get_default_email(
-        domain_request, 
-        path_root="emails/rejection_reasons", 
-        reason=action_needed_reason, 
+        domain_request,
+        path_root="emails/rejection_reasons",
+        reason=rejection_reason,
         excluded_reasons=[DomainRequest.RejectionReasons.OTHER]
     )
 
@@ -56,6 +56,7 @@ def _get_all_default_emails(reasons, path_root, excluded_reasons, domain_request
         emails[reason.value] = _get_default_email(
             domain_request, path_root, reason, excluded_reasons
         )
+    return emails
 
 def _get_default_email(domain_request, path_root, reason, excluded_reasons=None):
     if not reason:
diff --git a/src/registrar/views/utility/api_views.py b/src/registrar/views/utility/api_views.py
index 973f85855..bef6e5017 100644
--- a/src/registrar/views/utility/api_views.py
+++ b/src/registrar/views/utility/api_views.py
@@ -4,7 +4,7 @@ from django.forms.models import model_to_dict
 from registrar.models import FederalAgency, SeniorOfficial, DomainRequest
 from django.contrib.admin.views.decorators import staff_member_required
 from django.contrib.auth.decorators import login_required
-from registrar.utility.admin_helpers import get_all_action_needed_reason_emails
+from registrar.utility.admin_helpers import get_action_needed_reason_default_email, get_rejection_reason_default_email
 from registrar.models.portfolio import Portfolio
 from registrar.utility.constants import BranchChoices
 
@@ -90,5 +90,30 @@ def get_action_needed_email_for_user_json(request):
         return JsonResponse({"error": "No domain_request_id specified"}, status=404)
 
     domain_request = DomainRequest.objects.filter(id=domain_request_id).first()
-    emails = get_all_action_needed_reason_emails(domain_request)
-    return JsonResponse({"action_needed_email": emails.get(reason)}, status=200)
+
+    email = get_action_needed_reason_default_email(domain_request, reason)
+    return JsonResponse({"email": email}, status=200)
+
+
+@login_required
+@staff_member_required
+def get_rejection_email_for_user_json(request):
+    """Returns a default rejection email for a given user"""
+
+    # This API is only accessible to admins and analysts
+    superuser_perm = request.user.has_perm("registrar.full_access_permission")
+    analyst_perm = request.user.has_perm("registrar.analyst_access_permission")
+    if not request.user.is_authenticated or not any([analyst_perm, superuser_perm]):
+        return JsonResponse({"error": "You do not have access to this resource"}, status=403)
+
+    reason = request.GET.get("reason")
+    domain_request_id = request.GET.get("domain_request_id")
+    if not reason:
+        return JsonResponse({"error": "No reason specified"}, status=404)
+
+    if not domain_request_id:
+        return JsonResponse({"error": "No domain_request_id specified"}, status=404)
+
+    domain_request = DomainRequest.objects.filter(id=domain_request_id).first()
+    email = get_rejection_reason_default_email(domain_request, reason)
+    return JsonResponse({"email": email}, status=200)

From 1ce0724d3401358dbb94765c6be2d2d21e6d0171 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 27 Sep 2024 11:52:47 -0600
Subject: [PATCH 004/142] Cleanup + send email logic

---
 src/registrar/assets/js/get-gov-admin.js      | 78 ++-----------------
 src/registrar/models/domain_request.py        |  6 --
 .../admin/includes/detail_table_fieldset.html |  8 +-
 src/registrar/utility/email.py                |  2 +-
 4 files changed, 13 insertions(+), 81 deletions(-)

diff --git a/src/registrar/assets/js/get-gov-admin.js b/src/registrar/assets/js/get-gov-admin.js
index 95b28660f..17304ce97 100644
--- a/src/registrar/assets/js/get-gov-admin.js
+++ b/src/registrar/assets/js/get-gov-admin.js
@@ -344,69 +344,6 @@ function initializeWidgetOnList(list, parentId) {
     }
 }
 
-/** An IIFE for admin in DjangoAdmin to listen to changes on the domain request
- * status select and to show/hide the rejection reason
-*/
-(function (){
-    let rejectionReasonFormGroup = document.querySelector('.field-rejection_reason');
-    // This is the "action needed reason" field
-    let actionNeededReasonFormGroup = document.querySelector('.field-action_needed_reason');
-    // This is the "Email" field
-    let actionNeededReasonEmailFormGroup = document.querySelector('.field-action_needed_reason_email')
-
-    if (rejectionReasonFormGroup && actionNeededReasonFormGroup && actionNeededReasonEmailFormGroup) {
-        let statusSelect = document.getElementById('id_status')
-        let isRejected = statusSelect.value == "rejected"
-        let isActionNeeded = statusSelect.value == "action needed"
-
-        // Initial handling of rejectionReasonFormGroup display
-        showOrHideObject(rejectionReasonFormGroup, show=isRejected)
-        showOrHideObject(actionNeededReasonFormGroup, show=isActionNeeded)
-        showOrHideObject(actionNeededReasonEmailFormGroup, show=isActionNeeded)
-
-        // Listen to change events and handle rejectionReasonFormGroup display, then save status to session storage
-        statusSelect.addEventListener('change', function() {
-            // Show the rejection reason field if the status is rejected.
-            // Then track if its shown or hidden in our session cache.
-            isRejected = statusSelect.value == "rejected"
-            showOrHideObject(rejectionReasonFormGroup, show=isRejected)
-            addOrRemoveSessionBoolean("showRejectionReason", add=isRejected)
-
-            isActionNeeded = statusSelect.value == "action needed"
-            showOrHideObject(actionNeededReasonFormGroup, show=isActionNeeded)
-            showOrHideObject(actionNeededReasonEmailFormGroup, show=isActionNeeded)
-            addOrRemoveSessionBoolean("showActionNeededReason", add=isActionNeeded)
-        });
-        
-        // Listen to Back/Forward button navigation and handle rejectionReasonFormGroup display based on session storage
-
-        // When you navigate using forward/back after changing status but not saving, when you land back on the DA page the
-        // status select will say (for example) Rejected but the selected option can be something else. To manage the show/hide
-        // accurately for this edge case, we use cache and test for the back/forward navigation.
-        const observer = new PerformanceObserver((list) => {
-            list.getEntries().forEach((entry) => {
-            if (entry.type === "back_forward") {
-                let showRejectionReason = sessionStorage.getItem("showRejectionReason") !== null
-                showOrHideObject(rejectionReasonFormGroup, show=showRejectionReason)
-
-                let showActionNeededReason = sessionStorage.getItem("showActionNeededReason") !== null
-                showOrHideObject(actionNeededReasonFormGroup, show=showActionNeededReason)
-                showOrHideObject(actionNeededReasonEmailFormGroup, show=isActionNeeded)
-            }
-            });
-        });
-        observer.observe({ type: "navigation" });
-    }
-
-    // Adds or removes the display-none class to object depending on the value of boolean show
-    function showOrHideObject(object, show){
-        if (show){
-            object.classList.remove("display-none");
-        }else {
-            object.classList.add("display-none");
-        }
-    }
-})();
 
 /** An IIFE for toggling the submit bar on domain request forms
 */
@@ -530,17 +467,17 @@ class CustomizableEmailBase {
 
     // Handle showing/hiding the related fields on page load.
     initializeFormGroups(statusToCheck, sessionVariableName) {
-        let isStatus = statusSelect.value == statusToCheck;
+        let isStatus = this.statusSelect.value == statusToCheck;
 
         // Initial handling of these groups.
-        updateFormGroupVisibility(isStatus, isStatus);
+        this.updateFormGroupVisibility(isStatus, isStatus);
 
         // Listen to change events and handle rejectionReasonFormGroup display, then save status to session storage
         this.statusSelect.addEventListener('change', () => {
             // Show the action needed field if the status is what we expect.
             // Then track if its shown or hidden in our session cache.
-            isStatus = statusSelect.value == statusToCheck;
-            updateFormGroupVisibility(isStatus, isStatus);
+            isStatus = this.statusSelect.value == statusToCheck;
+            this.updateFormGroupVisibility(isStatus, isStatus);
             addOrRemoveSessionBoolean(sessionVariableName, add=isStatus);
         });
         
@@ -552,7 +489,7 @@ class CustomizableEmailBase {
             list.getEntries().forEach((entry) => {
             if (entry.type === "back_forward") {
                 let showTextAreaFormGroup = sessionStorage.getItem(sessionVariableName) !== null;
-                updateFormGroupVisibility(showTextAreaFormGroup, isStatus);
+                this.updateFormGroupVisibility(showTextAreaFormGroup, isStatus);
             }
             });
         });
@@ -681,7 +618,7 @@ class customActionNeededEmail extends CustomizableEmailBase {
         const modalTrigger = document.querySelector('.field-action_needed_reason_email__modal-trigger');
         const modalConfirm = document.getElementById('confirm-edit-email');
         const formLabel = document.querySelector('label[for="id_action_needed_reason_email"]');
-        const lastSentEmailContent = document.getElementById("last-sent-email-content");
+        const lastSentEmailContent = document.getElementById("last-sent-action-needed-email-content");
 
         let apiContainer = document.getElementById("get-action-needed-email-for-user-json")
         const apiUrl = apiContainer ? apiContainer.value : null;
@@ -750,7 +687,7 @@ class customRejectedEmail extends CustomizableEmailBase {
         const modalTrigger = document.querySelector('.field-rejection_reason_email__modal-trigger');
         const modalConfirm = document.getElementById('confirm-edit-email');
         const formLabel = document.querySelector('label[for="id_rejection_reason_email"]');
-        const lastSentEmailContent = document.getElementById("last-sent-email-content");
+        const lastSentEmailContent = document.getElementById("last-sent-rejection-email-content");
 
         let apiContainer = document.getElementById("get-rejection-email-for-user-json");
         const apiUrl = apiContainer ? apiContainer.value : null;
@@ -776,6 +713,7 @@ class customRejectedEmail extends CustomizableEmailBase {
 
     loadRejectedEmail() {
         if (this.textAreaFormGroup && this.dropdownFormGroup) {
+            // TODO: fix this for rejected
             this.initializeFormGroups("rejected", "showRejectionReason");
         }
         this.updateUserInterface(this.dropdown.value);
diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index c00953736..72e0e4773 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -1065,12 +1065,6 @@ class DomainRequest(TimeStampedModel):
         if self.status == self.DomainRequestStatus.APPROVED:
             self.delete_and_clean_up_domain("reject")
 
-        self._send_status_update_email(
-            "action needed",
-            "emails/status_change_rejected.txt",
-            "emails/status_change_rejected_subject.txt",
-        )
-
         # Send out an email if a rejection reason exists
         if self.rejection_reason:
             email_content = self.rejection_reason_email
diff --git a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
index 8f4e65ddc..0bef5d10d 100644
--- a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
+++ b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
@@ -221,9 +221,9 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html)
         </div>
         
         {% if original_object.action_needed_reason_email %}
-        <input id="last-sent-email-content" class="display-none" value="{{original_object.action_needed_reason_email}}">
+        <input id="last-sent-action-needed-email-content" class="display-none" value="{{original_object.action_needed_reason_email}}">
         {% else %}
-        <input id="last-sent-email-content" class="display-none" value="None">
+        <input id="last-sent-action-needed-email-content" class="display-none" value="None">
         {% endif %}
 
     {% elif field.field.name == "rejection_reason_email" %}
@@ -310,9 +310,9 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html)
         </div>
         
         {% if original_object.rejection_reason_reason_email %}
-        <input id="last-sent-email-content" class="display-none" value="{{original_object.action_needed_reason_email}}">
+        <input id="last-sent-rejection-email-content" class="display-none" value="{{original_object.rejection_reason_email}}">
         {% else %}
-        <input id="last-sent-email-content" class="display-none" value="None">
+        <input id="last-sent-rejection-email-content" class="display-none" value="None">
         {% endif %}
     {% else %}
         {{ field.field }}
diff --git a/src/registrar/utility/email.py b/src/registrar/utility/email.py
index 5f8a93bd9..3f508fb96 100644
--- a/src/registrar/utility/email.py
+++ b/src/registrar/utility/email.py
@@ -78,7 +78,7 @@ def send_templated_email(
             # Wrap the email body to a maximum width of 80 characters per line.
             # Not all email clients support CSS to do this, and our .txt files require parsing.
             if wrap_email:
-                email_body = wrap_text_and_preserve_paragraphs(email_body, width=80)
+                email_body = wrap_text_and_preserve_paragraphs(email_body, width=110)
 
             ses_client.send_email(
                 FromEmailAddress=settings.DEFAULT_FROM_EMAIL,

From e37a95ee1ee2190d0316df989c76b80300fb978f Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 27 Sep 2024 11:56:17 -0600
Subject: [PATCH 005/142] Typo

---
 .../templates/django/admin/includes/detail_table_fieldset.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
index 0bef5d10d..38a0b97c7 100644
--- a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
+++ b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
@@ -309,7 +309,7 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html)
             </div>
         </div>
         
-        {% if original_object.rejection_reason_reason_email %}
+        {% if original_object.rejection_reason_email %}
         <input id="last-sent-rejection-email-content" class="display-none" value="{{original_object.rejection_reason_email}}">
         {% else %}
         <input id="last-sent-rejection-email-content" class="display-none" value="None">

From c084ec62f09a20af9d728b273a37b337efe9ac30 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 27 Sep 2024 12:45:50 -0600
Subject: [PATCH 006/142] check for page

---
 src/registrar/assets/js/get-gov-admin.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/registrar/assets/js/get-gov-admin.js b/src/registrar/assets/js/get-gov-admin.js
index 17304ce97..5d8328bf4 100644
--- a/src/registrar/assets/js/get-gov-admin.js
+++ b/src/registrar/assets/js/get-gov-admin.js
@@ -668,12 +668,13 @@ class customActionNeededEmail extends CustomizableEmailBase {
  * This shows the auto generated email on action needed reason.
 */
 document.addEventListener('DOMContentLoaded', function() {
-    const customEmail = new customActionNeededEmail();
-    if (!customEmail.dropdown || !customEmail.textarea || !customEmail.domainRequestId || !customEmail.formLabel || !customEmail.modalConfirm){
+    const domainRequestForm = document.getElementById("domainrequest_form");
+    if (!domainRequestForm) {
         return;
     }
 
     // Initialize UI
+    const customEmail = new customActionNeededEmail();
     customEmail.loadActionNeededEmail()
 });
 
@@ -738,12 +739,13 @@ class customRejectedEmail extends CustomizableEmailBase {
  * This shows the auto generated email on action needed reason.
 */
 document.addEventListener('DOMContentLoaded', function() {
-    const customEmail = new customRejectedEmail();
-    if (!customEmail.dropdown || !customEmail.textarea || !customEmail.domainRequestId || !customEmail.formLabel || !customEmail.modalConfirm){
+    const domainRequestForm = document.getElementById("domainrequest_form");
+    if (!domainRequestForm) {
         return;
     }
 
     // Initialize UI
+    const customEmail = new customRejectedEmail();
     customEmail.loadRejectedEmail()
 });
 

From ff5212fb272a0395545786f3e0746a7a17b8ce7c Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Mon, 30 Sep 2024 10:04:29 -0600
Subject: [PATCH 007/142] Remove unhelpful logic

---
 src/registrar/admin.py | 44 ------------------------------------------
 1 file changed, 44 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index a5066d3b0..b9204666b 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -1944,16 +1944,6 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         # Get the original domain request from the database.
         original_obj = models.DomainRequest.objects.get(pk=obj.pk)
 
-        # == Handle action_needed_reason == #
-        action_needed_reason_changed = obj.action_needed_reason != original_obj.action_needed_reason
-        if action_needed_reason_changed:
-            obj = self._handle_action_needed_reason(request, obj, original_obj)
-
-        # == Handle rejection_reason == #
-        rejection_reason_changed = obj.rejection_reason != original_obj.rejection_reason
-        if rejection_reason_changed:
-            obj = self._handle_rejection_reason(request, obj, original_obj)
-
         # == Handle allowed emails == #
         if obj.status in DomainRequest.get_statuses_that_send_emails() and not settings.IS_PRODUCTION:
             self._check_for_valid_email(request, obj)
@@ -1970,40 +1960,6 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
             if should_save:
                 return super().save_model(request, obj, form, change)
 
-    def _handle_action_needed_reason(self, request, obj, original_obj):
-        # Track the fact that we sent out an email
-        request.session["action_needed_email_sent"] = True
-
-        # Set the action_needed_reason_email to the default if nothing exists.
-        # Since this check occurs after save, if the user enters a value then we won't update.
-
-        default_email = get_action_needed_reason_default_email(obj, obj.action_needed_reason)
-        if obj.action_needed_reason_email:
-            emails = get_all_action_needed_reason_emails(obj)
-            is_custom_email = obj.action_needed_reason_email not in emails.values()
-            if not is_custom_email:
-                obj.action_needed_reason_email = default_email
-        else:
-                obj.action_needed_reason_email = default_email
-        return obj
-
-    def _handle_rejection_reason(self, request, obj, original_obj):
-        # Track the fact that we sent out an email
-        request.session["rejection_reason_email_sent"] = True
-
-        # Set the rejection_reason_email to the default if nothing exists.
-        # Since this check occurs after save, if the user enters a value then we won't update.
-
-        default_email = get_rejection_reason_default_email(obj, obj.rejection_reason)
-        if obj.rejection_reason_email:
-            emails = get_all_rejection_reason_emails(obj)
-            is_custom_email = obj.rejection_reason_email not in emails.values()
-            if not is_custom_email:
-                obj.rejection_reason_email = default_email
-        else:
-            obj.rejection_reason_email = default_email
-        return obj
-
     def _check_for_valid_email(self, request, obj):
         """Certain emails are whitelisted in non-production environments,
         so we should display that information using this function.

From 7a5eda065bc17e225088d662b097a4658adc4f14 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Mon, 30 Sep 2024 10:20:36 -0600
Subject: [PATCH 008/142] Fix back button bug

---
 src/registrar/assets/js/get-gov-admin.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/registrar/assets/js/get-gov-admin.js b/src/registrar/assets/js/get-gov-admin.js
index 5d8328bf4..cbf2cf351 100644
--- a/src/registrar/assets/js/get-gov-admin.js
+++ b/src/registrar/assets/js/get-gov-admin.js
@@ -449,7 +449,7 @@ class CustomizableEmailBase {
         this.lastSentEmailContent = lastSentEmailContent;
         this.apiUrl = apiUrl;
 
-        // These fields are hidden on pageload
+        // These fields are hidden/shown on pageload depending on the current status
         this.textAreaFormGroup = textAreaFormGroup;
         this.dropdownFormGroup = dropdownFormGroup;
         this.statusSelect = document.getElementById("id_status");
@@ -459,8 +459,8 @@ class CustomizableEmailBase {
         this.initialEmailValue = this.textarea ? this.textarea.value : null;
 
         this.isEmailAlreadySentConst;
-        if (lastSentEmailContent && textarea) {
-            this.isEmailAlreadySentConst = lastSentEmailContent.value.replace(/\s+/g, '') === textarea.value.replace(/\s+/g, '');
+        if (this.lastSentEmailContent && this.textarea) {
+            this.isEmailAlreadySentConst = this.lastSentEmailContent.value.replace(/\s+/g, '') === this.textarea.value.replace(/\s+/g, '');
         }
 
     }
@@ -478,7 +478,7 @@ class CustomizableEmailBase {
             // Then track if its shown or hidden in our session cache.
             isStatus = this.statusSelect.value == statusToCheck;
             this.updateFormGroupVisibility(isStatus, isStatus);
-            addOrRemoveSessionBoolean(sessionVariableName, add=isStatus);
+            addOrRemoveSessionBoolean(sessionVariableName, isStatus);
         });
         
         // Listen to Back/Forward button navigation and handle rejectionReasonFormGroup display based on session storage
@@ -489,16 +489,16 @@ class CustomizableEmailBase {
             list.getEntries().forEach((entry) => {
             if (entry.type === "back_forward") {
                 let showTextAreaFormGroup = sessionStorage.getItem(sessionVariableName) !== null;
-                this.updateFormGroupVisibility(showTextAreaFormGroup, isStatus);
+                this.updateFormGroupVisibility(showTextAreaFormGroup, showTextAreaFormGroup);
             }
             });
         });
         observer.observe({ type: "navigation" });
     }
 
-    updateFormGroupVisibility(showTextAreaFormGroup, showdropDownFormGroup) {
+    updateFormGroupVisibility(showTextAreaFormGroup, showDropDownFormGroup) {
         showTextAreaFormGroup ? showElement(this.textAreaFormGroup) : hideElement(this.textAreaFormGroup);
-        showdropDownFormGroup ? showElement(this.dropdownFormGroup) : hideElement(this.dropdownFormGroup);
+        showDropDownFormGroup ? showElement(this.dropdownFormGroup) : hideElement(this.dropdownFormGroup);
     }
 
     initializeDropdown(errorMessage) {

From cfa1879909af49d502913d0ba4a94159949b1453 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Mon, 30 Sep 2024 12:33:08 -0600
Subject: [PATCH 009/142] cleanup

---
 src/registrar/assets/js/get-gov-admin.js | 11 ++++-------
 src/registrar/models/domain_request.py   |  4 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/registrar/assets/js/get-gov-admin.js b/src/registrar/assets/js/get-gov-admin.js
index cbf2cf351..f8d4d679d 100644
--- a/src/registrar/assets/js/get-gov-admin.js
+++ b/src/registrar/assets/js/get-gov-admin.js
@@ -644,9 +644,9 @@ class customActionNeededEmail extends CustomizableEmailBase {
     }
 
     loadActionNeededEmail() {
-        if (this.textAreaFormGroup && this.dropdownFormGroup) {
-            this.initializeFormGroups("action needed", "showActionNeededReason");
-        }
+        // Hide/show the email fields depending on the current status
+        this.initializeFormGroups("action needed", "showActionNeededReason");
+        // Setup the textarea, edit button, helper text
         this.updateUserInterface(this.dropdown.value);
         this.initializeDropdown("Error when attempting to grab action needed email: ")
         this.initializeModalConfirm()
@@ -713,10 +713,7 @@ class customRejectedEmail extends CustomizableEmailBase {
     }
 
     loadRejectedEmail() {
-        if (this.textAreaFormGroup && this.dropdownFormGroup) {
-            // TODO: fix this for rejected
-            this.initializeFormGroups("rejected", "showRejectionReason");
-        }
+        this.initializeFormGroups("rejected", "showRejectionReason");
         this.updateUserInterface(this.dropdown.value);
         this.initializeDropdown("Error when attempting to grab rejected email: ")
         this.initializeModalConfirm()
diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index 72e0e4773..3ccb490a9 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -693,8 +693,8 @@ class DomainRequest(TimeStampedModel):
 
         # We should never send an email if no reason was specified
         # Additionally, Don't send out emails for reasons that shouldn't send them
-        if new_reason is None or self.action_needed_reason in excluded_reasons:
-            return 
+        if new_reason is None or new_reason in excluded_reasons:
+            return
 
         # Only send out an email if the underlying email itself changed
         if old_reason != new_reason:

From 7cc5231cc0a70646b7569147307e4956382ae675 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Mon, 30 Sep 2024 14:35:22 -0600
Subject: [PATCH 010/142] cleanup

---
 src/registrar/assets/js/get-gov-admin.js | 191 ++++++++++++-----------
 src/registrar/models/domain_request.py   |  52 +++---
 2 files changed, 128 insertions(+), 115 deletions(-)

diff --git a/src/registrar/assets/js/get-gov-admin.js b/src/registrar/assets/js/get-gov-admin.js
index f8d4d679d..1886b9292 100644
--- a/src/registrar/assets/js/get-gov-admin.js
+++ b/src/registrar/assets/js/get-gov-admin.js
@@ -437,23 +437,46 @@ function initializeWidgetOnList(list, parentId) {
     }
 })();
 
+
 class CustomizableEmailBase {
-    constructor(dropdown, textarea, textareaPlaceholder, directEditButton, modalTrigger, modalConfirm, formLabel, lastSentEmailContent, apiUrl, textAreaFormGroup, dropdownFormGroup) {
-        this.dropdown = dropdown;
-        this.textarea = textarea;
-        this.textareaPlaceholder = textareaPlaceholder;
-        this.directEditButton = directEditButton;
-        this.modalTrigger = modalTrigger;
-        this.modalConfirm = modalConfirm;
-        this.formLabel = formLabel;
-        this.lastSentEmailContent = lastSentEmailContent;
-        this.apiUrl = apiUrl;
+
+    /**
+     * @param {Object} config - must contain the following:
+     * @property {HTMLElement} dropdown - The dropdown element.
+     * @property {HTMLElement} textarea - The textarea element.
+     * @property {HTMLElement} textareaPlaceholder - The placeholder for the textarea.
+     * @property {HTMLElement} directEditButton - The button to directly edit the email.
+     * @property {HTMLElement} modalTrigger - The trigger for the modal.
+     * @property {HTMLElement} modalConfirm - The confirm button in the modal.
+     * @property {HTMLElement} formLabel - The label for the form.
+     * @property {HTMLElement} lastSentEmailContent - The last sent email content element.
+     * @property {HTMLElement} textAreaFormGroup - The form group for the textarea.
+     * @property {HTMLElement} dropdownFormGroup - The form group for the dropdown.
+     * @property {string} apiUrl - The API URL for fetching email content.
+     * @property {string} statusToCheck - The status to check against. Used for show/hide on textAreaFormGroup/dropdownFormGroup.
+     * @property {string} sessionVariableName - The session variable name. Used for show/hide on textAreaFormGroup/dropdownFormGroup.
+     * @property {string} apiErrorMessage - The error message that the ajax call returns.
+     */
+    constructor(config) {        
+        this.dropdown = config.dropdown;
+        this.textarea = config.textarea;
+        this.textareaPlaceholder = config.textareaPlaceholder;
+        this.directEditButton = config.directEditButton;
+        this.modalTrigger = config.modalTrigger;
+        this.modalConfirm = config.modalConfirm;
+        this.formLabel = config.formLabel;
+        this.lastSentEmailContent = config.lastSentEmailContent;
+        this.apiUrl = config.apiUrl;
+        this.apiErrorMessage = config.apiErrorMessage;
 
         // These fields are hidden/shown on pageload depending on the current status
-        this.textAreaFormGroup = textAreaFormGroup;
-        this.dropdownFormGroup = dropdownFormGroup;
-        this.statusSelect = document.getElementById("id_status");
+        this.textAreaFormGroup = config.textAreaFormGroup;
+        this.dropdownFormGroup = config.dropdownFormGroup;
+        this.statusToCheck = config.statusToCheck;
+        this.sessionVariableName = config.sessionVariableName;
 
+        // Non-configurable variables
+        this.statusSelect = document.getElementById("id_status");
         this.domainRequestId = this.dropdown ? document.getElementById("domain_request_id").value : null
         this.initialDropdownValue = this.dropdown ? this.dropdown.value : null;
         this.initialEmailValue = this.textarea ? this.textarea.value : null;
@@ -466,19 +489,19 @@ class CustomizableEmailBase {
     }
 
     // Handle showing/hiding the related fields on page load.
-    initializeFormGroups(statusToCheck, sessionVariableName) {
-        let isStatus = this.statusSelect.value == statusToCheck;
+    initializeFormGroups() {
+        let isStatus = this.statusSelect.value == this.statusToCheck;
 
         // Initial handling of these groups.
-        this.updateFormGroupVisibility(isStatus, isStatus);
+        this.updateFormGroupVisibility(isStatus);
 
         // Listen to change events and handle rejectionReasonFormGroup display, then save status to session storage
         this.statusSelect.addEventListener('change', () => {
             // Show the action needed field if the status is what we expect.
             // Then track if its shown or hidden in our session cache.
-            isStatus = this.statusSelect.value == statusToCheck;
-            this.updateFormGroupVisibility(isStatus, isStatus);
-            addOrRemoveSessionBoolean(sessionVariableName, isStatus);
+            isStatus = this.statusSelect.value == this.statusToCheck;
+            this.updateFormGroupVisibility(isStatus);
+            addOrRemoveSessionBoolean(this.sessionVariableName, isStatus);
         });
         
         // Listen to Back/Forward button navigation and handle rejectionReasonFormGroup display based on session storage
@@ -487,21 +510,26 @@ class CustomizableEmailBase {
         // accurately for this edge case, we use cache and test for the back/forward navigation.
         const observer = new PerformanceObserver((list) => {
             list.getEntries().forEach((entry) => {
-            if (entry.type === "back_forward") {
-                let showTextAreaFormGroup = sessionStorage.getItem(sessionVariableName) !== null;
-                this.updateFormGroupVisibility(showTextAreaFormGroup, showTextAreaFormGroup);
-            }
+                if (entry.type === "back_forward") {
+                    let showTextAreaFormGroup = sessionStorage.getItem(this.sessionVariableName) !== null;
+                    this.updateFormGroupVisibility(showTextAreaFormGroup);
+                }
             });
         });
         observer.observe({ type: "navigation" });
     }
 
-    updateFormGroupVisibility(showTextAreaFormGroup, showDropDownFormGroup) {
-        showTextAreaFormGroup ? showElement(this.textAreaFormGroup) : hideElement(this.textAreaFormGroup);
-        showDropDownFormGroup ? showElement(this.dropdownFormGroup) : hideElement(this.dropdownFormGroup);
+    updateFormGroupVisibility(showFormGroups) {
+        if (showFormGroups) {
+            showElement(this.textAreaFormGroup);
+            showElement(this.dropdownFormGroup);
+        }else {
+            hideElement(this.textAreaFormGroup);
+            hideElement(this.dropdownFormGroup);
+        }
     }
 
-    initializeDropdown(errorMessage) {
+    initializeDropdown() {
         this.dropdown.addEventListener("change", () => {
             let reason = this.dropdown.value;
             if (this.initialDropdownValue !== this.dropdown.value || this.initialEmailValue !== this.textarea.value) {
@@ -525,7 +553,7 @@ class CustomizableEmailBase {
                     this.updateUserInterface(reason);
                 })
                 .catch(error => {
-                    console.error(errorMessage, error)
+                    console.error(this.apiErrorMessage, error)
                 });
             }
         });
@@ -553,7 +581,7 @@ class CustomizableEmailBase {
         return this.lastSentEmailContent.value.replace(/\s+/g, '') === this.textarea.value.replace(/\s+/g, '');
     }
 
-    updateUserInterface(reason) {
+    updateUserInterface(reason=this.dropdown.value) {
         if (!reason) {
             // No reason selected, we will set the label to "Email", show the "Make a selection" placeholder, hide the trigger, textarea, hide the help text
             this.showPlaceholderNoReason();
@@ -611,46 +639,33 @@ class CustomizableEmailBase {
 
 class customActionNeededEmail extends CustomizableEmailBase {
     constructor() {
-        const dropdown = document.getElementById("id_action_needed_reason");
-        const textarea = document.getElementById("id_action_needed_reason_email")
-        const textareaPlaceholder = document.querySelector(".field-action_needed_reason_email__placeholder");
-        const directEditButton = document.querySelector('.field-action_needed_reason_email__edit');
-        const modalTrigger = document.querySelector('.field-action_needed_reason_email__modal-trigger');
-        const modalConfirm = document.getElementById('confirm-edit-email');
-        const formLabel = document.querySelector('label[for="id_action_needed_reason_email"]');
-        const lastSentEmailContent = document.getElementById("last-sent-action-needed-email-content");
-
-        let apiContainer = document.getElementById("get-action-needed-email-for-user-json")
-        const apiUrl = apiContainer ? apiContainer.value : null;
-
-        // These fields are hidden on pageload
-        const textAreaFormGroup = document.querySelector('.field-action_needed_reason');
-        const dropdownFormGroup = document.querySelector('.field-action_needed_reason_email');
-
-        super(
-            dropdown, 
-            textarea, 
-            textareaPlaceholder, 
-            directEditButton, 
-            modalTrigger, 
-            modalConfirm, 
-            formLabel, 
-            lastSentEmailContent, 
-            apiUrl,
-            textAreaFormGroup,
-            dropdownFormGroup,
-        );
-
+        const emailConfig = {
+            dropdown: document.getElementById("id_action_needed_reason"),
+            textarea: document.getElementById("id_action_needed_reason_email"),
+            textareaPlaceholder: document.querySelector(".field-action_needed_reason_email__placeholder"),
+            directEditButton: document.querySelector('.field-action_needed_reason_email__edit'),
+            modalTrigger: document.querySelector('.field-action_needed_reason_email__modal-trigger'),
+            modalConfirm: document.getElementById('confirm-edit-email'),
+            formLabel: document.querySelector('label[for="id_action_needed_reason_email"]'),
+            lastSentEmailContent: document.getElementById("last-sent-action-needed-email-content"),
+            apiUrl: document.getElementById("get-action-needed-email-for-user-json")?.value || null,
+            textAreaFormGroup: document.querySelector('.field-action_needed_reason'),
+            dropdownFormGroup: document.querySelector('.field-action_needed_reason_email'),
+            statusToCheck: "rejected",
+            sessionVariableName: "showRejectionReason",
+            apiErrorMessage: "Error when attempting to grab rejected email: "
+        }
+        super(emailConfig);
     }
 
     loadActionNeededEmail() {
         // Hide/show the email fields depending on the current status
-        this.initializeFormGroups("action needed", "showActionNeededReason");
+        this.initializeFormGroups();
         // Setup the textarea, edit button, helper text
-        this.updateUserInterface(this.dropdown.value);
-        this.initializeDropdown("Error when attempting to grab action needed email: ")
-        this.initializeModalConfirm()
-        this.initializeDirectEditButton()
+        this.updateUserInterface();
+        this.initializeDropdown();
+        this.initializeModalConfirm();
+        this.initializeDirectEditButton();
     }
 
     // Overrides the placeholder text when no reason is selected
@@ -681,40 +696,28 @@ document.addEventListener('DOMContentLoaded', function() {
 
 class customRejectedEmail extends CustomizableEmailBase {
     constructor() {
-        const dropdown = document.getElementById("id_rejection_reason");
-        const textarea = document.getElementById("id_rejection_reason_email")
-        const textareaPlaceholder = document.querySelector(".field-rejection_reason_email__placeholder");
-        const directEditButton = document.querySelector('.field-rejection_reason_email__edit');
-        const modalTrigger = document.querySelector('.field-rejection_reason_email__modal-trigger');
-        const modalConfirm = document.getElementById('confirm-edit-email');
-        const formLabel = document.querySelector('label[for="id_rejection_reason_email"]');
-        const lastSentEmailContent = document.getElementById("last-sent-rejection-email-content");
-
-        let apiContainer = document.getElementById("get-rejection-email-for-user-json");
-        const apiUrl = apiContainer ? apiContainer.value : null;
-
-        // These fields are hidden on pageload
-        const textAreaFormGroup = document.querySelector('.field-rejection_reason');
-        const dropdownFormGroup = document.querySelector('.field-rejection_reason_email');
-
-        super(
-            dropdown, 
-            textarea, 
-            textareaPlaceholder, 
-            directEditButton, 
-            modalTrigger, 
-            modalConfirm, 
-            formLabel, 
-            lastSentEmailContent, 
-            apiUrl,
-            textAreaFormGroup,
-            dropdownFormGroup,
-        );
+        const emailConfig = {
+            dropdown: document.getElementById("id_rejection_reason"),
+            textarea: document.getElementById("id_rejection_reason_email"),
+            textareaPlaceholder: document.querySelector(".field-rejection_reason_email__placeholder"),
+            directEditButton: document.querySelector('.field-rejection_reason_email__edit'),
+            modalTrigger: document.querySelector('.field-rejection_reason_email__modal-trigger'),
+            modalConfirm: document.getElementById('confirm-edit-email'),
+            formLabel: document.querySelector('label[for="id_rejection_reason_email"]'),
+            lastSentEmailContent: document.getElementById("last-sent-rejection-email-content"),
+            apiUrl: document.getElementById("get-rejection-email-for-user-json")?.value || null,
+            textAreaFormGroup: document.querySelector('.field-rejection_reason'),
+            dropdownFormGroup: document.querySelector('.field-rejection_reason_email'),
+            statusToCheck: "rejected",
+            sessionVariableName: "showRejectionReason",
+            errorMessage: "Error when attempting to grab rejected email: "
+        };
+        super(emailConfig);
     }
 
     loadRejectedEmail() {
         this.initializeFormGroups("rejected", "showRejectionReason");
-        this.updateUserInterface(this.dropdown.value);
+        this.updateUserInterface();
         this.initializeDropdown("Error when attempting to grab rejected email: ")
         this.initializeModalConfirm()
         this.initializeDirectEditButton()
diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index 3ccb490a9..ac353406d 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -661,39 +661,49 @@ class DomainRequest(TimeStampedModel):
 
         super().save(*args, **kwargs)
 
-        # Handle the action needed email.
-        # An email is sent out when action_needed_reason is changed or added.
-        if self.status == self.DomainRequestStatus.ACTION_NEEDED:
-            self.send_another_status_reason_email(
-                checked_status=self.DomainRequestStatus.ACTION_NEEDED,
-                old_reason=self._cached_action_needed_reason,
-                new_reason=self.action_needed_reason,
-                excluded_reasons=[DomainRequest.ActionNeededReasons.OTHER],
-                email_to_send=self.action_needed_reason_email
-            )
-        elif self.status == self.DomainRequestStatus.REJECTED:
-            self.send_another_status_reason_email(
-                checked_status=self.DomainRequestStatus.REJECTED,
-                old_reason=self._cached_rejection_reason,
-                new_reason=self.rejection_reason,
-                excluded_reasons=[DomainRequest.RejectionReasons.OTHER],
-                email_to_send=self.rejection_reason_email,
-            )
+        # Handle custom status emails.
+        # An email is sent out when a, for example, action_needed_reason is changed or added.
+        statuses_that_send_custom_emails = [self.DomainRequestStatus.ACTION_NEEDED, self.DomainRequestStatus.REJECTED]
+        if self.status in statuses_that_send_custom_emails:
+            self.send_another_status_reason_email(self.status)
 
         # Update the cached values after saving
         self._cache_status_and_status_reasons()
 
-    def send_another_status_reason_email(self, checked_status, old_reason, new_reason, excluded_reasons, email_to_send):
+    def send_another_status_reason_email(self, status):
         """Helper function to send out a second status email when the status remains the same,
         but the reason has changed."""
 
+        # Currently, we store all this information in three variables.
+        # When adding new reasons, this can be a lot to manage so we store it here
+        # in a centralized location. However, this may need to change if this scales.
+        status_information = {
+            self.DomainRequestStatus.ACTION_NEEDED: {
+                "cached_reason": self._cached_action_needed_reason,
+                "reason": self.action_needed_reason,
+                "email": self.action_needed_reason_email,
+                "excluded_reasons": [DomainRequest.ActionNeededReasons.OTHER],
+            },
+            self.DomainRequestStatus.REJECTED: {
+                "cached_reason": self._cached_rejection_reason,
+                "reason": self.rejection_reason,
+                "email": self.rejection_reason_email,
+                "excluded_reasons": [DomainRequest.RejectionReasons.OTHER],
+            }
+        }
+
+        current_status = status_information.get(status)
+        old_reason = status_information.get("cached_reason")
+        new_reason = status_information.get("reason")
+        email_to_send = status_information.get("email")
+
         # If the status itself changed, then we already sent out an email
-        if self._cached_status != checked_status or old_reason is None:
+        if self._cached_status != status or old_reason is None:
             return
 
         # We should never send an email if no reason was specified
         # Additionally, Don't send out emails for reasons that shouldn't send them
-        if new_reason is None or new_reason in excluded_reasons:
+        if new_reason is None or new_reason in current_status.get("excluded_reasons"):
             return
 
         # Only send out an email if the underlying email itself changed

From 6bb907c6bc84cd37b92fc0201e85e25f8711f850 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Mon, 30 Sep 2024 15:05:09 -0600
Subject: [PATCH 011/142] Simplify backend logic

---
 src/registrar/assets/js/get-gov-admin.js |  6 +-
 src/registrar/models/domain_request.py   | 70 ++++++++++--------------
 2 files changed, 32 insertions(+), 44 deletions(-)

diff --git a/src/registrar/assets/js/get-gov-admin.js b/src/registrar/assets/js/get-gov-admin.js
index 1886b9292..dbe7b01d3 100644
--- a/src/registrar/assets/js/get-gov-admin.js
+++ b/src/registrar/assets/js/get-gov-admin.js
@@ -651,9 +651,9 @@ class customActionNeededEmail extends CustomizableEmailBase {
             apiUrl: document.getElementById("get-action-needed-email-for-user-json")?.value || null,
             textAreaFormGroup: document.querySelector('.field-action_needed_reason'),
             dropdownFormGroup: document.querySelector('.field-action_needed_reason_email'),
-            statusToCheck: "rejected",
-            sessionVariableName: "showRejectionReason",
-            apiErrorMessage: "Error when attempting to grab rejected email: "
+            statusToCheck: "action needed",
+            sessionVariableName: "showActionNeededReason",
+            apiErrorMessage: "Error when attempting to grab action needed email: "
         }
         super(emailConfig);
     }
diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index ac353406d..2210ac9d9 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -665,12 +665,12 @@ class DomainRequest(TimeStampedModel):
         # An email is sent out when a, for example, action_needed_reason is changed or added.
         statuses_that_send_custom_emails = [self.DomainRequestStatus.ACTION_NEEDED, self.DomainRequestStatus.REJECTED]
         if self.status in statuses_that_send_custom_emails:
-            self.send_another_status_reason_email(self.status)
+            self.send_custom_status_update_email(self.status)
 
         # Update the cached values after saving
         self._cache_status_and_status_reasons()
 
-    def send_another_status_reason_email(self, status):
+    def send_custom_status_update_email(self, status):
         """Helper function to send out a second status email when the status remains the same,
         but the reason has changed."""
 
@@ -691,24 +691,29 @@ class DomainRequest(TimeStampedModel):
                 "excluded_reasons": [DomainRequest.RejectionReasons.OTHER],
             }
         }
+        status_info = status_information.get(status)
 
-        current_status = status_information.get(status)
-        old_reason = status_information.get("cached_reason")
-        new_reason = status_information.get("reason")
-        email_to_send = status_information.get("email")
-
-        # If the status itself changed, then we already sent out an email
-        if self._cached_status != status or old_reason is None:
+        # Don't send an email if there is nothing to send.
+        if status_info.get("email") is None:
+            logger.warning("send_custom_status_update_email() => Tried sending an empty email.")
             return
 
-        # We should never send an email if no reason was specified
-        # Additionally, Don't send out emails for reasons that shouldn't send them
-        if new_reason is None or new_reason in current_status.get("excluded_reasons"):
+        # We should never send an email if no reason was specified.
+        # Additionally, Don't send out emails for reasons that shouldn't send them.
+        if status_info.get("reason") is None or status_info.get("reason") in status_info.get("excluded_reasons"):
             return
 
-        # Only send out an email if the underlying email itself changed
-        if old_reason != new_reason:
-            self._send_custom_status_update_email(email_content=email_to_send)
+        # Only send out an email if the underlying reason itself changed or if no email was sent previously.
+        if status_info.get("cached_reason") != status_info.get("reason") or status_info.get("cached_reason") is None:
+            bcc_address = settings.DEFAULT_FROM_EMAIL if settings.IS_PRODUCTION else ""
+            self._send_status_update_email(
+                new_status="action needed",
+                email_template=f"emails/includes/custom_email.txt",
+                email_template_subject=f"emails/status_change_subject.txt",
+                bcc_address=bcc_address,
+                custom_email_content=status_info.get("email"),
+                wrap_email=True,
+            )
 
     def sync_yes_no_form_fields(self):
         """Some yes/no forms use a db field to track whether it was checked or not.
@@ -835,19 +840,6 @@ class DomainRequest(TimeStampedModel):
         except EmailSendingError:
             logger.warning("Failed to send confirmation email", exc_info=True)
 
-    def _send_custom_status_update_email(self, email_content):
-        """Wrapper for `_send_status_update_email` that bcc's help@get.gov
-        and sends an email equivalent to the 'email_content' variable."""
-        bcc_address = settings.DEFAULT_FROM_EMAIL if settings.IS_PRODUCTION else ""
-        self._send_status_update_email(
-            new_status="action needed",
-            email_template=f"emails/includes/custom_email.txt",
-            email_template_subject=f"emails/status_change_subject.txt",
-            bcc_address=bcc_address,
-            custom_email_content=email_content,
-            wrap_email=True,
-        )
-
     def investigator_exists_and_is_staff(self):
         """Checks if the current investigator is in a valid state for a state transition"""
         is_valid = True
@@ -959,23 +951,23 @@ class DomainRequest(TimeStampedModel):
         This action cleans up the rejection status if moving away from rejected.
 
         As side effects this will delete the domain and domain_information
-        (will cascade) when they exist."""
+        (will cascade) when they exist.
+        
+        Afterwards, we send out an email for action_needed in def save().
+        See the function send_custom_status_update_email.
+        """
 
         if self.status == self.DomainRequestStatus.APPROVED:
             self.delete_and_clean_up_domain("reject_with_prejudice")
         elif self.status == self.DomainRequestStatus.REJECTED:
             self.rejection_reason = None
 
+        # Check if the tuple is setup correctly, then grab its value.
+
         literal = DomainRequest.DomainRequestStatus.ACTION_NEEDED
-        # Check if the tuple is setup correctly, then grab its value
         action_needed = literal if literal is not None else "Action Needed"
         logger.info(f"A status change occurred. {self} was changed to '{action_needed}'")
 
-        # Send out an email if an action needed reason exists
-        if self.action_needed_reason and self.action_needed_reason != self.ActionNeededReasons.OTHER:
-            email_content = self.action_needed_reason_email
-            self._send_custom_status_update_email(email_content)
-
     @transition(
         field="status",
         source=[
@@ -1070,16 +1062,12 @@ class DomainRequest(TimeStampedModel):
         """Reject an domain request that has been submitted.
 
         As side effects this will delete the domain and domain_information
-        (will cascade), and send an email notification."""
+        (will cascade), and send an email notification using send_custom_status_update_email.
+        """
 
         if self.status == self.DomainRequestStatus.APPROVED:
             self.delete_and_clean_up_domain("reject")
 
-        # Send out an email if a rejection reason exists
-        if self.rejection_reason:
-            email_content = self.rejection_reason_email
-            self._send_custom_status_update_email(email_content)
-
     @transition(
         field="status",
         source=[

From 5a96855ccc20abdef4d80280711c0a0aea4bd16a Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 1 Oct 2024 09:24:48 -0600
Subject: [PATCH 012/142] Simplify PR

Remove refactors + simplify logic
---
 src/registrar/admin.py                        |   6 -
 src/registrar/models/domain_request.py        |  14 +-
 .../emails/includes/email_footer.txt          |  10 --
 .../status_change_rejected_header.txt         |   8 -
 .../contacts_not_verified.txt                 |   8 -
 .../rejection_reasons/naming_not_met.txt      |  15 --
 .../rejection_reasons/org_has_domain.txt      |  15 --
 .../rejection_reasons/org_not_eligible.txt    |  14 --
 .../rejection_reasons/purpose_not_met.txt     |  15 --
 .../requestor_not_eligible.txt                |  14 --
 .../emails/status_change_rejected.txt         |  16 +-
 src/registrar/tests/test_admin_request.py     | 137 +++++++++++-------
 src/registrar/tests/test_models.py            |   4 +
 src/registrar/utility/admin_helpers.py        |  54 +------
 14 files changed, 113 insertions(+), 217 deletions(-)
 delete mode 100644 src/registrar/templates/emails/includes/email_footer.txt
 delete mode 100644 src/registrar/templates/emails/includes/status_change_rejected_header.txt
 delete mode 100644 src/registrar/templates/emails/rejection_reasons/contacts_not_verified.txt
 delete mode 100644 src/registrar/templates/emails/rejection_reasons/naming_not_met.txt
 delete mode 100644 src/registrar/templates/emails/rejection_reasons/org_has_domain.txt
 delete mode 100644 src/registrar/templates/emails/rejection_reasons/org_not_eligible.txt
 delete mode 100644 src/registrar/templates/emails/rejection_reasons/purpose_not_met.txt
 delete mode 100644 src/registrar/templates/emails/rejection_reasons/requestor_not_eligible.txt

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index b9204666b..84e7a22ff 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -21,12 +21,6 @@ from epplibwrapper.errors import ErrorCode, RegistryError
 from registrar.models.user_domain_role import UserDomainRole
 from waffle.admin import FlagAdmin
 from waffle.models import Sample, Switch
-from registrar.utility.admin_helpers import (
-    get_all_action_needed_reason_emails, 
-    get_action_needed_reason_default_email,
-    get_all_rejection_reason_emails,
-    get_rejection_reason_default_email,
-)
 from registrar.models import Contact, Domain, DomainRequest, DraftDomain, User, Website, SeniorOfficial
 from registrar.utility.constants import BranchChoices
 from registrar.utility.errors import FSMDomainRequestError, FSMErrorCodes
diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index 2210ac9d9..a41550ffb 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -254,18 +254,18 @@ class DomainRequest(TimeStampedModel):
         )
 
     class RejectionReasons(models.TextChoices):
-        DOMAIN_PURPOSE = "purpose_not_met", "Purpose requirements not met"
-        REQUESTOR = "requestor_not_eligible", "Requestor not eligible to make request"
-        SECOND_DOMAIN_REASONING = (
+        DOMAIN_PURPOSE = "domain_purpose", "Purpose requirements not met"
+        REQUESTOR_NOT_ELIGIBLE = "requestor_not_eligible", "Requestor not eligible to make request"
+        ORG_HAS_DOMAIN = (
             "org_has_domain",
             "Org already has a .gov domain",
         )
-        CONTACTS_OR_ORGANIZATION_LEGITIMACY = (
+        CONTACTS_NOT_VERIFIED = (
             "contacts_not_verified",
             "Org contacts couldn't be verified",
         )
-        ORGANIZATION_ELIGIBILITY = "org_not_eligible", "Org not eligible for a .gov domain"
-        NAMING_REQUIREMENTS = "naming_not_met", "Naming requirements not met"
+        ORG_NOT_ELIGIBLE = "org_not_eligible", "Org not eligible for a .gov domain"
+        NAMING_REQUIREMENTS = "naming_requirements", "Naming requirements not met"
         OTHER = "other", "Other/Unspecified"
 
         @classmethod
@@ -958,7 +958,7 @@ class DomainRequest(TimeStampedModel):
         """
 
         if self.status == self.DomainRequestStatus.APPROVED:
-            self.delete_and_clean_up_domain("reject_with_prejudice")
+            self.delete_and_clean_up_domain("action_needed")
         elif self.status == self.DomainRequestStatus.REJECTED:
             self.rejection_reason = None
 
diff --git a/src/registrar/templates/emails/includes/email_footer.txt b/src/registrar/templates/emails/includes/email_footer.txt
deleted file mode 100644
index f10d82a91..000000000
--- a/src/registrar/templates/emails/includes/email_footer.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-THANK YOU
-.Gov helps the public identify official, trusted information. Thank you for requesting a .gov domain.
-
-----------------------------------------------------------------
-
-The .gov team
-Contact us: <https://get.gov/contact/>
-Learn about .gov <https://get.gov>
-
-The .gov registry is a part of the Cybersecurity and Infrastructure Security Agency (CISA) <https://cisa.gov/>
\ No newline at end of file
diff --git a/src/registrar/templates/emails/includes/status_change_rejected_header.txt b/src/registrar/templates/emails/includes/status_change_rejected_header.txt
deleted file mode 100644
index 16b7c73a9..000000000
--- a/src/registrar/templates/emails/includes/status_change_rejected_header.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Hi, {{ recipient.first_name }}.
-
-Your .gov domain request has been rejected.
-
-DOMAIN REQUESTED: {{ domain_request.requested_domain.name }}
-REQUEST RECEIVED ON: {{ domain_request.last_submitted_date|date }}
-STATUS: Rejected
-----------------------------------------------------------------
\ No newline at end of file
diff --git a/src/registrar/templates/emails/rejection_reasons/contacts_not_verified.txt b/src/registrar/templates/emails/rejection_reasons/contacts_not_verified.txt
deleted file mode 100644
index 525a3a00a..000000000
--- a/src/registrar/templates/emails/rejection_reasons/contacts_not_verified.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-{% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
-{% include "emails/includes/status_change_rejected_header.txt" %}
-REJECTION REASON
-Your domain request was rejected because we could not verify the organizational 
-contacts you provided. If you have questions or comments, reply to this email.
-
-{% include "emails/includes/email_footer.txt" %}
-{% endautoescape %}
\ No newline at end of file
diff --git a/src/registrar/templates/emails/rejection_reasons/naming_not_met.txt b/src/registrar/templates/emails/rejection_reasons/naming_not_met.txt
deleted file mode 100644
index eb2e5e4c0..000000000
--- a/src/registrar/templates/emails/rejection_reasons/naming_not_met.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-{% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
-{% include "emails/includes/status_change_rejected_header.txt" %}
-REJECTION REASON
-Your domain request was rejected because it does not meet our naming requirements. 
-Domains should uniquely identify a government organization and be clear to the 
-general public. Learn more about naming requirements for your type of organization 
-<https://get.gov/domains/choosing/>. 
-
-
-YOU CAN SUBMIT A NEW REQUEST
-We encourage you to request a domain that meets our requirements. If you have 
-questions or want to discuss potential domain names, reply to this email.
-
-{% include "emails/includes/email_footer.txt" %}
-{% endautoescape %}
\ No newline at end of file
diff --git a/src/registrar/templates/emails/rejection_reasons/org_has_domain.txt b/src/registrar/templates/emails/rejection_reasons/org_has_domain.txt
deleted file mode 100644
index 175518ac3..000000000
--- a/src/registrar/templates/emails/rejection_reasons/org_has_domain.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-{% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
-{% include "emails/includes/status_change_rejected_header.txt" %}
-REJECTION REASON
-Your domain request was rejected because {{ domain_request.organization_name }} has a .gov domain. Our 
-practice is to approve one domain per online service per government organization. We 
-evaluate additional requests on a case-by-case basis. You did not provide sufficient 
-justification for an additional domain. 
-
-Read more about our practice of approving one domain per online service 
-<https://get.gov/domains/before/#one-domain-per-service>. 
-
-If you have questions or comments, reply to this email.
-
-{% include "emails/includes/email_footer.txt" %}
-{% endautoescape %}
\ No newline at end of file
diff --git a/src/registrar/templates/emails/rejection_reasons/org_not_eligible.txt b/src/registrar/templates/emails/rejection_reasons/org_not_eligible.txt
deleted file mode 100644
index 606184706..000000000
--- a/src/registrar/templates/emails/rejection_reasons/org_not_eligible.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
-{% include "emails/includes/status_change_rejected_header.txt" %}
-REJECTION REASON
-Your domain request was rejected because we determined that {{ domain_request.organization_name }} is not 
-eligible for a .gov domain. .Gov domains are only available to official U.S.-based 
-government organizations. 
-
-Learn more about eligibility for .gov domains 
-<https://get.gov/domains/eligibility/>.
-
-If you have questions or comments, reply to this email.
-
-{% include "emails/includes/email_footer.txt" %}
-{% endautoescape %}
\ No newline at end of file
diff --git a/src/registrar/templates/emails/rejection_reasons/purpose_not_met.txt b/src/registrar/templates/emails/rejection_reasons/purpose_not_met.txt
deleted file mode 100644
index d95a9e0b3..000000000
--- a/src/registrar/templates/emails/rejection_reasons/purpose_not_met.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-{% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
-{% include "emails/includes/status_change_rejected_header.txt" %}
-REJECTION REASON
-Your domain request was rejected because the purpose you provided did not meet our 
-requirements. You didn’t provide enough information about how you intend to use the 
-domain. 
-
-Learn more about:
-- Eligibility for a .gov domain <https://get.gov/domains/eligibility>
-- What you can and can’t do with .gov domains <https://get.gov/domains/requirements/>
-
-If you have questions or comments, reply to this email.
-
-{% include "emails/includes/email_footer.txt" %}
-{% endautoescape %}
\ No newline at end of file
diff --git a/src/registrar/templates/emails/rejection_reasons/requestor_not_eligible.txt b/src/registrar/templates/emails/rejection_reasons/requestor_not_eligible.txt
deleted file mode 100644
index deeb2d9da..000000000
--- a/src/registrar/templates/emails/rejection_reasons/requestor_not_eligible.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
-{% include "emails/includes/status_change_rejected_header.txt" %}
-REJECTION REASON
-Your domain request was rejected because we don’t believe you’re eligible to request a 
-.gov domain on behalf of {{ domain_request.organization_name }}. You must be a government employee, or be 
-working on behalf of a government organization, to request a .gov domain.
-
-
-DEMONSTRATE ELIGIBILITY
-If you can provide more information that demonstrates your eligibility, or you want to 
-discuss further, reply to this email.
-
-{% include "emails/includes/email_footer.txt" %}
-{% endautoescape %}
\ No newline at end of file
diff --git a/src/registrar/templates/emails/status_change_rejected.txt b/src/registrar/templates/emails/status_change_rejected.txt
index 4e5250162..62e8d6acb 100644
--- a/src/registrar/templates/emails/status_change_rejected.txt
+++ b/src/registrar/templates/emails/status_change_rejected.txt
@@ -8,8 +8,8 @@ REQUEST RECEIVED ON: {{ domain_request.last_submitted_date|date }}
 STATUS: Rejected
 
 ----------------------------------------------------------------
-{% if domain_request.rejection_reason != 'other' %}
-REJECTION REASON{% endif %}{% if domain_request.rejection_reason == 'purpose_not_met' %}
+{% if reason != domain_request.RejectionReasons.DOMAIN_PURPOSE.OTHER %}
+REJECTION REASON{% endif %}{% if reason == domain_request.RejectionReasons.DOMAIN_PURPOSE %}
 Your domain request was rejected because the purpose you provided did not meet our 
 requirements. You didn’t provide enough information about how you intend to use the 
 domain. 
@@ -18,7 +18,7 @@ Learn more about:
 - Eligibility for a .gov domain <https://get.gov/domains/eligibility>
 - What you can and can’t do with .gov domains <https://get.gov/domains/requirements/>
 
-If you have questions or comments, reply to this email.{% elif domain_request.rejection_reason == 'requestor_not_eligible' %}
+If you have questions or comments, reply to this email.{% elif reason == domain_request.RejectionReasons.DOMAIN_PURPOSE.REQUESTOR_NOT_ELIGIBLE %}
 Your domain request was rejected because we don’t believe you’re eligible to request a 
 .gov domain on behalf of {{ domain_request.organization_name }}. You must be a government employee, or be 
 working on behalf of a government organization, to request a .gov domain.
@@ -26,7 +26,7 @@ working on behalf of a government organization, to request a .gov domain.
 
 DEMONSTRATE ELIGIBILITY
 If you can provide more information that demonstrates your eligibility, or you want to 
-discuss further, reply to this email.{% elif domain_request.rejection_reason == 'org_has_domain' %}
+discuss further, reply to this email.{% elif reason == domain_request.RejectionReasons.DOMAIN_PURPOSE.ORG_HAS_DOMAIN %}
 Your domain request was rejected because {{ domain_request.organization_name }} has a .gov domain. Our 
 practice is to approve one domain per online service per government organization. We 
 evaluate additional requests on a case-by-case basis. You did not provide sufficient 
@@ -35,9 +35,9 @@ justification for an additional domain.
 Read more about our practice of approving one domain per online service 
 <https://get.gov/domains/before/#one-domain-per-service>. 
 
-If you have questions or comments, reply to this email.{% elif domain_request.rejection_reason == 'contacts_not_verified' %}
+If you have questions or comments, reply to this email.{% elif reason == 'contacts_not_verified' %}
 Your domain request was rejected because we could not verify the organizational 
-contacts you provided. If you have questions or comments, reply to this email.{% elif domain_request.rejection_reason == 'org_not_eligible' %}
+contacts you provided. If you have questions or comments, reply to this email.{% elif reason == domain_request.RejectionReasons.DOMAIN_PURPOSE.ORG_NOT_ELIGIBLE %}
 Your domain request was rejected because we determined that {{ domain_request.organization_name }} is not 
 eligible for a .gov domain. .Gov domains are only available to official U.S.-based 
 government organizations. 
@@ -46,7 +46,7 @@ Learn more about eligibility for .gov domains
 <https://get.gov/domains/eligibility/>.
 
 If you have questions or comments, reply to this email.
-{% elif domain_request.rejection_reason == 'naming_not_met' %}
+{% elif reason == domain_request.RejectionReasons.DOMAIN_PURPOSE.NAMING_NOT_MET %}
 Your domain request was rejected because it does not meet our naming requirements. 
 Domains should uniquely identify a government organization and be clear to the 
 general public. Learn more about naming requirements for your type of organization 
@@ -55,7 +55,7 @@ general public. Learn more about naming requirements for your type of organizati
 
 YOU CAN SUBMIT A NEW REQUEST
 We encourage you to request a domain that meets our requirements. If you have 
-questions or want to discuss potential domain names, reply to this email.{% elif domain_request.rejection_reason == 'other' %}
+questions or want to discuss potential domain names, reply to this email.{% elif reason == domain_request.RejectionReasons.DOMAIN_PURPOSE.OTHER %}
 YOU CAN SUBMIT A NEW REQUEST
 If your organization is eligible for a .gov domain and you meet our other requirements, you can submit a new request.
 
diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py
index a9b073472..382a1e973 100644
--- a/src/registrar/tests/test_admin_request.py
+++ b/src/registrar/tests/test_admin_request.py
@@ -595,7 +595,12 @@ class TestDomainRequestAdmin(MockEppLib):
 
     @less_console_noise_decorator
     def transition_state_and_send_email(
-        self, domain_request, status, rejection_reason=None, action_needed_reason=None, action_needed_reason_email=None
+        self, 
+        domain_request, 
+        status, 
+        rejection_reason=None, 
+        rejection_reason_email=None, 
+        action_needed_reason=None, action_needed_reason_email=None
     ):
         """Helper method for the email test cases."""
 
@@ -612,6 +617,9 @@ class TestDomainRequestAdmin(MockEppLib):
 
             if rejection_reason:
                 domain_request.rejection_reason = rejection_reason
+            
+            if rejection_reason_email:
+                domain_request.rejection_reason_email = rejection_reason_email
 
             if action_needed_reason:
                 domain_request.action_needed_reason = action_needed_reason
@@ -632,6 +640,7 @@ class TestDomainRequestAdmin(MockEppLib):
         with less_console_noise():
             # Access the arguments passed to send_email
             call_args = self.mock_client.EMAILS_SENT
+            logger.info(f"what are the call args? {call_args}")
             kwargs = call_args[email_index]["kwargs"]
 
             # Retrieve the email details from the arguments
@@ -757,55 +766,85 @@ class TestDomainRequestAdmin(MockEppLib):
         )
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 6)
 
-    # def test_action_needed_sends_reason_email_prod_bcc(self):
-    #     """When an action needed reason is set, an email is sent out and help@get.gov
-    #     is BCC'd in production"""
-    #     # Ensure there is no user with this email
-    #     EMAIL = "mayor@igorville.gov"
-    #     BCC_EMAIL = settings.DEFAULT_FROM_EMAIL
-    #     User.objects.filter(email=EMAIL).delete()
-    #     in_review = DomainRequest.DomainRequestStatus.IN_REVIEW
-    #     action_needed = DomainRequest.DomainRequestStatus.ACTION_NEEDED
+    @override_settings(IS_PRODUCTION=True)
+    @less_console_noise_decorator
+    def test_rejected_sends_reason_email_prod_bcc(self):
+        """When a rejection reason is set, an email is sent out and help@get.gov
+        is BCC'd in production"""
+        # Create fake creator
+        EMAIL = "meoward.jones@igorville.gov"
 
-    #     # Create a sample domain request
-    #     domain_request = completed_domain_request(status=in_review)
+        _creator = User.objects.create(
+            username="MrMeoward",
+            first_name="Meoward",
+            last_name="Jones",
+            email=EMAIL,
+            phone="(555) 123 12345",
+            title="Treat inspector",
+        )
 
-    #     # Test the email sent out for already_has_domains
-    #     already_has_domains = DomainRequest.ActionNeededReasons.ALREADY_HAS_DOMAINS
-    #     self.transition_state_and_send_email(domain_request, action_needed, action_needed_reason=already_has_domains)
-    #     self.assert_email_is_accurate("ORGANIZATION ALREADY HAS A .GOV DOMAIN", 0, EMAIL, bcc_email_address=BCC_EMAIL)
-    #     self.assertEqual(len(self.mock_client.EMAILS_SENT), 1)
+        BCC_EMAIL = settings.DEFAULT_FROM_EMAIL
+        in_review = DomainRequest.DomainRequestStatus.IN_REVIEW
+        rejected = DomainRequest.DomainRequestStatus.REJECTED
 
-    #     # Test the email sent out for bad_name
-    #     bad_name = DomainRequest.ActionNeededReasons.BAD_NAME
-    #     self.transition_state_and_send_email(domain_request, action_needed, action_needed_reason=bad_name)
-    #     self.assert_email_is_accurate(
-    #         "DOMAIN NAME DOES NOT MEET .GOV REQUIREMENTS", 1, EMAIL, bcc_email_address=BCC_EMAIL
-    #     )
-    #     self.assertEqual(len(self.mock_client.EMAILS_SENT), 2)
+        # Create a sample domain request
+        domain_request = completed_domain_request(status=in_review, user=_creator)
 
-    #     # Test the email sent out for eligibility_unclear
-    #     eligibility_unclear = DomainRequest.ActionNeededReasons.ELIGIBILITY_UNCLEAR
-    #     self.transition_state_and_send_email(domain_request, action_needed, action_needed_reason=eligibility_unclear)
-    #     self.assert_email_is_accurate(
-    #         "ORGANIZATION MAY NOT MEET ELIGIBILITY REQUIREMENTS", 2, EMAIL, bcc_email_address=BCC_EMAIL
-    #     )
-    #     self.assertEqual(len(self.mock_client.EMAILS_SENT), 3)
+        expected_emails = {
+            DomainRequest.RejectionReasons.DOMAIN_PURPOSE: "You didn’t provide enough information about how",
+            DomainRequest.RejectionReasons.REQUESTOR_NOT_ELIGIBLE: "You must be a government employee, or be",
+            DomainRequest.RejectionReasons.ORG_HAS_DOMAIN: "Our practice is to approve one domain",
+            DomainRequest.RejectionReasons.CONTACTS_NOT_VERIFIED: "we could not verify the organizational",
+            DomainRequest.RejectionReasons.ORG_NOT_ELIGIBLE: ".Gov domains are only available to official U.S.-based",
+            DomainRequest.RejectionReasons.NAMING_REQUIREMENTS: "does not meet our naming requirements",
+            # TODO - add back other?
+            #DomainRequest.RejectionReasons.OTHER: "",
+        }
+        for i, (reason, email_content) in enumerate(expected_emails.items()):
+            with self.subTest(reason=reason):
+                self.transition_state_and_send_email(domain_request, status=rejected, rejection_reason=reason)
+                self.assert_email_is_accurate(email_content, i, EMAIL, bcc_email_address=BCC_EMAIL)
+                self.assertEqual(len(self.mock_client.EMAILS_SENT), i+1)
 
-    #     # Test the email sent out for questionable_so
-    #     questionable_so = DomainRequest.ActionNeededReasons.QUESTIONABLE_SENIOR_OFFICIAL
-    #     self.transition_state_and_send_email(domain_request, action_needed, action_needed_reason=questionable_so)
-    #     self.assert_email_is_accurate(
-    #         "SENIOR OFFICIAL DOES NOT MEET ELIGIBILITY REQUIREMENTS", 3, EMAIL, bcc_email_address=BCC_EMAIL
-    #     )
-    #     self.assertEqual(len(self.mock_client.EMAILS_SENT), 4)
+        # Tests if an analyst can override existing email content
+        domain_purpose = DomainRequest.RejectionReasons.DOMAIN_PURPOSE
+        self.transition_state_and_send_email(
+            domain_request,
+            status=rejected,
+            rejection_reason=domain_purpose,
+            rejection_reason_email="custom email content",
+        )
 
-    #     # Assert that no other emails are sent on OTHER
-    #     other = DomainRequest.ActionNeededReasons.OTHER
-    #     self.transition_state_and_send_email(domain_request, action_needed, action_needed_reason=other)
+        logger.info(f"look: {len(self.mock_client.EMAILS_SENT)}")
+        domain_request.refresh_from_db()
+        self.assert_email_is_accurate("custom email content", 6, _creator.email, bcc_email_address=BCC_EMAIL)
+        self.assertEqual(len(self.mock_client.EMAILS_SENT), 7)
 
-    #     # Should be unchanged from before
-    #     self.assertEqual(len(self.mock_client.EMAILS_SENT), 4)
+        # Tests if a new email gets sent when just the email is changed.
+        # An email should NOT be sent out if we just modify the email content.
+        self.transition_state_and_send_email(
+            domain_request,
+            status=rejected,
+            action_needed_reason=domain_purpose,
+            action_needed_reason_email="dummy email content",
+        )
+
+        self.assertEqual(len(self.mock_client.EMAILS_SENT), 7)
+
+        # Set the request back to in review
+        domain_request.in_review()
+
+        # Try sending another email when changing states AND including content
+        self.transition_state_and_send_email(
+            domain_request,
+            status=rejected,
+            rejection_reason=domain_purpose,
+            rejection_reason_email="custom content when starting anew",
+        )
+        self.assert_email_is_accurate(
+            "custom content when starting anew", 7, _creator.email, bcc_email_address=BCC_EMAIL
+        )
+        self.assertEqual(len(self.mock_client.EMAILS_SENT), 8)
 
     @less_console_noise_decorator
     def test_save_model_sends_submitted_email(self):
@@ -1034,7 +1073,7 @@ class TestDomainRequestAdmin(MockEppLib):
 
         # Reject for reason REQUESTOR and test email including dynamic organization name
         self.transition_state_and_send_email(
-            domain_request, DomainRequest.DomainRequestStatus.REJECTED, DomainRequest.RejectionReasons.REQUESTOR
+            domain_request, DomainRequest.DomainRequestStatus.REJECTED, DomainRequest.RejectionReasons.REQUESTOR_NOT_ELIGIBLE
         )
         self.assert_email_is_accurate(
             "Your domain request was rejected because we don’t believe you’re eligible to request a \n.gov "
@@ -1072,7 +1111,7 @@ class TestDomainRequestAdmin(MockEppLib):
         self.transition_state_and_send_email(
             domain_request,
             DomainRequest.DomainRequestStatus.REJECTED,
-            DomainRequest.RejectionReasons.SECOND_DOMAIN_REASONING,
+            DomainRequest.RejectionReasons.ORG_HAS_DOMAIN,
         )
         self.assert_email_is_accurate(
             "Your domain request was rejected because Testorg has a .gov domain.", 0, _creator.email
@@ -1108,7 +1147,7 @@ class TestDomainRequestAdmin(MockEppLib):
         self.transition_state_and_send_email(
             domain_request,
             DomainRequest.DomainRequestStatus.REJECTED,
-            DomainRequest.RejectionReasons.CONTACTS_OR_ORGANIZATION_LEGITIMACY,
+            DomainRequest.RejectionReasons.CONTACTS_NOT_VERIFIED,
         )
         self.assert_email_is_accurate(
             "Your domain request was rejected because we could not verify the organizational \n"
@@ -1146,7 +1185,7 @@ class TestDomainRequestAdmin(MockEppLib):
         self.transition_state_and_send_email(
             domain_request,
             DomainRequest.DomainRequestStatus.REJECTED,
-            DomainRequest.RejectionReasons.ORGANIZATION_ELIGIBILITY,
+            DomainRequest.RejectionReasons.ORG_NOT_ELIGIBLE,
         )
         self.assert_email_is_accurate(
             "Your domain request was rejected because we determined that Testorg is not \neligible for "
@@ -1275,7 +1314,7 @@ class TestDomainRequestAdmin(MockEppLib):
             stack.enter_context(patch.object(messages, "error"))
             stack.enter_context(patch.object(messages, "warning"))
             domain_request.status = DomainRequest.DomainRequestStatus.REJECTED
-            domain_request.rejection_reason = DomainRequest.RejectionReasons.CONTACTS_OR_ORGANIZATION_LEGITIMACY
+            domain_request.rejection_reason = DomainRequest.RejectionReasons.CONTACTS_NOT_VERIFIED
 
             self.admin.save_model(request, domain_request, None, True)
 
@@ -1840,7 +1879,7 @@ class TestDomainRequestAdmin(MockEppLib):
         self.trigger_saving_approved_to_another_state(
             False,
             DomainRequest.DomainRequestStatus.REJECTED,
-            DomainRequest.RejectionReasons.CONTACTS_OR_ORGANIZATION_LEGITIMACY,
+            DomainRequest.RejectionReasons.CONTACTS_NOT_VERIFIED,
         )
 
     def test_side_effects_when_saving_approved_to_ineligible(self):
diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index a6cac1389..dab8ff242 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -39,9 +39,13 @@ from .common import (
 from django_fsm import TransitionNotAllowed
 from waffle.testutils import override_flag
 
+import logging
+
 from api.tests.common import less_console_noise_decorator
 
 
+logger = logging.getLogger(__name__)
+
 @boto3_mocking.patching
 class TestDomainRequest(TestCase):
     @less_console_noise_decorator
diff --git a/src/registrar/utility/admin_helpers.py b/src/registrar/utility/admin_helpers.py
index 20760164e..2f6d2ae8b 100644
--- a/src/registrar/utility/admin_helpers.py
+++ b/src/registrar/utility/admin_helpers.py
@@ -2,63 +2,26 @@ from registrar.models.domain_request import DomainRequest
 from django.template.loader import get_template
 
 
-def get_all_action_needed_reason_emails(domain_request):
-    """Returns a dictionary of every action needed reason and its associated email
-    for this particular domain request."""
-    return _get_all_default_emails(
-        reasons=DomainRequest.ActionNeededReasons,
-        # Where the emails are stored. This assumes that it contains a list of .txt files with the reason. 
-        path_root="emails/action_needed_reasons",
-        # What reasons don't send out emails (none is handled automagically)
-        excluded_reasons=[DomainRequest.ActionNeededReasons.OTHER],
-        # Who to send it to, and from what domain request to reference
-        domain_request=domain_request
-    )
-
-
 def get_action_needed_reason_default_email(domain_request, action_needed_reason):
     """Returns the default email associated with the given action needed reason"""
     return _get_default_email(
         domain_request,
-        path_root="emails/action_needed_reasons",
+        file_path=f"emails/action_needed_reasons/{action_needed_reason}.txt",
         reason=action_needed_reason,
         excluded_reasons=[DomainRequest.ActionNeededReasons.OTHER]
     )
 
 
-def get_all_rejection_reason_emails(domain_request):
-    """Returns a dictionary of every rejection reason and its associated email
-    for this particular domain request."""
-    return _get_all_default_emails(
-        reasons=DomainRequest.RejectionReasons,
-        # Where the emails are stored. This assumes that it contains a list of .txt files with the reason.
-        path_root="emails/rejection_reasons",
-        # What reasons don't send out emails (none is handled automagically)
-        excluded_reasons=[DomainRequest.RejectionReasons.OTHER],
-        # Who to send it to, and from what domain request to reference
-        domain_request=domain_request
-    )
-
-
 def get_rejection_reason_default_email(domain_request, rejection_reason):
     """Returns the default email associated with the given rejection reason"""
     return _get_default_email(
         domain_request,
-        path_root="emails/rejection_reasons",
+        file_path="emails/status_change_rejected.txt",
         reason=rejection_reason,
         excluded_reasons=[DomainRequest.RejectionReasons.OTHER]
     )
 
-def _get_all_default_emails(reasons, path_root, excluded_reasons, domain_request):
-    emails = {}
-    for reason in reasons:
-        # Map the reason to its default email
-        emails[reason.value] = _get_default_email(
-            domain_request, path_root, reason, excluded_reasons
-        )
-    return emails
-
-def _get_default_email(domain_request, path_root, reason, excluded_reasons=None):
+def _get_default_email(domain_request, file_path, reason, excluded_reasons=None):
     if not reason:
         return None
 
@@ -67,14 +30,9 @@ def _get_default_email(domain_request, path_root, reason, excluded_reasons=None)
 
     recipient = domain_request.creator
     # Return the context of the rendered views
-    context = {"domain_request": domain_request, "recipient": recipient}
+    context = {"domain_request": domain_request, "recipient": recipient, "reason": reason}
 
-    # Get the email body
-    template_path = f"{path_root}/{reason}.txt"
-
-    email_body_text = get_template(template_path).render(context=context)
-    email_body_text_cleaned = None
-    if email_body_text:
-        email_body_text_cleaned = email_body_text.strip().lstrip("\n")
+    email_body_text = get_template(file_path).render(context=context)
+    email_body_text_cleaned = email_body_text.strip().lstrip("\n") if email_body_text else None
 
     return email_body_text_cleaned

From 47d226ff5e32ed2f202aeb2fcacbc5f51d7f9db6 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 1 Oct 2024 09:28:07 -0600
Subject: [PATCH 013/142] Update domain_request.py

---
 src/registrar/models/domain_request.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index a41550ffb..426d81ea3 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -707,7 +707,7 @@ class DomainRequest(TimeStampedModel):
         if status_info.get("cached_reason") != status_info.get("reason") or status_info.get("cached_reason") is None:
             bcc_address = settings.DEFAULT_FROM_EMAIL if settings.IS_PRODUCTION else ""
             self._send_status_update_email(
-                new_status="action needed",
+                new_status=status.label,
                 email_template=f"emails/includes/custom_email.txt",
                 email_template_subject=f"emails/status_change_subject.txt",
                 bcc_address=bcc_address,

From 162369f5db4ddfda404d67aa50afa8091a7051f1 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 1 Oct 2024 09:32:25 -0600
Subject: [PATCH 014/142] add migration

---
 ...30_alter_domainrequest_rejection_reason.py | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 src/registrar/migrations/0130_alter_domainrequest_rejection_reason.py

diff --git a/src/registrar/migrations/0130_alter_domainrequest_rejection_reason.py b/src/registrar/migrations/0130_alter_domainrequest_rejection_reason.py
new file mode 100644
index 000000000..58a09772b
--- /dev/null
+++ b/src/registrar/migrations/0130_alter_domainrequest_rejection_reason.py
@@ -0,0 +1,30 @@
+# Generated by Django 4.2.10 on 2024-10-01 15:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("registrar", "0129_domainrequest_rejection_reason_email"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="domainrequest",
+            name="rejection_reason",
+            field=models.TextField(
+                blank=True,
+                choices=[
+                    ("domain_purpose", "Purpose requirements not met"),
+                    ("requestor_not_eligible", "Requestor not eligible to make request"),
+                    ("org_has_domain", "Org already has a .gov domain"),
+                    ("contacts_not_verified", "Org contacts couldn't be verified"),
+                    ("org_not_eligible", "Org not eligible for a .gov domain"),
+                    ("naming_requirements", "Naming requirements not met"),
+                    ("other", "Other/Unspecified"),
+                ],
+                null=True,
+            ),
+        ),
+    ]

From 0a7d4e460d84dffd810c855c728af656e4f3dfd7 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 1 Oct 2024 09:40:39 -0600
Subject: [PATCH 015/142] Exclude other reason for now

---
 src/registrar/assets/js/get-gov-admin.js | 13 ++++++++-----
 src/registrar/utility/admin_helpers.py   |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/registrar/assets/js/get-gov-admin.js b/src/registrar/assets/js/get-gov-admin.js
index dbe7b01d3..c8df161bb 100644
--- a/src/registrar/assets/js/get-gov-admin.js
+++ b/src/registrar/assets/js/get-gov-admin.js
@@ -581,11 +581,11 @@ class CustomizableEmailBase {
         return this.lastSentEmailContent.value.replace(/\s+/g, '') === this.textarea.value.replace(/\s+/g, '');
     }
 
-    updateUserInterface(reason=this.dropdown.value) {
+    updateUserInterface(reason=this.dropdown.value, excluded_reasons=["other"]) {
         if (!reason) {
             // No reason selected, we will set the label to "Email", show the "Make a selection" placeholder, hide the trigger, textarea, hide the help text
             this.showPlaceholderNoReason();
-        } else if (reason === 'other') {
+        } else if (excluded_reasons.includes(reason)) {
             // 'Other' selected, we will set the label to "Email", show the "No email will be sent" placeholder, hide the trigger, textarea, hide the help text
             this.showPlaceholderOtherReason();
         } else {
@@ -728,10 +728,13 @@ class customRejectedEmail extends CustomizableEmailBase {
         this.showPlaceholder("Email:", "Select a rejection reason to see email");
     }
 
-    // Overrides the placeholder text when the reason other is selected
-    showPlaceholderOtherReason() {
-        this.showPlaceholder("Email:", "No email will be sent");
+    updateUserInterface(reason=this.dropdown.value, excluded_reasons=[]) {
+        super.updateUserInterface(reason, excluded_reasons);
     }
+    // Overrides the placeholder text when the reason other is selected
+    // showPlaceholderOtherReason() {
+    //     this.showPlaceholder("Email:", "No email will be sent");
+    // }
 }
 
 
diff --git a/src/registrar/utility/admin_helpers.py b/src/registrar/utility/admin_helpers.py
index 2f6d2ae8b..19ea4c7b5 100644
--- a/src/registrar/utility/admin_helpers.py
+++ b/src/registrar/utility/admin_helpers.py
@@ -18,7 +18,7 @@ def get_rejection_reason_default_email(domain_request, rejection_reason):
         domain_request,
         file_path="emails/status_change_rejected.txt",
         reason=rejection_reason,
-        excluded_reasons=[DomainRequest.RejectionReasons.OTHER]
+        # excluded_reasons=[DomainRequest.RejectionReasons.OTHER]
     )
 
 def _get_default_email(domain_request, file_path, reason, excluded_reasons=None):

From 06e4daef6ac4395385c4ff8eb993af98ecaaf5c1 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 1 Oct 2024 10:28:40 -0600
Subject: [PATCH 016/142] lint

---
 src/registrar/models/domain_request.py    |  4 ++--
 src/registrar/tests/test_admin_request.py | 23 +++++++++++++----------
 src/registrar/tests/test_models.py        |  3 +++
 src/registrar/utility/admin_helpers.py    |  3 ++-
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index 426d81ea3..617143ac7 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -689,7 +689,7 @@ class DomainRequest(TimeStampedModel):
                 "reason": self.rejection_reason,
                 "email": self.rejection_reason_email,
                 "excluded_reasons": [DomainRequest.RejectionReasons.OTHER],
-            }
+            },
         }
         status_info = status_information.get(status)
 
@@ -952,7 +952,7 @@ class DomainRequest(TimeStampedModel):
 
         As side effects this will delete the domain and domain_information
         (will cascade) when they exist.
-        
+
         Afterwards, we send out an email for action_needed in def save().
         See the function send_custom_status_update_email.
         """
diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py
index 382a1e973..5104f23fb 100644
--- a/src/registrar/tests/test_admin_request.py
+++ b/src/registrar/tests/test_admin_request.py
@@ -595,12 +595,13 @@ class TestDomainRequestAdmin(MockEppLib):
 
     @less_console_noise_decorator
     def transition_state_and_send_email(
-        self, 
-        domain_request, 
-        status, 
-        rejection_reason=None, 
-        rejection_reason_email=None, 
-        action_needed_reason=None, action_needed_reason_email=None
+        self,
+        domain_request,
+        status,
+        rejection_reason=None,
+        rejection_reason_email=None,
+        action_needed_reason=None,
+        action_needed_reason_email=None,
     ):
         """Helper method for the email test cases."""
 
@@ -617,7 +618,7 @@ class TestDomainRequestAdmin(MockEppLib):
 
             if rejection_reason:
                 domain_request.rejection_reason = rejection_reason
-            
+
             if rejection_reason_email:
                 domain_request.rejection_reason_email = rejection_reason_email
 
@@ -798,13 +799,13 @@ class TestDomainRequestAdmin(MockEppLib):
             DomainRequest.RejectionReasons.ORG_NOT_ELIGIBLE: ".Gov domains are only available to official U.S.-based",
             DomainRequest.RejectionReasons.NAMING_REQUIREMENTS: "does not meet our naming requirements",
             # TODO - add back other?
-            #DomainRequest.RejectionReasons.OTHER: "",
+            # DomainRequest.RejectionReasons.OTHER: "",
         }
         for i, (reason, email_content) in enumerate(expected_emails.items()):
             with self.subTest(reason=reason):
                 self.transition_state_and_send_email(domain_request, status=rejected, rejection_reason=reason)
                 self.assert_email_is_accurate(email_content, i, EMAIL, bcc_email_address=BCC_EMAIL)
-                self.assertEqual(len(self.mock_client.EMAILS_SENT), i+1)
+                self.assertEqual(len(self.mock_client.EMAILS_SENT), i + 1)
 
         # Tests if an analyst can override existing email content
         domain_purpose = DomainRequest.RejectionReasons.DOMAIN_PURPOSE
@@ -1073,7 +1074,9 @@ class TestDomainRequestAdmin(MockEppLib):
 
         # Reject for reason REQUESTOR and test email including dynamic organization name
         self.transition_state_and_send_email(
-            domain_request, DomainRequest.DomainRequestStatus.REJECTED, DomainRequest.RejectionReasons.REQUESTOR_NOT_ELIGIBLE
+            domain_request,
+            DomainRequest.DomainRequestStatus.REJECTED,
+            DomainRequest.RejectionReasons.REQUESTOR_NOT_ELIGIBLE,
         )
         self.assert_email_is_accurate(
             "Your domain request was rejected because we don’t believe you’re eligible to request a \n.gov "
diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index dab8ff242..0b01ee0a6 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -46,6 +46,7 @@ from api.tests.common import less_console_noise_decorator
 
 logger = logging.getLogger(__name__)
 
+
 @boto3_mocking.patching
 class TestDomainRequest(TestCase):
     @less_console_noise_decorator
@@ -293,6 +294,8 @@ class TestDomainRequest(TestCase):
                 # Perform the specified action
                 action_method = getattr(domain_request, action)
                 action_method()
+                domain_request.save()
+                domain_request.refresh_from_db()
 
             # Check if an email was sent
             sent_emails = [
diff --git a/src/registrar/utility/admin_helpers.py b/src/registrar/utility/admin_helpers.py
index 19ea4c7b5..ad7ecae19 100644
--- a/src/registrar/utility/admin_helpers.py
+++ b/src/registrar/utility/admin_helpers.py
@@ -8,7 +8,7 @@ def get_action_needed_reason_default_email(domain_request, action_needed_reason)
         domain_request,
         file_path=f"emails/action_needed_reasons/{action_needed_reason}.txt",
         reason=action_needed_reason,
-        excluded_reasons=[DomainRequest.ActionNeededReasons.OTHER]
+        excluded_reasons=[DomainRequest.ActionNeededReasons.OTHER],
     )
 
 
@@ -21,6 +21,7 @@ def get_rejection_reason_default_email(domain_request, rejection_reason):
         # excluded_reasons=[DomainRequest.RejectionReasons.OTHER]
     )
 
+
 def _get_default_email(domain_request, file_path, reason, excluded_reasons=None):
     if not reason:
         return None

From ad43fabbab0b5cd097b9c18215ed03ca387d92e9 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 1 Oct 2024 14:22:56 -0600
Subject: [PATCH 017/142] fix unit tests

---
 src/registrar/admin.py                        | 10 +++
 src/registrar/models/domain_request.py        |  5 +-
 .../emails/status_change_rejected.txt         |  2 +-
 src/registrar/tests/test_admin_request.py     | 68 ++++++-------------
 src/registrar/tests/test_api.py               | 68 +++++++++++++++++++
 5 files changed, 103 insertions(+), 50 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 9584e3942..4410565f7 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -5,6 +5,7 @@ from django import forms
 from django.db.models import Value, CharField, Q
 from django.db.models.functions import Concat, Coalesce
 from django.http import HttpResponseRedirect
+from registrar.utility.admin_helpers import get_action_needed_reason_default_email, get_rejection_reason_default_email
 from django.conf import settings
 from django.shortcuts import redirect
 from django_fsm import get_available_FIELD_transitions, FSMField
@@ -1939,6 +1940,15 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         # Get the original domain request from the database.
         original_obj = models.DomainRequest.objects.get(pk=obj.pk)
 
+        # == Handle action needed and rejected emails == #
+        # Edge case: this logic is handled by javascript, so contexts outside that must be handled
+        if obj.status == DomainRequest.DomainRequestStatus.ACTION_NEEDED:
+            if obj.action_needed_reason and not obj.action_needed_reason_email:
+                obj.action_needed_reason_email = get_action_needed_reason_default_email(obj, obj.action_needed_reason)
+        elif obj.status == DomainRequest.DomainRequestStatus.REJECTED:
+            if obj.rejection_reason and not obj.rejection_reason_email:
+                obj.rejection_reason_email = get_rejection_reason_default_email(obj, obj.rejection_reason)
+
         # == Handle allowed emails == #
         if obj.status in DomainRequest.get_statuses_that_send_emails() and not settings.IS_PRODUCTION:
             self._check_for_valid_email(request, obj)
diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index 617143ac7..4877b3756 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -688,7 +688,8 @@ class DomainRequest(TimeStampedModel):
                 "cached_reason": self._cached_rejection_reason,
                 "reason": self.rejection_reason,
                 "email": self.rejection_reason_email,
-                "excluded_reasons": [DomainRequest.RejectionReasons.OTHER],
+                "excluded_reasons": [],
+                # "excluded_reasons": [DomainRequest.RejectionReasons.OTHER],
             },
         }
         status_info = status_information.get(status)
@@ -707,7 +708,7 @@ class DomainRequest(TimeStampedModel):
         if status_info.get("cached_reason") != status_info.get("reason") or status_info.get("cached_reason") is None:
             bcc_address = settings.DEFAULT_FROM_EMAIL if settings.IS_PRODUCTION else ""
             self._send_status_update_email(
-                new_status=status.label,
+                new_status=status,
                 email_template=f"emails/includes/custom_email.txt",
                 email_template_subject=f"emails/status_change_subject.txt",
                 bcc_address=bcc_address,
diff --git a/src/registrar/templates/emails/status_change_rejected.txt b/src/registrar/templates/emails/status_change_rejected.txt
index 62e8d6acb..b1d989bf1 100644
--- a/src/registrar/templates/emails/status_change_rejected.txt
+++ b/src/registrar/templates/emails/status_change_rejected.txt
@@ -46,7 +46,7 @@ Learn more about eligibility for .gov domains
 <https://get.gov/domains/eligibility/>.
 
 If you have questions or comments, reply to this email.
-{% elif reason == domain_request.RejectionReasons.DOMAIN_PURPOSE.NAMING_NOT_MET %}
+{% elif reason == domain_request.RejectionReasons.DOMAIN_PURPOSE.NAMING_REQUIREMENTS %}
 Your domain request was rejected because it does not meet our naming requirements. 
 Domains should uniquely identify a government organization and be clear to the 
 general public. Learn more about naming requirements for your type of organization 
diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py
index 5104f23fb..55aacd25d 100644
--- a/src/registrar/tests/test_admin_request.py
+++ b/src/registrar/tests/test_admin_request.py
@@ -599,7 +599,6 @@ class TestDomainRequestAdmin(MockEppLib):
         domain_request,
         status,
         rejection_reason=None,
-        rejection_reason_email=None,
         action_needed_reason=None,
         action_needed_reason_email=None,
     ):
@@ -619,9 +618,6 @@ class TestDomainRequestAdmin(MockEppLib):
             if rejection_reason:
                 domain_request.rejection_reason = rejection_reason
 
-            if rejection_reason_email:
-                domain_request.rejection_reason_email = rejection_reason_email
-
             if action_needed_reason:
                 domain_request.action_needed_reason = action_needed_reason
 
@@ -697,6 +693,10 @@ class TestDomainRequestAdmin(MockEppLib):
         self.assert_email_is_accurate("ORGANIZATION ALREADY HAS A .GOV DOMAIN", 0, EMAIL, bcc_email_address=BCC_EMAIL)
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 1)
 
+        # We use javascript to reset the content of this. It is only automatically set
+        # if the email itself is somehow None.
+        self._reset_action_needed_email(domain_request)
+
         # Test the email sent out for bad_name
         bad_name = DomainRequest.ActionNeededReasons.BAD_NAME
         self.transition_state_and_send_email(domain_request, action_needed, action_needed_reason=bad_name)
@@ -704,6 +704,7 @@ class TestDomainRequestAdmin(MockEppLib):
             "DOMAIN NAME DOES NOT MEET .GOV REQUIREMENTS", 1, EMAIL, bcc_email_address=BCC_EMAIL
         )
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 2)
+        self._reset_action_needed_email(domain_request)
 
         # Test the email sent out for eligibility_unclear
         eligibility_unclear = DomainRequest.ActionNeededReasons.ELIGIBILITY_UNCLEAR
@@ -712,6 +713,7 @@ class TestDomainRequestAdmin(MockEppLib):
             "ORGANIZATION MAY NOT MEET ELIGIBILITY REQUIREMENTS", 2, EMAIL, bcc_email_address=BCC_EMAIL
         )
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 3)
+        self._reset_action_needed_email(domain_request)
 
         # Test that a custom email is sent out for questionable_so
         questionable_so = DomainRequest.ActionNeededReasons.QUESTIONABLE_SENIOR_OFFICIAL
@@ -720,6 +722,7 @@ class TestDomainRequestAdmin(MockEppLib):
             "SENIOR OFFICIAL DOES NOT MEET ELIGIBILITY REQUIREMENTS", 3, _creator.email, bcc_email_address=BCC_EMAIL
         )
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 4)
+        self._reset_action_needed_email(domain_request)
 
         # Assert that no other emails are sent on OTHER
         other = DomainRequest.ActionNeededReasons.OTHER
@@ -727,6 +730,7 @@ class TestDomainRequestAdmin(MockEppLib):
 
         # Should be unchanged from before
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 4)
+        self._reset_action_needed_email(domain_request)
 
         # Tests if an analyst can override existing email content
         questionable_so = DomainRequest.ActionNeededReasons.QUESTIONABLE_SENIOR_OFFICIAL
@@ -740,6 +744,7 @@ class TestDomainRequestAdmin(MockEppLib):
         domain_request.refresh_from_db()
         self.assert_email_is_accurate("custom email content", 4, _creator.email, bcc_email_address=BCC_EMAIL)
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 5)
+        self._reset_action_needed_email(domain_request)
 
         # Tests if a new email gets sent when just the email is changed.
         # An email should NOT be sent out if we just modify the email content.
@@ -751,6 +756,7 @@ class TestDomainRequestAdmin(MockEppLib):
         )
 
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 5)
+        self._reset_action_needed_email(domain_request)
 
         # Set the request back to in review
         domain_request.in_review()
@@ -767,6 +773,12 @@ class TestDomainRequestAdmin(MockEppLib):
         )
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 6)
 
+    def _reset_action_needed_email(self, domain_request):
+        """Sets the given action needed email back to none"""
+        domain_request.action_needed_reason_email = None
+        domain_request.save()
+        domain_request.refresh_from_db()
+
     @override_settings(IS_PRODUCTION=True)
     @less_console_noise_decorator
     def test_rejected_sends_reason_email_prod_bcc(self):
@@ -794,58 +806,20 @@ class TestDomainRequestAdmin(MockEppLib):
         expected_emails = {
             DomainRequest.RejectionReasons.DOMAIN_PURPOSE: "You didn’t provide enough information about how",
             DomainRequest.RejectionReasons.REQUESTOR_NOT_ELIGIBLE: "You must be a government employee, or be",
-            DomainRequest.RejectionReasons.ORG_HAS_DOMAIN: "Our practice is to approve one domain",
+            DomainRequest.RejectionReasons.ORG_HAS_DOMAIN: "practice is to approve one domain",
             DomainRequest.RejectionReasons.CONTACTS_NOT_VERIFIED: "we could not verify the organizational",
             DomainRequest.RejectionReasons.ORG_NOT_ELIGIBLE: ".Gov domains are only available to official U.S.-based",
             DomainRequest.RejectionReasons.NAMING_REQUIREMENTS: "does not meet our naming requirements",
-            # TODO - add back other?
-            # DomainRequest.RejectionReasons.OTHER: "",
+            DomainRequest.RejectionReasons.OTHER: "YOU CAN SUBMIT A NEW REQUEST",
         }
         for i, (reason, email_content) in enumerate(expected_emails.items()):
             with self.subTest(reason=reason):
                 self.transition_state_and_send_email(domain_request, status=rejected, rejection_reason=reason)
                 self.assert_email_is_accurate(email_content, i, EMAIL, bcc_email_address=BCC_EMAIL)
                 self.assertEqual(len(self.mock_client.EMAILS_SENT), i + 1)
-
-        # Tests if an analyst can override existing email content
-        domain_purpose = DomainRequest.RejectionReasons.DOMAIN_PURPOSE
-        self.transition_state_and_send_email(
-            domain_request,
-            status=rejected,
-            rejection_reason=domain_purpose,
-            rejection_reason_email="custom email content",
-        )
-
-        logger.info(f"look: {len(self.mock_client.EMAILS_SENT)}")
-        domain_request.refresh_from_db()
-        self.assert_email_is_accurate("custom email content", 6, _creator.email, bcc_email_address=BCC_EMAIL)
-        self.assertEqual(len(self.mock_client.EMAILS_SENT), 7)
-
-        # Tests if a new email gets sent when just the email is changed.
-        # An email should NOT be sent out if we just modify the email content.
-        self.transition_state_and_send_email(
-            domain_request,
-            status=rejected,
-            action_needed_reason=domain_purpose,
-            action_needed_reason_email="dummy email content",
-        )
-
-        self.assertEqual(len(self.mock_client.EMAILS_SENT), 7)
-
-        # Set the request back to in review
-        domain_request.in_review()
-
-        # Try sending another email when changing states AND including content
-        self.transition_state_and_send_email(
-            domain_request,
-            status=rejected,
-            rejection_reason=domain_purpose,
-            rejection_reason_email="custom content when starting anew",
-        )
-        self.assert_email_is_accurate(
-            "custom content when starting anew", 7, _creator.email, bcc_email_address=BCC_EMAIL
-        )
-        self.assertEqual(len(self.mock_client.EMAILS_SENT), 8)
+            domain_request.rejection_reason_email = None
+            domain_request.save()
+            domain_request.refresh_from_db()
 
     @less_console_noise_decorator
     def test_save_model_sends_submitted_email(self):
diff --git a/src/registrar/tests/test_api.py b/src/registrar/tests/test_api.py
index ef5385d72..d60099570 100644
--- a/src/registrar/tests/test_api.py
+++ b/src/registrar/tests/test_api.py
@@ -177,3 +177,71 @@ class GetActionNeededEmailForUserJsonTest(TestCase):
             },
         )
         self.assertEqual(response.status_code, 302)
+
+
+class GetRejectionEmailForUserJsonTest(TestCase):
+    def setUp(self):
+        self.client = Client()
+        self.superuser = create_superuser()
+        self.analyst_user = create_user()
+        self.agency = FederalAgency.objects.create(agency="Test Agency")
+        self.domain_request = completed_domain_request(
+            federal_agency=self.agency,
+            name="test.gov",
+            status=DomainRequest.DomainRequestStatus.ACTION_NEEDED,
+        )
+
+        self.api_url = reverse("get-action-needed-email-for-user-json")
+
+    def tearDown(self):
+        DomainRequest.objects.all().delete()
+        User.objects.all().delete()
+        FederalAgency.objects.all().delete()
+
+    @less_console_noise_decorator
+    def test_get_action_needed_email_for_user_json_superuser(self):
+        """Test that a superuser can fetch the action needed email."""
+        self.client.force_login(self.superuser)
+
+        response = self.client.get(
+            self.api_url,
+            {
+                "reason": DomainRequest.ActionNeededReasons.ELIGIBILITY_UNCLEAR,
+                "domain_request_id": self.domain_request.id,
+            },
+        )
+        self.assertEqual(response.status_code, 200)
+        data = response.json()
+        self.assertIn("action_needed_email", data)
+        self.assertIn("ORGANIZATION MAY NOT MEET ELIGIBILITY REQUIREMENTS", data["action_needed_email"])
+
+    @less_console_noise_decorator
+    def test_get_action_needed_email_for_user_json_analyst(self):
+        """Test that an analyst can fetch the action needed email."""
+        self.client.force_login(self.analyst_user)
+
+        response = self.client.get(
+            self.api_url,
+            {
+                "reason": DomainRequest.ActionNeededReasons.QUESTIONABLE_SENIOR_OFFICIAL,
+                "domain_request_id": self.domain_request.id,
+            },
+        )
+        self.assertEqual(response.status_code, 200)
+        data = response.json()
+        self.assertIn("action_needed_email", data)
+        self.assertIn("SENIOR OFFICIAL DOES NOT MEET ELIGIBILITY REQUIREMENTS", data["action_needed_email"])
+
+    @less_console_noise_decorator
+    def test_get_action_needed_email_for_user_json_regular(self):
+        """Test that a regular user receives a 403 with an error message."""
+        p = "password"
+        self.client.login(username="testuser", password=p)
+        response = self.client.get(
+            self.api_url,
+            {
+                "reason": DomainRequest.ActionNeededReasons.QUESTIONABLE_SENIOR_OFFICIAL,
+                "domain_request_id": self.domain_request.id,
+            },
+        )
+        self.assertEqual(response.status_code, 302)

From dd29081fffa65f1a151f6c011f8cd233fe3d019b Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 1 Oct 2024 18:51:10 -0400
Subject: [PATCH 018/142] Fix bugs with the copy email button UI plus code
 cleanup

---
 src/registrar/admin.py                        |  2 +-
 src/registrar/assets/js/get-gov-admin.js      | 21 ++--
 src/registrar/assets/sass/_theme/_admin.scss  | 95 +++++++------------
 .../admin/change_form_object_tools.html       |  3 +-
 .../templates/admin/input_with_clipboard.html | 30 +++---
 .../admin/includes/contact_detail_list.html   |  2 +-
 .../admin/includes/detail_table_fieldset.html |  3 +-
 7 files changed, 63 insertions(+), 93 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 8718da9ba..a282e6c25 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -3112,7 +3112,7 @@ class PortfolioAdmin(ListHeaderAdmin):
             admin_details += f'<a href="{change_url}">{escape(portfolio_admin)}</a><br>'
             admin_details += f"{escape(portfolio_admin.title)}<br>"
             admin_details += f"{escape(portfolio_admin.email)}"
-            admin_details += "<div class='admin-icon-group admin-icon-group__clipboard-link'>"
+            admin_details += "<div class='admin-icon-group'>"
             admin_details += f"<input aria-hidden='true' class='display-none' value='{escape(portfolio_admin.email)}'>"
             admin_details += (
                 "<button class='usa-button usa-button--unstyled padding-right-1 usa-button--icon padding-left-05"
diff --git a/src/registrar/assets/js/get-gov-admin.js b/src/registrar/assets/js/get-gov-admin.js
index 7e3c086c4..a0fe48420 100644
--- a/src/registrar/assets/js/get-gov-admin.js
+++ b/src/registrar/assets/js/get-gov-admin.js
@@ -515,10 +515,14 @@ document.addEventListener('DOMContentLoaded', function() {
     const formLabel = document.querySelector('label[for="id_action_needed_reason_email"]');
     let lastSentEmailContent = document.getElementById("last-sent-email-content");
     const initialDropdownValue = dropdown ? dropdown.value : null;
-    const initialEmailValue = textarea.value;
+    let initialEmailValue;
+    if (textarea)
+        initialEmailValue = textarea.value
 
     // We will use the const to control the modal
-    let isEmailAlreadySentConst = lastSentEmailContent.value.replace(/\s+/g, '') === textarea.value.replace(/\s+/g, '');
+    let isEmailAlreadySentConst;
+    if (lastSentEmailContent)
+        isEmailAlreadySentConst = lastSentEmailContent.value.replace(/\s+/g, '') === textarea.value.replace(/\s+/g, '');
     // We will use the function to control the label and help
     function isEmailAlreadySent() {
         return lastSentEmailContent.value.replace(/\s+/g, '') === textarea.value.replace(/\s+/g, '');
@@ -706,18 +710,6 @@ document.addEventListener('DOMContentLoaded', function() {
                 }
                 return '';
             }
-            // Extract the submitter name, title, email, and phone number
-            const submitterDiv = document.querySelector('.form-row.field-submitter');
-            const submitterNameElement = document.getElementById('id_submitter');
-            // We have to account for different superuser and analyst markups
-            const submitterName = submitterNameElement 
-                ? submitterNameElement.options[submitterNameElement.selectedIndex].text 
-                : submitterDiv.querySelector('a').text;
-            const submitterTitle = extractTextById('contact_info_title', submitterDiv);
-            const submitterEmail = extractTextById('contact_info_email', submitterDiv);
-            const submitterPhone = extractTextById('contact_info_phone', submitterDiv);
-            let submitterInfo = `${submitterName}${submitterTitle}${submitterEmail}${submitterPhone}`;
-
 
             //------ Senior Official
             const seniorOfficialDiv = document.querySelector('.form-row.field-senior_official');
@@ -734,7 +726,6 @@ document.addEventListener('DOMContentLoaded', function() {
                             `<strong>Current Websites:</strong> ${existingWebsites.join(', ')}</br>` +
                             `<strong>Rationale:</strong></br>` +
                             `<strong>Alternative Domains:</strong> ${alternativeDomains.join(', ')}</br>` +
-                            `<strong>Submitter:</strong> ${submitterInfo}</br>` +
                             `<strong>Senior Official:</strong> ${seniorOfficialInfo}</br>` +
                             `<strong>Other Employees:</strong> ${otherContactsSummary}</br>`;
             
diff --git a/src/registrar/assets/sass/_theme/_admin.scss b/src/registrar/assets/sass/_theme/_admin.scss
index 7bc7dc53c..40258ec41 100644
--- a/src/registrar/assets/sass/_theme/_admin.scss
+++ b/src/registrar/assets/sass/_theme/_admin.scss
@@ -390,6 +390,9 @@ a.button,
 .usa-button--dja span {
     vertical-align: middle;
 }
+.usa-button--dja.usa-button--unstyled {
+    color: var(--link-fg);
+}
 .usa-button--dja:not(.usa-button--unstyled, .usa-button--outline, .usa-modal__close, .usa-button--secondary) {
     background: var(--button-bg);
 }
@@ -425,6 +428,37 @@ button .usa-icon,
 .button--clipboard .usa-icon {
     vertical-align: middle;      
 }
+// Make the clipboard button "float" inside of the input box
+.admin-icon-group {
+    position: relative;
+    display: inline;
+    align-items: center;
+
+    input {
+        // Allow for padding around the copy button
+        padding-right: 35px !important;
+    }
+
+    button {
+        width: max-content;
+        text-decoration: none !important;
+    }
+
+    @media (max-width: 1000px) {
+        button {
+            display: block;
+        }
+    }
+
+    span {
+        padding-left: 0.05rem;
+    }
+
+}
+.usa-button__small-text,
+.usa-button__small-text span {
+    font-size: 13px;
+}
 
 .module--custom {
     a {
@@ -670,71 +704,10 @@ address.dja-address-contact-list {
     }
 }
 
-// Make the clipboard button "float" inside of the input box
-.admin-icon-group {
-    position: relative;
-    display: inline;
-    align-items: center;
-
-    input {
-        // Allow for padding around the copy button
-        padding-right: 35px !important;
-        // Match the height of other inputs
-        min-height: 2.25rem !important;
-    }
-
-    button {
-        line-height: 14px;
-        width: max-content;
-        font-size: unset;
-        text-decoration: none !important;
-    }
-
-    @media (max-width: 1000px) {
-        button {
-            display: block;
-            padding-top: 8px;
-        }
-    }
-
-    span {
-        padding-left: 0.1rem;
-    }
-
-}
-
-.admin-icon-group.admin-icon-group__clipboard-link {
-    position: relative;
-    display: inline;
-    align-items: center;
-    
-
-    .usa-button--icon {
-        position: absolute;
-        right: auto;
-        left: 4px;
-        height: 100%;
-        top: -1px;
-    }
-    button {
-        font-size: unset !important;
-        display: inline-flex;
-        padding-top: 4px;
-        line-height: 14px;
-        width: max-content;
-        font-size: unset;
-        text-decoration: none !important;
-    }
-}
-
 .no-outline-on-click:focus {
     outline: none !important;
 }
 
-.usa-button__small-text {
-    font-size: small;
-}
-
 // Get rid of padding on all help texts
 form .aligned p.help, form .aligned div.help {
     padding-left: 0px !important;
diff --git a/src/registrar/templates/admin/change_form_object_tools.html b/src/registrar/templates/admin/change_form_object_tools.html
index 198140c19..55c374419 100644
--- a/src/registrar/templates/admin/change_form_object_tools.html
+++ b/src/registrar/templates/admin/change_form_object_tools.html
@@ -20,10 +20,11 @@
             </li>
             {% if opts.model_name == 'domainrequest' %}
             <li>
-                <a id="id-copy-to-clipboard-summary" class="button--clipboard" type="button" href="#">
+                <a id="id-copy-to-clipboard-summary" class="usa-button--dja button--clipboard" type="button" href="#">
                     <svg class="usa-icon" >
                         <use xlink:href="{%static 'img/sprite.svg'%}#content_copy"></use>
                     </svg>
+                    <!-- the span is targeted in JS, do not remove -->
                     <span>{% translate "Copy request summary" %}</span>
                 </a>
             </li>
diff --git a/src/registrar/templates/admin/input_with_clipboard.html b/src/registrar/templates/admin/input_with_clipboard.html
index 5ad2b27f7..de89602b8 100644
--- a/src/registrar/templates/admin/input_with_clipboard.html
+++ b/src/registrar/templates/admin/input_with_clipboard.html
@@ -8,7 +8,7 @@ Template for an input field with a clipboard
 <div class="admin-icon-group">
     {{ field }}
     <button 
-    class="usa-button usa-button--unstyled padding-left-1 usa-button--icon button--clipboard copy-to-clipboard" 
+    class="usa-button--dja usa-button usa-button__small-text usa-button--unstyled padding-left-1 usa-button--icon button--clipboard copy-to-clipboard" 
     type="button"
     >
         <div class="no-outline-on-click">
@@ -17,23 +17,27 @@ Template for an input field with a clipboard
             >
                 <use aria-hidden="true" xlink:href="{%static 'img/sprite.svg'%}#content_copy"></use>
             </svg>
-            Copy
+            <!-- the span is targeted in JS, do not remove -->
+            <span>Copy</span>
         </div>
     </button>
 </div>
 {% else %}
-<div class="admin-icon-group admin-icon-group__clipboard-link">
+<div class="admin-icon-group">
     <input aria-hidden="true" class="display-none" value="{{ field.email }}" />
-    <button 
-    class="usa-button usa-button--unstyled padding-right-1 usa-button--icon button--clipboard copy-to-clipboard text-no-underline padding-left-05" 
-    type="button"
-    >
-        <svg 
-        class="usa-icon" 
+    {% if field.email is not None %}
+        <button 
+        class="usa-button--dja usa-button usa-button__small-text usa-button--unstyled padding-right-1 usa-button--icon button--clipboard copy-to-clipboard text-no-underline padding-left-05" 
+        type="button"
         >
-            <use aria-hidden="true" xlink:href="{%static 'img/sprite.svg'%}#content_copy"></use>
-        </svg>
-        Copy
-    </button>
+            <svg 
+            class="usa-icon" 
+            >
+                <use aria-hidden="true" xlink:href="{%static 'img/sprite.svg'%}#content_copy"></use>
+            </svg>
+            <!-- the span is targeted in JS, do not remove -->
+            <span>Copy</span>
+        </button>
+    {% endif %}
 </div>
 {% endif %}
\ No newline at end of file
diff --git a/src/registrar/templates/django/admin/includes/contact_detail_list.html b/src/registrar/templates/django/admin/includes/contact_detail_list.html
index 7cc72e8e1..b855dcf12 100644
--- a/src/registrar/templates/django/admin/includes/contact_detail_list.html
+++ b/src/registrar/templates/django/admin/includes/contact_detail_list.html
@@ -26,7 +26,7 @@
         {% if user.email %}
             <span id="contact_info_email">{{ user.email }}</span>
             {% include "admin/input_with_clipboard.html" with field=user invisible_input_field=True %}
-            <br class="admin-icon-group__br">
+            <br>
         {% else %}
             None<br>
         {% endif %}
diff --git a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
index bee42d24e..1e8fcaaeb 100644
--- a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
+++ b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
@@ -269,7 +269,7 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html)
                                 <td class="padding-left-1 text-size-small">
                                     <input aria-hidden="true" class="display-none" value="{{ contact.email }}" />
                                     <button 
-                                    class="usa-button usa-button--unstyled padding-right-1 usa-button--icon button--clipboard copy-to-clipboard usa-button__small-text text-no-underline" 
+                                    class="usa-button--dja usa-button usa-button__small-text usa-button--unstyled padding-right-1 usa-button--icon button--clipboard copy-to-clipboard usa-button__small-text text-no-underline" 
                                     type="button"
                                     >
                                         <svg 
@@ -277,6 +277,7 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html)
                                         >
                                             <use aria-hidden="true" xlink:href="{%static 'img/sprite.svg'%}#content_copy"></use>
                                         </svg>
+                                        <!-- the span is targeted in JS, do not remove -->
                                         <span>Copy email</span>
                                     </button>
                                 </td>

From 997fc1bbed611d0776cc3ce3665dc26fee5fa8cd Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Wed, 2 Oct 2024 09:22:56 -0600
Subject: [PATCH 019/142] Remove no longer relevant test + linting

---
 src/registrar/admin.py                 | 16 ++++++++++------
 src/registrar/models/domain_request.py |  4 ++--
 src/registrar/tests/test_models.py     |  7 -------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 4410565f7..55b1e5fc4 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -1942,12 +1942,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
 
         # == Handle action needed and rejected emails == #
         # Edge case: this logic is handled by javascript, so contexts outside that must be handled
-        if obj.status == DomainRequest.DomainRequestStatus.ACTION_NEEDED:
-            if obj.action_needed_reason and not obj.action_needed_reason_email:
-                obj.action_needed_reason_email = get_action_needed_reason_default_email(obj, obj.action_needed_reason)
-        elif obj.status == DomainRequest.DomainRequestStatus.REJECTED:
-            if obj.rejection_reason and not obj.rejection_reason_email:
-                obj.rejection_reason_email = get_rejection_reason_default_email(obj, obj.rejection_reason)
+        obj = self._handle_custom_emails()
 
         # == Handle allowed emails == #
         if obj.status in DomainRequest.get_statuses_that_send_emails() and not settings.IS_PRODUCTION:
@@ -1965,6 +1960,15 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
             if should_save:
                 return super().save_model(request, obj, form, change)
 
+    def _handle_custom_emails(self, obj):
+        if obj.status == DomainRequest.DomainRequestStatus.ACTION_NEEDED:
+            if obj.action_needed_reason and not obj.action_needed_reason_email:
+                obj.action_needed_reason_email = get_action_needed_reason_default_email(obj, obj.action_needed_reason)
+        elif obj.status == DomainRequest.DomainRequestStatus.REJECTED:
+            if obj.rejection_reason and not obj.rejection_reason_email:
+                obj.rejection_reason_email = get_rejection_reason_default_email(obj, obj.rejection_reason)
+        return obj
+
     def _check_for_valid_email(self, request, obj):
         """Certain emails are whitelisted in non-production environments,
         so we should display that information using this function.
diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index 4877b3756..f43ba80d4 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -709,8 +709,8 @@ class DomainRequest(TimeStampedModel):
             bcc_address = settings.DEFAULT_FROM_EMAIL if settings.IS_PRODUCTION else ""
             self._send_status_update_email(
                 new_status=status,
-                email_template=f"emails/includes/custom_email.txt",
-                email_template_subject=f"emails/status_change_subject.txt",
+                email_template="emails/includes/custom_email.txt",
+                email_template_subject="emails/status_change_subject.txt",
                 bcc_address=bcc_address,
                 custom_email_content=status_info.get("email"),
                 wrap_email=True,
diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index 0b01ee0a6..ba52ba21d 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -355,13 +355,6 @@ class TestDomainRequest(TestCase):
             domain_request, msg, "withdraw", 1, expected_content="withdrawn", expected_email=user.email
         )
 
-    @less_console_noise_decorator
-    def test_reject_sends_email(self):
-        msg = "Create a domain request and reject it and see if email was sent."
-        user, _ = User.objects.get_or_create(username="testy")
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.APPROVED, user=user)
-        self.check_email_sent(domain_request, msg, "reject", 1, expected_content="Hi", expected_email=user.email)
-
     @less_console_noise_decorator
     def test_reject_with_prejudice_does_not_send_email(self):
         msg = "Create a domain request and reject it with prejudice and see if email was sent."

From db0d4a1eb233ffbec0b6cdd3ecc2b583e7076e67 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Wed, 2 Oct 2024 10:30:08 -0600
Subject: [PATCH 020/142] Update admin.py

---
 src/registrar/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 55b1e5fc4..efb832f6d 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -1942,7 +1942,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
 
         # == Handle action needed and rejected emails == #
         # Edge case: this logic is handled by javascript, so contexts outside that must be handled
-        obj = self._handle_custom_emails()
+        obj = self._handle_custom_emails(obj)
 
         # == Handle allowed emails == #
         if obj.status in DomainRequest.get_statuses_that_send_emails() and not settings.IS_PRODUCTION:

From 27662029520fd3677e3754b071267a40b7d9a4e4 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Wed, 2 Oct 2024 11:26:56 -0600
Subject: [PATCH 021/142] toggle email wrap

---
 src/registrar/models/domain_request.py | 4 +++-
 src/registrar/utility/email.py         | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index f43ba80d4..c939bfedb 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -683,6 +683,7 @@ class DomainRequest(TimeStampedModel):
                 "reason": self.action_needed_reason,
                 "email": self.action_needed_reason_email,
                 "excluded_reasons": [DomainRequest.ActionNeededReasons.OTHER],
+                "wrap_email": True,
             },
             self.DomainRequestStatus.REJECTED: {
                 "cached_reason": self._cached_rejection_reason,
@@ -690,6 +691,7 @@ class DomainRequest(TimeStampedModel):
                 "email": self.rejection_reason_email,
                 "excluded_reasons": [],
                 # "excluded_reasons": [DomainRequest.RejectionReasons.OTHER],
+                "wrap_email": False,
             },
         }
         status_info = status_information.get(status)
@@ -713,7 +715,7 @@ class DomainRequest(TimeStampedModel):
                 email_template_subject="emails/status_change_subject.txt",
                 bcc_address=bcc_address,
                 custom_email_content=status_info.get("email"),
-                wrap_email=True,
+                wrap_email=status_information.get("wrap_email"),
             )
 
     def sync_yes_no_form_fields(self):
diff --git a/src/registrar/utility/email.py b/src/registrar/utility/email.py
index 3f508fb96..5f8a93bd9 100644
--- a/src/registrar/utility/email.py
+++ b/src/registrar/utility/email.py
@@ -78,7 +78,7 @@ def send_templated_email(
             # Wrap the email body to a maximum width of 80 characters per line.
             # Not all email clients support CSS to do this, and our .txt files require parsing.
             if wrap_email:
-                email_body = wrap_text_and_preserve_paragraphs(email_body, width=110)
+                email_body = wrap_text_and_preserve_paragraphs(email_body, width=80)
 
             ses_client.send_email(
                 FromEmailAddress=settings.DEFAULT_FROM_EMAIL,

From 14241976fc31e36cbdfdcc4ca01aa1869380dab7 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Wed, 2 Oct 2024 11:57:30 -0600
Subject: [PATCH 022/142] Fix remaining tests

---
 src/registrar/tests/test_admin_request.py |  1 +
 src/registrar/tests/test_api.py           | 28 +++++++++++------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py
index 55aacd25d..d5ffa4bc7 100644
--- a/src/registrar/tests/test_admin_request.py
+++ b/src/registrar/tests/test_admin_request.py
@@ -1637,6 +1637,7 @@ class TestDomainRequestAdmin(MockEppLib):
             "updated_at",
             "status",
             "rejection_reason",
+            "rejection_reason_email",
             "action_needed_reason",
             "action_needed_reason_email",
             "federal_agency",
diff --git a/src/registrar/tests/test_api.py b/src/registrar/tests/test_api.py
index d60099570..22ad2b376 100644
--- a/src/registrar/tests/test_api.py
+++ b/src/registrar/tests/test_api.py
@@ -144,8 +144,8 @@ class GetActionNeededEmailForUserJsonTest(TestCase):
         )
         self.assertEqual(response.status_code, 200)
         data = response.json()
-        self.assertIn("action_needed_email", data)
-        self.assertIn("ORGANIZATION MAY NOT MEET ELIGIBILITY REQUIREMENTS", data["action_needed_email"])
+        self.assertIn("email", data)
+        self.assertIn("ORGANIZATION MAY NOT MEET ELIGIBILITY REQUIREMENTS", data["email"])
 
     @less_console_noise_decorator
     def test_get_action_needed_email_for_user_json_analyst(self):
@@ -161,8 +161,8 @@ class GetActionNeededEmailForUserJsonTest(TestCase):
         )
         self.assertEqual(response.status_code, 200)
         data = response.json()
-        self.assertIn("action_needed_email", data)
-        self.assertIn("SENIOR OFFICIAL DOES NOT MEET ELIGIBILITY REQUIREMENTS", data["action_needed_email"])
+        self.assertIn("email", data)
+        self.assertIn("SENIOR OFFICIAL DOES NOT MEET ELIGIBILITY REQUIREMENTS", data["email"])
 
     @less_console_noise_decorator
     def test_get_action_needed_email_for_user_json_regular(self):
@@ -188,10 +188,10 @@ class GetRejectionEmailForUserJsonTest(TestCase):
         self.domain_request = completed_domain_request(
             federal_agency=self.agency,
             name="test.gov",
-            status=DomainRequest.DomainRequestStatus.ACTION_NEEDED,
+            status=DomainRequest.DomainRequestStatus.REJECTED,
         )
 
-        self.api_url = reverse("get-action-needed-email-for-user-json")
+        self.api_url = reverse("get-rejection-email-for-user-json")
 
     def tearDown(self):
         DomainRequest.objects.all().delete()
@@ -199,21 +199,21 @@ class GetRejectionEmailForUserJsonTest(TestCase):
         FederalAgency.objects.all().delete()
 
     @less_console_noise_decorator
-    def test_get_action_needed_email_for_user_json_superuser(self):
+    def test_get_rejected_email_for_user_json_superuser(self):
         """Test that a superuser can fetch the action needed email."""
         self.client.force_login(self.superuser)
 
         response = self.client.get(
             self.api_url,
             {
-                "reason": DomainRequest.ActionNeededReasons.ELIGIBILITY_UNCLEAR,
+                "reason": DomainRequest.RejectionReasons.CONTACTS_NOT_VERIFIED,
                 "domain_request_id": self.domain_request.id,
             },
         )
         self.assertEqual(response.status_code, 200)
         data = response.json()
-        self.assertIn("action_needed_email", data)
-        self.assertIn("ORGANIZATION MAY NOT MEET ELIGIBILITY REQUIREMENTS", data["action_needed_email"])
+        self.assertIn("email", data)
+        self.assertIn("we could not verify the organizational", data["email"])
 
     @less_console_noise_decorator
     def test_get_action_needed_email_for_user_json_analyst(self):
@@ -223,14 +223,14 @@ class GetRejectionEmailForUserJsonTest(TestCase):
         response = self.client.get(
             self.api_url,
             {
-                "reason": DomainRequest.ActionNeededReasons.QUESTIONABLE_SENIOR_OFFICIAL,
+                "reason": DomainRequest.RejectionReasons.CONTACTS_NOT_VERIFIED,
                 "domain_request_id": self.domain_request.id,
             },
         )
         self.assertEqual(response.status_code, 200)
         data = response.json()
-        self.assertIn("action_needed_email", data)
-        self.assertIn("SENIOR OFFICIAL DOES NOT MEET ELIGIBILITY REQUIREMENTS", data["action_needed_email"])
+        self.assertIn("email", data)
+        self.assertIn("we could not verify the organizational", data["email"])
 
     @less_console_noise_decorator
     def test_get_action_needed_email_for_user_json_regular(self):
@@ -240,7 +240,7 @@ class GetRejectionEmailForUserJsonTest(TestCase):
         response = self.client.get(
             self.api_url,
             {
-                "reason": DomainRequest.ActionNeededReasons.QUESTIONABLE_SENIOR_OFFICIAL,
+                "reason": DomainRequest.RejectionReasons.CONTACTS_NOT_VERIFIED,
                 "domain_request_id": self.domain_request.id,
             },
         )

From b30e0173c4497527dc4f9cb1bb2348d971de7ee4 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Wed, 2 Oct 2024 11:58:00 -0600
Subject: [PATCH 023/142] rename

---
 src/registrar/tests/test_api.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/tests/test_api.py b/src/registrar/tests/test_api.py
index 22ad2b376..307a5553f 100644
--- a/src/registrar/tests/test_api.py
+++ b/src/registrar/tests/test_api.py
@@ -216,7 +216,7 @@ class GetRejectionEmailForUserJsonTest(TestCase):
         self.assertIn("we could not verify the organizational", data["email"])
 
     @less_console_noise_decorator
-    def test_get_action_needed_email_for_user_json_analyst(self):
+    def test_get_rejected_email_for_user_json_analyst(self):
         """Test that an analyst can fetch the action needed email."""
         self.client.force_login(self.analyst_user)
 
@@ -233,7 +233,7 @@ class GetRejectionEmailForUserJsonTest(TestCase):
         self.assertIn("we could not verify the organizational", data["email"])
 
     @less_console_noise_decorator
-    def test_get_action_needed_email_for_user_json_regular(self):
+    def test_get_rejected_email_for_user_json_regular(self):
         """Test that a regular user receives a 403 with an error message."""
         p = "password"
         self.client.login(username="testuser", password=p)

From 02e18a372c81e7b82028eb96cb6412cabf3c0c73 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Wed, 2 Oct 2024 14:03:53 -0600
Subject: [PATCH 024/142] Update get-gov-admin.js

---
 src/registrar/assets/js/get-gov-admin.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/registrar/assets/js/get-gov-admin.js b/src/registrar/assets/js/get-gov-admin.js
index c8df161bb..ee61811d6 100644
--- a/src/registrar/assets/js/get-gov-admin.js
+++ b/src/registrar/assets/js/get-gov-admin.js
@@ -716,11 +716,11 @@ class customRejectedEmail extends CustomizableEmailBase {
     }
 
     loadRejectedEmail() {
-        this.initializeFormGroups("rejected", "showRejectionReason");
+        this.initializeFormGroups();
         this.updateUserInterface();
-        this.initializeDropdown("Error when attempting to grab rejected email: ")
-        this.initializeModalConfirm()
-        this.initializeDirectEditButton()
+        this.initializeDropdown();
+        this.initializeModalConfirm();
+        this.initializeDirectEditButton();
     }
 
     // Overrides the placeholder text when no reason is selected

From 6162a26ee9f690cdfc8744b6c7cbb168b07dc9e9 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Wed, 2 Oct 2024 16:21:34 -0400
Subject: [PATCH 025/142] cleanup admin code

---
 src/registrar/admin.py                      |   19 +-
 src/registrar/tests/test_models.py          | 1080 -------------------
 src/registrar/tests/test_models_requests.py | 1030 ++++++++++++++++++
 src/registrar/utility/errors.py             |    2 +-
 4 files changed, 1040 insertions(+), 1091 deletions(-)
 create mode 100644 src/registrar/tests/test_models_requests.py

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 8718da9ba..79e9d55b3 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -2009,18 +2009,17 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
 
             # If the status is not mapped properly, saving could cause
             # weird issues down the line. Instead, we should block this.
+            # NEEDS A UNIT TEST
             should_proceed = False
-            return should_proceed
+            return (obj, should_proceed)
 
-        request_is_not_approved = obj.status != models.DomainRequest.DomainRequestStatus.APPROVED
-        if request_is_not_approved and not obj.domain_is_not_active():
-            # If an admin tried to set an approved domain request to
-            # another status and the related domain is already
-            # active, shortcut the action and throw a friendly
-            # error message. This action would still not go through
-            # shortcut or not as the rules are duplicated on the model,
-            # but the error would be an ugly Django error screen.
-            error_message = "This action is not permitted. The domain is already active."
+        request_is_not_approved = original_obj.status != models.DomainRequest.DomainRequestStatus.APPROVED
+        if request_is_not_approved and Domain.objects.filter(name=original_obj.requested_domain.name).exists():
+            # REDUNDANT CHECK:
+            # This action (approving a request when the domain is active)
+            # would still not go through check or not as the rules are
+            # duplicated in the model and the error is raised from the model.
+            error_message = FSMDomainRequestError.get_error_message(FSMErrorCodes.APPROVE_DOMAIN_IN_USE)
         elif obj.status == models.DomainRequest.DomainRequestStatus.REJECTED and not obj.rejection_reason:
             # This condition should never be triggered.
             # The opposite of this condition is acceptable (rejected -> other status and rejection_reason)
diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index a6cac1389..54b984f49 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -1,7 +1,5 @@
 from django.forms import ValidationError
 from django.test import TestCase
-from django.db.utils import IntegrityError
-from django.db import transaction
 from unittest.mock import patch
 
 from django.test import RequestFactory
@@ -21,1099 +19,21 @@ from registrar.models import (
     AllowedEmail,
 )
 
-import boto3_mocking
 from registrar.models.portfolio import Portfolio
 from registrar.models.portfolio_invitation import PortfolioInvitation
 from registrar.models.transition_domain import TransitionDomain
 from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices
 from registrar.models.verified_by_staff import VerifiedByStaff  # type: ignore
-from registrar.utility.constants import BranchChoices
 
 from .common import (
-    MockSESClient,
-    less_console_noise,
     completed_domain_request,
-    set_domain_request_investigators,
     create_test_user,
 )
-from django_fsm import TransitionNotAllowed
 from waffle.testutils import override_flag
 
 from api.tests.common import less_console_noise_decorator
 
 
-@boto3_mocking.patching
-class TestDomainRequest(TestCase):
-    @less_console_noise_decorator
-    def setUp(self):
-
-        self.dummy_user, _ = Contact.objects.get_or_create(
-            email="mayor@igorville.com", first_name="Hello", last_name="World"
-        )
-        self.dummy_user_2, _ = User.objects.get_or_create(
-            username="intern@igorville.com", email="intern@igorville.com", first_name="Lava", last_name="World"
-        )
-        self.started_domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.STARTED,
-            name="started.gov",
-        )
-        self.submitted_domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.SUBMITTED,
-            name="submitted.gov",
-        )
-        self.in_review_domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.IN_REVIEW,
-            name="in-review.gov",
-        )
-        self.action_needed_domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.ACTION_NEEDED,
-            name="action-needed.gov",
-        )
-        self.approved_domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.APPROVED,
-            name="approved.gov",
-        )
-        self.withdrawn_domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.WITHDRAWN,
-            name="withdrawn.gov",
-        )
-        self.rejected_domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.REJECTED,
-            name="rejected.gov",
-        )
-        self.ineligible_domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.INELIGIBLE,
-            name="ineligible.gov",
-        )
-
-        # Store all domain request statuses in a variable for ease of use
-        self.all_domain_requests = [
-            self.started_domain_request,
-            self.submitted_domain_request,
-            self.in_review_domain_request,
-            self.action_needed_domain_request,
-            self.approved_domain_request,
-            self.withdrawn_domain_request,
-            self.rejected_domain_request,
-            self.ineligible_domain_request,
-        ]
-
-        self.mock_client = MockSESClient()
-
-    def tearDown(self):
-        super().tearDown()
-        DomainInformation.objects.all().delete()
-        DomainRequest.objects.all().delete()
-        DraftDomain.objects.all().delete()
-        Domain.objects.all().delete()
-        User.objects.all().delete()
-        self.mock_client.EMAILS_SENT.clear()
-
-    def assertNotRaises(self, exception_type):
-        """Helper method for testing allowed transitions."""
-        with less_console_noise():
-            return self.assertRaises(Exception, None, exception_type)
-
-    @less_console_noise_decorator
-    def test_request_is_withdrawable(self):
-        """Tests the is_withdrawable function"""
-        domain_request_1 = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.SUBMITTED,
-            name="city2.gov",
-        )
-        domain_request_2 = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.IN_REVIEW,
-            name="city3.gov",
-        )
-        domain_request_3 = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.ACTION_NEEDED,
-            name="city4.gov",
-        )
-        domain_request_4 = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.REJECTED,
-            name="city5.gov",
-        )
-        self.assertTrue(domain_request_1.is_withdrawable())
-        self.assertTrue(domain_request_2.is_withdrawable())
-        self.assertTrue(domain_request_3.is_withdrawable())
-        self.assertFalse(domain_request_4.is_withdrawable())
-
-    @less_console_noise_decorator
-    def test_request_is_awaiting_review(self):
-        """Tests the is_awaiting_review function"""
-        domain_request_1 = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.SUBMITTED,
-            name="city2.gov",
-        )
-        domain_request_2 = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.IN_REVIEW,
-            name="city3.gov",
-        )
-        domain_request_3 = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.ACTION_NEEDED,
-            name="city4.gov",
-        )
-        domain_request_4 = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.REJECTED,
-            name="city5.gov",
-        )
-        self.assertTrue(domain_request_1.is_awaiting_review())
-        self.assertTrue(domain_request_2.is_awaiting_review())
-        self.assertFalse(domain_request_3.is_awaiting_review())
-        self.assertFalse(domain_request_4.is_awaiting_review())
-
-    @less_console_noise_decorator
-    def test_federal_agency_set_to_non_federal_on_approve(self):
-        """Ensures that when the federal_agency field is 'none' when .approve() is called,
-        the field is set to the 'Non-Federal Agency' record"""
-        domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.IN_REVIEW,
-            name="city2.gov",
-            federal_agency=None,
-        )
-
-        # Ensure that the federal agency is None
-        self.assertEqual(domain_request.federal_agency, None)
-
-        # Approve the request
-        domain_request.approve()
-        self.assertEqual(domain_request.status, DomainRequest.DomainRequestStatus.APPROVED)
-
-        # After approval, it should be "Non-Federal agency"
-        expected_federal_agency = FederalAgency.objects.filter(agency="Non-Federal Agency").first()
-        self.assertEqual(domain_request.federal_agency, expected_federal_agency)
-
-    def test_empty_create_fails(self):
-        """Can't create a completely empty domain request."""
-        with less_console_noise():
-            with transaction.atomic():
-                with self.assertRaisesRegex(IntegrityError, "creator"):
-                    DomainRequest.objects.create()
-
-    @less_console_noise_decorator
-    def test_minimal_create(self):
-        """Can create with just a creator."""
-        user, _ = User.objects.get_or_create(username="testy")
-        domain_request = DomainRequest.objects.create(creator=user)
-        self.assertEqual(domain_request.status, DomainRequest.DomainRequestStatus.STARTED)
-
-    @less_console_noise_decorator
-    def test_full_create(self):
-        """Can create with all fields."""
-        user, _ = User.objects.get_or_create(username="testy")
-        contact = Contact.objects.create()
-        com_website, _ = Website.objects.get_or_create(website="igorville.com")
-        gov_website, _ = Website.objects.get_or_create(website="igorville.gov")
-        domain, _ = DraftDomain.objects.get_or_create(name="igorville.gov")
-        domain_request = DomainRequest.objects.create(
-            creator=user,
-            investigator=user,
-            generic_org_type=DomainRequest.OrganizationChoices.FEDERAL,
-            federal_type=BranchChoices.EXECUTIVE,
-            is_election_board=False,
-            organization_name="Test",
-            address_line1="100 Main St.",
-            address_line2="APT 1A",
-            state_territory="CA",
-            zipcode="12345-6789",
-            senior_official=contact,
-            requested_domain=domain,
-            purpose="Igorville rules!",
-            anything_else="All of Igorville loves the dotgov program.",
-            is_policy_acknowledged=True,
-        )
-        domain_request.current_websites.add(com_website)
-        domain_request.alternative_domains.add(gov_website)
-        domain_request.other_contacts.add(contact)
-        domain_request.save()
-
-    @less_console_noise_decorator
-    def test_domain_info(self):
-        """Can create domain info with all fields."""
-        user, _ = User.objects.get_or_create(username="testy")
-        contact = Contact.objects.create()
-        domain, _ = Domain.objects.get_or_create(name="igorville.gov")
-        information = DomainInformation.objects.create(
-            creator=user,
-            generic_org_type=DomainInformation.OrganizationChoices.FEDERAL,
-            federal_type=BranchChoices.EXECUTIVE,
-            is_election_board=False,
-            organization_name="Test",
-            address_line1="100 Main St.",
-            address_line2="APT 1A",
-            state_territory="CA",
-            zipcode="12345-6789",
-            senior_official=contact,
-            purpose="Igorville rules!",
-            anything_else="All of Igorville loves the dotgov program.",
-            is_policy_acknowledged=True,
-            domain=domain,
-        )
-        information.other_contacts.add(contact)
-        information.save()
-        self.assertEqual(information.domain.id, domain.id)
-        self.assertEqual(information.id, domain.domain_info.id)
-
-    @less_console_noise_decorator
-    def test_status_fsm_submit_fail(self):
-        user, _ = User.objects.get_or_create(username="testy")
-        domain_request = DomainRequest.objects.create(creator=user)
-
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-            with less_console_noise():
-                with self.assertRaises(ValueError):
-                    # can't submit a domain request with a null domain name
-                    domain_request.submit()
-
-    @less_console_noise_decorator
-    def test_status_fsm_submit_succeed(self):
-        user, _ = User.objects.get_or_create(username="testy")
-        site = DraftDomain.objects.create(name="igorville.gov")
-        domain_request = DomainRequest.objects.create(creator=user, requested_domain=site)
-
-        # no email sent to creator so this emits a log warning
-
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-            with less_console_noise():
-                domain_request.submit()
-        self.assertEqual(domain_request.status, domain_request.DomainRequestStatus.SUBMITTED)
-
-    @less_console_noise_decorator
-    def check_email_sent(
-        self, domain_request, msg, action, expected_count, expected_content=None, expected_email="mayor@igorville.com"
-    ):
-        """Check if an email was sent after performing an action."""
-        email_allowed, _ = AllowedEmail.objects.get_or_create(email=expected_email)
-        with self.subTest(msg=msg, action=action):
-            with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-                # Perform the specified action
-                action_method = getattr(domain_request, action)
-                action_method()
-
-            # Check if an email was sent
-            sent_emails = [
-                email
-                for email in MockSESClient.EMAILS_SENT
-                if expected_email in email["kwargs"]["Destination"]["ToAddresses"]
-            ]
-            self.assertEqual(len(sent_emails), expected_count)
-
-            if expected_content:
-                email_content = sent_emails[0]["kwargs"]["Content"]["Simple"]["Body"]["Text"]["Data"]
-                self.assertIn(expected_content, email_content)
-
-        email_allowed.delete()
-
-    @less_console_noise_decorator
-    def test_submit_from_started_sends_email_to_creator(self):
-        """tests that we send an email to the creator"""
-        msg = "Create a domain request and submit it and see if email was sent when the feature flag is on."
-        domain_request = completed_domain_request(user=self.dummy_user_2)
-        self.check_email_sent(
-            domain_request, msg, "submit", 1, expected_content="Lava", expected_email="intern@igorville.com"
-        )
-
-    @less_console_noise_decorator
-    def test_submit_from_withdrawn_sends_email(self):
-        msg = "Create a withdrawn domain request and submit it and see if email was sent."
-        user, _ = User.objects.get_or_create(username="testy")
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.WITHDRAWN, user=user)
-        self.check_email_sent(domain_request, msg, "submit", 1, expected_content="Hi", expected_email=user.email)
-
-    @less_console_noise_decorator
-    def test_submit_from_action_needed_does_not_send_email(self):
-        msg = "Create a domain request with ACTION_NEEDED status and submit it, check if email was not sent."
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.ACTION_NEEDED)
-        self.check_email_sent(domain_request, msg, "submit", 0)
-
-    @less_console_noise_decorator
-    def test_submit_from_in_review_does_not_send_email(self):
-        msg = "Create a withdrawn domain request and submit it and see if email was sent."
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW)
-        self.check_email_sent(domain_request, msg, "submit", 0)
-
-    @less_console_noise_decorator
-    def test_approve_sends_email(self):
-        msg = "Create a domain request and approve it and see if email was sent."
-        user, _ = User.objects.get_or_create(username="testy")
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=user)
-        self.check_email_sent(domain_request, msg, "approve", 1, expected_content="approved", expected_email=user.email)
-
-    @less_console_noise_decorator
-    def test_withdraw_sends_email(self):
-        msg = "Create a domain request and withdraw it and see if email was sent."
-        user, _ = User.objects.get_or_create(username="testy")
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=user)
-        self.check_email_sent(
-            domain_request, msg, "withdraw", 1, expected_content="withdrawn", expected_email=user.email
-        )
-
-    @less_console_noise_decorator
-    def test_reject_sends_email(self):
-        msg = "Create a domain request and reject it and see if email was sent."
-        user, _ = User.objects.get_or_create(username="testy")
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.APPROVED, user=user)
-        self.check_email_sent(domain_request, msg, "reject", 1, expected_content="Hi", expected_email=user.email)
-
-    @less_console_noise_decorator
-    def test_reject_with_prejudice_does_not_send_email(self):
-        msg = "Create a domain request and reject it with prejudice and see if email was sent."
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.APPROVED)
-        self.check_email_sent(domain_request, msg, "reject_with_prejudice", 0)
-
-    @less_console_noise_decorator
-    def assert_fsm_transition_raises_error(self, test_cases, method_to_run):
-        """Given a list of test cases, check if each transition throws the intended error"""
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client), less_console_noise():
-            for domain_request, exception_type in test_cases:
-                with self.subTest(domain_request=domain_request, exception_type=exception_type):
-                    with self.assertRaises(exception_type):
-                        # Retrieve the method by name from the domain_request object and call it
-                        method = getattr(domain_request, method_to_run)
-                        # Call the method
-                        method()
-
-    @less_console_noise_decorator
-    def assert_fsm_transition_does_not_raise_error(self, test_cases, method_to_run):
-        """Given a list of test cases, ensure that none of them throw transition errors"""
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client), less_console_noise():
-            for domain_request, exception_type in test_cases:
-                with self.subTest(domain_request=domain_request, exception_type=exception_type):
-                    try:
-                        # Retrieve the method by name from the DomainRequest object and call it
-                        method = getattr(domain_request, method_to_run)
-                        # Call the method
-                        method()
-                    except exception_type:
-                        self.fail(f"{exception_type} was raised, but it was not expected.")
-
-    @less_console_noise_decorator
-    def test_submit_transition_allowed_with_no_investigator(self):
-        """
-        Tests for attempting to transition without an investigator.
-        For submit, this should be valid in all cases.
-        """
-
-        test_cases = [
-            (self.started_domain_request, TransitionNotAllowed),
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.withdrawn_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to none
-        set_domain_request_investigators(self.all_domain_requests, None)
-
-        self.assert_fsm_transition_does_not_raise_error(test_cases, "submit")
-
-    @less_console_noise_decorator
-    def test_submit_transition_allowed_with_investigator_not_staff(self):
-        """
-        Tests for attempting to transition with an investigator user that is not staff.
-        For submit, this should be valid in all cases.
-        """
-
-        test_cases = [
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to a user with no staff privs
-        user, _ = User.objects.get_or_create(username="pancakesyrup", is_staff=False)
-        set_domain_request_investigators(self.all_domain_requests, user)
-
-        self.assert_fsm_transition_does_not_raise_error(test_cases, "submit")
-
-    @less_console_noise_decorator
-    def test_submit_transition_allowed(self):
-        """
-        Test that calling submit from allowable statuses does raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.started_domain_request, TransitionNotAllowed),
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.withdrawn_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_does_not_raise_error(test_cases, "submit")
-
-    @less_console_noise_decorator
-    def test_submit_transition_allowed_twice(self):
-        """
-        Test that rotating between submit and in_review doesn't throw an error
-        """
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-            try:
-                # Make a submission
-                self.in_review_domain_request.submit()
-
-                # Rerun the old method to get back to the original state
-                self.in_review_domain_request.in_review()
-
-                # Make another submission
-                self.in_review_domain_request.submit()
-            except TransitionNotAllowed:
-                self.fail("TransitionNotAllowed was raised, but it was not expected.")
-
-        self.assertEqual(self.in_review_domain_request.status, DomainRequest.DomainRequestStatus.SUBMITTED)
-
-    @less_console_noise_decorator
-    def test_submit_transition_not_allowed(self):
-        """
-        Test that calling submit against transition rules raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.submitted_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-            (self.ineligible_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_raises_error(test_cases, "submit")
-
-    @less_console_noise_decorator
-    def test_in_review_transition_allowed(self):
-        """
-        Test that calling in_review from allowable statuses does raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.submitted_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-            (self.ineligible_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_does_not_raise_error(test_cases, "in_review")
-
-    @less_console_noise_decorator
-    def test_in_review_transition_not_allowed_with_no_investigator(self):
-        """
-        Tests for attempting to transition without an investigator
-        """
-
-        test_cases = [
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-            (self.ineligible_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to none
-        set_domain_request_investigators(self.all_domain_requests, None)
-
-        self.assert_fsm_transition_raises_error(test_cases, "in_review")
-
-    @less_console_noise_decorator
-    def test_in_review_transition_not_allowed_with_investigator_not_staff(self):
-        """
-        Tests for attempting to transition with an investigator that is not staff.
-        This should throw an exception.
-        """
-
-        test_cases = [
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-            (self.ineligible_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to a user with no staff privs
-        user, _ = User.objects.get_or_create(username="pancakesyrup", is_staff=False)
-        set_domain_request_investigators(self.all_domain_requests, user)
-
-        self.assert_fsm_transition_raises_error(test_cases, "in_review")
-
-    @less_console_noise_decorator
-    def test_in_review_transition_not_allowed(self):
-        """
-        Test that calling in_review against transition rules raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.started_domain_request, TransitionNotAllowed),
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.withdrawn_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_raises_error(test_cases, "in_review")
-
-    @less_console_noise_decorator
-    def test_action_needed_transition_allowed(self):
-        """
-        Test that calling action_needed from allowable statuses does raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-            (self.ineligible_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_does_not_raise_error(test_cases, "action_needed")
-
-    @less_console_noise_decorator
-    def test_action_needed_transition_not_allowed_with_no_investigator(self):
-        """
-        Tests for attempting to transition without an investigator
-        """
-
-        test_cases = [
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-            (self.ineligible_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to none
-        set_domain_request_investigators(self.all_domain_requests, None)
-
-        self.assert_fsm_transition_raises_error(test_cases, "action_needed")
-
-    @less_console_noise_decorator
-    def test_action_needed_transition_not_allowed_with_investigator_not_staff(self):
-        """
-        Tests for attempting to transition with an investigator that is not staff
-        """
-
-        test_cases = [
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-            (self.ineligible_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to a user with no staff privs
-        user, _ = User.objects.get_or_create(username="pancakesyrup", is_staff=False)
-        set_domain_request_investigators(self.all_domain_requests, user)
-
-        self.assert_fsm_transition_raises_error(test_cases, "action_needed")
-
-    @less_console_noise_decorator
-    def test_action_needed_transition_not_allowed(self):
-        """
-        Test that calling action_needed against transition rules raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.started_domain_request, TransitionNotAllowed),
-            (self.submitted_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.withdrawn_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_raises_error(test_cases, "action_needed")
-
-    @less_console_noise_decorator
-    def test_approved_transition_allowed(self):
-        """
-        Test that calling action_needed from allowable statuses does raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.submitted_domain_request, TransitionNotAllowed),
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_does_not_raise_error(test_cases, "approve")
-
-    @less_console_noise_decorator
-    def test_approved_transition_not_allowed_with_no_investigator(self):
-        """
-        Tests for attempting to transition without an investigator
-        """
-
-        test_cases = [
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to none
-        set_domain_request_investigators(self.all_domain_requests, None)
-
-        self.assert_fsm_transition_raises_error(test_cases, "approve")
-
-    @less_console_noise_decorator
-    def test_approved_transition_not_allowed_with_investigator_not_staff(self):
-        """
-        Tests for attempting to transition with an investigator that is not staff
-        """
-
-        test_cases = [
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to a user with no staff privs
-        user, _ = User.objects.get_or_create(username="pancakesyrup", is_staff=False)
-        set_domain_request_investigators(self.all_domain_requests, user)
-
-        self.assert_fsm_transition_raises_error(test_cases, "approve")
-
-    @less_console_noise_decorator
-    def test_approved_skips_sending_email(self):
-        """
-        Test that calling .approve with send_email=False doesn't actually send
-        an email
-        """
-
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-            self.submitted_domain_request.approve(send_email=False)
-
-        # Assert that no emails were sent
-        self.assertEqual(len(self.mock_client.EMAILS_SENT), 0)
-
-    @less_console_noise_decorator
-    def test_approved_transition_not_allowed(self):
-        """
-        Test that calling action_needed against transition rules raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.started_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-            (self.withdrawn_domain_request, TransitionNotAllowed),
-            (self.ineligible_domain_request, TransitionNotAllowed),
-        ]
-        self.assert_fsm_transition_raises_error(test_cases, "approve")
-
-    @less_console_noise_decorator
-    def test_withdraw_transition_allowed(self):
-        """
-        Test that calling action_needed from allowable statuses does raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.submitted_domain_request, TransitionNotAllowed),
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_does_not_raise_error(test_cases, "withdraw")
-
-    @less_console_noise_decorator
-    def test_withdraw_transition_allowed_with_no_investigator(self):
-        """
-        Tests for attempting to transition without an investigator.
-        For withdraw, this should be valid in all cases.
-        """
-
-        test_cases = [
-            (self.submitted_domain_request, TransitionNotAllowed),
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to none
-        set_domain_request_investigators(self.all_domain_requests, None)
-
-        self.assert_fsm_transition_does_not_raise_error(test_cases, "withdraw")
-
-    @less_console_noise_decorator
-    def test_withdraw_transition_allowed_with_investigator_not_staff(self):
-        """
-        Tests for attempting to transition when investigator is not staff.
-        For withdraw, this should be valid in all cases.
-        """
-
-        test_cases = [
-            (self.submitted_domain_request, TransitionNotAllowed),
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to a user with no staff privs
-        user, _ = User.objects.get_or_create(username="pancakesyrup", is_staff=False)
-        set_domain_request_investigators(self.all_domain_requests, user)
-
-        self.assert_fsm_transition_does_not_raise_error(test_cases, "withdraw")
-
-    @less_console_noise_decorator
-    def test_withdraw_transition_not_allowed(self):
-        """
-        Test that calling action_needed against transition rules raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.started_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-            (self.withdrawn_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-            (self.ineligible_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_raises_error(test_cases, "withdraw")
-
-    @less_console_noise_decorator
-    def test_reject_transition_allowed(self):
-        """
-        Test that calling action_needed from allowable statuses does raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_does_not_raise_error(test_cases, "reject")
-
-    @less_console_noise_decorator
-    def test_reject_transition_not_allowed_with_no_investigator(self):
-        """
-        Tests for attempting to transition without an investigator
-        """
-
-        test_cases = [
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to none
-        set_domain_request_investigators(self.all_domain_requests, None)
-
-        self.assert_fsm_transition_raises_error(test_cases, "reject")
-
-    @less_console_noise_decorator
-    def test_reject_transition_not_allowed_with_investigator_not_staff(self):
-        """
-        Tests for attempting to transition when investigator is not staff
-        """
-
-        test_cases = [
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to a user with no staff privs
-        user, _ = User.objects.get_or_create(username="pancakesyrup", is_staff=False)
-        set_domain_request_investigators(self.all_domain_requests, user)
-
-        self.assert_fsm_transition_raises_error(test_cases, "reject")
-
-    @less_console_noise_decorator
-    def test_reject_transition_not_allowed(self):
-        """
-        Test that calling action_needed against transition rules raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.started_domain_request, TransitionNotAllowed),
-            (self.submitted_domain_request, TransitionNotAllowed),
-            (self.withdrawn_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-            (self.ineligible_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_raises_error(test_cases, "reject")
-
-    @less_console_noise_decorator
-    def test_reject_with_prejudice_transition_allowed(self):
-        """
-        Test that calling action_needed from allowable statuses does raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_does_not_raise_error(test_cases, "reject_with_prejudice")
-
-    @less_console_noise_decorator
-    def test_reject_with_prejudice_transition_not_allowed_with_no_investigator(self):
-        """
-        Tests for attempting to transition without an investigator
-        """
-
-        test_cases = [
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to none
-        set_domain_request_investigators(self.all_domain_requests, None)
-
-        self.assert_fsm_transition_raises_error(test_cases, "reject_with_prejudice")
-
-    @less_console_noise_decorator
-    def test_reject_with_prejudice_not_allowed_with_investigator_not_staff(self):
-        """
-        Tests for attempting to transition when investigator is not staff
-        """
-
-        test_cases = [
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to a user with no staff privs
-        user, _ = User.objects.get_or_create(username="pancakesyrup", is_staff=False)
-        set_domain_request_investigators(self.all_domain_requests, user)
-
-        self.assert_fsm_transition_raises_error(test_cases, "reject_with_prejudice")
-
-    @less_console_noise_decorator
-    def test_reject_with_prejudice_transition_not_allowed(self):
-        """
-        Test that calling action_needed against transition rules raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.started_domain_request, TransitionNotAllowed),
-            (self.submitted_domain_request, TransitionNotAllowed),
-            (self.withdrawn_domain_request, TransitionNotAllowed),
-            (self.ineligible_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_raises_error(test_cases, "reject_with_prejudice")
-
-    @less_console_noise_decorator
-    def test_transition_not_allowed_approved_in_review_when_domain_is_active(self):
-        """Create a domain request with status approved, create a matching domain that
-        is active, and call in_review against transition rules"""
-
-        domain = Domain.objects.create(name=self.approved_domain_request.requested_domain.name)
-        self.approved_domain_request.approved_domain = domain
-        self.approved_domain_request.save()
-
-        # Define a custom implementation for is_active
-        def custom_is_active(self):
-            return True  # Override to return True
-
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-            # Use patch to temporarily replace is_active with the custom implementation
-            with patch.object(Domain, "is_active", custom_is_active):
-                # Now, when you call is_active on Domain, it will return True
-                with self.assertRaises(TransitionNotAllowed):
-                    self.approved_domain_request.in_review()
-
-    @less_console_noise_decorator
-    def test_transition_not_allowed_approved_action_needed_when_domain_is_active(self):
-        """Create a domain request with status approved, create a matching domain that
-        is active, and call action_needed against transition rules"""
-
-        domain = Domain.objects.create(name=self.approved_domain_request.requested_domain.name)
-        self.approved_domain_request.approved_domain = domain
-        self.approved_domain_request.save()
-
-        # Define a custom implementation for is_active
-        def custom_is_active(self):
-            return True  # Override to return True
-
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-            # Use patch to temporarily replace is_active with the custom implementation
-            with patch.object(Domain, "is_active", custom_is_active):
-                # Now, when you call is_active on Domain, it will return True
-                with self.assertRaises(TransitionNotAllowed):
-                    self.approved_domain_request.action_needed()
-
-    @less_console_noise_decorator
-    def test_transition_not_allowed_approved_rejected_when_domain_is_active(self):
-        """Create a domain request with status approved, create a matching domain that
-        is active, and call reject against transition rules"""
-
-        domain = Domain.objects.create(name=self.approved_domain_request.requested_domain.name)
-        self.approved_domain_request.approved_domain = domain
-        self.approved_domain_request.save()
-
-        # Define a custom implementation for is_active
-        def custom_is_active(self):
-            return True  # Override to return True
-
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-            # Use patch to temporarily replace is_active with the custom implementation
-            with patch.object(Domain, "is_active", custom_is_active):
-                # Now, when you call is_active on Domain, it will return True
-                with self.assertRaises(TransitionNotAllowed):
-                    self.approved_domain_request.reject()
-
-    @less_console_noise_decorator
-    def test_transition_not_allowed_approved_ineligible_when_domain_is_active(self):
-        """Create a domain request with status approved, create a matching domain that
-        is active, and call reject_with_prejudice against transition rules"""
-
-        domain = Domain.objects.create(name=self.approved_domain_request.requested_domain.name)
-        self.approved_domain_request.approved_domain = domain
-        self.approved_domain_request.save()
-
-        # Define a custom implementation for is_active
-        def custom_is_active(self):
-            return True  # Override to return True
-
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-            # Use patch to temporarily replace is_active with the custom implementation
-            with patch.object(Domain, "is_active", custom_is_active):
-                # Now, when you call is_active on Domain, it will return True
-                with self.assertRaises(TransitionNotAllowed):
-                    self.approved_domain_request.reject_with_prejudice()
-
-    @less_console_noise_decorator
-    def test_approve_from_rejected_clears_rejection_reason(self):
-        """When transitioning from rejected to approved on a domain request,
-        the rejection_reason is cleared."""
-
-        # Create a sample domain request
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.REJECTED)
-        domain_request.rejection_reason = DomainRequest.RejectionReasons.DOMAIN_PURPOSE
-
-        # Approve
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-            domain_request.approve()
-
-        self.assertEqual(domain_request.status, DomainRequest.DomainRequestStatus.APPROVED)
-        self.assertEqual(domain_request.rejection_reason, None)
-
-    @less_console_noise_decorator
-    def test_in_review_from_rejected_clears_rejection_reason(self):
-        """When transitioning from rejected to in_review on a domain request,
-        the rejection_reason is cleared."""
-
-        # Create a sample domain request
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.REJECTED)
-        domain_request.domain_is_not_active = True
-        domain_request.rejection_reason = DomainRequest.RejectionReasons.DOMAIN_PURPOSE
-
-        # Approve
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-            domain_request.in_review()
-
-        self.assertEqual(domain_request.status, DomainRequest.DomainRequestStatus.IN_REVIEW)
-        self.assertEqual(domain_request.rejection_reason, None)
-
-    @less_console_noise_decorator
-    def test_action_needed_from_rejected_clears_rejection_reason(self):
-        """When transitioning from rejected to action_needed on a domain request,
-        the rejection_reason is cleared."""
-
-        # Create a sample domain request
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.REJECTED)
-        domain_request.domain_is_not_active = True
-        domain_request.rejection_reason = DomainRequest.RejectionReasons.DOMAIN_PURPOSE
-
-        # Approve
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-            domain_request.action_needed()
-
-        self.assertEqual(domain_request.status, DomainRequest.DomainRequestStatus.ACTION_NEEDED)
-        self.assertEqual(domain_request.rejection_reason, None)
-
-    @less_console_noise_decorator
-    def test_has_rationale_returns_true(self):
-        """has_rationale() returns true when a domain request has no_other_contacts_rationale"""
-        self.started_domain_request.no_other_contacts_rationale = "You talkin' to me?"
-        self.started_domain_request.save()
-        self.assertEquals(self.started_domain_request.has_rationale(), True)
-
-    @less_console_noise_decorator
-    def test_has_rationale_returns_false(self):
-        """has_rationale() returns false when a domain request has no no_other_contacts_rationale"""
-        self.assertEquals(self.started_domain_request.has_rationale(), False)
-
-    @less_console_noise_decorator
-    def test_has_other_contacts_returns_true(self):
-        """has_other_contacts() returns true when a domain request has other_contacts"""
-        # completed_domain_request has other contacts by default
-        self.assertEquals(self.started_domain_request.has_other_contacts(), True)
-
-    @less_console_noise_decorator
-    def test_has_other_contacts_returns_false(self):
-        """has_other_contacts() returns false when a domain request has no other_contacts"""
-        domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.STARTED, name="no-others.gov", has_other_contacts=False
-        )
-        self.assertEquals(domain_request.has_other_contacts(), False)
-
-
-class TestPermissions(TestCase):
-    """Test the User-Domain-Role connection."""
-
-    def setUp(self):
-        super().setUp()
-        self.mock_client = MockSESClient()
-
-    def tearDown(self):
-        super().tearDown()
-        self.mock_client.EMAILS_SENT.clear()
-
-    @boto3_mocking.patching
-    @less_console_noise_decorator
-    def test_approval_creates_role(self):
-        draft_domain, _ = DraftDomain.objects.get_or_create(name="igorville.gov")
-        user, _ = User.objects.get_or_create()
-        investigator, _ = User.objects.get_or_create(username="frenchtoast", is_staff=True)
-        domain_request = DomainRequest.objects.create(
-            creator=user, requested_domain=draft_domain, investigator=investigator
-        )
-
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-            # skip using the submit method
-            domain_request.status = DomainRequest.DomainRequestStatus.SUBMITTED
-            domain_request.approve()
-
-        # should be a role for this user
-        domain = Domain.objects.get(name="igorville.gov")
-        self.assertTrue(UserDomainRole.objects.get(user=user, domain=domain))
-
-
-class TestDomainInformation(TestCase):
-    """Test the DomainInformation model, when approved or otherwise"""
-
-    def setUp(self):
-        super().setUp()
-        self.mock_client = MockSESClient()
-
-    def tearDown(self):
-        super().tearDown()
-        self.mock_client.EMAILS_SENT.clear()
-        Domain.objects.all().delete()
-        DomainInformation.objects.all().delete()
-        DomainRequest.objects.all().delete()
-        User.objects.all().delete()
-        DraftDomain.objects.all().delete()
-
-    @boto3_mocking.patching
-    @less_console_noise_decorator
-    def test_approval_creates_info(self):
-        draft_domain, _ = DraftDomain.objects.get_or_create(name="igorville.gov")
-        user, _ = User.objects.get_or_create()
-        investigator, _ = User.objects.get_or_create(username="frenchtoast", is_staff=True)
-        domain_request = DomainRequest.objects.create(
-            creator=user, requested_domain=draft_domain, notes="test notes", investigator=investigator
-        )
-
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-            # skip using the submit method
-            domain_request.status = DomainRequest.DomainRequestStatus.SUBMITTED
-            domain_request.approve()
-
-            # should be an information present for this domain
-            domain = Domain.objects.get(name="igorville.gov")
-            domain_information = DomainInformation.objects.filter(domain=domain)
-            self.assertTrue(domain_information.exists())
-
-            # Test that both objects are what we expect
-            current_domain_information = domain_information.get().__dict__
-            expected_domain_information = DomainInformation(
-                creator=user,
-                domain=domain,
-                notes="test notes",
-                domain_request=domain_request,
-                federal_agency=FederalAgency.objects.get(agency="Non-Federal Agency"),
-            ).__dict__
-
-            # Test the two records for consistency
-            self.assertEqual(self.clean_dict(current_domain_information), self.clean_dict(expected_domain_information))
-
-    def clean_dict(self, dict_obj):
-        """Cleans dynamic fields in a dictionary"""
-        bad_fields = ["_state", "created_at", "id", "updated_at"]
-        return {k: v for k, v in dict_obj.items() if k not in bad_fields}
-
-
 class TestDomainInvitations(TestCase):
     """Test the retrieval of domain invitations."""
 
diff --git a/src/registrar/tests/test_models_requests.py b/src/registrar/tests/test_models_requests.py
new file mode 100644
index 000000000..fe814f146
--- /dev/null
+++ b/src/registrar/tests/test_models_requests.py
@@ -0,0 +1,1030 @@
+from django.test import TestCase
+from django.db.utils import IntegrityError
+from django.db import transaction
+from unittest.mock import patch
+
+
+from registrar.models import (
+    Contact,
+    DomainRequest,
+    DomainInformation,
+    User,
+    Website,
+    Domain,
+    DraftDomain,
+    FederalAgency,
+    AllowedEmail,
+)
+
+import boto3_mocking
+from registrar.utility.constants import BranchChoices
+from registrar.utility.errors import FSMErrorCodes
+
+from .common import (
+    MockSESClient,
+    less_console_noise,
+    completed_domain_request,
+    set_domain_request_investigators,
+    create_test_user,
+)
+from django_fsm import TransitionNotAllowed
+
+from api.tests.common import less_console_noise_decorator
+
+
+@boto3_mocking.patching
+class TestDomainRequest(TestCase):
+    @less_console_noise_decorator
+    def setUp(self):
+
+        self.dummy_user, _ = Contact.objects.get_or_create(
+            email="mayor@igorville.com", first_name="Hello", last_name="World"
+        )
+        self.dummy_user_2, _ = User.objects.get_or_create(
+            username="intern@igorville.com", email="intern@igorville.com", first_name="Lava", last_name="World"
+        )
+        self.started_domain_request = completed_domain_request(
+            status=DomainRequest.DomainRequestStatus.STARTED,
+            name="started.gov",
+        )
+        self.submitted_domain_request = completed_domain_request(
+            status=DomainRequest.DomainRequestStatus.SUBMITTED,
+            name="submitted.gov",
+        )
+        self.in_review_domain_request = completed_domain_request(
+            status=DomainRequest.DomainRequestStatus.IN_REVIEW,
+            name="in-review.gov",
+        )
+        self.action_needed_domain_request = completed_domain_request(
+            status=DomainRequest.DomainRequestStatus.ACTION_NEEDED,
+            name="action-needed.gov",
+        )
+        self.approved_domain_request = completed_domain_request(
+            status=DomainRequest.DomainRequestStatus.APPROVED,
+            name="approved.gov",
+        )
+        self.withdrawn_domain_request = completed_domain_request(
+            status=DomainRequest.DomainRequestStatus.WITHDRAWN,
+            name="withdrawn.gov",
+        )
+        self.rejected_domain_request = completed_domain_request(
+            status=DomainRequest.DomainRequestStatus.REJECTED,
+            name="rejected.gov",
+        )
+        self.ineligible_domain_request = completed_domain_request(
+            status=DomainRequest.DomainRequestStatus.INELIGIBLE,
+            name="ineligible.gov",
+        )
+
+        # Store all domain request statuses in a variable for ease of use
+        self.all_domain_requests = [
+            self.started_domain_request,
+            self.submitted_domain_request,
+            self.in_review_domain_request,
+            self.action_needed_domain_request,
+            self.approved_domain_request,
+            self.withdrawn_domain_request,
+            self.rejected_domain_request,
+            self.ineligible_domain_request,
+        ]
+
+        self.mock_client = MockSESClient()
+
+    def tearDown(self):
+        super().tearDown()
+        DomainInformation.objects.all().delete()
+        DomainRequest.objects.all().delete()
+        DraftDomain.objects.all().delete()
+        Domain.objects.all().delete()
+        User.objects.all().delete()
+        self.mock_client.EMAILS_SENT.clear()
+
+    def assertNotRaises(self, exception_type):
+        """Helper method for testing allowed transitions."""
+        with less_console_noise():
+            return self.assertRaises(Exception, None, exception_type)
+
+    @less_console_noise_decorator
+    def test_request_is_withdrawable(self):
+        """Tests the is_withdrawable function"""
+        domain_request_1 = completed_domain_request(
+            status=DomainRequest.DomainRequestStatus.SUBMITTED,
+            name="city2.gov",
+        )
+        domain_request_2 = completed_domain_request(
+            status=DomainRequest.DomainRequestStatus.IN_REVIEW,
+            name="city3.gov",
+        )
+        domain_request_3 = completed_domain_request(
+            status=DomainRequest.DomainRequestStatus.ACTION_NEEDED,
+            name="city4.gov",
+        )
+        domain_request_4 = completed_domain_request(
+            status=DomainRequest.DomainRequestStatus.REJECTED,
+            name="city5.gov",
+        )
+        self.assertTrue(domain_request_1.is_withdrawable())
+        self.assertTrue(domain_request_2.is_withdrawable())
+        self.assertTrue(domain_request_3.is_withdrawable())
+        self.assertFalse(domain_request_4.is_withdrawable())
+
+    @less_console_noise_decorator
+    def test_request_is_awaiting_review(self):
+        """Tests the is_awaiting_review function"""
+        domain_request_1 = completed_domain_request(
+            status=DomainRequest.DomainRequestStatus.SUBMITTED,
+            name="city2.gov",
+        )
+        domain_request_2 = completed_domain_request(
+            status=DomainRequest.DomainRequestStatus.IN_REVIEW,
+            name="city3.gov",
+        )
+        domain_request_3 = completed_domain_request(
+            status=DomainRequest.DomainRequestStatus.ACTION_NEEDED,
+            name="city4.gov",
+        )
+        domain_request_4 = completed_domain_request(
+            status=DomainRequest.DomainRequestStatus.REJECTED,
+            name="city5.gov",
+        )
+        self.assertTrue(domain_request_1.is_awaiting_review())
+        self.assertTrue(domain_request_2.is_awaiting_review())
+        self.assertFalse(domain_request_3.is_awaiting_review())
+        self.assertFalse(domain_request_4.is_awaiting_review())
+
+    @less_console_noise_decorator
+    def test_federal_agency_set_to_non_federal_on_approve(self):
+        """Ensures that when the federal_agency field is 'none' when .approve() is called,
+        the field is set to the 'Non-Federal Agency' record"""
+        domain_request = completed_domain_request(
+            status=DomainRequest.DomainRequestStatus.IN_REVIEW,
+            name="city2.gov",
+            federal_agency=None,
+        )
+
+        # Ensure that the federal agency is None
+        self.assertEqual(domain_request.federal_agency, None)
+
+        # Approve the request
+        domain_request.approve()
+        self.assertEqual(domain_request.status, DomainRequest.DomainRequestStatus.APPROVED)
+
+        # After approval, it should be "Non-Federal agency"
+        expected_federal_agency = FederalAgency.objects.filter(agency="Non-Federal Agency").first()
+        self.assertEqual(domain_request.federal_agency, expected_federal_agency)
+
+    def test_empty_create_fails(self):
+        """Can't create a completely empty domain request."""
+        with less_console_noise():
+            with transaction.atomic():
+                with self.assertRaisesRegex(IntegrityError, "creator"):
+                    DomainRequest.objects.create()
+
+    @less_console_noise_decorator
+    def test_minimal_create(self):
+        """Can create with just a creator."""
+        user, _ = User.objects.get_or_create(username="testy")
+        domain_request = DomainRequest.objects.create(creator=user)
+        self.assertEqual(domain_request.status, DomainRequest.DomainRequestStatus.STARTED)
+
+    @less_console_noise_decorator
+    def test_full_create(self):
+        """Can create with all fields."""
+        user, _ = User.objects.get_or_create(username="testy")
+        contact = Contact.objects.create()
+        com_website, _ = Website.objects.get_or_create(website="igorville.com")
+        gov_website, _ = Website.objects.get_or_create(website="igorville.gov")
+        domain, _ = DraftDomain.objects.get_or_create(name="igorville.gov")
+        domain_request = DomainRequest.objects.create(
+            creator=user,
+            investigator=user,
+            generic_org_type=DomainRequest.OrganizationChoices.FEDERAL,
+            federal_type=BranchChoices.EXECUTIVE,
+            is_election_board=False,
+            organization_name="Test",
+            address_line1="100 Main St.",
+            address_line2="APT 1A",
+            state_territory="CA",
+            zipcode="12345-6789",
+            senior_official=contact,
+            requested_domain=domain,
+            purpose="Igorville rules!",
+            anything_else="All of Igorville loves the dotgov program.",
+            is_policy_acknowledged=True,
+        )
+        domain_request.current_websites.add(com_website)
+        domain_request.alternative_domains.add(gov_website)
+        domain_request.other_contacts.add(contact)
+        domain_request.save()
+
+    @less_console_noise_decorator
+    def test_domain_info(self):
+        """Can create domain info with all fields."""
+        user, _ = User.objects.get_or_create(username="testy")
+        contact = Contact.objects.create()
+        domain, _ = Domain.objects.get_or_create(name="igorville.gov")
+        information = DomainInformation.objects.create(
+            creator=user,
+            generic_org_type=DomainInformation.OrganizationChoices.FEDERAL,
+            federal_type=BranchChoices.EXECUTIVE,
+            is_election_board=False,
+            organization_name="Test",
+            address_line1="100 Main St.",
+            address_line2="APT 1A",
+            state_territory="CA",
+            zipcode="12345-6789",
+            senior_official=contact,
+            purpose="Igorville rules!",
+            anything_else="All of Igorville loves the dotgov program.",
+            is_policy_acknowledged=True,
+            domain=domain,
+        )
+        information.other_contacts.add(contact)
+        information.save()
+        self.assertEqual(information.domain.id, domain.id)
+        self.assertEqual(information.id, domain.domain_info.id)
+
+    @less_console_noise_decorator
+    def test_status_fsm_submit_fail(self):
+        user, _ = User.objects.get_or_create(username="testy")
+        domain_request = DomainRequest.objects.create(creator=user)
+
+        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
+            with less_console_noise():
+                with self.assertRaises(ValueError):
+                    # can't submit a domain request with a null domain name
+                    domain_request.submit()
+
+    @less_console_noise_decorator
+    def test_status_fsm_submit_succeed(self):
+        user, _ = User.objects.get_or_create(username="testy")
+        site = DraftDomain.objects.create(name="igorville.gov")
+        domain_request = DomainRequest.objects.create(creator=user, requested_domain=site)
+
+        # no email sent to creator so this emits a log warning
+
+        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
+            with less_console_noise():
+                domain_request.submit()
+        self.assertEqual(domain_request.status, domain_request.DomainRequestStatus.SUBMITTED)
+
+    @less_console_noise_decorator
+    def check_email_sent(
+        self, domain_request, msg, action, expected_count, expected_content=None, expected_email="mayor@igorville.com"
+    ):
+        """Check if an email was sent after performing an action."""
+        email_allowed, _ = AllowedEmail.objects.get_or_create(email=expected_email)
+        with self.subTest(msg=msg, action=action):
+            with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
+                # Perform the specified action
+                action_method = getattr(domain_request, action)
+                action_method()
+
+            # Check if an email was sent
+            sent_emails = [
+                email
+                for email in MockSESClient.EMAILS_SENT
+                if expected_email in email["kwargs"]["Destination"]["ToAddresses"]
+            ]
+            self.assertEqual(len(sent_emails), expected_count)
+
+            if expected_content:
+                email_content = sent_emails[0]["kwargs"]["Content"]["Simple"]["Body"]["Text"]["Data"]
+                self.assertIn(expected_content, email_content)
+
+        email_allowed.delete()
+
+    @less_console_noise_decorator
+    def test_submit_from_started_sends_email_to_creator(self):
+        """tests that we send an email to the creator"""
+        msg = "Create a domain request and submit it and see if email was sent when the feature flag is on."
+        domain_request = completed_domain_request(user=self.dummy_user_2)
+        self.check_email_sent(
+            domain_request, msg, "submit", 1, expected_content="Lava", expected_email="intern@igorville.com"
+        )
+
+    @less_console_noise_decorator
+    def test_submit_from_withdrawn_sends_email(self):
+        msg = "Create a withdrawn domain request and submit it and see if email was sent."
+        user, _ = User.objects.get_or_create(username="testy")
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.WITHDRAWN, user=user)
+        self.check_email_sent(domain_request, msg, "submit", 1, expected_content="Hi", expected_email=user.email)
+
+    @less_console_noise_decorator
+    def test_submit_from_action_needed_does_not_send_email(self):
+        msg = "Create a domain request with ACTION_NEEDED status and submit it, check if email was not sent."
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.ACTION_NEEDED)
+        self.check_email_sent(domain_request, msg, "submit", 0)
+
+    @less_console_noise_decorator
+    def test_submit_from_in_review_does_not_send_email(self):
+        msg = "Create a withdrawn domain request and submit it and see if email was sent."
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW)
+        self.check_email_sent(domain_request, msg, "submit", 0)
+
+    @less_console_noise_decorator
+    def test_approve_sends_email(self):
+        msg = "Create a domain request and approve it and see if email was sent."
+        user, _ = User.objects.get_or_create(username="testy")
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=user)
+        self.check_email_sent(domain_request, msg, "approve", 1, expected_content="approved", expected_email=user.email)
+
+    @less_console_noise_decorator
+    def test_withdraw_sends_email(self):
+        msg = "Create a domain request and withdraw it and see if email was sent."
+        user, _ = User.objects.get_or_create(username="testy")
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=user)
+        self.check_email_sent(
+            domain_request, msg, "withdraw", 1, expected_content="withdrawn", expected_email=user.email
+        )
+
+    @less_console_noise_decorator
+    def test_reject_sends_email(self):
+        msg = "Create a domain request and reject it and see if email was sent."
+        user, _ = User.objects.get_or_create(username="testy")
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.APPROVED, user=user)
+        self.check_email_sent(domain_request, msg, "reject", 1, expected_content="Hi", expected_email=user.email)
+
+    @less_console_noise_decorator
+    def test_reject_with_prejudice_does_not_send_email(self):
+        msg = "Create a domain request and reject it with prejudice and see if email was sent."
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.APPROVED)
+        self.check_email_sent(domain_request, msg, "reject_with_prejudice", 0)
+
+    @less_console_noise_decorator
+    def assert_fsm_transition_raises_error(self, test_cases, method_to_run):
+        """Given a list of test cases, check if each transition throws the intended error"""
+        with boto3_mocking.clients.handler_for("sesv2", self.mock_client), less_console_noise():
+            for domain_request, exception_type in test_cases:
+                with self.subTest(domain_request=domain_request, exception_type=exception_type):
+                    with self.assertRaises(exception_type):
+                        # Retrieve the method by name from the domain_request object and call it
+                        method = getattr(domain_request, method_to_run)
+                        # Call the method
+                        method()
+
+    @less_console_noise_decorator
+    def assert_fsm_transition_does_not_raise_error(self, test_cases, method_to_run):
+        """Given a list of test cases, ensure that none of them throw transition errors"""
+        with boto3_mocking.clients.handler_for("sesv2", self.mock_client), less_console_noise():
+            for domain_request, exception_type in test_cases:
+                with self.subTest(domain_request=domain_request, exception_type=exception_type):
+                    try:
+                        # Retrieve the method by name from the DomainRequest object and call it
+                        method = getattr(domain_request, method_to_run)
+                        # Call the method
+                        method()
+                    except exception_type:
+                        self.fail(f"{exception_type} was raised, but it was not expected.")
+
+    @less_console_noise_decorator
+    def test_submit_transition_allowed_with_no_investigator(self):
+        """
+        Tests for attempting to transition without an investigator.
+        For submit, this should be valid in all cases.
+        """
+
+        test_cases = [
+            (self.started_domain_request, TransitionNotAllowed),
+            (self.in_review_domain_request, TransitionNotAllowed),
+            (self.action_needed_domain_request, TransitionNotAllowed),
+            (self.withdrawn_domain_request, TransitionNotAllowed),
+        ]
+
+        # Set all investigators to none
+        set_domain_request_investigators(self.all_domain_requests, None)
+
+        self.assert_fsm_transition_does_not_raise_error(test_cases, "submit")
+
+    @less_console_noise_decorator
+    def test_submit_transition_allowed_with_investigator_not_staff(self):
+        """
+        Tests for attempting to transition with an investigator user that is not staff.
+        For submit, this should be valid in all cases.
+        """
+
+        test_cases = [
+            (self.in_review_domain_request, TransitionNotAllowed),
+            (self.action_needed_domain_request, TransitionNotAllowed),
+        ]
+
+        # Set all investigators to a user with no staff privs
+        user, _ = User.objects.get_or_create(username="pancakesyrup", is_staff=False)
+        set_domain_request_investigators(self.all_domain_requests, user)
+
+        self.assert_fsm_transition_does_not_raise_error(test_cases, "submit")
+
+    @less_console_noise_decorator
+    def test_submit_transition_allowed(self):
+        """
+        Test that calling submit from allowable statuses does raises TransitionNotAllowed.
+        """
+        test_cases = [
+            (self.started_domain_request, TransitionNotAllowed),
+            (self.in_review_domain_request, TransitionNotAllowed),
+            (self.action_needed_domain_request, TransitionNotAllowed),
+            (self.withdrawn_domain_request, TransitionNotAllowed),
+        ]
+
+        self.assert_fsm_transition_does_not_raise_error(test_cases, "submit")
+
+    @less_console_noise_decorator
+    def test_submit_transition_allowed_twice(self):
+        """
+        Test that rotating between submit and in_review doesn't throw an error
+        """
+        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
+            try:
+                # Make a submission
+                self.in_review_domain_request.submit()
+
+                # Rerun the old method to get back to the original state
+                self.in_review_domain_request.in_review()
+
+                # Make another submission
+                self.in_review_domain_request.submit()
+            except TransitionNotAllowed:
+                self.fail("TransitionNotAllowed was raised, but it was not expected.")
+
+        self.assertEqual(self.in_review_domain_request.status, DomainRequest.DomainRequestStatus.SUBMITTED)
+
+    @less_console_noise_decorator
+    def test_submit_transition_not_allowed(self):
+        """
+        Test that calling submit against transition rules raises TransitionNotAllowed.
+        """
+        test_cases = [
+            (self.submitted_domain_request, TransitionNotAllowed),
+            (self.approved_domain_request, TransitionNotAllowed),
+            (self.rejected_domain_request, TransitionNotAllowed),
+            (self.ineligible_domain_request, TransitionNotAllowed),
+        ]
+
+        self.assert_fsm_transition_raises_error(test_cases, "submit")
+
+    @less_console_noise_decorator
+    def test_in_review_transition_allowed(self):
+        """
+        Test that calling in_review from allowable statuses does raises TransitionNotAllowed.
+        """
+        test_cases = [
+            (self.submitted_domain_request, TransitionNotAllowed),
+            (self.action_needed_domain_request, TransitionNotAllowed),
+            (self.approved_domain_request, TransitionNotAllowed),
+            (self.rejected_domain_request, TransitionNotAllowed),
+            (self.ineligible_domain_request, TransitionNotAllowed),
+        ]
+
+        self.assert_fsm_transition_does_not_raise_error(test_cases, "in_review")
+
+    @less_console_noise_decorator
+    def test_in_review_transition_not_allowed_with_no_investigator(self):
+        """
+        Tests for attempting to transition without an investigator
+        """
+
+        test_cases = [
+            (self.action_needed_domain_request, TransitionNotAllowed),
+            (self.approved_domain_request, TransitionNotAllowed),
+            (self.rejected_domain_request, TransitionNotAllowed),
+            (self.ineligible_domain_request, TransitionNotAllowed),
+        ]
+
+        # Set all investigators to none
+        set_domain_request_investigators(self.all_domain_requests, None)
+
+        self.assert_fsm_transition_raises_error(test_cases, "in_review")
+
+    @less_console_noise_decorator
+    def test_in_review_transition_not_allowed_with_investigator_not_staff(self):
+        """
+        Tests for attempting to transition with an investigator that is not staff.
+        This should throw an exception.
+        """
+
+        test_cases = [
+            (self.action_needed_domain_request, TransitionNotAllowed),
+            (self.approved_domain_request, TransitionNotAllowed),
+            (self.rejected_domain_request, TransitionNotAllowed),
+            (self.ineligible_domain_request, TransitionNotAllowed),
+        ]
+
+        # Set all investigators to a user with no staff privs
+        user, _ = User.objects.get_or_create(username="pancakesyrup", is_staff=False)
+        set_domain_request_investigators(self.all_domain_requests, user)
+
+        self.assert_fsm_transition_raises_error(test_cases, "in_review")
+
+    @less_console_noise_decorator
+    def test_in_review_transition_not_allowed(self):
+        """
+        Test that calling in_review against transition rules raises TransitionNotAllowed.
+        """
+        test_cases = [
+            (self.started_domain_request, TransitionNotAllowed),
+            (self.in_review_domain_request, TransitionNotAllowed),
+            (self.withdrawn_domain_request, TransitionNotAllowed),
+        ]
+
+        self.assert_fsm_transition_raises_error(test_cases, "in_review")
+
+    @less_console_noise_decorator
+    def test_action_needed_transition_allowed(self):
+        """
+        Test that calling action_needed from allowable statuses does raises TransitionNotAllowed.
+        """
+        test_cases = [
+            (self.in_review_domain_request, TransitionNotAllowed),
+            (self.approved_domain_request, TransitionNotAllowed),
+            (self.rejected_domain_request, TransitionNotAllowed),
+            (self.ineligible_domain_request, TransitionNotAllowed),
+        ]
+
+        self.assert_fsm_transition_does_not_raise_error(test_cases, "action_needed")
+
+    @less_console_noise_decorator
+    def test_action_needed_transition_not_allowed_with_no_investigator(self):
+        """
+        Tests for attempting to transition without an investigator
+        """
+
+        test_cases = [
+            (self.in_review_domain_request, TransitionNotAllowed),
+            (self.approved_domain_request, TransitionNotAllowed),
+            (self.rejected_domain_request, TransitionNotAllowed),
+            (self.ineligible_domain_request, TransitionNotAllowed),
+        ]
+
+        # Set all investigators to none
+        set_domain_request_investigators(self.all_domain_requests, None)
+
+        self.assert_fsm_transition_raises_error(test_cases, "action_needed")
+
+    @less_console_noise_decorator
+    def test_action_needed_transition_not_allowed_with_investigator_not_staff(self):
+        """
+        Tests for attempting to transition with an investigator that is not staff
+        """
+
+        test_cases = [
+            (self.in_review_domain_request, TransitionNotAllowed),
+            (self.approved_domain_request, TransitionNotAllowed),
+            (self.rejected_domain_request, TransitionNotAllowed),
+            (self.ineligible_domain_request, TransitionNotAllowed),
+        ]
+
+        # Set all investigators to a user with no staff privs
+        user, _ = User.objects.get_or_create(username="pancakesyrup", is_staff=False)
+        set_domain_request_investigators(self.all_domain_requests, user)
+
+        self.assert_fsm_transition_raises_error(test_cases, "action_needed")
+
+    @less_console_noise_decorator
+    def test_action_needed_transition_not_allowed(self):
+        """
+        Test that calling action_needed against transition rules raises TransitionNotAllowed.
+        """
+        test_cases = [
+            (self.started_domain_request, TransitionNotAllowed),
+            (self.submitted_domain_request, TransitionNotAllowed),
+            (self.action_needed_domain_request, TransitionNotAllowed),
+            (self.withdrawn_domain_request, TransitionNotAllowed),
+        ]
+
+        self.assert_fsm_transition_raises_error(test_cases, "action_needed")
+
+    @less_console_noise_decorator
+    def test_approved_transition_allowed(self):
+        """
+        Test that calling action_needed from allowable statuses does raises TransitionNotAllowed.
+        """
+        test_cases = [
+            (self.submitted_domain_request, TransitionNotAllowed),
+            (self.in_review_domain_request, TransitionNotAllowed),
+            (self.action_needed_domain_request, TransitionNotAllowed),
+            (self.rejected_domain_request, TransitionNotAllowed),
+        ]
+
+        self.assert_fsm_transition_does_not_raise_error(test_cases, "approve")
+
+    @less_console_noise_decorator
+    def test_approved_transition_not_allowed_with_no_investigator(self):
+        """
+        Tests for attempting to transition without an investigator
+        """
+
+        test_cases = [
+            (self.in_review_domain_request, TransitionNotAllowed),
+            (self.action_needed_domain_request, TransitionNotAllowed),
+            (self.rejected_domain_request, TransitionNotAllowed),
+        ]
+
+        # Set all investigators to none
+        set_domain_request_investigators(self.all_domain_requests, None)
+
+        self.assert_fsm_transition_raises_error(test_cases, "approve")
+
+    @less_console_noise_decorator
+    def test_approved_transition_not_allowed_with_investigator_not_staff(self):
+        """
+        Tests for attempting to transition with an investigator that is not staff
+        """
+
+        test_cases = [
+            (self.in_review_domain_request, TransitionNotAllowed),
+            (self.action_needed_domain_request, TransitionNotAllowed),
+            (self.rejected_domain_request, TransitionNotAllowed),
+        ]
+
+        # Set all investigators to a user with no staff privs
+        user, _ = User.objects.get_or_create(username="pancakesyrup", is_staff=False)
+        set_domain_request_investigators(self.all_domain_requests, user)
+
+        self.assert_fsm_transition_raises_error(test_cases, "approve")
+
+    @less_console_noise_decorator
+    def test_approved_skips_sending_email(self):
+        """
+        Test that calling .approve with send_email=False doesn't actually send
+        an email
+        """
+
+        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
+            self.submitted_domain_request.approve(send_email=False)
+
+        # Assert that no emails were sent
+        self.assertEqual(len(self.mock_client.EMAILS_SENT), 0)
+
+    @less_console_noise_decorator
+    def test_approved_transition_not_allowed(self):
+        """
+        Test that calling approve against transition rules raises TransitionNotAllowed.
+        """
+        test_cases = [
+            (self.started_domain_request, TransitionNotAllowed),
+            (self.approved_domain_request, TransitionNotAllowed),
+            (self.withdrawn_domain_request, TransitionNotAllowed),
+            (self.ineligible_domain_request, TransitionNotAllowed),
+        ]
+        self.assert_fsm_transition_raises_error(test_cases, "approve")
+    
+    @less_console_noise_decorator
+    def test_approved_transition_not_allowed_when_domain_already_approved(self):
+        """
+        Test that calling approve whith an already approved requested domain raises
+        TransitionNotAllowed.
+        """
+        Domain.objects.all().create(name=self.submitted_domain_request.requested_domain.name)
+        test_cases = [
+            (self.submitted_domain_request, FSMErrorCodes.APPROVE_DOMAIN_IN_USE),
+        ]
+        self.assert_fsm_transition_raises_error(test_cases, "approve")
+
+    @less_console_noise_decorator
+    def test_withdraw_transition_allowed(self):
+        """
+        Test that calling action_needed from allowable statuses does raises TransitionNotAllowed.
+        """
+        test_cases = [
+            (self.submitted_domain_request, TransitionNotAllowed),
+            (self.in_review_domain_request, TransitionNotAllowed),
+            (self.action_needed_domain_request, TransitionNotAllowed),
+        ]
+
+        self.assert_fsm_transition_does_not_raise_error(test_cases, "withdraw")
+
+    @less_console_noise_decorator
+    def test_withdraw_transition_allowed_with_no_investigator(self):
+        """
+        Tests for attempting to transition without an investigator.
+        For withdraw, this should be valid in all cases.
+        """
+
+        test_cases = [
+            (self.submitted_domain_request, TransitionNotAllowed),
+            (self.in_review_domain_request, TransitionNotAllowed),
+            (self.action_needed_domain_request, TransitionNotAllowed),
+        ]
+
+        # Set all investigators to none
+        set_domain_request_investigators(self.all_domain_requests, None)
+
+        self.assert_fsm_transition_does_not_raise_error(test_cases, "withdraw")
+
+    @less_console_noise_decorator
+    def test_withdraw_transition_allowed_with_investigator_not_staff(self):
+        """
+        Tests for attempting to transition when investigator is not staff.
+        For withdraw, this should be valid in all cases.
+        """
+
+        test_cases = [
+            (self.submitted_domain_request, TransitionNotAllowed),
+            (self.in_review_domain_request, TransitionNotAllowed),
+            (self.action_needed_domain_request, TransitionNotAllowed),
+        ]
+
+        # Set all investigators to a user with no staff privs
+        user, _ = User.objects.get_or_create(username="pancakesyrup", is_staff=False)
+        set_domain_request_investigators(self.all_domain_requests, user)
+
+        self.assert_fsm_transition_does_not_raise_error(test_cases, "withdraw")
+
+    @less_console_noise_decorator
+    def test_withdraw_transition_not_allowed(self):
+        """
+        Test that calling action_needed against transition rules raises TransitionNotAllowed.
+        """
+        test_cases = [
+            (self.started_domain_request, TransitionNotAllowed),
+            (self.approved_domain_request, TransitionNotAllowed),
+            (self.withdrawn_domain_request, TransitionNotAllowed),
+            (self.rejected_domain_request, TransitionNotAllowed),
+            (self.ineligible_domain_request, TransitionNotAllowed),
+        ]
+
+        self.assert_fsm_transition_raises_error(test_cases, "withdraw")
+
+    @less_console_noise_decorator
+    def test_reject_transition_allowed(self):
+        """
+        Test that calling action_needed from allowable statuses does raises TransitionNotAllowed.
+        """
+        test_cases = [
+            (self.in_review_domain_request, TransitionNotAllowed),
+            (self.action_needed_domain_request, TransitionNotAllowed),
+            (self.approved_domain_request, TransitionNotAllowed),
+        ]
+
+        self.assert_fsm_transition_does_not_raise_error(test_cases, "reject")
+
+    @less_console_noise_decorator
+    def test_reject_transition_not_allowed_with_no_investigator(self):
+        """
+        Tests for attempting to transition without an investigator
+        """
+
+        test_cases = [
+            (self.in_review_domain_request, TransitionNotAllowed),
+            (self.action_needed_domain_request, TransitionNotAllowed),
+            (self.approved_domain_request, TransitionNotAllowed),
+        ]
+
+        # Set all investigators to none
+        set_domain_request_investigators(self.all_domain_requests, None)
+
+        self.assert_fsm_transition_raises_error(test_cases, "reject")
+
+    @less_console_noise_decorator
+    def test_reject_transition_not_allowed_with_investigator_not_staff(self):
+        """
+        Tests for attempting to transition when investigator is not staff
+        """
+
+        test_cases = [
+            (self.in_review_domain_request, TransitionNotAllowed),
+            (self.action_needed_domain_request, TransitionNotAllowed),
+            (self.approved_domain_request, TransitionNotAllowed),
+        ]
+
+        # Set all investigators to a user with no staff privs
+        user, _ = User.objects.get_or_create(username="pancakesyrup", is_staff=False)
+        set_domain_request_investigators(self.all_domain_requests, user)
+
+        self.assert_fsm_transition_raises_error(test_cases, "reject")
+
+    @less_console_noise_decorator
+    def test_reject_transition_not_allowed(self):
+        """
+        Test that calling action_needed against transition rules raises TransitionNotAllowed.
+        """
+        test_cases = [
+            (self.started_domain_request, TransitionNotAllowed),
+            (self.submitted_domain_request, TransitionNotAllowed),
+            (self.withdrawn_domain_request, TransitionNotAllowed),
+            (self.rejected_domain_request, TransitionNotAllowed),
+            (self.ineligible_domain_request, TransitionNotAllowed),
+        ]
+
+        self.assert_fsm_transition_raises_error(test_cases, "reject")
+
+    @less_console_noise_decorator
+    def test_reject_with_prejudice_transition_allowed(self):
+        """
+        Test that calling action_needed from allowable statuses does raises TransitionNotAllowed.
+        """
+        test_cases = [
+            (self.in_review_domain_request, TransitionNotAllowed),
+            (self.action_needed_domain_request, TransitionNotAllowed),
+            (self.approved_domain_request, TransitionNotAllowed),
+            (self.rejected_domain_request, TransitionNotAllowed),
+        ]
+
+        self.assert_fsm_transition_does_not_raise_error(test_cases, "reject_with_prejudice")
+
+    @less_console_noise_decorator
+    def test_reject_with_prejudice_transition_not_allowed_with_no_investigator(self):
+        """
+        Tests for attempting to transition without an investigator
+        """
+
+        test_cases = [
+            (self.in_review_domain_request, TransitionNotAllowed),
+            (self.action_needed_domain_request, TransitionNotAllowed),
+            (self.approved_domain_request, TransitionNotAllowed),
+            (self.rejected_domain_request, TransitionNotAllowed),
+        ]
+
+        # Set all investigators to none
+        set_domain_request_investigators(self.all_domain_requests, None)
+
+        self.assert_fsm_transition_raises_error(test_cases, "reject_with_prejudice")
+
+    @less_console_noise_decorator
+    def test_reject_with_prejudice_not_allowed_with_investigator_not_staff(self):
+        """
+        Tests for attempting to transition when investigator is not staff
+        """
+
+        test_cases = [
+            (self.in_review_domain_request, TransitionNotAllowed),
+            (self.action_needed_domain_request, TransitionNotAllowed),
+            (self.approved_domain_request, TransitionNotAllowed),
+            (self.rejected_domain_request, TransitionNotAllowed),
+        ]
+
+        # Set all investigators to a user with no staff privs
+        user, _ = User.objects.get_or_create(username="pancakesyrup", is_staff=False)
+        set_domain_request_investigators(self.all_domain_requests, user)
+
+        self.assert_fsm_transition_raises_error(test_cases, "reject_with_prejudice")
+
+    @less_console_noise_decorator
+    def test_reject_with_prejudice_transition_not_allowed(self):
+        """
+        Test that calling action_needed against transition rules raises TransitionNotAllowed.
+        """
+        test_cases = [
+            (self.started_domain_request, TransitionNotAllowed),
+            (self.submitted_domain_request, TransitionNotAllowed),
+            (self.withdrawn_domain_request, TransitionNotAllowed),
+            (self.ineligible_domain_request, TransitionNotAllowed),
+        ]
+
+        self.assert_fsm_transition_raises_error(test_cases, "reject_with_prejudice")
+
+    @less_console_noise_decorator
+    def test_transition_not_allowed_approved_in_review_when_domain_is_active(self):
+        """Create a domain request with status approved, create a matching domain that
+        is active, and call in_review against transition rules"""
+
+        domain = Domain.objects.create(name=self.approved_domain_request.requested_domain.name)
+        self.approved_domain_request.approved_domain = domain
+        self.approved_domain_request.save()
+
+        # Define a custom implementation for is_active
+        def custom_is_active(self):
+            return True  # Override to return True
+
+        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
+            # Use patch to temporarily replace is_active with the custom implementation
+            with patch.object(Domain, "is_active", custom_is_active):
+                # Now, when you call is_active on Domain, it will return True
+                with self.assertRaises(TransitionNotAllowed):
+                    self.approved_domain_request.in_review()
+
+    @less_console_noise_decorator
+    def test_transition_not_allowed_approved_action_needed_when_domain_is_active(self):
+        """Create a domain request with status approved, create a matching domain that
+        is active, and call action_needed against transition rules"""
+
+        domain = Domain.objects.create(name=self.approved_domain_request.requested_domain.name)
+        self.approved_domain_request.approved_domain = domain
+        self.approved_domain_request.save()
+
+        # Define a custom implementation for is_active
+        def custom_is_active(self):
+            return True  # Override to return True
+
+        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
+            # Use patch to temporarily replace is_active with the custom implementation
+            with patch.object(Domain, "is_active", custom_is_active):
+                # Now, when you call is_active on Domain, it will return True
+                with self.assertRaises(TransitionNotAllowed):
+                    self.approved_domain_request.action_needed()
+
+    @less_console_noise_decorator
+    def test_transition_not_allowed_approved_rejected_when_domain_is_active(self):
+        """Create a domain request with status approved, create a matching domain that
+        is active, and call reject against transition rules"""
+
+        domain = Domain.objects.create(name=self.approved_domain_request.requested_domain.name)
+        self.approved_domain_request.approved_domain = domain
+        self.approved_domain_request.save()
+
+        # Define a custom implementation for is_active
+        def custom_is_active(self):
+            return True  # Override to return True
+
+        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
+            # Use patch to temporarily replace is_active with the custom implementation
+            with patch.object(Domain, "is_active", custom_is_active):
+                # Now, when you call is_active on Domain, it will return True
+                with self.assertRaises(TransitionNotAllowed):
+                    self.approved_domain_request.reject()
+
+    @less_console_noise_decorator
+    def test_transition_not_allowed_approved_ineligible_when_domain_is_active(self):
+        """Create a domain request with status approved, create a matching domain that
+        is active, and call reject_with_prejudice against transition rules"""
+
+        domain = Domain.objects.create(name=self.approved_domain_request.requested_domain.name)
+        self.approved_domain_request.approved_domain = domain
+        self.approved_domain_request.save()
+
+        # Define a custom implementation for is_active
+        def custom_is_active(self):
+            return True  # Override to return True
+
+        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
+            # Use patch to temporarily replace is_active with the custom implementation
+            with patch.object(Domain, "is_active", custom_is_active):
+                # Now, when you call is_active on Domain, it will return True
+                with self.assertRaises(TransitionNotAllowed):
+                    self.approved_domain_request.reject_with_prejudice()
+
+    @less_console_noise_decorator
+    def test_approve_from_rejected_clears_rejection_reason(self):
+        """When transitioning from rejected to approved on a domain request,
+        the rejection_reason is cleared."""
+
+        # Create a sample domain request
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.REJECTED)
+        domain_request.rejection_reason = DomainRequest.RejectionReasons.DOMAIN_PURPOSE
+
+        # Approve
+        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
+            domain_request.approve()
+
+        self.assertEqual(domain_request.status, DomainRequest.DomainRequestStatus.APPROVED)
+        self.assertEqual(domain_request.rejection_reason, None)
+
+    @less_console_noise_decorator
+    def test_in_review_from_rejected_clears_rejection_reason(self):
+        """When transitioning from rejected to in_review on a domain request,
+        the rejection_reason is cleared."""
+
+        # Create a sample domain request
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.REJECTED)
+        domain_request.domain_is_not_active = True
+        domain_request.rejection_reason = DomainRequest.RejectionReasons.DOMAIN_PURPOSE
+
+        # Approve
+        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
+            domain_request.in_review()
+
+        self.assertEqual(domain_request.status, DomainRequest.DomainRequestStatus.IN_REVIEW)
+        self.assertEqual(domain_request.rejection_reason, None)
+
+    @less_console_noise_decorator
+    def test_action_needed_from_rejected_clears_rejection_reason(self):
+        """When transitioning from rejected to action_needed on a domain request,
+        the rejection_reason is cleared."""
+
+        # Create a sample domain request
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.REJECTED)
+        domain_request.domain_is_not_active = True
+        domain_request.rejection_reason = DomainRequest.RejectionReasons.DOMAIN_PURPOSE
+
+        # Approve
+        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
+            domain_request.action_needed()
+
+        self.assertEqual(domain_request.status, DomainRequest.DomainRequestStatus.ACTION_NEEDED)
+        self.assertEqual(domain_request.rejection_reason, None)
+
+    @less_console_noise_decorator
+    def test_has_rationale_returns_true(self):
+        """has_rationale() returns true when a domain request has no_other_contacts_rationale"""
+        self.started_domain_request.no_other_contacts_rationale = "You talkin' to me?"
+        self.started_domain_request.save()
+        self.assertEquals(self.started_domain_request.has_rationale(), True)
+
+    @less_console_noise_decorator
+    def test_has_rationale_returns_false(self):
+        """has_rationale() returns false when a domain request has no no_other_contacts_rationale"""
+        self.assertEquals(self.started_domain_request.has_rationale(), False)
+
+    @less_console_noise_decorator
+    def test_has_other_contacts_returns_true(self):
+        """has_other_contacts() returns true when a domain request has other_contacts"""
+        # completed_domain_request has other contacts by default
+        self.assertEquals(self.started_domain_request.has_other_contacts(), True)
+
+    @less_console_noise_decorator
+    def test_has_other_contacts_returns_false(self):
+        """has_other_contacts() returns false when a domain request has no other_contacts"""
+        domain_request = completed_domain_request(
+            status=DomainRequest.DomainRequestStatus.STARTED, name="no-others.gov", has_other_contacts=False
+        )
+        self.assertEquals(domain_request.has_other_contacts(), False)
diff --git a/src/registrar/utility/errors.py b/src/registrar/utility/errors.py
index 8cb83c0ee..9e30b59a3 100644
--- a/src/registrar/utility/errors.py
+++ b/src/registrar/utility/errors.py
@@ -95,7 +95,7 @@ class FSMDomainRequestError(Exception):
     """
 
     _error_mapping = {
-        FSMErrorCodes.APPROVE_DOMAIN_IN_USE: ("Cannot approve. Requested domain is already in use."),
+        FSMErrorCodes.APPROVE_DOMAIN_IN_USE: ("The domain name for this request is already in use. The name will need to be updated before this request can be approved."),
         FSMErrorCodes.NO_INVESTIGATOR: ("Investigator is required for this status."),
         FSMErrorCodes.INVESTIGATOR_NOT_STAFF: ("Investigator is not a staff user."),
         FSMErrorCodes.NO_REJECTION_REASON: ("A reason is required for this status."),

From 4df509c4f7fbd7dbae55f66bd94f5e7682fbacd4 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Wed, 2 Oct 2024 17:49:57 -0400
Subject: [PATCH 026/142] working on tests

---
 src/registrar/models/domain.py              |  1 +
 src/registrar/tests/test_admin_request.py   | 35 +++++++++++++++------
 src/registrar/tests/test_models_requests.py |  4 +--
 src/registrar/utility/errors.py             |  2 +-
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py
index 7fdc56971..c4e61ba46 100644
--- a/src/registrar/models/domain.py
+++ b/src/registrar/models/domain.py
@@ -969,6 +969,7 @@ class Domain(TimeStampedModel, DomainHelper):
         Is the domain live on the inter webs?
         could be replaced with request to see if ok status is set
         """
+        return True
         return self.state == self.State.READY
 
     def is_editable(self) -> bool:
diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py
index a9b073472..6fd2da8db 100644
--- a/src/registrar/tests/test_admin_request.py
+++ b/src/registrar/tests/test_admin_request.py
@@ -25,6 +25,7 @@ from registrar.models import (
     Portfolio,
     AllowedEmail,
 )
+from registrar.utility.errors import FSMErrorCodes
 from .common import (
     MockSESClient,
     completed_domain_request,
@@ -37,6 +38,7 @@ from .common import (
     GenericTestHelper,
 )
 from unittest.mock import patch
+from django_fsm import TransitionNotAllowed
 
 from django.conf import settings
 import boto3_mocking  # type: ignore
@@ -1796,18 +1798,10 @@ class TestDomainRequestAdmin(MockEppLib):
 
                 domain_request.rejection_reason = rejection_reason
 
-                self.admin.save_model(request, domain_request, None, True)
-
-                # Assert that the error message was called with the correct argument
                 if domain_is_active:
-                    messages.error.assert_called_once_with(
-                        request,
-                        "This action is not permitted. The domain " + "is already active.",
-                    )
+                    with self.assertRaises(TransitionNotAllowed):
+                        self.admin.save_model(request, domain_request, None, True)
                 else:
-                    # Assert that the error message was never called
-                    messages.error.assert_not_called()
-
                     self.assertEqual(domain_request.approved_domain, None)
 
                     # Assert that Domain got Deleted
@@ -1818,6 +1812,27 @@ class TestDomainRequestAdmin(MockEppLib):
                     with self.assertRaises(DomainInformation.DoesNotExist):
                         domain_information.refresh_from_db()
 
+
+                # # Assert that the error message was called with the correct argument
+                # if domain_is_active:
+                #     messages.error.assert_called_once_with(
+                #         request,
+                #         FSMErrorCodes.APPROVE_DOMAIN_IN_USE,
+                #     )
+                # else:
+                #     # Assert that the error message was never called
+                #     messages.error.assert_not_called()
+
+                #     self.assertEqual(domain_request.approved_domain, None)
+
+                #     # Assert that Domain got Deleted
+                #     with self.assertRaises(Domain.DoesNotExist):
+                #         domain.refresh_from_db()
+
+                #     # Assert that DomainInformation got Deleted
+                #     with self.assertRaises(DomainInformation.DoesNotExist):
+                #         domain_information.refresh_from_db()
+
     def test_error_when_saving_approved_to_in_review_and_domain_is_active(self):
         self.trigger_saving_approved_to_another_state(True, DomainRequest.DomainRequestStatus.IN_REVIEW)
 
diff --git a/src/registrar/tests/test_models_requests.py b/src/registrar/tests/test_models_requests.py
index fe814f146..96a19aae1 100644
--- a/src/registrar/tests/test_models_requests.py
+++ b/src/registrar/tests/test_models_requests.py
@@ -18,7 +18,7 @@ from registrar.models import (
 
 import boto3_mocking
 from registrar.utility.constants import BranchChoices
-from registrar.utility.errors import FSMErrorCodes
+from registrar.utility.errors import FSMDomainRequestError, FSMErrorCodes
 
 from .common import (
     MockSESClient,
@@ -676,7 +676,7 @@ class TestDomainRequest(TestCase):
         """
         Domain.objects.all().create(name=self.submitted_domain_request.requested_domain.name)
         test_cases = [
-            (self.submitted_domain_request, FSMErrorCodes.APPROVE_DOMAIN_IN_USE),
+            (self.submitted_domain_request, FSMDomainRequestError),
         ]
         self.assert_fsm_transition_raises_error(test_cases, "approve")
 
diff --git a/src/registrar/utility/errors.py b/src/registrar/utility/errors.py
index 9e30b59a3..8cb83c0ee 100644
--- a/src/registrar/utility/errors.py
+++ b/src/registrar/utility/errors.py
@@ -95,7 +95,7 @@ class FSMDomainRequestError(Exception):
     """
 
     _error_mapping = {
-        FSMErrorCodes.APPROVE_DOMAIN_IN_USE: ("The domain name for this request is already in use. The name will need to be updated before this request can be approved."),
+        FSMErrorCodes.APPROVE_DOMAIN_IN_USE: ("Cannot approve. Requested domain is already in use."),
         FSMErrorCodes.NO_INVESTIGATOR: ("Investigator is required for this status."),
         FSMErrorCodes.INVESTIGATOR_NOT_STAFF: ("Investigator is not a staff user."),
         FSMErrorCodes.NO_REJECTION_REASON: ("A reason is required for this status."),

From 0ea37d71135c2d3e5c0574cb7371775240869347 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Wed, 2 Oct 2024 18:12:40 -0400
Subject: [PATCH 027/142] unit tests

---
 src/registrar/admin.py                    | 13 +++++++--
 src/registrar/tests/test_admin_request.py | 35 +++++++----------------
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 79e9d55b3..321014949 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -2013,8 +2013,17 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
             should_proceed = False
             return (obj, should_proceed)
 
-        request_is_not_approved = original_obj.status != models.DomainRequest.DomainRequestStatus.APPROVED
-        if request_is_not_approved and Domain.objects.filter(name=original_obj.requested_domain.name).exists():
+        obj_is_not_approved = obj.status != models.DomainRequest.DomainRequestStatus.APPROVED
+        original_obj_is_not_approved = original_obj.status != models.DomainRequest.DomainRequestStatus.APPROVED
+        if obj_is_not_approved and not obj.domain_is_not_active():
+            # If an admin tried to set an approved domain request to
+            # another status and the related domain is already
+            # active (READY), shortcut the action and throw a friendly
+            # error message. This action would still not go through
+            # shortcut or not as the rules are duplicated on the model,
+            # but the error would be an ugly Django error screen.
+            error_message = "This action is not permitted. The domain is already active."
+        if original_obj_is_not_approved and Domain.objects.filter(name=original_obj.requested_domain.name).exists():
             # REDUNDANT CHECK:
             # This action (approving a request when the domain is active)
             # would still not go through check or not as the rules are
diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py
index 6fd2da8db..a9b073472 100644
--- a/src/registrar/tests/test_admin_request.py
+++ b/src/registrar/tests/test_admin_request.py
@@ -25,7 +25,6 @@ from registrar.models import (
     Portfolio,
     AllowedEmail,
 )
-from registrar.utility.errors import FSMErrorCodes
 from .common import (
     MockSESClient,
     completed_domain_request,
@@ -38,7 +37,6 @@ from .common import (
     GenericTestHelper,
 )
 from unittest.mock import patch
-from django_fsm import TransitionNotAllowed
 
 from django.conf import settings
 import boto3_mocking  # type: ignore
@@ -1798,10 +1796,18 @@ class TestDomainRequestAdmin(MockEppLib):
 
                 domain_request.rejection_reason = rejection_reason
 
+                self.admin.save_model(request, domain_request, None, True)
+
+                # Assert that the error message was called with the correct argument
                 if domain_is_active:
-                    with self.assertRaises(TransitionNotAllowed):
-                        self.admin.save_model(request, domain_request, None, True)
+                    messages.error.assert_called_once_with(
+                        request,
+                        "This action is not permitted. The domain " + "is already active.",
+                    )
                 else:
+                    # Assert that the error message was never called
+                    messages.error.assert_not_called()
+
                     self.assertEqual(domain_request.approved_domain, None)
 
                     # Assert that Domain got Deleted
@@ -1812,27 +1818,6 @@ class TestDomainRequestAdmin(MockEppLib):
                     with self.assertRaises(DomainInformation.DoesNotExist):
                         domain_information.refresh_from_db()
 
-
-                # # Assert that the error message was called with the correct argument
-                # if domain_is_active:
-                #     messages.error.assert_called_once_with(
-                #         request,
-                #         FSMErrorCodes.APPROVE_DOMAIN_IN_USE,
-                #     )
-                # else:
-                #     # Assert that the error message was never called
-                #     messages.error.assert_not_called()
-
-                #     self.assertEqual(domain_request.approved_domain, None)
-
-                #     # Assert that Domain got Deleted
-                #     with self.assertRaises(Domain.DoesNotExist):
-                #         domain.refresh_from_db()
-
-                #     # Assert that DomainInformation got Deleted
-                #     with self.assertRaises(DomainInformation.DoesNotExist):
-                #         domain_information.refresh_from_db()
-
     def test_error_when_saving_approved_to_in_review_and_domain_is_active(self):
         self.trigger_saving_approved_to_another_state(True, DomainRequest.DomainRequestStatus.IN_REVIEW)
 

From 6dd4132a29d672c5100c4aa96c08dd28d33f7f04 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Wed, 2 Oct 2024 18:14:10 -0400
Subject: [PATCH 028/142] cleanup

---
 src/registrar/models/domain.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py
index c4e61ba46..7fdc56971 100644
--- a/src/registrar/models/domain.py
+++ b/src/registrar/models/domain.py
@@ -969,7 +969,6 @@ class Domain(TimeStampedModel, DomainHelper):
         Is the domain live on the inter webs?
         could be replaced with request to see if ok status is set
         """
-        return True
         return self.state == self.State.READY
 
     def is_editable(self) -> bool:

From bb3ceb4dea34eb55328e63897cc6223ff4a47630 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Wed, 2 Oct 2024 19:11:12 -0400
Subject: [PATCH 029/142] updated error messages

---
 src/registrar/forms/domain.py                           | 8 ++++----
 src/registrar/forms/domain_request_wizard.py            | 6 +++---
 src/registrar/forms/portfolio.py                        | 3 ++-
 src/registrar/forms/user_profile.py                     | 2 +-
 src/registrar/templates/domain_org_name_address.html    | 2 +-
 src/registrar/templates/domain_request_org_contact.html | 2 +-
 src/registrar/templates/portfolio_organization.html     | 2 +-
 src/registrar/tests/test_forms.py                       | 2 +-
 src/registrar/utility/errors.py                         | 2 +-
 9 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index 84fcbe973..3d79790ca 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -35,7 +35,7 @@ class DomainAddUserForm(forms.Form):
     email = forms.EmailField(
         label="Email",
         max_length=None,
-        error_messages={"invalid": ("Enter your email address in the required format, like name@example.com.")},
+        error_messages={"invalid": ("Enter an email address in the required format, like name@example.com.")},
         validators=[
             MaxLengthValidator(
                 320,
@@ -285,7 +285,7 @@ class UserForm(forms.ModelForm):
             "required": "Enter your title or role in your organization (e.g., Chief Information Officer)"
         }
         self.fields["email"].error_messages = {
-            "required": "Enter your email address in the required format, like name@example.com."
+            "required": "Enter an email address in the required format, like name@example.com."
         }
         self.fields["phone"].error_messages["required"] = "Enter your phone number."
         self.domainInfo = None
@@ -342,7 +342,7 @@ class ContactForm(forms.ModelForm):
             "required": "Enter your title or role in your organization (e.g., Chief Information Officer)"
         }
         self.fields["email"].error_messages = {
-            "required": "Enter your email address in the required format, like name@example.com."
+            "required": "Enter an email address in the required format, like name@example.com."
         }
         self.fields["phone"].error_messages["required"] = "Enter your phone number."
         self.domainInfo = None
@@ -458,7 +458,7 @@ class DomainOrgNameAddressForm(forms.ModelForm):
         validators=[
             RegexValidator(
                 "^[0-9]{5}(?:-[0-9]{4})?$|^$",
-                message="Enter a zip code in the required format, like 12345 or 12345-6789.",
+                message="Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789.",
             )
         ],
     )
diff --git a/src/registrar/forms/domain_request_wizard.py b/src/registrar/forms/domain_request_wizard.py
index f2fdd32bc..4fb2f9265 100644
--- a/src/registrar/forms/domain_request_wizard.py
+++ b/src/registrar/forms/domain_request_wizard.py
@@ -137,10 +137,10 @@ class OrganizationContactForm(RegistrarForm):
         validators=[
             RegexValidator(
                 "^[0-9]{5}(?:-[0-9]{4})?$|^$",
-                message="Enter a zip code in the form of 12345 or 12345-6789.",
+                message="Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789.",
             )
         ],
-        error_messages={"required": ("Enter a zip code in the form of 12345 or 12345-6789.")},
+        error_messages={"required": ("Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789.")},
     )
     urbanization = forms.CharField(
         required=False,
@@ -603,7 +603,7 @@ class CisaRepresentativeForm(BaseDeletableRegistrarForm):
         max_length=None,
         required=False,
         error_messages={
-            "invalid": ("Enter your representative’s email address in the required format, like name@example.com."),
+            "invalid": ("Enter an email address in the required format, like name@example.com."),
         },
         validators=[
             MaxLengthValidator(
diff --git a/src/registrar/forms/portfolio.py b/src/registrar/forms/portfolio.py
index 14a45f6ae..85bc51240 100644
--- a/src/registrar/forms/portfolio.py
+++ b/src/registrar/forms/portfolio.py
@@ -17,7 +17,7 @@ class PortfolioOrgAddressForm(forms.ModelForm):
         validators=[
             RegexValidator(
                 "^[0-9]{5}(?:-[0-9]{4})?$|^$",
-                message="Enter a zip code in the required format, like 12345 or 12345-6789.",
+                message="Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789.",
             )
         ],
     )
@@ -38,6 +38,7 @@ class PortfolioOrgAddressForm(forms.ModelForm):
             "state_territory": {
                 "required": "Select the state, territory, or military post where your organization is located."
             },
+            "zipcode": {"required": "Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789."},
         }
         widgets = {
             # We need to set the required attributed for State/territory
diff --git a/src/registrar/forms/user_profile.py b/src/registrar/forms/user_profile.py
index 2a6ed4a47..8d8e2973d 100644
--- a/src/registrar/forms/user_profile.py
+++ b/src/registrar/forms/user_profile.py
@@ -58,7 +58,7 @@ class UserProfileForm(forms.ModelForm):
             "required": "Enter your title or role in your organization (e.g., Chief Information Officer)"
         }
         self.fields["email"].error_messages = {
-            "required": "Enter your email address in the required format, like name@example.com."
+            "required": "Enter an email address in the required format, like name@example.com."
         }
         self.fields["phone"].error_messages["required"] = "Enter your phone number."
 
diff --git a/src/registrar/templates/domain_org_name_address.html b/src/registrar/templates/domain_org_name_address.html
index 78baed09e..f7f6b558b 100644
--- a/src/registrar/templates/domain_org_name_address.html
+++ b/src/registrar/templates/domain_org_name_address.html
@@ -42,7 +42,7 @@
 
     {% input_with_errors form.state_territory %}
 
-    {% with add_class="usa-input--small" sublabel_text="Enter a zip code in the required format, like 12345 or 12345-6789." %}
+    {% with add_class="usa-input--small" sublabel_text="Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789." %}
       {% input_with_errors form.zipcode %}
     {% endwith %}
 
diff --git a/src/registrar/templates/domain_request_org_contact.html b/src/registrar/templates/domain_request_org_contact.html
index d4f3c2071..72c6e4b6d 100644
--- a/src/registrar/templates/domain_request_org_contact.html
+++ b/src/registrar/templates/domain_request_org_contact.html
@@ -33,7 +33,7 @@
 
     {% input_with_errors forms.0.state_territory %}
 
-    {% with add_class="usa-input--small" sublabel_text="Enter a zip code in the required format, like 12345 or 12345-6789." %}
+    {% with add_class="usa-input--small" sublabel_text="Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789." %}
       {% input_with_errors forms.0.zipcode %}
     {% endwith %}
 
diff --git a/src/registrar/templates/portfolio_organization.html b/src/registrar/templates/portfolio_organization.html
index 2e6a1f488..1c59ae726 100644
--- a/src/registrar/templates/portfolio_organization.html
+++ b/src/registrar/templates/portfolio_organization.html
@@ -45,7 +45,7 @@
                 {% input_with_errors form.address_line2 %}
                 {% input_with_errors form.city %}
                 {% input_with_errors form.state_territory %}
-                {% with add_class="usa-input--small" sublabel_text="Enter a zip code in the required format, like 12345 or 12345-6789." %}
+                {% with add_class="usa-input--small" sublabel_text="Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789." %}
                     {% input_with_errors form.zipcode %}
                 {% endwith %}
                 <button type="submit" class="usa-button">
diff --git a/src/registrar/tests/test_forms.py b/src/registrar/tests/test_forms.py
index eb4cad040..8ca5b4192 100644
--- a/src/registrar/tests/test_forms.py
+++ b/src/registrar/tests/test_forms.py
@@ -33,7 +33,7 @@ class TestFormValidation(MockEppLib):
         form = OrganizationContactForm(data={"zipcode": "nah"})
         self.assertEqual(
             form.errors["zipcode"],
-            ["Enter a zip code in the form of 12345 or 12345-6789."],
+            ["Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789."],
         )
 
     def test_org_contact_zip_valid(self):
diff --git a/src/registrar/utility/errors.py b/src/registrar/utility/errors.py
index 8cb83c0ee..cfa6a537b 100644
--- a/src/registrar/utility/errors.py
+++ b/src/registrar/utility/errors.py
@@ -240,7 +240,7 @@ class SecurityEmailError(Exception):
     """
 
     _error_mapping = {
-        SecurityEmailErrorCodes.BAD_DATA: ("Enter an email address in the required format, " "like name@example.com."),
+        SecurityEmailErrorCodes.BAD_DATA: ("Enter an email address in the required format, like name@example.com."),
     }
 
     def __init__(self, *args, code=None, **kwargs):

From d723825b12d0b60e99388bc030329d01f76f3068 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Wed, 2 Oct 2024 19:17:11 -0400
Subject: [PATCH 030/142] cleanup

---
 src/registrar/admin.py | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 321014949..dcd7bee99 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -2014,21 +2014,14 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
             return (obj, should_proceed)
 
         obj_is_not_approved = obj.status != models.DomainRequest.DomainRequestStatus.APPROVED
-        original_obj_is_not_approved = original_obj.status != models.DomainRequest.DomainRequestStatus.APPROVED
         if obj_is_not_approved and not obj.domain_is_not_active():
-            # If an admin tried to set an approved domain request to
-            # another status and the related domain is already
-            # active (READY), shortcut the action and throw a friendly
-            # error message. This action would still not go through
-            # shortcut or not as the rules are duplicated on the model,
-            # but the error would be an ugly Django error screen.
-            error_message = "This action is not permitted. The domain is already active."
-        if original_obj_is_not_approved and Domain.objects.filter(name=original_obj.requested_domain.name).exists():
-            # REDUNDANT CHECK:
-            # This action (approving a request when the domain is active)
-            # would still not go through check or not as the rules are
+            # REDUNDANT CHECK / ERROR SCREEN AVOIDANCE:
+            # This action (moving a request from approved to
+            # another status when the domain is already active (READY),
+            # would still not go through even without this check as the rules are
             # duplicated in the model and the error is raised from the model.
-            error_message = FSMDomainRequestError.get_error_message(FSMErrorCodes.APPROVE_DOMAIN_IN_USE)
+            # This avoids an ugly Django error screen.
+            error_message = "This action is not permitted. The domain is already active."
         elif obj.status == models.DomainRequest.DomainRequestStatus.REJECTED and not obj.rejection_reason:
             # This condition should never be triggered.
             # The opposite of this condition is acceptable (rejected -> other status and rejection_reason)

From 98b417bc44c3cadb3dbde8167f257ca11e10130f Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Wed, 2 Oct 2024 19:25:31 -0400
Subject: [PATCH 031/142] lint

---
 src/registrar/tests/test_models_requests.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/registrar/tests/test_models_requests.py b/src/registrar/tests/test_models_requests.py
index 96a19aae1..f102baf05 100644
--- a/src/registrar/tests/test_models_requests.py
+++ b/src/registrar/tests/test_models_requests.py
@@ -18,7 +18,6 @@ from registrar.models import (
 
 import boto3_mocking
 from registrar.utility.constants import BranchChoices
-from registrar.utility.errors import FSMDomainRequestError, FSMErrorCodes
 
 from .common import (
     MockSESClient,
@@ -667,7 +666,7 @@ class TestDomainRequest(TestCase):
             (self.ineligible_domain_request, TransitionNotAllowed),
         ]
         self.assert_fsm_transition_raises_error(test_cases, "approve")
-    
+
     @less_console_noise_decorator
     def test_approved_transition_not_allowed_when_domain_already_approved(self):
         """

From b51b20a075c9b0abf13963d9cfb278f788ab0d76 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Wed, 2 Oct 2024 19:34:36 -0400
Subject: [PATCH 032/142] cleanup

---
 src/registrar/tests/test_models_requests.py | 2 +-
 src/registrar/tests/test_views_request.py   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/registrar/tests/test_models_requests.py b/src/registrar/tests/test_models_requests.py
index f102baf05..9e86f5f9c 100644
--- a/src/registrar/tests/test_models_requests.py
+++ b/src/registrar/tests/test_models_requests.py
@@ -18,13 +18,13 @@ from registrar.models import (
 
 import boto3_mocking
 from registrar.utility.constants import BranchChoices
+from registrar.utility.errors import FSMDomainRequestError
 
 from .common import (
     MockSESClient,
     less_console_noise,
     completed_domain_request,
     set_domain_request_investigators,
-    create_test_user,
 )
 from django_fsm import TransitionNotAllowed
 
diff --git a/src/registrar/tests/test_views_request.py b/src/registrar/tests/test_views_request.py
index 8530859e2..ff2e61939 100644
--- a/src/registrar/tests/test_views_request.py
+++ b/src/registrar/tests/test_views_request.py
@@ -82,7 +82,6 @@ class DomainRequestTests(TestWithUser, WebTest):
         response = self.app.get(f"/domain-request/{domain_request.id}")
         # Ensure that the date is still set to None
         self.assertIsNone(domain_request.last_status_update)
-        print(response)
         # We should still grab a date for this field in this event - but it should come from the audit log instead
         self.assertContains(response, "Started on:")
         self.assertContains(response, fixed_date.strftime("%B %-d, %Y"))

From 4a06a94f4619fd8fa1d785d4bbe701cd1215cb21 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Wed, 2 Oct 2024 21:37:36 -0400
Subject: [PATCH 033/142] admin redundant test

---
 src/registrar/admin.py                    | 10 +++++
 src/registrar/tests/test_admin_request.py | 52 +++++++++++++++++++++++
 2 files changed, 62 insertions(+)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index dcd7bee99..939f2056d 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -2022,6 +2022,16 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
             # duplicated in the model and the error is raised from the model.
             # This avoids an ugly Django error screen.
             error_message = "This action is not permitted. The domain is already active."
+        elif (
+            original_obj.status != models.DomainRequest.DomainRequestStatus.APPROVED
+            and obj.status == models.DomainRequest.DomainRequestStatus.APPROVED
+            and Domain.objects.filter(name=original_obj.requested_domain.name).exists()
+        ):
+            # REDUNDANT CHECK:
+            # This action (approving a request when the domain exists)
+            # would still not go through even without this check as the rules are
+            # duplicated in the model and the error is raised from the model.
+            error_message = FSMDomainRequestError.get_error_message(FSMErrorCodes.APPROVE_DOMAIN_IN_USE)
         elif obj.status == models.DomainRequest.DomainRequestStatus.REJECTED and not obj.rejection_reason:
             # This condition should never be triggered.
             # The opposite of this condition is acceptable (rejected -> other status and rejection_reason)
diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py
index a9b073472..56cfb3473 100644
--- a/src/registrar/tests/test_admin_request.py
+++ b/src/registrar/tests/test_admin_request.py
@@ -1846,6 +1846,58 @@ class TestDomainRequestAdmin(MockEppLib):
     def test_side_effects_when_saving_approved_to_ineligible(self):
         self.trigger_saving_approved_to_another_state(False, DomainRequest.DomainRequestStatus.INELIGIBLE)
 
+    @less_console_noise
+    def test_error_when_saving_to_approved_and_domain_exists(self):
+        """Redundant admin check on model transition not allowed."""
+        Domain.objects.create(name="wabbitseason.gov")
+
+        new_request = completed_domain_request(
+            status=DomainRequest.DomainRequestStatus.SUBMITTED, name="wabbitseason.gov"
+        )
+
+        # Create a request object with a superuser
+        request = self.factory.post("/admin/registrar/domainrequest/{}/change/".format(new_request.pk))
+        request.user = self.superuser
+
+        request.session = {}
+
+        # Use ExitStack to combine patch contexts
+        with ExitStack() as stack:
+            # Patch Domain.is_active and django.contrib.messages.error simultaneously
+            stack.enter_context(patch.object(messages, "error"))
+
+            new_request.status = DomainRequest.DomainRequestStatus.APPROVED
+
+            self.admin.save_model(request, new_request, None, True)
+
+            messages.error.assert_called_once_with(
+                request,
+                "Cannot approve. Requested domain is already in use.",
+            )
+
+    @less_console_noise
+    def test_no_error_when_saving_to_approved_and_domain_exists(self):
+        """The negative of the redundant admin check on model transition not allowed."""
+        new_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.SUBMITTED)
+
+        # Create a request object with a superuser
+        request = self.factory.post("/admin/registrar/domainrequest/{}/change/".format(new_request.pk))
+        request.user = self.superuser
+
+        request.session = {}
+
+        # Use ExitStack to combine patch contexts
+        with ExitStack() as stack:
+            # Patch Domain.is_active and django.contrib.messages.error simultaneously
+            stack.enter_context(patch.object(messages, "error"))
+
+            new_request.status = DomainRequest.DomainRequestStatus.APPROVED
+
+            self.admin.save_model(request, new_request, None, True)
+
+            # Assert that the error message was never called
+            messages.error.assert_not_called()
+
     def test_has_correct_filters(self):
         """
         This test verifies that DomainRequestAdmin has the correct filters set up.

From c878e7aebb935d1e1cb7506f1f958abf432aebde Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Wed, 2 Oct 2024 21:58:35 -0400
Subject: [PATCH 034/142] fix copy button on other contacts and more cleanup

---
 src/registrar/admin.py                               |  2 +-
 src/registrar/assets/sass/_theme/_admin.scss         | 12 ++++--------
 .../templates/admin/change_form_object_tools.html    |  2 +-
 .../templates/admin/input_with_clipboard.html        |  6 +++---
 .../django/admin/includes/detail_table_fieldset.html | 12 +++++++++++-
 src/registrar/tests/test_admin.py                    |  2 +-
 src/registrar/tests/test_admin_domain.py             |  2 +-
 src/registrar/tests/test_admin_request.py            |  2 +-
 8 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index a282e6c25..0875fd6fd 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -3116,7 +3116,7 @@ class PortfolioAdmin(ListHeaderAdmin):
             admin_details += f"<input aria-hidden='true' class='display-none' value='{escape(portfolio_admin.email)}'>"
             admin_details += (
                 "<button class='usa-button usa-button--unstyled padding-right-1 usa-button--icon padding-left-05"
-                + "button--clipboard copy-to-clipboard text-no-underline' type='button'>"
+                + "copy-to-clipboard text-no-underline' type='button'>"
             )
             admin_details += "<svg class='usa-icon'>"
             admin_details += "<use aria-hidden='true' xlink:href='/public/img/sprite.svg#content_copy'></use>"
diff --git a/src/registrar/assets/sass/_theme/_admin.scss b/src/registrar/assets/sass/_theme/_admin.scss
index 40258ec41..3d2ef8175 100644
--- a/src/registrar/assets/sass/_theme/_admin.scss
+++ b/src/registrar/assets/sass/_theme/_admin.scss
@@ -383,6 +383,7 @@ a.button,
     font-kerning: auto;
     font-family: inherit;
     font-weight: normal;
+    text-decoration: none !important;
 }
 .button svg,
 .button span,
@@ -422,13 +423,6 @@ input[type=submit].button--dja-toolbar {
 input[type=submit].button--dja-toolbar:focus, input[type=submit].button--dja-toolbar:hover {
     border-color: var(--body-quiet-color);
 }
-// Targets the DJA buttom with a nested icon
-button .usa-icon,
-.button .usa-icon,
-.button--clipboard .usa-icon {
-    vertical-align: middle;      
-}
-// Make the clipboard button "float" inside of the input box
 .admin-icon-group {
     position: relative;
     display: inline;
@@ -441,7 +435,6 @@ button .usa-icon,
 
     button {
         width: max-content;
-        text-decoration: none !important;
     }
 
     @media (max-width: 1000px) {
@@ -857,6 +850,9 @@ div.dja__model-description{
     padding-top: 0 !important;
 }
 
+.padding-bottom-0 {
+    padding-bottom: 0 !important;
+}
 
 .flex-container {
     @media screen and (min-width: 700px) and (max-width: 1150px) {
diff --git a/src/registrar/templates/admin/change_form_object_tools.html b/src/registrar/templates/admin/change_form_object_tools.html
index 55c374419..66011a3c4 100644
--- a/src/registrar/templates/admin/change_form_object_tools.html
+++ b/src/registrar/templates/admin/change_form_object_tools.html
@@ -20,7 +20,7 @@
             </li>
             {% if opts.model_name == 'domainrequest' %}
             <li>
-                <a id="id-copy-to-clipboard-summary" class="usa-button--dja button--clipboard" type="button" href="#">
+                <a id="id-copy-to-clipboard-summary" class="usa-button--dja" type="button" href="#">
                     <svg class="usa-icon" >
                         <use xlink:href="{%static 'img/sprite.svg'%}#content_copy"></use>
                     </svg>
diff --git a/src/registrar/templates/admin/input_with_clipboard.html b/src/registrar/templates/admin/input_with_clipboard.html
index de89602b8..d6a016fd5 100644
--- a/src/registrar/templates/admin/input_with_clipboard.html
+++ b/src/registrar/templates/admin/input_with_clipboard.html
@@ -8,7 +8,7 @@ Template for an input field with a clipboard
 <div class="admin-icon-group">
     {{ field }}
     <button 
-    class="usa-button--dja usa-button usa-button__small-text usa-button--unstyled padding-left-1 usa-button--icon button--clipboard copy-to-clipboard" 
+    class="usa-button--dja usa-button usa-button__small-text usa-button--unstyled padding-left-1 usa-button--icon copy-to-clipboard" 
     type="button"
     >
         <div class="no-outline-on-click">
@@ -27,7 +27,7 @@ Template for an input field with a clipboard
     <input aria-hidden="true" class="display-none" value="{{ field.email }}" />
     {% if field.email is not None %}
         <button 
-        class="usa-button--dja usa-button usa-button__small-text usa-button--unstyled padding-right-1 usa-button--icon button--clipboard copy-to-clipboard text-no-underline padding-left-05" 
+        class="usa-button--dja usa-button usa-button__small-text usa-button--unstyled padding-right-1 usa-button--icon copy-to-clipboard text-no-underline padding-left-05" 
         type="button"
         >
             <svg 
@@ -40,4 +40,4 @@ Template for an input field with a clipboard
         </button>
     {% endif %}
 </div>
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
index 1e8fcaaeb..ca221fccb 100644
--- a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
+++ b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
@@ -269,7 +269,17 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html)
                                 <td class="padding-left-1 text-size-small">
                                     <input aria-hidden="true" class="display-none" value="{{ contact.email }}" />
                                     <button 
-                                    class="usa-button--dja usa-button usa-button__small-text usa-button--unstyled padding-right-1 usa-button--icon button--clipboard copy-to-clipboard usa-button__small-text text-no-underline" 
+                                    class="
+                                        usa-button--dja 
+                                        usa-button 
+                                        usa-button__small-text 
+                                        usa-button--unstyled 
+                                        padding-right-1 
+                                        padding-top-0
+                                        padding-bottom-0
+                                        usa-button--icon 
+                                        copy-to-clipboard 
+                                        text-no-underline" 
                                     type="button"
                                     >
                                         <svg 
diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index 88482e4db..3b50c7746 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -654,7 +654,7 @@ class TestDomainInformationAdmin(TestCase):
         self.test_helper.assert_response_contains_distinct_values(response, expected_other_employees_fields)
 
         # Test for the copy link
-        self.assertContains(response, "button--clipboard", count=3)
+        self.assertContains(response, "copy-to-clipboard", count=3)
 
         # cleanup this test
         domain_info.delete()
diff --git a/src/registrar/tests/test_admin_domain.py b/src/registrar/tests/test_admin_domain.py
index a9b94781f..4302db683 100644
--- a/src/registrar/tests/test_admin_domain.py
+++ b/src/registrar/tests/test_admin_domain.py
@@ -535,7 +535,7 @@ class TestDomainAdminWithClient(TestCase):
         self.assertContains(response, "Testy Tester")
 
         # Test for the copy link
-        self.assertContains(response, "button--clipboard")
+        self.assertContains(response, "copy-to-clipboard)
 
         # cleanup from this test
         domain.delete()
diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py
index a9b073472..8dfb777a0 100644
--- a/src/registrar/tests/test_admin_request.py
+++ b/src/registrar/tests/test_admin_request.py
@@ -1511,7 +1511,7 @@ class TestDomainRequestAdmin(MockEppLib):
         self.test_helper.assert_response_contains_distinct_values(response, expected_other_employees_fields)
 
         # Test for the copy link
-        self.assertContains(response, "button--clipboard", count=4)
+        self.assertContains(response, "copy-to-clipboard", count=4)
 
         # Test that Creator counts display properly
         self.assertNotContains(response, "Approved domains")

From 9b091263d4ebd35d54d62838ab2e76d58216f0f8 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Wed, 2 Oct 2024 22:12:46 -0400
Subject: [PATCH 035/142] cleanup

---
 src/registrar/tests/test_admin_domain.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/tests/test_admin_domain.py b/src/registrar/tests/test_admin_domain.py
index 4302db683..f02b59a91 100644
--- a/src/registrar/tests/test_admin_domain.py
+++ b/src/registrar/tests/test_admin_domain.py
@@ -535,7 +535,7 @@ class TestDomainAdminWithClient(TestCase):
         self.assertContains(response, "Testy Tester")
 
         # Test for the copy link
-        self.assertContains(response, "copy-to-clipboard)
+        self.assertContains(response, "copy-to-clipboard")
 
         # cleanup from this test
         domain.delete()

From 3f11dd084e6d7e3fdbbac457f25348919d9a04fb Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Thu, 3 Oct 2024 12:06:49 -0400
Subject: [PATCH 036/142] Hide copy button if no email on other contact

---
 .../admin/includes/detail_table_fieldset.html | 48 ++++++++++---------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
index ca221fccb..90c02f386 100644
--- a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
+++ b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
@@ -254,7 +254,7 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html)
                     <table>
                         <thead>
                             <tr>
-                                <th colspan="4">Other contact information</th>
+                                <th colspan="5">Other contact information</th>
                             <tr>
                         </thead>
                         <tbody>
@@ -267,29 +267,31 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html)
                                 </td>
                                 <td class="padding-left-1">{{ contact.phone }}</td>
                                 <td class="padding-left-1 text-size-small">
-                                    <input aria-hidden="true" class="display-none" value="{{ contact.email }}" />
-                                    <button 
-                                    class="
-                                        usa-button--dja 
-                                        usa-button 
-                                        usa-button__small-text 
-                                        usa-button--unstyled 
-                                        padding-right-1 
-                                        padding-top-0
-                                        padding-bottom-0
-                                        usa-button--icon 
-                                        copy-to-clipboard 
-                                        text-no-underline" 
-                                    type="button"
-                                    >
-                                        <svg 
-                                        class="usa-icon" 
+                                    {% if contact.email %}
+                                        <input aria-hidden="true" class="display-none" value="{{ contact.email }}" />
+                                        <button 
+                                        class="
+                                            usa-button--dja 
+                                            usa-button 
+                                            usa-button__small-text 
+                                            usa-button--unstyled 
+                                            padding-right-1 
+                                            padding-top-0
+                                            padding-bottom-0
+                                            usa-button--icon 
+                                            copy-to-clipboard 
+                                            text-no-underline" 
+                                        type="button"
                                         >
-                                            <use aria-hidden="true" xlink:href="{%static 'img/sprite.svg'%}#content_copy"></use>
-                                        </svg>
-                                        <!-- the span is targeted in JS, do not remove -->
-                                        <span>Copy email</span>
-                                    </button>
+                                            <svg 
+                                            class="usa-icon" 
+                                            >
+                                                <use aria-hidden="true" xlink:href="{%static 'img/sprite.svg'%}#content_copy"></use>
+                                            </svg>
+                                            <!-- the span is targeted in JS, do not remove -->
+                                            <span>Copy email</span>
+                                        </button>
+                                    {% endif %}
                                 </td>
                             </tr>
                             {% endfor %}

From 360d0d434005b2d045f7babfcf181e5e69fc1029 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Thu, 3 Oct 2024 12:21:05 -0400
Subject: [PATCH 037/142] lowercased ZIP

---
 src/registrar/forms/domain.py                           | 2 +-
 src/registrar/forms/domain_request_wizard.py            | 4 ++--
 src/registrar/forms/portfolio.py                        | 4 ++--
 src/registrar/templates/domain_org_name_address.html    | 2 +-
 src/registrar/templates/domain_request_org_contact.html | 2 +-
 src/registrar/templates/portfolio_organization.html     | 2 +-
 src/registrar/tests/test_forms.py                       | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index 3d79790ca..c4e9fdcb7 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -458,7 +458,7 @@ class DomainOrgNameAddressForm(forms.ModelForm):
         validators=[
             RegexValidator(
                 "^[0-9]{5}(?:-[0-9]{4})?$|^$",
-                message="Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789.",
+                message="Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789.",
             )
         ],
     )
diff --git a/src/registrar/forms/domain_request_wizard.py b/src/registrar/forms/domain_request_wizard.py
index 4fb2f9265..3dc9c157c 100644
--- a/src/registrar/forms/domain_request_wizard.py
+++ b/src/registrar/forms/domain_request_wizard.py
@@ -137,10 +137,10 @@ class OrganizationContactForm(RegistrarForm):
         validators=[
             RegexValidator(
                 "^[0-9]{5}(?:-[0-9]{4})?$|^$",
-                message="Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789.",
+                message="Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789.",
             )
         ],
-        error_messages={"required": ("Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789.")},
+        error_messages={"required": ("Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789.")},
     )
     urbanization = forms.CharField(
         required=False,
diff --git a/src/registrar/forms/portfolio.py b/src/registrar/forms/portfolio.py
index 85bc51240..642b6b46e 100644
--- a/src/registrar/forms/portfolio.py
+++ b/src/registrar/forms/portfolio.py
@@ -17,7 +17,7 @@ class PortfolioOrgAddressForm(forms.ModelForm):
         validators=[
             RegexValidator(
                 "^[0-9]{5}(?:-[0-9]{4})?$|^$",
-                message="Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789.",
+                message="Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789.",
             )
         ],
     )
@@ -38,7 +38,7 @@ class PortfolioOrgAddressForm(forms.ModelForm):
             "state_territory": {
                 "required": "Select the state, territory, or military post where your organization is located."
             },
-            "zipcode": {"required": "Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789."},
+            "zipcode": {"required": "Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789."},
         }
         widgets = {
             # We need to set the required attributed for State/territory
diff --git a/src/registrar/templates/domain_org_name_address.html b/src/registrar/templates/domain_org_name_address.html
index f7f6b558b..0785b6da1 100644
--- a/src/registrar/templates/domain_org_name_address.html
+++ b/src/registrar/templates/domain_org_name_address.html
@@ -42,7 +42,7 @@
 
     {% input_with_errors form.state_territory %}
 
-    {% with add_class="usa-input--small" sublabel_text="Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789." %}
+    {% with add_class="usa-input--small" sublabel_text="Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789." %}
       {% input_with_errors form.zipcode %}
     {% endwith %}
 
diff --git a/src/registrar/templates/domain_request_org_contact.html b/src/registrar/templates/domain_request_org_contact.html
index 72c6e4b6d..44b404bbf 100644
--- a/src/registrar/templates/domain_request_org_contact.html
+++ b/src/registrar/templates/domain_request_org_contact.html
@@ -33,7 +33,7 @@
 
     {% input_with_errors forms.0.state_territory %}
 
-    {% with add_class="usa-input--small" sublabel_text="Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789." %}
+    {% with add_class="usa-input--small" sublabel_text="Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789." %}
       {% input_with_errors forms.0.zipcode %}
     {% endwith %}
 
diff --git a/src/registrar/templates/portfolio_organization.html b/src/registrar/templates/portfolio_organization.html
index 1c59ae726..712d1a6ca 100644
--- a/src/registrar/templates/portfolio_organization.html
+++ b/src/registrar/templates/portfolio_organization.html
@@ -45,7 +45,7 @@
                 {% input_with_errors form.address_line2 %}
                 {% input_with_errors form.city %}
                 {% input_with_errors form.state_territory %}
-                {% with add_class="usa-input--small" sublabel_text="Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789." %}
+                {% with add_class="usa-input--small" sublabel_text="Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789." %}
                     {% input_with_errors form.zipcode %}
                 {% endwith %}
                 <button type="submit" class="usa-button">
diff --git a/src/registrar/tests/test_forms.py b/src/registrar/tests/test_forms.py
index 8ca5b4192..12d9af8ac 100644
--- a/src/registrar/tests/test_forms.py
+++ b/src/registrar/tests/test_forms.py
@@ -33,7 +33,7 @@ class TestFormValidation(MockEppLib):
         form = OrganizationContactForm(data={"zipcode": "nah"})
         self.assertEqual(
             form.errors["zipcode"],
-            ["Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789."],
+            ["Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789."],
         )
 
     def test_org_contact_zip_valid(self):

From c34025fbb061790042de63b442daf3b7bd2a1db2 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Thu, 3 Oct 2024 12:31:35 -0400
Subject: [PATCH 038/142] added logic to shorten text if its too long

---
 src/registrar/views/domain_request.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index b7462f300..bbd27288b 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -379,6 +379,11 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         if self.domain_request.requested_domain is not None:
             requested_domain_name = self.domain_request.requested_domain.name
 
+        text_domain_name = str(requested_domain_name) if requested_domain_name is not None else None
+        
+        if text_domain_name and len(text_domain_name) > 30:
+            text_domain_name = text_domain_name[:27] + "..."
+
         context_stuff = {}
         if DomainRequest._form_complete(self.domain_request, self.request):
             modal_button = '<button type="submit" ' 'class="usa-button" ' ">Submit request</button>"
@@ -390,7 +395,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
                 "is_federal": self.domain_request.is_federal(),
                 "modal_button": modal_button,
                 "modal_heading": "You are about to submit a domain request for "
-                + str(self.domain_request.requested_domain),
+                + text_domain_name,
                 "modal_description": "Once you submit this request, you won’t be able to edit it until we review it.\
                 You’ll only be able to withdraw your request.",
                 "review_form_is_complete": True,

From 25b460c7246e5693419050748b4796cfa4179d08 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Thu, 3 Oct 2024 12:44:45 -0400
Subject: [PATCH 039/142] ran lin

---
 src/registrar/views/domain_request.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index bbd27288b..55e1e2363 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -380,7 +380,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
             requested_domain_name = self.domain_request.requested_domain.name
 
         text_domain_name = str(requested_domain_name) if requested_domain_name is not None else None
-        
+
         if text_domain_name and len(text_domain_name) > 30:
             text_domain_name = text_domain_name[:27] + "..."
 
@@ -394,8 +394,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
                 "visited": self.storage.get("step_history", []),
                 "is_federal": self.domain_request.is_federal(),
                 "modal_button": modal_button,
-                "modal_heading": "You are about to submit a domain request for "
-                + text_domain_name,
+                "modal_heading": "You are about to submit a domain request for " + text_domain_name,
                 "modal_description": "Once you submit this request, you won’t be able to edit it until we review it.\
                 You’ll only be able to withdraw your request.",
                 "review_form_is_complete": True,

From f1ab40a3a075eea2c59d1f2ece3816e3e0d3c8a8 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Thu, 3 Oct 2024 11:16:35 -0600
Subject: [PATCH 040/142] Modify domain request wizard to show portfolio views

---
 src/registrar/config/urls.py                  |  11 +-
 src/registrar/forms/domain_request_wizard.py  |   9 ++
 .../domain_request_requesting_entity.html     |  16 +++
 .../templates/domain_request_review.html      |   6 +-
 .../portfolio_request_review_steps.html       |   1 -
 src/registrar/utility/enums.py                |   3 +-
 src/registrar/views/domain_request.py         | 136 +++++++++++++-----
 7 files changed, 139 insertions(+), 43 deletions(-)
 create mode 100644 src/registrar/templates/domain_request_requesting_entity.html

diff --git a/src/registrar/config/urls.py b/src/registrar/config/urls.py
index df5733238..ba93d1dec 100644
--- a/src/registrar/config/urls.py
+++ b/src/registrar/config/urls.py
@@ -22,7 +22,7 @@ from registrar.views.report_views import (
     ExportDataTypeUser,
 )
 
-from registrar.views.domain_request import Step
+from registrar.views.domain_request import Step, PortfolioDomainRequestStep
 from registrar.views.domain_requests_json import get_domain_requests_json
 from registrar.views.transfer_user import TransferUserView
 from registrar.views.utility.api_views import (
@@ -58,6 +58,15 @@ for step, view in [
     (Step.ADDITIONAL_DETAILS, views.AdditionalDetails),
     (Step.REQUIREMENTS, views.Requirements),
     (Step.REVIEW, views.Review),
+
+    # Portfolio steps
+    (PortfolioDomainRequestStep.REQUESTING_ENTITY, views.RequestingEntity),
+    # (PortfolioDomainRequestStep.CURRENT_SITES, views.CurrentSites),
+    # (PortfolioDomainRequestStep.DOTGOV_DOMAIN, views.DotgovDomain),
+    # (PortfolioDomainRequestStep.PURPOSE, views.Purpose),
+    # (PortfolioDomainRequestStep.ADDITIONAL_DETAILS, views.AdditionalDetails),
+    # (PortfolioDomainRequestStep.REQUIREMENTS, views.Requirements),
+    # (PortfolioDomainRequestStep.REVIEW, views.Review),
 ]:
     domain_request_urls.append(path(f"{step}/", view.as_view(), name=step))
 
diff --git a/src/registrar/forms/domain_request_wizard.py b/src/registrar/forms/domain_request_wizard.py
index f2fdd32bc..c40184a20 100644
--- a/src/registrar/forms/domain_request_wizard.py
+++ b/src/registrar/forms/domain_request_wizard.py
@@ -21,6 +21,15 @@ from registrar.utility.constants import BranchChoices
 logger = logging.getLogger(__name__)
 
 
+class RequestingEntityForm(RegistrarForm):
+    is_policy_acknowledged = forms.BooleanField(
+        label="I read and agree to the requirements for operating a .gov domain.",
+        error_messages={
+            "required": ("Check the box if you read and agree to the requirements for operating a .gov domain.")
+        },
+    )
+
+
 class OrganizationTypeForm(RegistrarForm):
     generic_org_type = forms.ChoiceField(
         # use the long names in the domain request form
diff --git a/src/registrar/templates/domain_request_requesting_entity.html b/src/registrar/templates/domain_request_requesting_entity.html
new file mode 100644
index 000000000..831c37984
--- /dev/null
+++ b/src/registrar/templates/domain_request_requesting_entity.html
@@ -0,0 +1,16 @@
+{% extends 'domain_request_form.html' %}
+{% load field_helpers url_helpers %}
+
+{% block form_instructions %}
+    <p>🛸🛸🛸🛸 Placeholder content 🛸🛸🛸🛸</p>
+{% endblock %}
+
+{% block form_fields %}
+    <fieldset class="usa-fieldset">
+        <legend>
+        <h2>Are you from the polaris star system?</h2>
+        </legend>
+
+        {% input_with_errors forms.0.is_policy_acknowledged %}
+    </fieldset>
+{% endblock %}
\ No newline at end of file
diff --git a/src/registrar/templates/domain_request_review.html b/src/registrar/templates/domain_request_review.html
index 03624d2ec..03cf31287 100644
--- a/src/registrar/templates/domain_request_review.html
+++ b/src/registrar/templates/domain_request_review.html
@@ -19,5 +19,9 @@
 {% endblock %}
 
 {% block form_fields %}
-  {% include "includes/request_review_steps.html" with is_editable=True %}
+  {% if portfolio %}
+    {% include "includes/portfolio_request_review_steps.html" with is_editable=True %}
+  {% else %}
+    {% include "includes/request_review_steps.html" with is_editable=True %}
+  {% endif %}
 {% endblock %}
diff --git a/src/registrar/templates/includes/portfolio_request_review_steps.html b/src/registrar/templates/includes/portfolio_request_review_steps.html
index 8f7dba9ac..1c4286baa 100644
--- a/src/registrar/templates/includes/portfolio_request_review_steps.html
+++ b/src/registrar/templates/includes/portfolio_request_review_steps.html
@@ -8,7 +8,6 @@
     {% endif %}
 
     {% if step == Step.REQUESTING_ENTITY %}
-
         {% if domain_request.organization_name %}
             {% with title=form_titles|get_item:step value=domain_request %}
                 {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url address='true' %}
diff --git a/src/registrar/utility/enums.py b/src/registrar/utility/enums.py
index b4fc5ed6f..f67fd3f61 100644
--- a/src/registrar/utility/enums.py
+++ b/src/registrar/utility/enums.py
@@ -75,9 +75,10 @@ class PortfolioDomainRequestStep(StrEnum):
     """
 
     # Portfolio
-    REQUESTING_ENTITY = "organization_name"
+    REQUESTING_ENTITY = "requesting_entity"
     CURRENT_SITES = "current_sites"
     DOTGOV_DOMAIN = "dotgov_domain"
     PURPOSE = "purpose"
     ADDITIONAL_DETAILS = "additional_details"
     REQUIREMENTS = "requirements"
+    REVIEW = "review"
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index b7462f300..8cf748274 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -43,9 +43,11 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
     although not without consulting the base implementation, first.
     """
 
-    StepEnum: Step = Step  # type: ignore
+    StepEnum: Step | PortfolioDomainRequestStep = Step  # type: ignore
     template_name = ""
 
+    is_portfolio = False
+
     # uniquely namespace the wizard in urls.py
     # (this is not seen _in_ urls, only for Django's internal naming)
     # NB: this is included here for reference. Do not change it without
@@ -188,8 +190,32 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         else:
             return default
 
+    def mark_as_portfolio_wizard(self):
+        """Swaps the wizard over to the "portfolio" view"""
+        self.is_portfolio = True
+        self.StepEnum = PortfolioDomainRequestStep  # type: ignore
+        self.TITLES = {
+            self.StepEnum.REQUESTING_ENTITY: _("Requesting entity"),
+            self.StepEnum.CURRENT_SITES: _("Current websites"),
+            self.StepEnum.DOTGOV_DOMAIN: _(".gov domain"),
+            self.StepEnum.PURPOSE: _("Purpose of your domain"),
+            self.StepEnum.ADDITIONAL_DETAILS: _("Additional details"),
+            self.StepEnum.REQUIREMENTS: _("Requirements for operating a .gov domain"),
+            self.StepEnum.REVIEW: _("Review and submit your domain request"),
+        }
+        self.WIZARD_CONDITIONS = {}
+
+        # Regenerate the steps helper
+        print("look, da fuq")
+        print(self.storage)
+        self.steps = StepsHelper(self)
+
     def get(self, request, *args, **kwargs):
         """This method handles GET requests."""
+
+        if not self.is_portfolio and self.request.user.is_org_user(request):
+            self.mark_as_portfolio_wizard()
+
         current_url = resolve(request.path_info).url_name
 
         # if user visited via an "edit" url, associate the id of the
@@ -211,6 +237,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
                 # intro page.
                 return render(request, "domain_request_intro.html", {})
             else:
+                print(f"look at these steps: {self.steps}")
                 return self.goto(self.steps.first)
 
         # refresh step_history to ensure we don't erroneously unlock unfinished
@@ -219,6 +246,9 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         context = self.get_context_data()
         self.steps.current = current_url
         context["forms"] = self.get_forms()
+        print(f"storage is: {self.storage}")
+        print(f"steps are: {self.steps}")
+        print(f"context is: {context}")
 
         # if pending requests exist and user does not have approved domains,
         # present message that domain request cannot be submitted
@@ -334,42 +364,63 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         # and is used to determine how steps appear in the side nav.
         # It is worth noting that any step assigned "false" here will be EXCLUDED
         # from the list of "unlocked" steps.
-
-        history_dict = {
-            "generic_org_type": self.domain_request.generic_org_type is not None,
-            "tribal_government": self.domain_request.tribe_name is not None,
-            "organization_federal": self.domain_request.federal_type is not None,
-            "organization_election": self.domain_request.is_election_board is not None,
-            "organization_contact": (
-                self.domain_request.federal_agency is not None
-                or self.domain_request.organization_name is not None
-                or self.domain_request.address_line1 is not None
-                or self.domain_request.city is not None
-                or self.domain_request.state_territory is not None
-                or self.domain_request.zipcode is not None
-                or self.domain_request.urbanization is not None
-            ),
-            "about_your_organization": self.domain_request.about_your_organization is not None,
-            "senior_official": self.domain_request.senior_official is not None,
-            "current_sites": (
-                self.domain_request.current_websites.exists() or self.domain_request.requested_domain is not None
-            ),
-            "dotgov_domain": self.domain_request.requested_domain is not None,
-            "purpose": self.domain_request.purpose is not None,
-            "other_contacts": (
-                self.domain_request.other_contacts.exists()
-                or self.domain_request.no_other_contacts_rationale is not None
-            ),
-            "additional_details": (
-                # Additional details is complete as long as "has anything else" and "has cisa rep" are not None
-                (
-                    self.domain_request.has_anything_else_text is not None
-                    and self.domain_request.has_cisa_representative is not None
-                )
-            ),
-            "requirements": self.domain_request.is_policy_acknowledged is not None,
-            "review": self.domain_request.is_policy_acknowledged is not None,
-        }
+        if self.is_portfolio:
+            history_dict = {
+                "requesting_entity": self.domain_request.is_policy_acknowledged is not None,
+                "current_sites": (
+                    self.domain_request.current_websites.exists() or self.domain_request.requested_domain is not None
+                ),
+                "dotgov_domain": self.domain_request.requested_domain is not None,
+                "purpose": self.domain_request.purpose is not None,
+                "other_contacts": (
+                    self.domain_request.other_contacts.exists()
+                    or self.domain_request.no_other_contacts_rationale is not None
+                ),
+                "additional_details": (
+                    # Additional details is complete as long as "has anything else" and "has cisa rep" are not None
+                    (
+                        self.domain_request.has_anything_else_text is not None
+                        and self.domain_request.has_cisa_representative is not None
+                    )
+                ),
+                "review": self.domain_request.is_policy_acknowledged is not None,
+            }
+        else:
+            history_dict = {
+                "generic_org_type": self.domain_request.generic_org_type is not None,
+                "tribal_government": self.domain_request.tribe_name is not None,
+                "organization_federal": self.domain_request.federal_type is not None,
+                "organization_election": self.domain_request.is_election_board is not None,
+                "organization_contact": (
+                    self.domain_request.federal_agency is not None
+                    or self.domain_request.organization_name is not None
+                    or self.domain_request.address_line1 is not None
+                    or self.domain_request.city is not None
+                    or self.domain_request.state_territory is not None
+                    or self.domain_request.zipcode is not None
+                    or self.domain_request.urbanization is not None
+                ),
+                "about_your_organization": self.domain_request.about_your_organization is not None,
+                "senior_official": self.domain_request.senior_official is not None,
+                "current_sites": (
+                    self.domain_request.current_websites.exists() or self.domain_request.requested_domain is not None
+                ),
+                "dotgov_domain": self.domain_request.requested_domain is not None,
+                "purpose": self.domain_request.purpose is not None,
+                "other_contacts": (
+                    self.domain_request.other_contacts.exists()
+                    or self.domain_request.no_other_contacts_rationale is not None
+                ),
+                "additional_details": (
+                    # Additional details is complete as long as "has anything else" and "has cisa rep" are not None
+                    (
+                        self.domain_request.has_anything_else_text is not None
+                        and self.domain_request.has_cisa_representative is not None
+                    )
+                ),
+                "requirements": self.domain_request.is_policy_acknowledged is not None,
+                "review": self.domain_request.is_policy_acknowledged is not None,
+            }
         return [key for key, value in history_dict.items() if value]
 
     def get_context_data(self):
@@ -420,7 +471,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         return request_step_list(self)
 
     def goto(self, step):
-        if step == "generic_org_type":
+        if step == "generic_org_type" or step == "requesting_entity":
             # We need to avoid creating a new domain request if the user
             # clicks the back button
             self.request.session["new_request"] = False
@@ -443,6 +494,8 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
 
     def post(self, request, *args, **kwargs) -> HttpResponse:
         """This method handles POST requests."""
+        if not self.is_portfolio and self.request.user.is_org_user(request):
+            self.mark_as_portfolio_wizard()
 
         # which button did the user press?
         button: str = request.POST.get("submit_button", "")
@@ -456,7 +509,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
                 if self.request.session["new_request"] is True:
                     # This will trigger the domain_request getter into creating a new DomainRequest
                     del self.storage
-
+            print(f"what are the steps? {self.steps}")
             return self.goto(self.steps.first)
 
         # if accessing this class directly, redirect to the first step
@@ -518,7 +571,12 @@ class PortfolioDomainRequestWizard(DomainRequestWizard):
         self.steps = StepsHelper(self)
         self._domain_request = None  # for caching
 
+# Portfolio pages
+class RequestingEntity(DomainRequestWizard):
+    template_name = "domain_request_requesting_entity.html"
+    forms = [forms.RequestingEntityForm]
 
+# Non-portfolio pages
 class OrganizationType(DomainRequestWizard):
     template_name = "domain_request_org_type.html"
     forms = [forms.OrganizationTypeForm]

From 1f2793bfc14e86c1b669c12c70d125d12737a663 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Thu, 3 Oct 2024 11:21:52 -0600
Subject: [PATCH 041/142] Update domain_request.py

---
 src/registrar/views/domain_request.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 8cf748274..dbc93e289 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -206,8 +206,6 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         self.WIZARD_CONDITIONS = {}
 
         # Regenerate the steps helper
-        print("look, da fuq")
-        print(self.storage)
         self.steps = StepsHelper(self)
 
     def get(self, request, *args, **kwargs):
@@ -237,7 +235,6 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
                 # intro page.
                 return render(request, "domain_request_intro.html", {})
             else:
-                print(f"look at these steps: {self.steps}")
                 return self.goto(self.steps.first)
 
         # refresh step_history to ensure we don't erroneously unlock unfinished
@@ -246,9 +243,6 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         context = self.get_context_data()
         self.steps.current = current_url
         context["forms"] = self.get_forms()
-        print(f"storage is: {self.storage}")
-        print(f"steps are: {self.steps}")
-        print(f"context is: {context}")
 
         # if pending requests exist and user does not have approved domains,
         # present message that domain request cannot be submitted
@@ -383,6 +377,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
                         and self.domain_request.has_cisa_representative is not None
                     )
                 ),
+                "requirements": self.domain_request.is_policy_acknowledged is not None,
                 "review": self.domain_request.is_policy_acknowledged is not None,
             }
         else:
@@ -509,7 +504,6 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
                 if self.request.session["new_request"] is True:
                     # This will trigger the domain_request getter into creating a new DomainRequest
                     del self.storage
-            print(f"what are the steps? {self.steps}")
             return self.goto(self.steps.first)
 
         # if accessing this class directly, redirect to the first step
@@ -756,7 +750,7 @@ class Review(DomainRequestWizard):
         if DomainRequest._form_complete(self.domain_request, self.request) is False:
             logger.warning("User arrived at review page with an incomplete form.")
         context = super().get_context_data()
-        context["Step"] = Step.__members__
+        context["Step"] = self.StepEnum.__members__
         context["domain_request"] = self.domain_request
         return context
 

From b08c7e1478d120e610305c2e5b849dcdb0b58764 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Thu, 3 Oct 2024 11:39:43 -0600
Subject: [PATCH 042/142] Configure permissions correctly

---
 src/registrar/config/urls.py          |  2 +-
 src/registrar/views/utility/mixins.py | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/registrar/config/urls.py b/src/registrar/config/urls.py
index ba93d1dec..0f76596c5 100644
--- a/src/registrar/config/urls.py
+++ b/src/registrar/config/urls.py
@@ -175,7 +175,7 @@ urlpatterns = [
         name="export_data_type_user",
     ),
     path(
-        "domain-request/<id>/edit/",
+        "domain-request/<int:id>/edit/",
         views.DomainRequestWizard.as_view(),
         name=views.DomainRequestWizard.EDIT_URL_NAME,
     ),
diff --git a/src/registrar/views/utility/mixins.py b/src/registrar/views/utility/mixins.py
index d8c48e01e..74651ee6d 100644
--- a/src/registrar/views/utility/mixins.py
+++ b/src/registrar/views/utility/mixins.py
@@ -384,10 +384,28 @@ class DomainRequestWizardPermission(PermissionsLoginMixin):
         The user is in self.request.user
         """
 
+        if not self.request.user.is_authenticated:
+            return False
+
         # The user has an ineligible flag
         if self.request.user.is_restricted():
             return False
 
+        # user needs to be the creator of the domain request to edit it.
+        id = self.kwargs.get("id") if hasattr(self, "kwargs") else None
+        if not id:
+            domain_request_wizard = self.request.session.get("wizard_domain_request")
+            if domain_request_wizard:
+                id = domain_request_wizard.get("domain_request_id")
+
+        if not DomainRequest.objects.filter(creator=self.request.user, id=id).exists():
+            return False
+
+        if self.request.user.is_org_user(self.request):
+            portfolio = self.request.session.get("portfolio")
+            if not self.request.user.has_edit_request_portfolio_permission(portfolio):
+                return False
+
         return True
 
 

From eef82382aecd6128fa8dfe351238fec12b7811c3 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Thu, 3 Oct 2024 12:27:51 -0600
Subject: [PATCH 043/142] Hide content in navbar

---
 src/registrar/forms/domain_request_wizard.py    |  8 +++-----
 .../templates/domain_request_dotgov_domain.html |  4 +++-
 .../templates/domain_request_intro.html         |  4 ++++
 .../domain_request_requesting_entity.html       |  4 ++--
 .../templates/includes/header_extended.html     |  6 ++++--
 src/registrar/views/domain_request.py           | 17 ++++++++++++++---
 src/registrar/views/utility/mixins.py           | 16 ++++++++++------
 7 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/src/registrar/forms/domain_request_wizard.py b/src/registrar/forms/domain_request_wizard.py
index c40184a20..6b160b14d 100644
--- a/src/registrar/forms/domain_request_wizard.py
+++ b/src/registrar/forms/domain_request_wizard.py
@@ -22,11 +22,9 @@ logger = logging.getLogger(__name__)
 
 
 class RequestingEntityForm(RegistrarForm):
-    is_policy_acknowledged = forms.BooleanField(
-        label="I read and agree to the requirements for operating a .gov domain.",
-        error_messages={
-            "required": ("Check the box if you read and agree to the requirements for operating a .gov domain.")
-        },
+    organization_name = forms.CharField(
+        label="Organization name",
+        error_messages={"required": "Enter the name of your organization."},
     )
 
 
diff --git a/src/registrar/templates/domain_request_dotgov_domain.html b/src/registrar/templates/domain_request_dotgov_domain.html
index 5864cad29..764154254 100644
--- a/src/registrar/templates/domain_request_dotgov_domain.html
+++ b/src/registrar/templates/domain_request_dotgov_domain.html
@@ -12,8 +12,10 @@
 
   <p>Names that <em>uniquely apply to your organization</em> are likely to be approved over names that could also apply to other organizations. 
     {% if not is_federal %}In most instances, this requires including your state’s two-letter abbreviation.{% endif %}</p> 
-
+  
+  {% if not portfolio %}
   <p>Requests for your organization’s initials or an abbreviated name might not be approved, but we encourage you to request the name you want.</p> 
+  {% endif %}
 
   <p>Note that <strong>only federal agencies can request generic terms</strong> like
   vote.gov.</p>
diff --git a/src/registrar/templates/domain_request_intro.html b/src/registrar/templates/domain_request_intro.html
index fd94e0ef1..6b5223991 100644
--- a/src/registrar/templates/domain_request_intro.html
+++ b/src/registrar/templates/domain_request_intro.html
@@ -12,7 +12,11 @@
 
         <h1>You’re about to start your .gov domain request.</h1>
         <p>You don’t have to complete the process in one session. You can save what you enter and come back to it when you’re ready.</p>
+        {% if portfolio %}
+        <p>We’ll use the information you provide to verify your domain request meets our guidelines.</p>
+        {% else %}
         <p>We’ll use the information you provide to verify your organization’s eligibility for a .gov domain. We’ll also verify that the domain you request meets our guidelines.</p>
+        {% endif %}
         <h2>Time to complete the form</h2>
         <p>If you have <a href="{% public_site_url 'domains/before/#information-you%E2%80%99ll-need-to-complete-the-domain-request-form' %}" target="_blank" class="usa-link">all the information you need</a>,
           completing your domain request might take around 15 minutes.</p>
diff --git a/src/registrar/templates/domain_request_requesting_entity.html b/src/registrar/templates/domain_request_requesting_entity.html
index 831c37984..375f7ce74 100644
--- a/src/registrar/templates/domain_request_requesting_entity.html
+++ b/src/registrar/templates/domain_request_requesting_entity.html
@@ -8,9 +8,9 @@
 {% block form_fields %}
     <fieldset class="usa-fieldset">
         <legend>
-        <h2>Are you from the polaris star system?</h2>
+        <h2>What is the name of your space vessel?</h2>
         </legend>
 
-        {% input_with_errors forms.0.is_policy_acknowledged %}
+        {% input_with_errors forms.0.organization_name %}
     </fieldset>
 {% endblock %}
\ No newline at end of file
diff --git a/src/registrar/templates/includes/header_extended.html b/src/registrar/templates/includes/header_extended.html
index ab53dd5cf..c10245946 100644
--- a/src/registrar/templates/includes/header_extended.html
+++ b/src/registrar/templates/includes/header_extended.html
@@ -34,6 +34,7 @@
             </ul>
         </div>
         <ul class="usa-nav__primary usa-accordion">
+            {% if not hide_domains %}
             <li class="usa-nav__primary-item">
                 {% if has_any_domains_portfolio_permission %}
                     {% url 'domains' as url %}
@@ -44,13 +45,14 @@
                 Domains
                 </a>
             </li>
+            {% endif %}
             <!-- <li class="usa-nav__primary-item">
                 <a href="#" class="usa-nav-link">
                     Domain groups
                 </a>
             </li> -->
-            
-            {% if has_organization_requests_flag %}
+
+            {% if has_organization_requests_flag and not hide_requests %}
             <li class="usa-nav__primary-item">
                 <!-- user has one of the view permissions plus the edit permission, show the dropdown -->
                 {% if has_edit_request_portfolio_permission %}
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index dbc93e289..263e57be1 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -130,10 +130,16 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
 
         # If a user is creating a request, we assume that perms are handled upstream
         if self.request.user.is_org_user(self.request):
+            portfolio = self.request.session.get("portfolio")
             self._domain_request = DomainRequest.objects.create(
                 creator=self.request.user,
-                portfolio=self.request.session.get("portfolio"),
+                portfolio=portfolio,
             )
+
+            # TODO - is this needed?
+            if portfolio:
+                self._domain_request.generic_org_type = portfolio.organization_type
+                self._domain_request.save()
         else:
             self._domain_request = DomainRequest.objects.create(creator=self.request.user)
 
@@ -233,7 +239,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
                 # Clear context so the prop getter won't create a request here.
                 # Creating a request will be handled in the post method for the
                 # intro page.
-                return render(request, "domain_request_intro.html", {})
+                return render(request, "domain_request_intro.html", {"hide_requests": True, "hide_domains": True})
             else:
                 return self.goto(self.steps.first)
 
@@ -360,7 +366,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         # from the list of "unlocked" steps.
         if self.is_portfolio:
             history_dict = {
-                "requesting_entity": self.domain_request.is_policy_acknowledged is not None,
+                "requesting_entity": self.domain_request.organization_name is not None,
                 "current_sites": (
                     self.domain_request.current_websites.exists() or self.domain_request.requested_domain is not None
                 ),
@@ -459,6 +465,11 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
                 "user": self.request.user,
                 "requested_domain__name": requested_domain_name,
             }
+
+        # Hides the requests and domains buttons in the navbar
+        context_stuff["hide_requests"] = self.is_portfolio
+        context_stuff["hide_domains"] = self.is_portfolio
+
         return context_stuff
 
     def get_step_list(self) -> list:
diff --git a/src/registrar/views/utility/mixins.py b/src/registrar/views/utility/mixins.py
index 74651ee6d..3499c147c 100644
--- a/src/registrar/views/utility/mixins.py
+++ b/src/registrar/views/utility/mixins.py
@@ -391,6 +391,12 @@ class DomainRequestWizardPermission(PermissionsLoginMixin):
         if self.request.user.is_restricted():
             return False
 
+        # If the user is an org user and doesn't have add/edit perms, forbid this
+        if self.request.user.is_org_user(self.request):
+            portfolio = self.request.session.get("portfolio")
+            if not self.request.user.has_edit_request_portfolio_permission(portfolio):
+                return False
+
         # user needs to be the creator of the domain request to edit it.
         id = self.kwargs.get("id") if hasattr(self, "kwargs") else None
         if not id:
@@ -398,12 +404,10 @@ class DomainRequestWizardPermission(PermissionsLoginMixin):
             if domain_request_wizard:
                 id = domain_request_wizard.get("domain_request_id")
 
-        if not DomainRequest.objects.filter(creator=self.request.user, id=id).exists():
-            return False
-
-        if self.request.user.is_org_user(self.request):
-            portfolio = self.request.session.get("portfolio")
-            if not self.request.user.has_edit_request_portfolio_permission(portfolio):
+        # If no id is provided, we can assume that the user is starting a new request.
+        # If one IS provided, check that they are the original creator of it.
+        if id:
+            if not DomainRequest.objects.filter(creator=self.request.user, id=id).exists():
                 return False
 
         return True

From e96da61d55e0f31f8772b0da7130be6c386da74e Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Thu, 3 Oct 2024 15:10:46 -0400
Subject: [PATCH 044/142] added code to break up text on modal

---
 src/registrar/views/domain_request.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 55e1e2363..82b7dc4d2 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -382,8 +382,8 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         text_domain_name = str(requested_domain_name) if requested_domain_name is not None else None
 
         if text_domain_name and len(text_domain_name) > 30:
-            text_domain_name = text_domain_name[:27] + "..."
-
+            text_domain_name = text_domain_name[:30] + "\n" + text_domain_name[30:]
+ 
         context_stuff = {}
         if DomainRequest._form_complete(self.domain_request, self.request):
             modal_button = '<button type="submit" ' 'class="usa-button" ' ">Submit request</button>"

From 2ecbab459bbdcc7448ae424059ebb09756baf1c9 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Thu, 3 Oct 2024 15:56:29 -0400
Subject: [PATCH 045/142] wip

---
 src/registrar/config/urls.py                  |  5 +++
 .../fixtures_user_portfolio_permissions.py    |  3 +-
 src/registrar/templates/portfolio_member.html | 32 +++++++++++++++++++
 .../tests/test_views_members_json.py          |  5 +++
 src/registrar/views/portfolio_members_json.py |  3 +-
 src/registrar/views/portfolios.py             | 13 ++++++++
 src/registrar/views/utility/mixins.py         | 23 ++++++++++++-
 .../views/utility/permission_views.py         | 11 ++++++-
 8 files changed, 91 insertions(+), 4 deletions(-)
 create mode 100644 src/registrar/templates/portfolio_member.html

diff --git a/src/registrar/config/urls.py b/src/registrar/config/urls.py
index 3099f468f..754edca1c 100644
--- a/src/registrar/config/urls.py
+++ b/src/registrar/config/urls.py
@@ -81,6 +81,11 @@ urlpatterns = [
         views.PortfolioMembersView.as_view(),
         name="members",
     ),
+    path(
+        "member/<int:pk>",
+        views.PortfolioMemberView.as_view(),
+        name="member",
+    ),
     # path(
     #     "no-organization-members/",
     #     views.PortfolioNoMembersView.as_view(),
diff --git a/src/registrar/fixtures/fixtures_user_portfolio_permissions.py b/src/registrar/fixtures/fixtures_user_portfolio_permissions.py
index 3c64eb6b5..0ff740573 100644
--- a/src/registrar/fixtures/fixtures_user_portfolio_permissions.py
+++ b/src/registrar/fixtures/fixtures_user_portfolio_permissions.py
@@ -7,7 +7,7 @@ from registrar.fixtures.fixtures_users import UserFixture
 from registrar.models import User
 from registrar.models.portfolio import Portfolio
 from registrar.models.user_portfolio_permission import UserPortfolioPermission
-from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices
+from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices
 
 fake = Faker()
 logger = logging.getLogger(__name__)
@@ -58,6 +58,7 @@ class UserPortfolioPermissionFixture:
                                 user=user,
                                 portfolio=portfolio,
                                 roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+                                additional_permissions=[UserPortfolioPermissionChoices.EDIT_MEMBERS],
                             )
                             user_portfolio_permissions_to_create.append(user_portfolio_permission)
                         else:
diff --git a/src/registrar/templates/portfolio_member.html b/src/registrar/templates/portfolio_member.html
new file mode 100644
index 000000000..55435d3b1
--- /dev/null
+++ b/src/registrar/templates/portfolio_member.html
@@ -0,0 +1,32 @@
+{% extends 'portfolio_base.html' %}
+{% load static field_helpers%}
+
+{% block title %}Organization member {% endblock %}
+
+{% load static %}
+
+{% block portfolio_content %}
+<div class="grid-row grid-gap">
+    <div class="tablet:grid-col-3">
+        <p class="font-body-md margin-top-0 margin-bottom-2
+                    text-primary-darker text-semibold"
+        >
+            <span class="usa-sr-only"> Portfolio name:</span> {{ portfolio }}
+        </p>
+    </div>
+
+    <div class="tablet:grid-col-9" id="main-content">
+
+        {% block messages %}
+            {% include "includes/form_messages.html" %}
+        {% endblock %}
+
+        <h1>Member</h1>
+
+        <p>The name of your organization will be publicly listed as the domain registrant.</p>
+
+        
+
+    </div>
+</div>
+{% endblock %}
diff --git a/src/registrar/tests/test_views_members_json.py b/src/registrar/tests/test_views_members_json.py
index 75c3a3a66..1a8238502 100644
--- a/src/registrar/tests/test_views_members_json.py
+++ b/src/registrar/tests/test_views_members_json.py
@@ -68,6 +68,11 @@ class GetPortfolioMembersJsonTest(TestWithUser, WebTest):
             roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
         )
 
+    def tearDownClass(cls):
+        UserPortfolioPermission.objects.all().delete()
+        Portfolio.objects.all().delete()
+        User.objects.all().delete()
+
     def setUp(self):
         super().setUp()
         self.app.set_user(self.user.username)
diff --git a/src/registrar/views/portfolio_members_json.py b/src/registrar/views/portfolio_members_json.py
index 133e6750e..34cc08ee7 100644
--- a/src/registrar/views/portfolio_members_json.py
+++ b/src/registrar/views/portfolio_members_json.py
@@ -2,6 +2,7 @@ from django.http import JsonResponse
 from django.core.paginator import Paginator
 from django.contrib.auth.decorators import login_required
 from django.db.models import Q
+from django.urls import reverse
 
 from registrar.models.portfolio_invitation import PortfolioInvitation
 from registrar.models.user import User
@@ -118,7 +119,7 @@ def serialize_members(request, portfolio, member, user, admin_ids, portfolio_inv
         "email": member.email,
         "is_admin": is_admin,
         "last_active": last_active,
-        "action_url": "#",  # reverse("members", kwargs={"pk": member.id}), # TODO: Future ticket?
+        "action_url": reverse("member", kwargs={"pk": member.id}), # TODO: Future ticket?
         "action_label": ("View" if view_only else "Manage"),
         "svg_icon": ("visibility" if view_only else "settings"),
     }
diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py
index 552fdb6ff..fe15ccd27 100644
--- a/src/registrar/views/portfolios.py
+++ b/src/registrar/views/portfolios.py
@@ -12,6 +12,7 @@ from registrar.views.utility.permission_views import (
     PortfolioDomainsPermissionView,
     PortfolioBasePermissionView,
     NoPortfolioDomainsPermissionView,
+    PortfolioMemberPermissionView,
     PortfolioMembersPermissionView,
 )
 from django.views.generic import View
@@ -51,6 +52,18 @@ class PortfolioMembersView(PortfolioMembersPermissionView, View):
         return render(request, "portfolio_members.html")
 
 
+class PortfolioMemberView(PortfolioMemberPermissionView, View):
+
+    template_name = "portfolio_member.html"
+    model = User
+
+    # def get(self, request):
+    #     """Add additional context data to the template."""
+    #     return render(request, self.template_name, context=self.get_context_data())
+    
+
+
+
 class PortfolioNoDomainsView(NoPortfolioDomainsPermissionView, View):
     """Some users have access to the underlying portfolio, but not any domains.
     This is a custom view which explains that to the user - and denotes who to contact.
diff --git a/src/registrar/views/utility/mixins.py b/src/registrar/views/utility/mixins.py
index 2cb2a599b..3e3453bed 100644
--- a/src/registrar/views/utility/mixins.py
+++ b/src/registrar/views/utility/mixins.py
@@ -490,7 +490,28 @@ class PortfolioMembersPermission(PortfolioBasePermission):
         up from the portfolio's primary key in self.kwargs["pk"]"""
 
         portfolio = self.request.session.get("portfolio")
-        if not self.request.user.has_view_members_portfolio_permission(portfolio):
+        if not self.request.user.has_view_members_portfolio_permission(
+            portfolio
+        ) and not self.request.user.has_edit_members_portfolio_permission(portfolio):
+            return False
+
+        return super().has_permission()
+
+
+class PortfolioMemberPermission(PortfolioBasePermission):
+    """Permission mixin that allows access to portfolio member pages if user
+    has access, otherwise 403"""
+
+    def has_permission(self):
+        """Check if this user has access to members for this portfolio.
+
+        The user is in self.request.user and the portfolio can be looked
+        up from the portfolio's primary key in self.kwargs["pk"]"""
+
+        portfolio = self.request.session.get("portfolio")
+        if not self.request.user.has_view_members_portfolio_permission(
+            portfolio
+        ) and not self.request.user.has_edit_members_portfolio_permission(portfolio):
             return False
 
         return super().has_permission()
diff --git a/src/registrar/views/utility/permission_views.py b/src/registrar/views/utility/permission_views.py
index 414e58275..c9ffa8625 100644
--- a/src/registrar/views/utility/permission_views.py
+++ b/src/registrar/views/utility/permission_views.py
@@ -19,6 +19,7 @@ from .mixins import (
     UserProfilePermission,
     PortfolioBasePermission,
     PortfolioMembersPermission,
+    PortfolioMemberPermission,
     DomainRequestPortfolioViewonlyPermission,
 )
 import logging
@@ -253,7 +254,15 @@ class PortfolioDomainRequestsPermissionView(PortfolioDomainRequestsPermission, P
 
 
 class PortfolioMembersPermissionView(PortfolioMembersPermission, PortfolioBasePermissionView, abc.ABC):
-    """Abstract base view for portfolio domain request views that enforces permissions.
+    """Abstract base view for portfolio members views that enforces permissions.
+
+    This abstract view cannot be instantiated. Actual views must specify
+    `template_name`.
+    """
+
+
+class PortfolioMemberPermissionView(PortfolioMemberPermission, PortfolioBasePermissionView, abc.ABC):
+    """Abstract base view for portfolio member views that enforces permissions.
 
     This abstract view cannot be instantiated. Actual views must specify
     `template_name`.

From 60dac00914e4ce3a7dc5f83e057188152cb6e30c Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Thu, 3 Oct 2024 16:02:18 -0400
Subject: [PATCH 046/142] formatting

---
 src/registrar/views/domain_request.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 82b7dc4d2..71afd1a70 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -383,7 +383,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
 
         if text_domain_name and len(text_domain_name) > 30:
             text_domain_name = text_domain_name[:30] + "\n" + text_domain_name[30:]
- 
+
         context_stuff = {}
         if DomainRequest._form_complete(self.domain_request, self.request):
             modal_button = '<button type="submit" ' 'class="usa-button" ' ">Submit request</button>"

From d933da326cb30f6c40cc735cbc13b676c0a586f7 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Thu, 3 Oct 2024 18:44:34 -0400
Subject: [PATCH 047/142] wip

---
 src/registrar/forms/__init__.py               |   1 +
 src/registrar/forms/portfolio.py              |  31 ++++
 .../templates/includes/header_extended.html   |  14 +-
 src/registrar/templates/portfolio_member.html |  25 ++--
 src/registrar/views/portfolio_members_json.py | 133 +++++++++++-------
 src/registrar/views/portfolios.py             |  34 ++++-
 6 files changed, 165 insertions(+), 73 deletions(-)

diff --git a/src/registrar/forms/__init__.py b/src/registrar/forms/__init__.py
index 033e955ed..121e2b3f7 100644
--- a/src/registrar/forms/__init__.py
+++ b/src/registrar/forms/__init__.py
@@ -13,4 +13,5 @@ from .domain import (
 )
 from .portfolio import (
     PortfolioOrgAddressForm,
+    PortfolioMemberForm,
 )
diff --git a/src/registrar/forms/portfolio.py b/src/registrar/forms/portfolio.py
index 14a45f6ae..2b669c50c 100644
--- a/src/registrar/forms/portfolio.py
+++ b/src/registrar/forms/portfolio.py
@@ -4,6 +4,9 @@ import logging
 from django import forms
 from django.core.validators import RegexValidator
 
+from registrar.models.user_portfolio_permission import UserPortfolioPermission
+from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices
+
 from ..models import DomainInformation, Portfolio, SeniorOfficial
 
 logger = logging.getLogger(__name__)
@@ -95,3 +98,31 @@ class PortfolioSeniorOfficialForm(forms.ModelForm):
         cleaned_data = super().clean()
         cleaned_data.pop("full_name", None)
         return cleaned_data
+    
+
+class PortfolioMemberForm(forms.ModelForm):
+    """
+    Form for updating a portfolio member.
+    """
+
+    roles = forms.MultipleChoiceField(
+        choices=UserPortfolioRoleChoices.choices,
+        widget=forms.SelectMultiple(attrs={'class': 'usa-select'}),
+        required=False,
+        label="Roles",
+    )
+
+    additional_permissions = forms.MultipleChoiceField(
+        choices=UserPortfolioPermissionChoices.choices,
+        widget=forms.SelectMultiple(attrs={'class': 'usa-select'}),
+        required=False,
+        label="Additional Permissions",
+    )
+    
+    class Meta:
+        model = UserPortfolioPermission
+        fields = [
+            "roles",
+            "additional_permissions",
+        ]
+
diff --git a/src/registrar/templates/includes/header_extended.html b/src/registrar/templates/includes/header_extended.html
index a3b2364a9..43467602e 100644
--- a/src/registrar/templates/includes/header_extended.html
+++ b/src/registrar/templates/includes/header_extended.html
@@ -91,12 +91,14 @@
             </li>
             {% endif %}
 
-            {% if has_organization_members_flag and has_view_members_portfolio_permission %}
-            <li class="usa-nav__primary-item">
-                <a href="/members/" class="usa-nav-link {% if path|is_members_subpage %} usa-current{% endif %}">
-                    Members
-                </a>
-            </li>
+            {% if has_organization_members_flag %}
+                {% if has_view_members_portfolio_permission or has_edit_members_portfolio_permission %}
+                    <li class="usa-nav__primary-item">
+                        <a href="/members/" class="usa-nav-link {% if path|is_members_subpage %} usa-current{% endif %}">
+                            Members
+                        </a>
+                    </li>
+                {% endif %}
             {% endif %}
 
             <li class="usa-nav__primary-item">
diff --git a/src/registrar/templates/portfolio_member.html b/src/registrar/templates/portfolio_member.html
index 55435d3b1..3f089ebe1 100644
--- a/src/registrar/templates/portfolio_member.html
+++ b/src/registrar/templates/portfolio_member.html
@@ -7,14 +7,6 @@
 
 {% block portfolio_content %}
 <div class="grid-row grid-gap">
-    <div class="tablet:grid-col-3">
-        <p class="font-body-md margin-top-0 margin-bottom-2
-                    text-primary-darker text-semibold"
-        >
-            <span class="usa-sr-only"> Portfolio name:</span> {{ portfolio }}
-        </p>
-    </div>
-
     <div class="tablet:grid-col-9" id="main-content">
 
         {% block messages %}
@@ -23,7 +15,22 @@
 
         <h1>Member</h1>
 
-        <p>The name of your organization will be publicly listed as the domain registrant.</p>
+        <p>{{ user.first_name }}</p>
+
+
+        <hr>
+
+        <form class="usa-form usa-form--large" method="post" novalidate>
+            {% csrf_token %}
+        
+            {% input_with_errors form.roles %}
+            {% input_with_errors form.additional_permissions %}
+        
+            <button
+              type="submit"
+              class="usa-button"
+            >Submit</button>
+          </form>
 
         
 
diff --git a/src/registrar/views/portfolio_members_json.py b/src/registrar/views/portfolio_members_json.py
index 34cc08ee7..f3a175980 100644
--- a/src/registrar/views/portfolio_members_json.py
+++ b/src/registrar/views/portfolio_members_json.py
@@ -8,6 +8,7 @@ from registrar.models.portfolio_invitation import PortfolioInvitation
 from registrar.models.user import User
 from registrar.models.user_portfolio_permission import UserPortfolioPermission
 from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices
+from operator import itemgetter
 
 
 @login_required
@@ -15,31 +16,60 @@ def get_portfolio_members_json(request):
     """Given the current request,
     get all members that are associated with the given portfolio"""
     portfolio = request.GET.get("portfolio")
-    member_ids = get_member_ids_from_request(request, portfolio)
-    objects = User.objects.filter(id__in=member_ids)
+    # member_ids = get_member_ids_from_request(request, portfolio)
+    # members = User.objects.filter(id__in=member_ids)
 
-    admin_ids = UserPortfolioPermission.objects.filter(
-        portfolio=portfolio,
-        roles__overlap=[
-            UserPortfolioRoleChoices.ORGANIZATION_ADMIN,
-        ],
-    ).values_list("user__id", flat=True)
-    portfolio_invitation_emails = PortfolioInvitation.objects.filter(portfolio=portfolio).values_list(
-        "email", flat=True
+    permissions = UserPortfolioPermission.objects.filter(portfolio=portfolio).select_related("user").values_list("pk", "user__first_name", "user__last_name", "user__email", "user__last_login", "roles")
+    invitations = PortfolioInvitation.objects.filter(portfolio=portfolio).values_list(
+        'pk', 'email', 'portfolio_roles', 'portfolio_additional_permissions', 'status'
     )
 
-    unfiltered_total = objects.count()
+    # Convert the permissions queryset into a list of dictionaries
+    permission_list = [
+        {
+            'id': perm[0],
+            'first_name': perm[1],
+            'last_name': perm[2],
+            'email': perm[3],
+            'last_active': perm[4],
+            'roles': perm[5],
+            'source': 'permission'  # Mark the source as permissions
+        }
+        for perm in permissions
+    ]
 
-    objects = apply_search(objects, request)
-    # objects = apply_status_filter(objects, request)
-    objects = apply_sorting(objects, request)
+    # Convert the invitations queryset into a list of dictionaries
+    invitation_list = [
+        {
+            'id': invite[0],
+            'first_name': None,  # No first name in invitations
+            'last_name': None,   # No last name in invitations
+            'email': invite[1],
+            'roles': invite[2],
+            'additional_permissions': invite[3],
+            'status': invite[4],
+            'last_active': 'Invited',
+            'source': 'invitation'  # Mark the source as invitations
+        }
+        for invite in invitations
+    ]
 
-    paginator = Paginator(objects, 10)
+    # Combine both lists into one unified list
+    combined_list = permission_list + invitation_list
+
+    unfiltered_total = len(combined_list)
+
+    combined_list = apply_search(combined_list, request)
+    combined_list = apply_sorting(combined_list, request)
+
+    paginator = Paginator(combined_list, 10)
     page_number = request.GET.get("page", 1)
     page_obj = paginator.get_page(page_number)
+    
+    
     members = [
-        serialize_members(request, portfolio, member, request.user, admin_ids, portfolio_invitation_emails)
-        for member in page_obj.object_list
+        serialize_members(request, portfolio, item, request.user)
+        for item in page_obj.object_list
     ]
 
     return JsonResponse(
@@ -55,44 +85,43 @@ def get_portfolio_members_json(request):
     )
 
 
-def get_member_ids_from_request(request, portfolio):
-    """Given the current request,
-    get all members that are associated with the given portfolio"""
-    member_ids = []
-    if portfolio:
-        member_ids = UserPortfolioPermission.objects.filter(portfolio=portfolio).values_list("user__id", flat=True)
-    return member_ids
+# def get_member_ids_from_request(request, portfolio):
+#     """Given the current request,
+#     get all members that are associated with the given portfolio"""
+#     member_ids = []
+#     if portfolio:
+#         member_ids = UserPortfolioPermission.objects.filter(portfolio=portfolio).values_list("user__id", flat=True)
+#     return member_ids
 
-
-def apply_search(queryset, request):
-    search_term = request.GET.get("search_term")
+def apply_search(data_list, request):
+    search_term = request.GET.get("search_term", "").lower()
 
     if search_term:
-        queryset = queryset.filter(
-            Q(username__icontains=search_term)
-            | Q(first_name__icontains=search_term)
-            | Q(last_name__icontains=search_term)
-            | Q(email__icontains=search_term)
-        )
-    return queryset
+        # Filter the list based on the search term (case-insensitive)
+        data_list = [
+            item for item in data_list
+            if search_term in (item.get('first_name', '') or '').lower()
+            or search_term in (item.get('last_name', '') or '').lower()
+            or search_term in (item.get('email', '') or '').lower()
+        ]
+    
+    return data_list
 
 
-def apply_sorting(queryset, request):
+def apply_sorting(data_list, request):
     sort_by = request.GET.get("sort_by", "id")  # Default to 'id'
     order = request.GET.get("order", "asc")  # Default to 'asc'
 
     if sort_by == "member":
-        sort_by = ["email", "first_name", "middle_name", "last_name"]
-    else:
-        sort_by = [sort_by]
+        sort_by = "email"
 
-    if order == "desc":
-        sort_by = [f"-{field}" for field in sort_by]
+    # Sort the list
+    data_list = sorted(data_list, key=itemgetter(sort_by), reverse=(order == "desc"))
 
-    return queryset.order_by(*sort_by)
+    return data_list
 
 
-def serialize_members(request, portfolio, member, user, admin_ids, portfolio_invitation_emails):
+def serialize_members(request, portfolio, item, user):
     # ------- VIEW ONLY
     # If not view_only (the user has permissions to edit/manage users), show the gear icon with "Manage" link.
     # If view_only (the user only has view user permissions), show the "View" link (no gear icon).
@@ -106,20 +135,20 @@ def serialize_members(request, portfolio, member, user, admin_ids, portfolio_inv
     view_only = not user.has_edit_members_portfolio_permission(portfolio) or not user_can_edit_other_users
 
     # ------- USER STATUSES
-    is_invited = member.email in portfolio_invitation_emails
-    last_active = "Invited" if is_invited else "Unknown"
-    if member.last_login:
-        last_active = member.last_login.strftime("%b. %d, %Y")
-    is_admin = member.id in admin_ids
+    is_admin = UserPortfolioRoleChoices.ORGANIZATION_ADMIN in item['roles']
+
+    action_url = '#'
+    if item['source'] == 'permission':
+        action_url = reverse("member", kwargs={"pk": item['id']})
 
     # ------- SERIALIZE
     member_json = {
-        "id": member.id,
-        "name": member.get_formatted_name(),
-        "email": member.email,
+        "id": item['id'],
+        "name": (item['first_name'] or '') + ' ' + (item['last_name'] or ''),
+        "email": item['email'],
         "is_admin": is_admin,
-        "last_active": last_active,
-        "action_url": reverse("member", kwargs={"pk": member.id}), # TODO: Future ticket?
+        "last_active": item['last_active'],
+        "action_url": action_url,
         "action_label": ("View" if view_only else "Manage"),
         "svg_icon": ("visibility" if view_only else "settings"),
     }
diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py
index fe15ccd27..c4a19e2cd 100644
--- a/src/registrar/views/portfolios.py
+++ b/src/registrar/views/portfolios.py
@@ -3,7 +3,7 @@ from django.http import Http404
 from django.shortcuts import render
 from django.urls import reverse
 from django.contrib import messages
-from registrar.forms.portfolio import PortfolioOrgAddressForm, PortfolioSeniorOfficialForm
+from registrar.forms.portfolio import PortfolioMemberForm, PortfolioOrgAddressForm, PortfolioSeniorOfficialForm
 from registrar.models import Portfolio, User
 from registrar.models.user_portfolio_permission import UserPortfolioPermission
 from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices
@@ -17,7 +17,7 @@ from registrar.views.utility.permission_views import (
 )
 from django.views.generic import View
 from django.views.generic.edit import FormMixin
-
+from django.shortcuts import get_object_or_404, redirect
 
 logger = logging.getLogger(__name__)
 
@@ -55,11 +55,33 @@ class PortfolioMembersView(PortfolioMembersPermissionView, View):
 class PortfolioMemberView(PortfolioMemberPermissionView, View):
 
     template_name = "portfolio_member.html"
-    model = User
+    form_class = PortfolioMemberForm
 
-    # def get(self, request):
-    #     """Add additional context data to the template."""
-    #     return render(request, self.template_name, context=self.get_context_data())
+    def get(self, request, pk):
+        portfolio_permission = get_object_or_404(UserPortfolioPermission, pk=pk)
+        user = portfolio_permission.user
+        
+        form = self.form_class(instance=portfolio_permission)
+        
+        return render(request, self.template_name, {
+            'form': form,
+            'user': user,
+        })
+
+    def post(self, request, pk):
+        portfolio_permission = get_object_or_404(UserPortfolioPermission, pk=pk)
+        user = portfolio_permission.user
+        
+        form = self.form_class(request.POST, instance=portfolio_permission)
+        
+        if form.is_valid():
+            form.save()
+            return redirect('home')
+        
+        return render(request, self.template_name, {
+            'form': form,
+            'user': user,  # Pass the user object again to the template
+        })
     
 
 

From 993ae06b6abc8b76c752aeca1f46b875fd823cea Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 4 Oct 2024 10:56:28 -0400
Subject: [PATCH 048/142] fixed sorting for last_active

---
 src/registrar/views/portfolio_members_json.py | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/registrar/views/portfolio_members_json.py b/src/registrar/views/portfolio_members_json.py
index f3a175980..ed8fb9c3f 100644
--- a/src/registrar/views/portfolio_members_json.py
+++ b/src/registrar/views/portfolio_members_json.py
@@ -1,3 +1,4 @@
+from datetime import datetime
 from django.http import JsonResponse
 from django.core.paginator import Paginator
 from django.contrib.auth.decorators import login_required
@@ -115,8 +116,25 @@ def apply_sorting(data_list, request):
     if sort_by == "member":
         sort_by = "email"
 
-    # Sort the list
-    data_list = sorted(data_list, key=itemgetter(sort_by), reverse=(order == "desc"))
+    # Custom key function that handles None, 'Invited', and datetime values for last_active
+    def sort_key(item):
+        value = item.get(sort_by)
+        if sort_by == "last_active":
+            # Return a tuple to ensure consistent data types for comparison
+            # First element: ordering value (0 for valid datetime, 1 for 'Invited', 2 for None)
+            # Second element: the actual value to sort by
+            if value is None:
+                return (2, value)  # Position None last
+            if value == 'Invited':
+                return (1, value)  # Position 'Invited' before None but after valid datetimes
+            if isinstance(value, datetime):
+                return (0, value)  # Position valid datetime values first
+        
+        # Default case: return the value as is for comparison
+        return value
+
+    # Sort the list using the custom key function
+    data_list = sorted(data_list, key=sort_key, reverse=(order == "desc"))
 
     return data_list
 

From 4aa91ccc9cd1524641ec5bfecbe7fc0a3471685f Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 4 Oct 2024 09:24:28 -0600
Subject: [PATCH 049/142] Unit tests

---
 src/registrar/config/urls.py                  |   7 -
 .../domain_request_requesting_entity.html     |   2 +-
 src/registrar/tests/test_views_request.py     | 152 +++++++++++++++++-
 src/registrar/views/domain_request.py         |  25 +--
 4 files changed, 167 insertions(+), 19 deletions(-)

diff --git a/src/registrar/config/urls.py b/src/registrar/config/urls.py
index b25f6e0ea..e7f1883cd 100644
--- a/src/registrar/config/urls.py
+++ b/src/registrar/config/urls.py
@@ -60,15 +60,8 @@ for step, view in [
     (Step.ADDITIONAL_DETAILS, views.AdditionalDetails),
     (Step.REQUIREMENTS, views.Requirements),
     (Step.REVIEW, views.Review),
-
     # Portfolio steps
     (PortfolioDomainRequestStep.REQUESTING_ENTITY, views.RequestingEntity),
-    # (PortfolioDomainRequestStep.CURRENT_SITES, views.CurrentSites),
-    # (PortfolioDomainRequestStep.DOTGOV_DOMAIN, views.DotgovDomain),
-    # (PortfolioDomainRequestStep.PURPOSE, views.Purpose),
-    # (PortfolioDomainRequestStep.ADDITIONAL_DETAILS, views.AdditionalDetails),
-    # (PortfolioDomainRequestStep.REQUIREMENTS, views.Requirements),
-    # (PortfolioDomainRequestStep.REVIEW, views.Review),
 ]:
     domain_request_urls.append(path(f"{step}/", view.as_view(), name=step))
 
diff --git a/src/registrar/templates/domain_request_requesting_entity.html b/src/registrar/templates/domain_request_requesting_entity.html
index 375f7ce74..ed8dd771c 100644
--- a/src/registrar/templates/domain_request_requesting_entity.html
+++ b/src/registrar/templates/domain_request_requesting_entity.html
@@ -13,4 +13,4 @@
 
         {% input_with_errors forms.0.organization_name %}
     </fieldset>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/registrar/tests/test_views_request.py b/src/registrar/tests/test_views_request.py
index 8530859e2..6ff9ae218 100644
--- a/src/registrar/tests/test_views_request.py
+++ b/src/registrar/tests/test_views_request.py
@@ -2742,6 +2742,64 @@ class DomainRequestTests(TestWithUser, WebTest):
         self.assertContains(review_page, "toggle-submit-domain-request")
         self.assertContains(review_page, "Your request form is incomplete")
 
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_requests", active=True)
+    def test_portfolio_user_missing_edit_permissions(self):
+        """Tests that a portfolio user without edit request permissions cannot edit or add new requests"""
+        portfolio, _ = Portfolio.objects.get_or_create(creator=self.user, organization_name="Test Portfolio")
+        portfolio_perm, _ = UserPortfolioPermission.objects.get_or_create(
+            user=self.user, portfolio=portfolio, roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER]
+        )
+        # This user should be forbidden from creating new domain requests
+        intro_page = self.app.get(reverse("domain-request:"), expect_errors=True)
+        self.assertEqual(intro_page.status_code, 403)
+
+        # This user should also be forbidden from editing existing ones
+        domain_request = completed_domain_request(user=self.user)
+        edit_page = self.app.get(reverse("edit-domain-request", kwargs={"id": domain_request.pk}), expect_errors=True)
+        self.assertEqual(edit_page.status_code, 403)
+
+        # Cleanup
+        portfolio_perm.delete()
+        portfolio.delete()
+
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_requests", active=True)
+    def test_portfolio_user_with_edit_permissions(self):
+        """Tests that a portfolio user with edit request permissions can edit and add new requests"""
+        portfolio, _ = Portfolio.objects.get_or_create(creator=self.user, organization_name="Test Portfolio")
+        portfolio_perm, _ = UserPortfolioPermission.objects.get_or_create(
+            user=self.user, portfolio=portfolio, roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+        )
+        
+        # This user should be allowed to create new domain requests
+        intro_page = self.app.get(reverse("domain-request:"))
+        self.assertEqual(intro_page.status_code, 200)
+
+        # This user should also be allowed to edit existing ones
+        domain_request = completed_domain_request(user=self.user)
+        edit_page = self.app.get(reverse("edit-domain-request", kwargs={"id": domain_request.pk}))
+        self.assertEqual(edit_page.status_code, 200)
+
+        # Cleanup
+        portfolio_perm.delete()
+        portfolio.delete()
+
+    def test_non_creator_access(self):
+        """Tests that a user cannot edit a domain request they didn't create"""
+        other_user = User.objects.create_user(username="other_user", password="password")
+        domain_request = completed_domain_request(user=other_user)
+
+        edit_page = self.app.get(reverse("edit-domain-request", kwargs={"id": domain_request.pk}), expect_errors=True)
+        self.assertEqual(edit_page.status_code, 403)
+
+    def test_creator_access(self):
+        """Tests that a user can edit a domain request they created"""
+        domain_request = completed_domain_request(user=self.user)
+
+        edit_page = self.app.get(reverse("edit-domain-request", kwargs={"id": domain_request.pk}))
+        self.assertEqual(edit_page.status_code, 200)
+
 
 class DomainRequestTestDifferentStatuses(TestWithUser, WebTest):
     def setUp(self):
@@ -2904,7 +2962,7 @@ class DomainRequestTestDifferentStatuses(TestWithUser, WebTest):
         self.assertNotContains(home_page, "city.gov")
 
 
-class TestWizardUnlockingSteps(TestWithUser, WebTest):
+class TestDomainRequestWizard(TestWithUser, WebTest):
     def setUp(self):
         super().setUp()
         self.app.set_user(self.user.username)
@@ -2928,7 +2986,10 @@ class TestWizardUnlockingSteps(TestWithUser, WebTest):
     def test_unlocked_steps_full_domain_request(self):
         """Test when all fields in the domain request are filled."""
 
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.STARTED, user=self.user)
+        domain_request = completed_domain_request(
+            status=DomainRequest.DomainRequestStatus.STARTED, 
+            user=self.user
+        )
         domain_request.anything_else = False
         domain_request.has_anything_else_text = False
         domain_request.save()
@@ -3026,6 +3087,93 @@ class TestWizardUnlockingSteps(TestWithUser, WebTest):
         else:
             self.fail(f"Expected a redirect, but got a different response: {response}")
 
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_requests", active=True)
+    def test_wizard_steps_portfolio(self):
+        """
+        Tests the behavior of the domain request wizard for portfolios.
+        Ensures that:
+        - The user can access the organization page.
+        - The expected number of steps are locked/unlocked (implicit test for expected steps).
+        - The user lands on the "Requesting entity" page
+        - The user does not see the Domain and Domain requests buttons
+        """
+        
+        # This should unlock 4 steps by default.
+        # Purpose, .gov domain, current websites, and requirements for operating
+        domain_request = completed_domain_request(
+            status=DomainRequest.DomainRequestStatus.STARTED,
+            user=self.user,
+        )
+
+        federal_agency = FederalAgency.objects.get(agency="Non-Federal Agency")
+        # Add a portfolio
+        portfolio = Portfolio.objects.create(
+            creator=self.user,
+            organization_name="test portfolio",
+            federal_agency=federal_agency,
+        )
+
+        user_portfolio_permission = UserPortfolioPermission.objects.create(
+            user=self.user,
+            portfolio=portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+        )
+
+        response = self.app.get(f"/domain-request/{domain_request.id}/edit/")
+        # django-webtest does not handle cookie-based sessions well because it keeps
+        # resetting the session key on each new request, thus destroying the concept
+        # of a "session". We are going to do it manually, saving the session ID here
+        # and then setting the cookie on each request.
+        session_id = self.app.cookies[settings.SESSION_COOKIE_NAME]
+        self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+
+        # Check if the response is a redirect
+        if response.status_code == 302:
+            # Follow the redirect manually
+            try:
+                detail_page = response.follow()
+
+                self.wizard.get_context_data()
+            except Exception as err:
+                # Handle any potential errors while following the redirect
+                self.fail(f"Error following the redirect {err}")
+
+            # Now 'detail_page' contains the response after following the redirect
+            self.assertEqual(detail_page.status_code, 200)
+
+            # Assert that we're on the organization page
+            self.assertContains(detail_page, portfolio.organization_name)
+            print(f"what is the page? {detail_page}")
+
+            # We should only see one unlocked step
+            self.assertContains(detail_page, "#check_circle", count=4)
+
+            # One pages should still be locked (additional details)
+            self.assertContains(detail_page, "#lock", 1)
+
+            # The current option should be selected
+            self.assertContains(detail_page, "usa-current", count=1)
+
+            # We default to the requesting entity page
+            expected_url = reverse("domain-request:requesting_entity")
+            # This returns the entire url, thus "in"
+            self.assertIn(expected_url, detail_page.request.url)
+
+            # We shouldn't show the "domains" and "domain requests" buttons
+            # on this page.
+            self.assertNotContains(detail_page, "Domains")
+            self.assertNotContains(detail_page, "Domain requests")
+        else:
+            self.fail(f"Expected a redirect, but got a different response: {response}")
+        
+        # Data cleanup
+        user_portfolio_permission.delete()
+        portfolio.delete()
+        federal_agency.delete()
+        domain_request.delete()
+
 
 class TestPortfolioDomainRequestViewonly(TestWithUser, WebTest):
 
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 263e57be1..1a5cf48cb 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -136,8 +136,8 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
                 portfolio=portfolio,
             )
 
-            # TODO - is this needed?
-            if portfolio:
+            # Question for reviewers: we should probably be doing this right?
+            if portfolio and not self._domain_request.generic_org_type:
                 self._domain_request.generic_org_type = portfolio.organization_type
                 self._domain_request.save()
         else:
@@ -505,17 +505,14 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
 
         # which button did the user press?
         button: str = request.POST.get("submit_button", "")
-        # If a user hits the new request url directly
+
         if "new_request" not in request.session:
             request.session["new_request"] = True
+
         # if user has acknowledged the intro message
         if button == "intro_acknowledge":
-            if request.path_info == self.NEW_URL_NAME:
-
-                if self.request.session["new_request"] is True:
-                    # This will trigger the domain_request getter into creating a new DomainRequest
-                    del self.storage
-            return self.goto(self.steps.first)
+            # Split into a function: C901 'DomainRequestWizard.post' is too complex (11)
+            self.handle_intro_acknowledge(request)
 
         # if accessing this class directly, redirect to the first step
         if self.__class__ == DomainRequestWizard:
@@ -546,6 +543,14 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         # otherwise, proceed as normal
         return self.goto_next_step()
 
+    def handle_intro_acknowledge(self, request):
+        """If we are starting a new request, clear storage
+        and redirect to the first step"""
+        if request.path_info == self.NEW_URL_NAME:
+            if self.request.session["new_request"] is True:
+                del self.storage
+        return self.goto(self.steps.first)
+
     def save(self, forms: list):
         """
         Unpack the form responses onto the model object properties.
@@ -576,11 +581,13 @@ class PortfolioDomainRequestWizard(DomainRequestWizard):
         self.steps = StepsHelper(self)
         self._domain_request = None  # for caching
 
+
 # Portfolio pages
 class RequestingEntity(DomainRequestWizard):
     template_name = "domain_request_requesting_entity.html"
     forms = [forms.RequestingEntityForm]
 
+
 # Non-portfolio pages
 class OrganizationType(DomainRequestWizard):
     template_name = "domain_request_org_type.html"

From c1c060cb363df9f2aec9c7b2164fab0142d5dfe3 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 4 Oct 2024 11:40:29 -0400
Subject: [PATCH 050/142] added support for invited member

---
 src/registrar/config/urls.py                  |  5 +++
 src/registrar/forms/portfolio.py              | 28 +++++++++++++++
 src/registrar/templates/portfolio_member.html | 15 +++++---
 src/registrar/views/portfolio_members_json.py | 10 ++----
 src/registrar/views/portfolios.py             | 36 ++++++++++++++++---
 src/registrar/views/utility/mixins.py         | 19 ++++++++++
 .../views/utility/permission_views.py         |  9 +++++
 7 files changed, 105 insertions(+), 17 deletions(-)

diff --git a/src/registrar/config/urls.py b/src/registrar/config/urls.py
index 754edca1c..da115d471 100644
--- a/src/registrar/config/urls.py
+++ b/src/registrar/config/urls.py
@@ -86,6 +86,11 @@ urlpatterns = [
         views.PortfolioMemberView.as_view(),
         name="member",
     ),
+    path(
+        "invitedmember/<int:pk>",
+        views.PortfolioInvitedMemberView.as_view(),
+        name="invitedmember",
+    ),
     # path(
     #     "no-organization-members/",
     #     views.PortfolioNoMembersView.as_view(),
diff --git a/src/registrar/forms/portfolio.py b/src/registrar/forms/portfolio.py
index 2b669c50c..cdf00c625 100644
--- a/src/registrar/forms/portfolio.py
+++ b/src/registrar/forms/portfolio.py
@@ -4,6 +4,7 @@ import logging
 from django import forms
 from django.core.validators import RegexValidator
 
+from registrar.models.portfolio_invitation import PortfolioInvitation
 from registrar.models.user_portfolio_permission import UserPortfolioPermission
 from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices
 
@@ -126,3 +127,30 @@ class PortfolioMemberForm(forms.ModelForm):
             "additional_permissions",
         ]
 
+
+class PortfolioInvitedMemberForm(forms.ModelForm):
+    """
+    Form for updating a portfolio invited member.
+    """
+
+    portfolio_roles = forms.MultipleChoiceField(
+        choices=UserPortfolioRoleChoices.choices,
+        widget=forms.SelectMultiple(attrs={'class': 'usa-select'}),
+        required=False,
+        label="Roles",
+    )
+
+    portfolio_additional_permissions = forms.MultipleChoiceField(
+        choices=UserPortfolioPermissionChoices.choices,
+        widget=forms.SelectMultiple(attrs={'class': 'usa-select'}),
+        required=False,
+        label="Additional Permissions",
+    )
+    
+    class Meta:
+        model = PortfolioInvitation
+        fields = [
+            "portfolio_roles",
+            "portfolio_additional_permissions",
+        ]
+
diff --git a/src/registrar/templates/portfolio_member.html b/src/registrar/templates/portfolio_member.html
index 3f089ebe1..284a795eb 100644
--- a/src/registrar/templates/portfolio_member.html
+++ b/src/registrar/templates/portfolio_member.html
@@ -15,17 +15,22 @@
 
         <h1>Member</h1>
 
-        <p>{{ user.first_name }}</p>
+        <p>{{ member.first_name }}</p>
 
 
         <hr>
 
         <form class="usa-form usa-form--large" method="post" novalidate>
             {% csrf_token %}
-        
-            {% input_with_errors form.roles %}
-            {% input_with_errors form.additional_permissions %}
-        
+            {% if form.roles %}
+              {% comment - handling form fields for member %}
+              {% input_with_errors form.roles %}
+              {% input_with_errors form.additional_permissions %}
+            {% elif form.portfolio_roles %}
+              {% comment - handling form fields for invited member %}
+              {% input_with_errors form.portfolio_roles %}
+              {% input_with_errors form.portfolio_additional_permissions %}
+            {% endif %}
             <button
               type="submit"
               class="usa-button"
diff --git a/src/registrar/views/portfolio_members_json.py b/src/registrar/views/portfolio_members_json.py
index ed8fb9c3f..7dfc4ede4 100644
--- a/src/registrar/views/portfolio_members_json.py
+++ b/src/registrar/views/portfolio_members_json.py
@@ -86,14 +86,6 @@ def get_portfolio_members_json(request):
     )
 
 
-# def get_member_ids_from_request(request, portfolio):
-#     """Given the current request,
-#     get all members that are associated with the given portfolio"""
-#     member_ids = []
-#     if portfolio:
-#         member_ids = UserPortfolioPermission.objects.filter(portfolio=portfolio).values_list("user__id", flat=True)
-#     return member_ids
-
 def apply_search(data_list, request):
     search_term = request.GET.get("search_term", "").lower()
 
@@ -158,6 +150,8 @@ def serialize_members(request, portfolio, item, user):
     action_url = '#'
     if item['source'] == 'permission':
         action_url = reverse("member", kwargs={"pk": item['id']})
+    elif item['source'] == 'invitation':
+        action_url = reverse("invitedmember", kwargs={"pk": item['id']})
 
     # ------- SERIALIZE
     member_json = {
diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py
index c4a19e2cd..56af5897e 100644
--- a/src/registrar/views/portfolios.py
+++ b/src/registrar/views/portfolios.py
@@ -3,8 +3,9 @@ from django.http import Http404
 from django.shortcuts import render
 from django.urls import reverse
 from django.contrib import messages
-from registrar.forms.portfolio import PortfolioMemberForm, PortfolioOrgAddressForm, PortfolioSeniorOfficialForm
+from registrar.forms.portfolio import PortfolioInvitedMemberForm, PortfolioMemberForm, PortfolioOrgAddressForm, PortfolioSeniorOfficialForm
 from registrar.models import Portfolio, User
+from registrar.models.portfolio_invitation import PortfolioInvitation
 from registrar.models.user_portfolio_permission import UserPortfolioPermission
 from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices
 from registrar.views.utility.permission_views import (
@@ -12,6 +13,7 @@ from registrar.views.utility.permission_views import (
     PortfolioDomainsPermissionView,
     PortfolioBasePermissionView,
     NoPortfolioDomainsPermissionView,
+    PortfolioInvitedMemberPermissionView,
     PortfolioMemberPermissionView,
     PortfolioMembersPermissionView,
 )
@@ -65,7 +67,7 @@ class PortfolioMemberView(PortfolioMemberPermissionView, View):
         
         return render(request, self.template_name, {
             'form': form,
-            'user': user,
+            'member': user,
         })
 
     def post(self, request, pk):
@@ -76,15 +78,41 @@ class PortfolioMemberView(PortfolioMemberPermissionView, View):
         
         if form.is_valid():
             form.save()
-            return redirect('home')
+            return redirect('members')
         
         return render(request, self.template_name, {
             'form': form,
-            'user': user,  # Pass the user object again to the template
+            'member': user,  # Pass the user object again to the template
         })
     
 
 
+class PortfolioInvitedMemberView(PortfolioInvitedMemberPermissionView, View):
+
+    template_name = "portfolio_member.html"
+    form_class = PortfolioInvitedMemberForm
+
+    def get(self, request, pk):
+        portfolio_invitation = get_object_or_404(PortfolioInvitation, pk=pk)
+        form = self.form_class(instance=portfolio_invitation)
+        return render(request, self.template_name, {
+            'form': form,
+            'member': None,
+        })
+
+    def post(self, request, pk):
+        portfolio_invitation = get_object_or_404(PortfolioInvitation, pk=pk)
+        form = self.form_class(request.POST, instance=portfolio_invitation)
+        if form.is_valid():
+            form.save()
+            return redirect('members')
+        
+        return render(request, self.template_name, {
+            'form': form,
+            'member': None,  # Pass the user object again to the template
+        })
+    
+
 
 class PortfolioNoDomainsView(NoPortfolioDomainsPermissionView, View):
     """Some users have access to the underlying portfolio, but not any domains.
diff --git a/src/registrar/views/utility/mixins.py b/src/registrar/views/utility/mixins.py
index 3e3453bed..10e8fe3c6 100644
--- a/src/registrar/views/utility/mixins.py
+++ b/src/registrar/views/utility/mixins.py
@@ -515,3 +515,22 @@ class PortfolioMemberPermission(PortfolioBasePermission):
             return False
 
         return super().has_permission()
+
+
+class PortfolioInvitedMemberPermission(PortfolioBasePermission):
+    """Permission mixin that allows access to portfolio invited member pages if user
+    has access, otherwise 403"""
+
+    def has_permission(self):
+        """Check if this user has access to members for this portfolio.
+
+        The user is in self.request.user and the portfolio can be looked
+        up from the portfolio's primary key in self.kwargs["pk"]"""
+
+        portfolio = self.request.session.get("portfolio")
+        if not self.request.user.has_view_members_portfolio_permission(
+            portfolio
+        ) and not self.request.user.has_edit_members_portfolio_permission(portfolio):
+            return False
+
+        return super().has_permission()
diff --git a/src/registrar/views/utility/permission_views.py b/src/registrar/views/utility/permission_views.py
index c9ffa8625..65af99a14 100644
--- a/src/registrar/views/utility/permission_views.py
+++ b/src/registrar/views/utility/permission_views.py
@@ -15,6 +15,7 @@ from .mixins import (
     DomainRequestWizardPermission,
     PortfolioDomainRequestsPermission,
     PortfolioDomainsPermission,
+    PortfolioInvitedMemberPermission,
     UserDeleteDomainRolePermission,
     UserProfilePermission,
     PortfolioBasePermission,
@@ -267,3 +268,11 @@ class PortfolioMemberPermissionView(PortfolioMemberPermission, PortfolioBasePerm
     This abstract view cannot be instantiated. Actual views must specify
     `template_name`.
     """
+
+
+class PortfolioInvitedMemberPermissionView(PortfolioInvitedMemberPermission, PortfolioBasePermissionView, abc.ABC):
+    """Abstract base view for portfolio member views that enforces permissions.
+
+    This abstract view cannot be instantiated. Actual views must specify
+    `template_name`.
+    """

From b396a5c61be0a406d5355e8736ed581909bb21dc Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Fri, 4 Oct 2024 11:41:49 -0400
Subject: [PATCH 051/142] Add invited case to unit tests

---
 .../tests/test_views_members_json.py          | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/registrar/tests/test_views_members_json.py b/src/registrar/tests/test_views_members_json.py
index 1a8238502..8a029b834 100644
--- a/src/registrar/tests/test_views_members_json.py
+++ b/src/registrar/tests/test_views_members_json.py
@@ -1,6 +1,7 @@
 from django.urls import reverse
 
 from registrar.models.portfolio import Portfolio
+from registrar.models.portfolio_invitation import PortfolioInvitation
 from registrar.models.user import User
 from registrar.models.user_portfolio_permission import UserPortfolioPermission
 from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices
@@ -38,6 +39,7 @@ class GetPortfolioMembersJsonTest(TestWithUser, WebTest):
             phone="8003114567",
             title="Admin",
         )
+        cls.email5 = "fifth@example.com"
 
         # Create Portfolio
         cls.portfolio = Portfolio.objects.create(creator=cls.user, organization_name="Test Portfolio")
@@ -67,11 +69,23 @@ class GetPortfolioMembersJsonTest(TestWithUser, WebTest):
             portfolio=cls.portfolio,
             roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
         )
+        PortfolioInvitation.objects.create(
+            email=cls.email5,
+            portfolio=cls.portfolio,
+            portfolio_roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+            portfolio_additional_permissions=[
+                UserPortfolioPermissionChoices.VIEW_MEMBERS,
+                UserPortfolioPermissionChoices.EDIT_MEMBERS,
+            ],
+        )
 
+    @classmethod
     def tearDownClass(cls):
+        PortfolioInvitation.objects.all().delete()
         UserPortfolioPermission.objects.all().delete()
         Portfolio.objects.all().delete()
         User.objects.all().delete()
+        super().tearDownClass()
 
     def setUp(self):
         super().setUp()
@@ -88,14 +102,14 @@ class GetPortfolioMembersJsonTest(TestWithUser, WebTest):
         self.assertFalse(data["has_previous"])
         self.assertFalse(data["has_next"])
         self.assertEqual(data["num_pages"], 1)
-        self.assertEqual(data["total"], 4)
-        self.assertEqual(data["unfiltered_total"], 4)
+        self.assertEqual(data["total"], 5)
+        self.assertEqual(data["unfiltered_total"], 5)
 
         # Check the number of members
-        self.assertEqual(len(data["members"]), 4)
+        self.assertEqual(len(data["members"]), 5)
 
         # Check member fields
-        expected_emails = {self.user.email, self.user2.email, self.user3.email, self.user4.email}
+        expected_emails = {self.user.email, self.user2.email, self.user3.email, self.user4.email, self.user4.email, self.email5}
         actual_emails = {member["email"] for member in data["members"]}
         self.assertEqual(expected_emails, actual_emails)
 
@@ -128,8 +142,8 @@ class GetPortfolioMembersJsonTest(TestWithUser, WebTest):
         self.assertTrue(data["has_next"])
         self.assertFalse(data["has_previous"])
         self.assertEqual(data["num_pages"], 2)
-        self.assertEqual(data["total"], 14)
-        self.assertEqual(data["unfiltered_total"], 14)
+        self.assertEqual(data["total"], 15)
+        self.assertEqual(data["unfiltered_total"], 15)
 
         # Check the number of members on page 1
         self.assertEqual(len(data["members"]), 10)
@@ -147,7 +161,7 @@ class GetPortfolioMembersJsonTest(TestWithUser, WebTest):
         self.assertEqual(data["num_pages"], 2)
 
         # Check the number of members on page 2
-        self.assertEqual(len(data["members"]), 4)
+        self.assertEqual(len(data["members"]), 5)
 
     def test_search(self):
         """Test search functionality for portfolio members."""

From e9413a53bda8bcdcb9824e382b6cb9b9e1d6e0cd Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 4 Oct 2024 09:58:27 -0600
Subject: [PATCH 052/142] Lint + fix tests

---
 src/registrar/tests/test_views_request.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/registrar/tests/test_views_request.py b/src/registrar/tests/test_views_request.py
index 6ff9ae218..180cb3f98 100644
--- a/src/registrar/tests/test_views_request.py
+++ b/src/registrar/tests/test_views_request.py
@@ -2771,17 +2771,18 @@ class DomainRequestTests(TestWithUser, WebTest):
         portfolio_perm, _ = UserPortfolioPermission.objects.get_or_create(
             user=self.user, portfolio=portfolio, roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
         )
-        
+
         # This user should be allowed to create new domain requests
         intro_page = self.app.get(reverse("domain-request:"))
         self.assertEqual(intro_page.status_code, 200)
 
         # This user should also be allowed to edit existing ones
         domain_request = completed_domain_request(user=self.user)
-        edit_page = self.app.get(reverse("edit-domain-request", kwargs={"id": domain_request.pk}))
+        edit_page = self.app.get(reverse("edit-domain-request", kwargs={"id": domain_request.pk})).follow()
         self.assertEqual(edit_page.status_code, 200)
 
         # Cleanup
+        DomainRequest.objects.all().delete()
         portfolio_perm.delete()
         portfolio.delete()
 
@@ -2797,7 +2798,7 @@ class DomainRequestTests(TestWithUser, WebTest):
         """Tests that a user can edit a domain request they created"""
         domain_request = completed_domain_request(user=self.user)
 
-        edit_page = self.app.get(reverse("edit-domain-request", kwargs={"id": domain_request.pk}))
+        edit_page = self.app.get(reverse("edit-domain-request", kwargs={"id": domain_request.pk})).follow()
         self.assertEqual(edit_page.status_code, 200)
 
 
@@ -2986,10 +2987,7 @@ class TestDomainRequestWizard(TestWithUser, WebTest):
     def test_unlocked_steps_full_domain_request(self):
         """Test when all fields in the domain request are filled."""
 
-        domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.STARTED, 
-            user=self.user
-        )
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.STARTED, user=self.user)
         domain_request.anything_else = False
         domain_request.has_anything_else_text = False
         domain_request.save()
@@ -3099,7 +3097,7 @@ class TestDomainRequestWizard(TestWithUser, WebTest):
         - The user lands on the "Requesting entity" page
         - The user does not see the Domain and Domain requests buttons
         """
-        
+
         # This should unlock 4 steps by default.
         # Purpose, .gov domain, current websites, and requirements for operating
         domain_request = completed_domain_request(
@@ -3167,7 +3165,7 @@ class TestDomainRequestWizard(TestWithUser, WebTest):
             self.assertNotContains(detail_page, "Domain requests")
         else:
             self.fail(f"Expected a redirect, but got a different response: {response}")
-        
+
         # Data cleanup
         user_portfolio_permission.delete()
         portfolio.delete()

From 30d1e9a06d5bff2f1b34bccd4d4d205f44c02895 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 4 Oct 2024 12:21:18 -0400
Subject: [PATCH 053/142] added simple page header info

---
 src/registrar/templates/portfolio_member.html | 43 +++++++++++++++++--
 src/registrar/views/portfolios.py             |  5 ++-
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/registrar/templates/portfolio_member.html b/src/registrar/templates/portfolio_member.html
index 284a795eb..557e3b480 100644
--- a/src/registrar/templates/portfolio_member.html
+++ b/src/registrar/templates/portfolio_member.html
@@ -13,9 +13,46 @@
             {% include "includes/form_messages.html" %}
         {% endblock %}
 
-        <h1>Member</h1>
+        <h1>Manage member</h1>
+        
+        <p>
+          {% if member %}
+            {{ member.email }}
+          {% elif invitation %}
+            {{ invitation.email }}
+          {% endif %}
+        </p>
 
-        <p>{{ member.first_name }}</p>
+        <p>Last active: 
+          {% if member and member.last_login %}
+            {{ member.last_login }}
+          {% elif invitation %}
+            Invited
+          {% else %}
+            --
+          {% endif %}
+        </p>
+
+        <p>Full name:
+          {% if member %}
+            {% if member.first_name or member.last_name %}
+              {{ member.get_formatted_name }}
+            {% else %}
+              --
+            {% endif %}
+          {% else %}
+            --
+          {% endif %}
+        </p>
+
+        <p>Title or organization role:
+          {% if member and member.title %}
+            {{ member.title }}
+          {% else %}
+            --
+          {% endif %}
+        </p>
+      
 
 
         <hr>
@@ -23,11 +60,9 @@
         <form class="usa-form usa-form--large" method="post" novalidate>
             {% csrf_token %}
             {% if form.roles %}
-              {% comment - handling form fields for member %}
               {% input_with_errors form.roles %}
               {% input_with_errors form.additional_permissions %}
             {% elif form.portfolio_roles %}
-              {% comment - handling form fields for invited member %}
               {% input_with_errors form.portfolio_roles %}
               {% input_with_errors form.portfolio_additional_permissions %}
             {% endif %}
diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py
index 56af5897e..98402fb95 100644
--- a/src/registrar/views/portfolios.py
+++ b/src/registrar/views/portfolios.py
@@ -95,9 +95,10 @@ class PortfolioInvitedMemberView(PortfolioInvitedMemberPermissionView, View):
     def get(self, request, pk):
         portfolio_invitation = get_object_or_404(PortfolioInvitation, pk=pk)
         form = self.form_class(instance=portfolio_invitation)
+
         return render(request, self.template_name, {
             'form': form,
-            'member': None,
+            'invitation': portfolio_invitation,
         })
 
     def post(self, request, pk):
@@ -109,7 +110,7 @@ class PortfolioInvitedMemberView(PortfolioInvitedMemberPermissionView, View):
         
         return render(request, self.template_name, {
             'form': form,
-            'member': None,  # Pass the user object again to the template
+            'invitation': portfolio_invitation,  # Pass the user object again to the template
         })
     
 

From 54e061256448d0c33406bbfbea474cffc55860f8 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 4 Oct 2024 13:14:04 -0400
Subject: [PATCH 054/142] added edit views

---
 src/registrar/config/urls.py                  | 10 ++++
 src/registrar/templates/portfolio_member.html |  6 +--
 .../portfolio_member_permissions.html         | 47 +++++++++++++++++++
 src/registrar/views/portfolios.py             | 35 ++++++++++++--
 src/registrar/views/utility/mixins.py         | 34 ++++++++++++++
 .../views/utility/permission_views.py         | 18 +++++++
 6 files changed, 144 insertions(+), 6 deletions(-)
 create mode 100644 src/registrar/templates/portfolio_member_permissions.html

diff --git a/src/registrar/config/urls.py b/src/registrar/config/urls.py
index da115d471..1af8bf7fd 100644
--- a/src/registrar/config/urls.py
+++ b/src/registrar/config/urls.py
@@ -86,11 +86,21 @@ urlpatterns = [
         views.PortfolioMemberView.as_view(),
         name="member",
     ),
+    path(
+        "member/<int:pk>/permissions",
+        views.PortfolioMemberEditView.as_view(),
+        name="member-permissions",
+    ),
     path(
         "invitedmember/<int:pk>",
         views.PortfolioInvitedMemberView.as_view(),
         name="invitedmember",
     ),
+    path(
+        "invitedmember/<int:pk>/permissions",
+        views.PortfolioInvitedMemberEditView.as_view(),
+        name="invitedmember-permissions",
+    ),
     # path(
     #     "no-organization-members/",
     #     views.PortfolioNoMembersView.as_view(),
diff --git a/src/registrar/templates/portfolio_member.html b/src/registrar/templates/portfolio_member.html
index 557e3b480..c68f561d2 100644
--- a/src/registrar/templates/portfolio_member.html
+++ b/src/registrar/templates/portfolio_member.html
@@ -18,15 +18,15 @@
         <p>
           {% if member %}
             {{ member.email }}
-          {% elif invitation %}
-            {{ invitation.email }}
+          {% elif portfolio_invitation %}
+            {{ portfolio_invitation.email }}
           {% endif %}
         </p>
 
         <p>Last active: 
           {% if member and member.last_login %}
             {{ member.last_login }}
-          {% elif invitation %}
+          {% elif portfolio_invitation %}
             Invited
           {% else %}
             --
diff --git a/src/registrar/templates/portfolio_member_permissions.html b/src/registrar/templates/portfolio_member_permissions.html
new file mode 100644
index 000000000..ca7b30b44
--- /dev/null
+++ b/src/registrar/templates/portfolio_member_permissions.html
@@ -0,0 +1,47 @@
+{% extends 'portfolio_base.html' %}
+{% load static field_helpers%}
+
+{% block title %}Organization member {% endblock %}
+
+{% load static %}
+
+{% block portfolio_content %}
+<div class="grid-row grid-gap">
+    <div class="tablet:grid-col-9" id="main-content">
+
+        {% block messages %}
+            {% include "includes/form_messages.html" %}
+        {% endblock %}
+
+        <h1>Manage member</h1>
+        
+        <p>
+          {% if member %}
+            {{ member.email }}
+          {% elif invitation %}
+            {{ invitation.email }}
+          {% endif %}
+        </p>
+
+        <hr>
+
+        <form class="usa-form usa-form--large" method="post" novalidate>
+            {% csrf_token %}
+            {% if form.roles %}
+              {% input_with_errors form.roles %}
+              {% input_with_errors form.additional_permissions %}
+            {% elif form.portfolio_roles %}
+              {% input_with_errors form.portfolio_roles %}
+              {% input_with_errors form.portfolio_additional_permissions %}
+            {% endif %}
+            <button
+              type="submit"
+              class="usa-button"
+            >Submit</button>
+          </form>
+
+        
+
+    </div>
+</div>
+{% endblock %}
diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py
index 98402fb95..d33c327f8 100644
--- a/src/registrar/views/portfolios.py
+++ b/src/registrar/views/portfolios.py
@@ -13,7 +13,9 @@ from registrar.views.utility.permission_views import (
     PortfolioDomainsPermissionView,
     PortfolioBasePermissionView,
     NoPortfolioDomainsPermissionView,
+    PortfolioInvitedMemberEditPermissionView,
     PortfolioInvitedMemberPermissionView,
+    PortfolioMemberEditPermissionView,
     PortfolioMemberPermissionView,
     PortfolioMembersPermissionView,
 )
@@ -57,6 +59,20 @@ class PortfolioMembersView(PortfolioMembersPermissionView, View):
 class PortfolioMemberView(PortfolioMemberPermissionView, View):
 
     template_name = "portfolio_member.html"
+
+    def get(self, request, pk):
+        portfolio_permission = get_object_or_404(UserPortfolioPermission, pk=pk)
+        user = portfolio_permission.user
+        
+        return render(request, self.template_name, {
+            'portfolio_permission': portfolio_permission,
+            'member': user,
+        })
+
+    
+class PortfolioMemberEditView(PortfolioMemberEditPermissionView, View):
+
+    template_name = "portfolio_member_permissions.html"
     form_class = PortfolioMemberForm
 
     def get(self, request, pk):
@@ -78,7 +94,7 @@ class PortfolioMemberView(PortfolioMemberPermissionView, View):
         
         if form.is_valid():
             form.save()
-            return redirect('members')
+            return redirect('member',pk=pk)
         
         return render(request, self.template_name, {
             'form': form,
@@ -86,10 +102,23 @@ class PortfolioMemberView(PortfolioMemberPermissionView, View):
         })
     
 
-
 class PortfolioInvitedMemberView(PortfolioInvitedMemberPermissionView, View):
 
     template_name = "portfolio_member.html"
+    # form_class = PortfolioInvitedMemberForm
+
+    def get(self, request, pk):
+        portfolio_invitation = get_object_or_404(PortfolioInvitation, pk=pk)
+        # form = self.form_class(instance=portfolio_invitation)
+
+        return render(request, self.template_name, {
+            'portfolio_invitation': portfolio_invitation,
+        })
+
+
+class PortfolioInvitedMemberEditView(PortfolioInvitedMemberEditPermissionView, View):
+
+    template_name = "portfolio_member_permissions.html"
     form_class = PortfolioInvitedMemberForm
 
     def get(self, request, pk):
@@ -106,7 +135,7 @@ class PortfolioInvitedMemberView(PortfolioInvitedMemberPermissionView, View):
         form = self.form_class(request.POST, instance=portfolio_invitation)
         if form.is_valid():
             form.save()
-            return redirect('members')
+            return redirect('invitedmember', pk=pk)
         
         return render(request, self.template_name, {
             'form': form,
diff --git a/src/registrar/views/utility/mixins.py b/src/registrar/views/utility/mixins.py
index 10e8fe3c6..94fc0b1c5 100644
--- a/src/registrar/views/utility/mixins.py
+++ b/src/registrar/views/utility/mixins.py
@@ -515,6 +515,23 @@ class PortfolioMemberPermission(PortfolioBasePermission):
             return False
 
         return super().has_permission()
+    
+
+class PortfolioMemberEditPermission(PortfolioBasePermission):
+    """Permission mixin that allows access to portfolio member pages if user
+    has access to edit, otherwise 403"""
+
+    def has_permission(self):
+        """Check if this user has access to members for this portfolio.
+
+        The user is in self.request.user and the portfolio can be looked
+        up from the portfolio's primary key in self.kwargs["pk"]"""
+
+        portfolio = self.request.session.get("portfolio")
+        if not self.request.user.has_edit_members_portfolio_permission(portfolio):
+            return False
+
+        return super().has_permission()
 
 
 class PortfolioInvitedMemberPermission(PortfolioBasePermission):
@@ -534,3 +551,20 @@ class PortfolioInvitedMemberPermission(PortfolioBasePermission):
             return False
 
         return super().has_permission()
+    
+
+class PortfolioInvitedMemberEditPermission(PortfolioBasePermission):
+    """Permission mixin that allows access to portfolio invited member pages if user
+    has access to edit, otherwise 403"""
+
+    def has_permission(self):
+        """Check if this user has access to members for this portfolio.
+
+        The user is in self.request.user and the portfolio can be looked
+        up from the portfolio's primary key in self.kwargs["pk"]"""
+
+        portfolio = self.request.session.get("portfolio")
+        if not self.request.user.has_edit_members_portfolio_permission(portfolio):
+            return False
+
+        return super().has_permission()
diff --git a/src/registrar/views/utility/permission_views.py b/src/registrar/views/utility/permission_views.py
index 65af99a14..6fb7fee50 100644
--- a/src/registrar/views/utility/permission_views.py
+++ b/src/registrar/views/utility/permission_views.py
@@ -15,7 +15,9 @@ from .mixins import (
     DomainRequestWizardPermission,
     PortfolioDomainRequestsPermission,
     PortfolioDomainsPermission,
+    PortfolioInvitedMemberEditPermission,
     PortfolioInvitedMemberPermission,
+    PortfolioMemberEditPermission,
     UserDeleteDomainRolePermission,
     UserProfilePermission,
     PortfolioBasePermission,
@@ -270,9 +272,25 @@ class PortfolioMemberPermissionView(PortfolioMemberPermission, PortfolioBasePerm
     """
 
 
+class PortfolioMemberEditPermissionView(PortfolioMemberEditPermission, PortfolioBasePermissionView, abc.ABC):
+    """Abstract base view for portfolio member edit views that enforces permissions.
+
+    This abstract view cannot be instantiated. Actual views must specify
+    `template_name`.
+    """
+
+
 class PortfolioInvitedMemberPermissionView(PortfolioInvitedMemberPermission, PortfolioBasePermissionView, abc.ABC):
     """Abstract base view for portfolio member views that enforces permissions.
 
     This abstract view cannot be instantiated. Actual views must specify
     `template_name`.
     """
+
+
+class PortfolioInvitedMemberEditPermissionView(PortfolioInvitedMemberEditPermission, PortfolioBasePermissionView, abc.ABC):
+    """Abstract base view for portfolio member edit views that enforces permissions.
+
+    This abstract view cannot be instantiated. Actual views must specify
+    `template_name`.
+    """

From 133155fb0bd63b82f14c2bc23e77270701634b09 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 4 Oct 2024 11:45:02 -0600
Subject: [PATCH 055/142] Custom additional details page

---
 src/registrar/config/urls.py                  |  1 +
 .../portfolio_request_review_steps.html       | 28 +--------
 ...lio_domain_request_additional_details.html | 22 +++++++
 src/registrar/utility/enums.py                |  9 +--
 src/registrar/views/domain_request.py         | 60 +++++++++----------
 5 files changed, 58 insertions(+), 62 deletions(-)
 create mode 100644 src/registrar/templates/portfolio_domain_request_additional_details.html

diff --git a/src/registrar/config/urls.py b/src/registrar/config/urls.py
index e7f1883cd..57b84e2d5 100644
--- a/src/registrar/config/urls.py
+++ b/src/registrar/config/urls.py
@@ -62,6 +62,7 @@ for step, view in [
     (Step.REVIEW, views.Review),
     # Portfolio steps
     (PortfolioDomainRequestStep.REQUESTING_ENTITY, views.RequestingEntity),
+    (PortfolioDomainRequestStep.ADDITIONAL_DETAILS, views.PortfolioAdditionalDetails)
 ]:
     domain_request_urls.append(path(f"{step}/", view.as_view(), name=step))
 
diff --git a/src/registrar/templates/includes/portfolio_request_review_steps.html b/src/registrar/templates/includes/portfolio_request_review_steps.html
index 1c4286baa..9d3c5bdeb 100644
--- a/src/registrar/templates/includes/portfolio_request_review_steps.html
+++ b/src/registrar/templates/includes/portfolio_request_review_steps.html
@@ -53,32 +53,8 @@
     {% endif %}
 
     {% if step == Step.ADDITIONAL_DETAILS %}
-        {% 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="register-form-review-header">CISA Regional Representative</h3>
-                <ul class="usa-list usa-list--unstyled margin-top-0">
-                    {% 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 %}
-                        <li>{{domain_request.cisa_representative_email}}</li>
-                    {% endif %}
-                    {% else %}
-                    No
-                    {% endif %}
-                </ul>
-
-            <h3 class="register-form-review-header">Anything else</h3>
-            <ul class="usa-list usa-list--unstyled margin-top-0">
-                {% if domain_request.anything_else %}
-                    {{domain_request.anything_else}}
-                {% else %}
-                    No
-                {% endif %}
-            </ul>
-            {% else %}
-                {% include "includes/summary_item.html" with title="Additional Details" value="<span class='text-bold text-secondary-dark'>Incomplete</span>"|safe heading_level=heading_level editable=is_editable edit_link=domain_request_url %}
-            {% endif %}
+        {% with title=form_titles|get_item:step value=domain_request.anything_else|default:"<span class='text-bold text-secondary-dark'>Incomplete</span>"|safe %}
+            {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url %}
         {% endwith %}
     {% endif %}
 
diff --git a/src/registrar/templates/portfolio_domain_request_additional_details.html b/src/registrar/templates/portfolio_domain_request_additional_details.html
new file mode 100644
index 000000000..3b004354f
--- /dev/null
+++ b/src/registrar/templates/portfolio_domain_request_additional_details.html
@@ -0,0 +1,22 @@
+{% extends 'domain_request_form.html' %}
+{% load static field_helpers %}
+
+{% block form_required_fields_help_text %}
+{% include "includes/required_fields.html" %}
+{% endblock %}
+
+{% block form_fields %}
+
+    <fieldset class="usa-fieldset margin-top-2">
+        <legend>
+            <h2>Is there anything else you’d like us to know about your domain request?</h2> 
+        </legend>
+    </fieldset>
+
+    <div class="margin-top-3" id="anything-else">
+        <p>Provide details below. <abbr class="usa-hint usa-hint--required" title="required">*</abbr></p>
+        {% with attr_maxlength=2000 add_label_class="usa-sr-only" %}
+            {% input_with_errors forms.0.anything_else %}
+        {% endwith %}
+    </div>
+{% endblock %}
diff --git a/src/registrar/utility/enums.py b/src/registrar/utility/enums.py
index f67fd3f61..41fffce72 100644
--- a/src/registrar/utility/enums.py
+++ b/src/registrar/utility/enums.py
@@ -73,12 +73,13 @@ class PortfolioDomainRequestStep(StrEnum):
     As with Django's own `TextChoices` class, steps will
     appear in the order they are defined. (Order matters.)
     """
-
-    # Portfolio
-    REQUESTING_ENTITY = "requesting_entity"
+    # NOTE: Append portfolio_ when customizing a view for portfolio.
+    # By default, these will redirect to the normal request flow views.
+    # After creating a new view, you will need to add this to urls.py.
+    REQUESTING_ENTITY = "portfolio_requesting_entity"
     CURRENT_SITES = "current_sites"
     DOTGOV_DOMAIN = "dotgov_domain"
     PURPOSE = "purpose"
-    ADDITIONAL_DETAILS = "additional_details"
+    ADDITIONAL_DETAILS = "portfolio_additional_details"
     REQUIREMENTS = "requirements"
     REVIEW = "review"
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 1a5cf48cb..6d0146c6d 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -366,33 +366,23 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         # from the list of "unlocked" steps.
         if self.is_portfolio:
             history_dict = {
-                "requesting_entity": self.domain_request.organization_name is not None,
-                "current_sites": (
+                self.StepEnum.REQUESTING_ENTITY: self.domain_request.organization_name is not None,
+                self.StepEnum.CURRENT_SITES: (
                     self.domain_request.current_websites.exists() or self.domain_request.requested_domain is not None
                 ),
-                "dotgov_domain": self.domain_request.requested_domain is not None,
-                "purpose": self.domain_request.purpose is not None,
-                "other_contacts": (
-                    self.domain_request.other_contacts.exists()
-                    or self.domain_request.no_other_contacts_rationale is not None
-                ),
-                "additional_details": (
-                    # Additional details is complete as long as "has anything else" and "has cisa rep" are not None
-                    (
-                        self.domain_request.has_anything_else_text is not None
-                        and self.domain_request.has_cisa_representative is not None
-                    )
-                ),
-                "requirements": self.domain_request.is_policy_acknowledged is not None,
-                "review": self.domain_request.is_policy_acknowledged is not None,
+                self.StepEnum.DOTGOV_DOMAIN: self.domain_request.requested_domain is not None,
+                self.StepEnum.PURPOSE: self.domain_request.purpose is not None,
+                self.StepEnum.ADDITIONAL_DETAILS: self.domain_request.anything_else is not None,
+                self.StepEnum.REQUIREMENTS: self.domain_request.is_policy_acknowledged is not None,
+                self.StepEnum.REVIEW: self.domain_request.is_policy_acknowledged is not None,
             }
         else:
             history_dict = {
-                "generic_org_type": self.domain_request.generic_org_type is not None,
-                "tribal_government": self.domain_request.tribe_name is not None,
-                "organization_federal": self.domain_request.federal_type is not None,
-                "organization_election": self.domain_request.is_election_board is not None,
-                "organization_contact": (
+                self.StepEnum.ORGANIZATION_TYPE: self.domain_request.generic_org_type is not None,
+                self.StepEnum.TRIBAL_GOVERNMENT: self.domain_request.tribe_name is not None,
+                self.StepEnum.ORGANIZATION_FEDERAL: self.domain_request.federal_type is not None,
+                self.StepEnum.ORGANIZATION_ELECTION: self.domain_request.is_election_board is not None,
+                self.StepEnum.ORGANIZATION_CONTACT: (
                     self.domain_request.federal_agency is not None
                     or self.domain_request.organization_name is not None
                     or self.domain_request.address_line1 is not None
@@ -401,26 +391,26 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
                     or self.domain_request.zipcode is not None
                     or self.domain_request.urbanization is not None
                 ),
-                "about_your_organization": self.domain_request.about_your_organization is not None,
-                "senior_official": self.domain_request.senior_official is not None,
-                "current_sites": (
+                self.StepEnum.ABOUT_YOUR_ORGANIZATION: self.domain_request.about_your_organization is not None,
+                self.StepEnum.SENIOR_OFFICIAL: self.domain_request.senior_official is not None,
+                self.StepEnum.CURRENT_SITES: (
                     self.domain_request.current_websites.exists() or self.domain_request.requested_domain is not None
                 ),
-                "dotgov_domain": self.domain_request.requested_domain is not None,
-                "purpose": self.domain_request.purpose is not None,
-                "other_contacts": (
+                self.StepEnum.DOTGOV_DOMAIN: self.domain_request.requested_domain is not None,
+                self.StepEnum.PURPOSE: self.domain_request.purpose is not None,
+                self.StepEnum.OTHER_CONTACTS: (
                     self.domain_request.other_contacts.exists()
                     or self.domain_request.no_other_contacts_rationale is not None
                 ),
-                "additional_details": (
+                self.StepEnum.ADDITIONAL_DETAILS: (
                     # Additional details is complete as long as "has anything else" and "has cisa rep" are not None
                     (
                         self.domain_request.has_anything_else_text is not None
                         and self.domain_request.has_cisa_representative is not None
                     )
                 ),
-                "requirements": self.domain_request.is_policy_acknowledged is not None,
-                "review": self.domain_request.is_policy_acknowledged is not None,
+                self.StepEnum.REQUIREMENTS: self.domain_request.is_policy_acknowledged is not None,
+                self.StepEnum.REVIEW: self.domain_request.is_policy_acknowledged is not None,
             }
         return [key for key, value in history_dict.items() if value]
 
@@ -477,7 +467,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         return request_step_list(self)
 
     def goto(self, step):
-        if step == "generic_org_type" or step == "requesting_entity":
+        if step == "generic_org_type" or step == "portfolio_requesting_entity":
             # We need to avoid creating a new domain request if the user
             # clicks the back button
             self.request.session["new_request"] = False
@@ -588,6 +578,12 @@ class RequestingEntity(DomainRequestWizard):
     forms = [forms.RequestingEntityForm]
 
 
+class PortfolioAdditionalDetails(DomainRequestWizard):
+    template_name = "portfolio_domain_request_additional_details.html"
+
+    forms = [forms.AnythingElseForm]
+
+
 # Non-portfolio pages
 class OrganizationType(DomainRequestWizard):
     template_name = "domain_request_org_type.html"

From 8f1ac687101861a88395584bd719507e0c799e0a Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 4 Oct 2024 11:50:36 -0600
Subject: [PATCH 056/142] linting

---
 src/registrar/config/urls.py              | 2 +-
 src/registrar/tests/test_views_request.py | 2 ++
 src/registrar/utility/enums.py            | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/registrar/config/urls.py b/src/registrar/config/urls.py
index 57b84e2d5..7d9b5b8cf 100644
--- a/src/registrar/config/urls.py
+++ b/src/registrar/config/urls.py
@@ -62,7 +62,7 @@ for step, view in [
     (Step.REVIEW, views.Review),
     # Portfolio steps
     (PortfolioDomainRequestStep.REQUESTING_ENTITY, views.RequestingEntity),
-    (PortfolioDomainRequestStep.ADDITIONAL_DETAILS, views.PortfolioAdditionalDetails)
+    (PortfolioDomainRequestStep.ADDITIONAL_DETAILS, views.PortfolioAdditionalDetails),
 ]:
     domain_request_urls.append(path(f"{step}/", view.as_view(), name=step))
 
diff --git a/src/registrar/tests/test_views_request.py b/src/registrar/tests/test_views_request.py
index 180cb3f98..3d1780e2b 100644
--- a/src/registrar/tests/test_views_request.py
+++ b/src/registrar/tests/test_views_request.py
@@ -3104,6 +3104,8 @@ class TestDomainRequestWizard(TestWithUser, WebTest):
             status=DomainRequest.DomainRequestStatus.STARTED,
             user=self.user,
         )
+        domain_request.anything_else = None
+        domain_request.save()
 
         federal_agency = FederalAgency.objects.get(agency="Non-Federal Agency")
         # Add a portfolio
diff --git a/src/registrar/utility/enums.py b/src/registrar/utility/enums.py
index 41fffce72..e430a4881 100644
--- a/src/registrar/utility/enums.py
+++ b/src/registrar/utility/enums.py
@@ -73,6 +73,7 @@ class PortfolioDomainRequestStep(StrEnum):
     As with Django's own `TextChoices` class, steps will
     appear in the order they are defined. (Order matters.)
     """
+
     # NOTE: Append portfolio_ when customizing a view for portfolio.
     # By default, these will redirect to the normal request flow views.
     # After creating a new view, you will need to add this to urls.py.

From cfff3322bc33e339217392a8bae8964b8185ea27 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 4 Oct 2024 12:22:12 -0600
Subject: [PATCH 057/142] Change reverse url on test

---
 src/registrar/tests/test_views_request.py | 2 +-
 src/registrar/views/domain_request.py     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/registrar/tests/test_views_request.py b/src/registrar/tests/test_views_request.py
index 3d1780e2b..d1aec7b7b 100644
--- a/src/registrar/tests/test_views_request.py
+++ b/src/registrar/tests/test_views_request.py
@@ -3157,7 +3157,7 @@ class TestDomainRequestWizard(TestWithUser, WebTest):
             self.assertContains(detail_page, "usa-current", count=1)
 
             # We default to the requesting entity page
-            expected_url = reverse("domain-request:requesting_entity")
+            expected_url = reverse("domain-request:portfolio_requesting_entity")
             # This returns the entire url, thus "in"
             self.assertIn(expected_url, detail_page.request.url)
 
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 6d0146c6d..d0f8d09b2 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -72,7 +72,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         StepEnum.ADDITIONAL_DETAILS: _("Additional details"),
         StepEnum.REQUIREMENTS: _("Requirements for operating a .gov domain"),
         StepEnum.REVIEW: _("Review and submit your domain request"),
-    }
+    }  # type: ignore
 
     # We can use a dictionary with step names and callables that return booleans
     # to show or hide particular steps based on the state of the process.
@@ -81,7 +81,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         StepEnum.TRIBAL_GOVERNMENT: lambda w: w.from_model("show_tribal_government", False),
         StepEnum.ORGANIZATION_ELECTION: lambda w: w.from_model("show_organization_election", False),
         StepEnum.ABOUT_YOUR_ORGANIZATION: lambda w: w.from_model("show_about_your_organization", False),
-    }
+    }  # type: ignore
 
     def __init__(self):
         super().__init__()
@@ -208,7 +208,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
             self.StepEnum.ADDITIONAL_DETAILS: _("Additional details"),
             self.StepEnum.REQUIREMENTS: _("Requirements for operating a .gov domain"),
             self.StepEnum.REVIEW: _("Review and submit your domain request"),
-        }
+        }  # type: ignore
         self.WIZARD_CONDITIONS = {}
 
         # Regenerate the steps helper
@@ -490,7 +490,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
 
     def post(self, request, *args, **kwargs) -> HttpResponse:
         """This method handles POST requests."""
-        if not self.is_portfolio and self.request.user.is_org_user(request):
+        if not self.is_portfolio and self.request.user.is_org_user(request):  # type: ignore
             self.mark_as_portfolio_wizard()
 
         # which button did the user press?

From c6f50f0af29dd3cbe5802411efadbc6e4cf57ebd Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 4 Oct 2024 12:37:42 -0600
Subject: [PATCH 058/142] lint

---
 src/registrar/tests/test_views_request.py | 3 ++-
 src/registrar/views/domain_request.py     | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/registrar/tests/test_views_request.py b/src/registrar/tests/test_views_request.py
index d1aec7b7b..197667e2a 100644
--- a/src/registrar/tests/test_views_request.py
+++ b/src/registrar/tests/test_views_request.py
@@ -2788,7 +2788,8 @@ class DomainRequestTests(TestWithUser, WebTest):
 
     def test_non_creator_access(self):
         """Tests that a user cannot edit a domain request they didn't create"""
-        other_user = User.objects.create_user(username="other_user", password="password")
+        p = "password"
+        other_user = User.objects.create_user(username="other_user", password=p)
         domain_request = completed_domain_request(user=other_user)
 
         edit_page = self.app.get(reverse("edit-domain-request", kwargs={"id": domain_request.pk}), expect_errors=True)
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index d0f8d09b2..4e899d507 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -43,7 +43,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
     although not without consulting the base implementation, first.
     """
 
-    StepEnum: Step | PortfolioDomainRequestStep = Step  # type: ignore
+    StepEnum = Step  # type: ignore
     template_name = ""
 
     is_portfolio = False
@@ -72,7 +72,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         StepEnum.ADDITIONAL_DETAILS: _("Additional details"),
         StepEnum.REQUIREMENTS: _("Requirements for operating a .gov domain"),
         StepEnum.REVIEW: _("Review and submit your domain request"),
-    }  # type: ignore
+    }
 
     # We can use a dictionary with step names and callables that return booleans
     # to show or hide particular steps based on the state of the process.
@@ -81,7 +81,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         StepEnum.TRIBAL_GOVERNMENT: lambda w: w.from_model("show_tribal_government", False),
         StepEnum.ORGANIZATION_ELECTION: lambda w: w.from_model("show_organization_election", False),
         StepEnum.ABOUT_YOUR_ORGANIZATION: lambda w: w.from_model("show_about_your_organization", False),
-    }  # type: ignore
+    }
 
     def __init__(self):
         super().__init__()
@@ -208,7 +208,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
             self.StepEnum.ADDITIONAL_DETAILS: _("Additional details"),
             self.StepEnum.REQUIREMENTS: _("Requirements for operating a .gov domain"),
             self.StepEnum.REVIEW: _("Review and submit your domain request"),
-        }  # type: ignore
+        }
         self.WIZARD_CONDITIONS = {}
 
         # Regenerate the steps helper

From 097312f08e5a6706004b3e14ee2cf19e67fd6157 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 4 Oct 2024 12:45:56 -0600
Subject: [PATCH 059/142] Update domain_request.py

---
 src/registrar/views/domain_request.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 4e899d507..ed596ac75 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -554,7 +554,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
 
 # TODO - this is a WIP until the domain request experience for portfolios is complete
 class PortfolioDomainRequestWizard(DomainRequestWizard):
-    StepEnum: PortfolioDomainRequestStep = PortfolioDomainRequestStep  # type: ignore
+    StepEnum = PortfolioDomainRequestStep  # type: ignore
 
     TITLES = {
         StepEnum.REQUESTING_ENTITY: _("Requesting entity"),

From a8a938b2760f3f934b57be1f798292559caafecf Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 4 Oct 2024 12:53:02 -0600
Subject: [PATCH 060/142] Update domain_request.py

---
 src/registrar/views/domain_request.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index ed596ac75..8880da02a 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -554,9 +554,9 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
 
 # TODO - this is a WIP until the domain request experience for portfolios is complete
 class PortfolioDomainRequestWizard(DomainRequestWizard):
-    StepEnum = PortfolioDomainRequestStep  # type: ignore
+    StepEnum: PortfolioDomainRequestStep = PortfolioDomainRequestStep  # type: ignore
 
-    TITLES = {
+    TITLES: dict[PortfolioDomainRequestStep, str] = {
         StepEnum.REQUESTING_ENTITY: _("Requesting entity"),
         StepEnum.CURRENT_SITES: _("Current websites"),
         StepEnum.DOTGOV_DOMAIN: _(".gov domain"),

From 0b7818bc7b25f9a44c3a88a93a33a3f0b9275798 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 4 Oct 2024 13:33:13 -0600
Subject: [PATCH 061/142] Fix linting issue

---
 src/registrar/views/domain_request.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 8880da02a..7041d8d27 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -556,7 +556,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
 class PortfolioDomainRequestWizard(DomainRequestWizard):
     StepEnum: PortfolioDomainRequestStep = PortfolioDomainRequestStep  # type: ignore
 
-    TITLES: dict[PortfolioDomainRequestStep, str] = {
+    TITLES: dict = {
         StepEnum.REQUESTING_ENTITY: _("Requesting entity"),
         StepEnum.CURRENT_SITES: _("Current websites"),
         StepEnum.DOTGOV_DOMAIN: _(".gov domain"),
@@ -564,7 +564,7 @@ class PortfolioDomainRequestWizard(DomainRequestWizard):
         StepEnum.ADDITIONAL_DETAILS: _("Additional details"),
         StepEnum.REQUIREMENTS: _("Requirements for operating a .gov domain"),
         # Step.REVIEW: _("Review and submit your domain request"),
-    }
+    }  # type: ignore
 
     def __init__(self):
         super().__init__()

From 9a2e031979f88899946eb56fa30abe01a03cecc0 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 4 Oct 2024 13:54:52 -0600
Subject: [PATCH 062/142] Update src/registrar/views/domain_request.py

---
 src/registrar/views/domain_request.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 7041d8d27..f649f9c8a 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -564,7 +564,7 @@ class PortfolioDomainRequestWizard(DomainRequestWizard):
         StepEnum.ADDITIONAL_DETAILS: _("Additional details"),
         StepEnum.REQUIREMENTS: _("Requirements for operating a .gov domain"),
         # Step.REVIEW: _("Review and submit your domain request"),
-    }  # type: ignore
+    }
 
     def __init__(self):
         super().__init__()

From 9a28c8c404fdc83fef958b5e09875387f237ee76 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Fri, 4 Oct 2024 16:21:59 -0400
Subject: [PATCH 063/142] wip member edit ui

---
 .../includes/member_permissions.html          |  44 ++++++
 .../templates/includes/summary_item.html      |   8 +-
 src/registrar/templates/portfolio_member.html | 133 +++++++++---------
 src/registrar/views/portfolio_members_json.py |   2 -
 src/registrar/views/portfolios.py             |   4 +-
 5 files changed, 119 insertions(+), 72 deletions(-)
 create mode 100644 src/registrar/templates/includes/member_permissions.html

diff --git a/src/registrar/templates/includes/member_permissions.html b/src/registrar/templates/includes/member_permissions.html
new file mode 100644
index 000000000..d2e8d5392
--- /dev/null
+++ b/src/registrar/templates/includes/member_permissions.html
@@ -0,0 +1,44 @@
+<h4 class="margin-bottom-0 text-primary">Member access</h4>
+{% if permissions.roles and 'organization_admin' in permissions.roles %}
+    <p class="margin-top-0">Admin access</p>
+{% elif permissions.portfolio_roles and 'organization_admin' in permissions.portfolio_roles %}
+    <p class="margin-top-0">Admin access</p>
+
+{% elif permissions.roles and 'organization_member' in permissions.roles %}
+    <p class="margin-top-0">Basic access</p>
+{% elif permissions.portfolio_roles and 'organization_member' in permissions.portfolio_roles %}
+    <p class="margin-top-0">Basic access</p>
+
+{% else %}
+    <p class="margin-top-0">⎯</p>
+{% endif %}
+
+<h4 class="margin-bottom-0 text-primary">Organization domain requests</h4>
+{% if permissions.roles and 'organization_admin' in permissions.roles or 'edit_requests' in permissions.additional_permissions %}
+    <p class="margin-top-0">View all requests plus create requests</p>
+{% elif permissions.portfolio_roles and 'organization_admin' in permissions.portfolio_roles or 'edit_requests' in permissions.portfolio_additional_permissions %}
+    <p class="margin-top-0">View all requests plus create requests</p>
+
+{% elif permissions.additional_permissions and 'view_all_requests' in permissions.additional_permissions %}
+    <p class="margin-top-0">View all requests</p>
+{% elif permissions.portfolio_additional_permissions and 'view_all_requests' in permissions.portfolio_additional_permissions %}
+    <p class="margin-top-0">View all requests</p>
+
+{% else %}
+    <p class="margin-top-0">No access</p>
+{% endif %}
+
+<h4 class="margin-bottom-0 text-primary">Organization members</h4>
+{% if permissions.additional_permissions and 'edit_members' in permissions.additional_permissions %}
+    <p class="margin-top-0">View all members plus manage members</p>
+{% elif permissions.portfolio_additional_permissions and 'edit_members' in permissions.portfolio_additional_permissions %}
+    <p class="margin-top-0">View all members plus manage members</p>
+
+{% elif permissions.additional_permissions and 'view_members' in permissions.additional_permissions %}
+    <p class="margin-top-0">View all members</p>
+{% elif permissions.portfolio_additional_permissions and 'view_members' in permissions.portfolio_additional_permissions %}
+    <p class="margin-top-0">View all members</p>
+
+{% else %}
+    <p class="margin-top-0">No access</p>
+{% endif %}
\ No newline at end of file
diff --git a/src/registrar/templates/includes/summary_item.html b/src/registrar/templates/includes/summary_item.html
index d4c68395f..fbe392c4d 100644
--- a/src/registrar/templates/includes/summary_item.html
+++ b/src/registrar/templates/includes/summary_item.html
@@ -24,7 +24,9 @@
       {% if sub_header_text %}
         <h4 class="register-form-review-header">{{ sub_header_text }}</h4>
       {% endif %}
-      {% if address %}
+      {% if permissions %}
+        {% include "includes/member_permissions.html" with permissions=value %}
+      {% elif address %}
         {% include "includes/organization_address.html" with organization=value %}
       {% elif contact %}
         {% if list %}
@@ -122,9 +124,9 @@
           class="usa-link usa-link--icon font-sans-sm line-height-sans-5"
       >
         <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24">
-          <use xlink:href="{% static 'img/sprite.svg' %}#edit"></use>
+          <use xlink:href="{% static 'img/sprite.svg' %}#{% if manage_button %}settings{% elif view_button %}visibility{% else %}edit{% endif %}"></use>
         </svg>
-        Edit<span class="sr-only"> {{ title }}</span>
+        {% if manage_button %}Manage{% elif view_button %}View{% else %}Edit{% endif %}<span class="sr-only"> {{ title }}</span>
       </a>
       </div>
     {% endif %}
diff --git a/src/registrar/templates/portfolio_member.html b/src/registrar/templates/portfolio_member.html
index c68f561d2..718970818 100644
--- a/src/registrar/templates/portfolio_member.html
+++ b/src/registrar/templates/portfolio_member.html
@@ -6,74 +6,75 @@
 {% load static %}
 
 {% block portfolio_content %}
-<div class="grid-row grid-gap">
-    <div class="tablet:grid-col-9" id="main-content">
+<div id="main-content">
 
-        {% block messages %}
-            {% include "includes/form_messages.html" %}
-        {% endblock %}
+  {% url 'members' as url %}
+  <nav class="usa-breadcrumb padding-top-0 margin-bottom-3" aria-label="Portfolio member breadcrumb">
+  <ol class="usa-breadcrumb__list">
+      <li class="usa-breadcrumb__list-item">
+        <a href="{{ url }}" class="usa-breadcrumb__link"><span>Members</span></a>
+      </li>
+      <li class="usa-breadcrumb__list-item usa-current" aria-current="page">
+        <span>Manage member</span>
+      </li>
+  </ol>
+  </nav>
+  
 
-        <h1>Manage member</h1>
+  <h1>Manage member</h1>
+
+  <h2 class="margin-y-3">
+    {% if member %}
+      {{ member.email }}
+    {% elif portfolio_invitation %}
+      {{ portfolio_invitation.email }}
+    {% endif %}
+  </h2>
+
+  <address>
+    <strong class="text-primary-dark">Last active:</strong>
+    {% if member and member.last_login %}
+        {{ member.last_login }}
+      {% elif portfolio_invitation %}
+        Invited
+      {% else %}
+        --
+      {% endif %}
+    <br />
+
+    <strong class="text-primary-dark">Full name:</strong>
+    {% if member %}
+      {% if member.first_name or member.last_name %}
+        {{ member.get_formatted_name }}
+      {% else %}
+        --
+      {% endif %}
+    {% else %}
+      --
+    {% endif %}
+    <br />
+
+    <strong class="text-primary-dark">Title or organization role:</strong>
+    {% if member and member.title %}
+      {{ member.title }}
+    {% else %}
+      --
+    {% endif %}
+  </address>
+
+  {% if portfolio_permission %}
+    {% include "includes/summary_item.html" with title='Member access and permissions' permissions='true' value=portfolio_permission edit_link=edit_url editable=has_edit_members_portfolio_permission %}
+  {% elif portfolio_invitation %}
+    {% include "includes/summary_item.html" with title='Member access and permissions' permissions='true' value=portfolio_invitation edit_link=edit_url editable=has_edit_members_portfolio_permission %}
+  {% endif %}
+
+  {% if has_any_domains_portfolio_permission %}
+    {% if has_edit_members_portfolio_permission %}
+      {% include "includes/summary_item.html" with title='Domain management' value="Asdasd" edit_link='#' editable='true' manage_button='true' %}
+    {% else %}
+      {% include "includes/summary_item.html" with title='Domain management' value="Asdasd" edit_link='#' editable='true' view_button='true' %}
+    {% endif %}
+  {% endif %}
         
-        <p>
-          {% if member %}
-            {{ member.email }}
-          {% elif portfolio_invitation %}
-            {{ portfolio_invitation.email }}
-          {% endif %}
-        </p>
-
-        <p>Last active: 
-          {% if member and member.last_login %}
-            {{ member.last_login }}
-          {% elif portfolio_invitation %}
-            Invited
-          {% else %}
-            --
-          {% endif %}
-        </p>
-
-        <p>Full name:
-          {% if member %}
-            {% if member.first_name or member.last_name %}
-              {{ member.get_formatted_name }}
-            {% else %}
-              --
-            {% endif %}
-          {% else %}
-            --
-          {% endif %}
-        </p>
-
-        <p>Title or organization role:
-          {% if member and member.title %}
-            {{ member.title }}
-          {% else %}
-            --
-          {% endif %}
-        </p>
-      
-
-
-        <hr>
-
-        <form class="usa-form usa-form--large" method="post" novalidate>
-            {% csrf_token %}
-            {% if form.roles %}
-              {% input_with_errors form.roles %}
-              {% input_with_errors form.additional_permissions %}
-            {% elif form.portfolio_roles %}
-              {% input_with_errors form.portfolio_roles %}
-              {% input_with_errors form.portfolio_additional_permissions %}
-            {% endif %}
-            <button
-              type="submit"
-              class="usa-button"
-            >Submit</button>
-          </form>
-
-        
-
-    </div>
 </div>
 {% endblock %}
diff --git a/src/registrar/views/portfolio_members_json.py b/src/registrar/views/portfolio_members_json.py
index 56904988e..ec0004654 100644
--- a/src/registrar/views/portfolio_members_json.py
+++ b/src/registrar/views/portfolio_members_json.py
@@ -17,8 +17,6 @@ def get_portfolio_members_json(request):
     """Given the current request,
     get all members that are associated with the given portfolio"""
     portfolio = request.GET.get("portfolio")
-    # member_ids = get_member_ids_from_request(request, portfolio)
-    # members = User.objects.filter(id__in=member_ids)
 
     permissions = UserPortfolioPermission.objects.filter(portfolio=portfolio).select_related("user").values_list("pk", "user__first_name", "user__last_name", "user__email", "user__last_login", "roles")
     invitations = PortfolioInvitation.objects.filter(portfolio=portfolio).values_list(
diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py
index d33c327f8..2b231a0b9 100644
--- a/src/registrar/views/portfolios.py
+++ b/src/registrar/views/portfolios.py
@@ -65,6 +65,7 @@ class PortfolioMemberView(PortfolioMemberPermissionView, View):
         user = portfolio_permission.user
         
         return render(request, self.template_name, {
+            'edit_url': reverse('member-permissions', args=[pk]),
             'portfolio_permission': portfolio_permission,
             'member': user,
         })
@@ -94,7 +95,7 @@ class PortfolioMemberEditView(PortfolioMemberEditPermissionView, View):
         
         if form.is_valid():
             form.save()
-            return redirect('member',pk=pk)
+            return redirect('member', pk=pk)
         
         return render(request, self.template_name, {
             'form': form,
@@ -112,6 +113,7 @@ class PortfolioInvitedMemberView(PortfolioInvitedMemberPermissionView, View):
         # form = self.form_class(instance=portfolio_invitation)
 
         return render(request, self.template_name, {
+            'edit_url': reverse('invitedmember-permissions', args=[pk]),
             'portfolio_invitation': portfolio_invitation,
         })
 

From d86a676f4f24f0d4570216407a05cbb76f0b093f Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Fri, 4 Oct 2024 16:30:11 -0400
Subject: [PATCH 064/142] trying it via styling

---
 src/registrar/templates/includes/modal.html | 2 +-
 src/registrar/views/domain_request.py       | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/registrar/templates/includes/modal.html b/src/registrar/templates/includes/modal.html
index b0b316a2f..3a6535a4c 100644
--- a/src/registrar/templates/includes/modal.html
+++ b/src/registrar/templates/includes/modal.html
@@ -2,7 +2,7 @@
 
 <div class="usa-modal__content">
     <div class="usa-modal__main">
-        <h2 class="usa-modal__heading" id="modal-1-heading">
+        <h2 class="usa-modal__heading domain-name-wrap" id="modal-1-heading">
             {{ modal_heading }}
             {% if heading_value is not None %}
             {# Add a breakpoint #}
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 71afd1a70..805e06199 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -379,11 +379,6 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         if self.domain_request.requested_domain is not None:
             requested_domain_name = self.domain_request.requested_domain.name
 
-        text_domain_name = str(requested_domain_name) if requested_domain_name is not None else None
-
-        if text_domain_name and len(text_domain_name) > 30:
-            text_domain_name = text_domain_name[:30] + "\n" + text_domain_name[30:]
-
         context_stuff = {}
         if DomainRequest._form_complete(self.domain_request, self.request):
             modal_button = '<button type="submit" ' 'class="usa-button" ' ">Submit request</button>"
@@ -394,7 +389,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
                 "visited": self.storage.get("step_history", []),
                 "is_federal": self.domain_request.is_federal(),
                 "modal_button": modal_button,
-                "modal_heading": "You are about to submit a domain request for " + text_domain_name,
+                "modal_heading": "You are about to submit a domain request for " + str(self.domain_request.name),
                 "modal_description": "Once you submit this request, you won’t be able to edit it until we review it.\
                 You’ll only be able to withdraw your request.",
                 "review_form_is_complete": True,

From 9fed794521b6710835ac997f0f73e52aa9c4de66 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Fri, 4 Oct 2024 17:10:19 -0400
Subject: [PATCH 065/142] fixed text in domain request py file

---
 src/registrar/views/domain_request.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 805e06199..0b56ce673 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -389,7 +389,8 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
                 "visited": self.storage.get("step_history", []),
                 "is_federal": self.domain_request.is_federal(),
                 "modal_button": modal_button,
-                "modal_heading": "You are about to submit a domain request for " + str(self.domain_request.name),
+                "modal_heading": "You are about to submit a domain request for " 
+                + str(self.domain_request.requested_domain),
                 "modal_description": "Once you submit this request, you won’t be able to edit it until we review it.\
                 You’ll only be able to withdraw your request.",
                 "review_form_is_complete": True,

From 221e236775bbbc7bee4428529a39a0dee476f298 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 4 Oct 2024 15:13:21 -0600
Subject: [PATCH 066/142] Be explicit when swapping between enum / portfolio
 types

Centralizes all config options at the start of the class
---
 .../forms/utility/wizard_form_helper.py       |   6 +-
 src/registrar/tests/test_views_request.py     |   4 +-
 src/registrar/views/domain_request.py         | 252 +++++++++---------
 3 files changed, 138 insertions(+), 124 deletions(-)

diff --git a/src/registrar/forms/utility/wizard_form_helper.py b/src/registrar/forms/utility/wizard_form_helper.py
index ba3c37e1e..eedf5839b 100644
--- a/src/registrar/forms/utility/wizard_form_helper.py
+++ b/src/registrar/forms/utility/wizard_form_helper.py
@@ -279,11 +279,11 @@ class BaseYesNoForm(RegistrarForm):
         return initial_value
 
 
-def request_step_list(request_wizard):
+def request_step_list(request_wizard, step_enum):
     """Dynamically generated list of steps in the form wizard."""
     step_list = []
-    for step in request_wizard.StepEnum:
-        condition = request_wizard.WIZARD_CONDITIONS.get(step, True)
+    for step in step_enum:
+        condition = request_wizard.wizard_conditions.get(step, True)
         if callable(condition):
             condition = condition(request_wizard)
         if condition:
diff --git a/src/registrar/tests/test_views_request.py b/src/registrar/tests/test_views_request.py
index 197667e2a..441d5239e 100644
--- a/src/registrar/tests/test_views_request.py
+++ b/src/registrar/tests/test_views_request.py
@@ -43,7 +43,7 @@ class DomainRequestTests(TestWithUser, WebTest):
         super().setUp()
         self.federal_agency, _ = FederalAgency.objects.get_or_create(agency="General Services Administration")
         self.app.set_user(self.user.username)
-        self.TITLES = DomainRequestWizard.TITLES
+        self.TITLES = DomainRequestWizard.titles
 
     def tearDown(self):
         super().tearDown()
@@ -3186,7 +3186,7 @@ class TestPortfolioDomainRequestViewonly(TestWithUser, WebTest):
         super().setUp()
         self.federal_agency, _ = FederalAgency.objects.get_or_create(agency="General Services Administration")
         self.app.set_user(self.user.username)
-        self.TITLES = DomainRequestWizard.TITLES
+        self.TITLES = DomainRequestWizard.titles
 
     def tearDown(self):
         super().tearDown()
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index f649f9c8a..e620fff5e 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -43,9 +43,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
     although not without consulting the base implementation, first.
     """
 
-    StepEnum = Step  # type: ignore
     template_name = ""
-
     is_portfolio = False
 
     # uniquely namespace the wizard in urls.py
@@ -56,42 +54,136 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
     # name for accessing /domain-request/<id>/edit
     EDIT_URL_NAME = "edit-domain-request"
     NEW_URL_NAME = "/request/"
+
+    # region: Titles
     # We need to pass our human-readable step titles as context to the templates.
-    TITLES = {
-        StepEnum.ORGANIZATION_TYPE: _("Type of organization"),
-        StepEnum.TRIBAL_GOVERNMENT: _("Tribal government"),
-        StepEnum.ORGANIZATION_FEDERAL: _("Federal government branch"),
-        StepEnum.ORGANIZATION_ELECTION: _("Election office"),
-        StepEnum.ORGANIZATION_CONTACT: _("Organization"),
-        StepEnum.ABOUT_YOUR_ORGANIZATION: _("About your organization"),
-        StepEnum.SENIOR_OFFICIAL: _("Senior official"),
-        StepEnum.CURRENT_SITES: _("Current websites"),
-        StepEnum.DOTGOV_DOMAIN: _(".gov domain"),
-        StepEnum.PURPOSE: _("Purpose of your domain"),
-        StepEnum.OTHER_CONTACTS: _("Other employees from your organization"),
-        StepEnum.ADDITIONAL_DETAILS: _("Additional details"),
-        StepEnum.REQUIREMENTS: _("Requirements for operating a .gov domain"),
-        StepEnum.REVIEW: _("Review and submit your domain request"),
+    REGULAR_TITLES = {
+        Step.ORGANIZATION_TYPE: _("Type of organization"),
+        Step.TRIBAL_GOVERNMENT: _("Tribal government"),
+        Step.ORGANIZATION_FEDERAL: _("Federal government branch"),
+        Step.ORGANIZATION_ELECTION: _("Election office"),
+        Step.ORGANIZATION_CONTACT: _("Organization"),
+        Step.ABOUT_YOUR_ORGANIZATION: _("About your organization"),
+        Step.SENIOR_OFFICIAL: _("Senior official"),
+        Step.CURRENT_SITES: _("Current websites"),
+        Step.DOTGOV_DOMAIN: _(".gov domain"),
+        Step.PURPOSE: _("Purpose of your domain"),
+        Step.OTHER_CONTACTS: _("Other employees from your organization"),
+        Step.ADDITIONAL_DETAILS: _("Additional details"),
+        Step.REQUIREMENTS: _("Requirements for operating a .gov domain"),
+        Step.REVIEW: _("Review and submit your domain request"),
     }
 
+    # Titles for the portfolio context
+    PORTFOLIO_TITLES = {
+        PortfolioDomainRequestStep.REQUESTING_ENTITY: _("Requesting entity"),
+        PortfolioDomainRequestStep.CURRENT_SITES: _("Current websites"),
+        PortfolioDomainRequestStep.DOTGOV_DOMAIN: _(".gov domain"),
+        PortfolioDomainRequestStep.PURPOSE: _("Purpose of your domain"),
+        PortfolioDomainRequestStep.ADDITIONAL_DETAILS: _("Additional details"),
+        PortfolioDomainRequestStep.REQUIREMENTS: _("Requirements for operating a .gov domain"),
+        PortfolioDomainRequestStep.REVIEW: _("Review and submit your domain request"),
+    }
+    # endregion
+
+    # region: Wizard conditions
     # We can use a dictionary with step names and callables that return booleans
     # to show or hide particular steps based on the state of the process.
-    WIZARD_CONDITIONS = {
-        StepEnum.ORGANIZATION_FEDERAL: lambda w: w.from_model("show_organization_federal", False),
-        StepEnum.TRIBAL_GOVERNMENT: lambda w: w.from_model("show_tribal_government", False),
-        StepEnum.ORGANIZATION_ELECTION: lambda w: w.from_model("show_organization_election", False),
-        StepEnum.ABOUT_YOUR_ORGANIZATION: lambda w: w.from_model("show_about_your_organization", False),
+    REGULAR_WIZARD_CONDITIONS = {
+        Step.ORGANIZATION_FEDERAL: lambda w: w.from_model("show_organization_federal", False),
+        Step.TRIBAL_GOVERNMENT: lambda w: w.from_model("show_tribal_government", False),
+        Step.ORGANIZATION_ELECTION: lambda w: w.from_model("show_organization_election", False),
+        Step.ABOUT_YOUR_ORGANIZATION: lambda w: w.from_model("show_about_your_organization", False),
     }
 
+    PORTFOLIO_WIZARD_CONDITIONS = {}
+    # endregion
+
+    # region: Unlocking steps
+    # The conditions by which each step is "unlocked" or "locked"
+    REGULAR_UNLOCKING_STEPS = {
+        Step.ORGANIZATION_TYPE: lambda self: self.domain_request.generic_org_type is not None,
+        Step.TRIBAL_GOVERNMENT: lambda self: self.domain_request.tribe_name is not None,
+        Step.ORGANIZATION_FEDERAL: lambda self: self.domain_request.federal_type is not None,
+        Step.ORGANIZATION_ELECTION: lambda self: self.domain_request.is_election_board is not None,
+        Step.ORGANIZATION_CONTACT: lambda self: (
+            self.domain_request.federal_agency is not None
+            or self.domain_request.organization_name is not None
+            or self.domain_request.address_line1 is not None
+            or self.domain_request.city is not None
+            or self.domain_request.state_territory is not None
+            or self.domain_request.zipcode is not None
+            or self.domain_request.urbanization is not None
+        ),
+        Step.ABOUT_YOUR_ORGANIZATION: lambda self: self.domain_request.about_your_organization is not None,
+        Step.SENIOR_OFFICIAL: lambda self: self.domain_request.senior_official is not None,
+        Step.CURRENT_SITES: lambda self: (
+            self.domain_request.current_websites.exists() or self.domain_request.requested_domain is not None
+        ),
+        Step.DOTGOV_DOMAIN: lambda self: self.domain_request.requested_domain is not None,
+        Step.PURPOSE: lambda self: self.domain_request.purpose is not None,
+        Step.OTHER_CONTACTS: lambda self: (
+            self.domain_request.other_contacts.exists()
+            or self.domain_request.no_other_contacts_rationale is not None
+        ),
+        Step.ADDITIONAL_DETAILS: lambda self: (
+            # Additional details is complete as long as "has anything else" and "has cisa rep" are not None
+            (
+                self.domain_request.has_anything_else_text is not None
+                and self.domain_request.has_cisa_representative is not None
+            )
+        ),
+        Step.REQUIREMENTS: lambda self: self.domain_request.is_policy_acknowledged is not None,
+        Step.REVIEW: lambda self: self.domain_request.is_policy_acknowledged is not None,
+    }
+
+    PORTFOLIO_UNLOCKING_STEPS = {
+        PortfolioDomainRequestStep.REQUESTING_ENTITY: lambda self: self.domain_request.organization_name is not None,
+        PortfolioDomainRequestStep.CURRENT_SITES: lambda self: (
+            self.domain_request.current_websites.exists() or self.domain_request.requested_domain is not None
+        ),
+        PortfolioDomainRequestStep.DOTGOV_DOMAIN: lambda self: self.domain_request.requested_domain is not None,
+        PortfolioDomainRequestStep.PURPOSE: lambda self: self.domain_request.purpose is not None,
+        PortfolioDomainRequestStep.ADDITIONAL_DETAILS: lambda self: self.domain_request.anything_else is not None,
+        PortfolioDomainRequestStep.REQUIREMENTS: lambda self: self.domain_request.is_policy_acknowledged is not None,
+        PortfolioDomainRequestStep.REVIEW: lambda self: self.domain_request.is_policy_acknowledged is not None,
+    }
+    # endregion
+
     def __init__(self):
         super().__init__()
-        self.steps = StepsHelper(self)
+        self.configure_step_options()
         self._domain_request = None  # for caching
 
+    def configure_step_options(self):
+        """Changes which steps are available to the user based on self.is_portfolio.
+        This may change on the fly, so we need to evaluate it on the fly.
+
+        Using this information, we then set three configuration variables.
+        - self.titles => Returns the page titles for each step
+        - self.wizard_conditions => Conditionally shows / hides certain steps  
+        - self.unlocking_steps => Determines what steps are locked/unlocked
+
+        Then, we create self.steps.
+        """
+        if self.is_portfolio:
+            self.titles = self.PORTFOLIO_TITLES
+            self.wizard_conditions = self.PORTFOLIO_WIZARD_CONDITIONS
+            self.unlocking_steps = self.PORTFOLIO_UNLOCKING_STEPS
+        else:
+            self.titles = self.REGULAR_TITLES
+            self.wizard_conditions = self.REGULAR_WIZARD_CONDITIONS
+            self.unlocking_steps = self.REGULAR_UNLOCKING_STEPS
+        self.steps = StepsHelper(self)
+
     def has_pk(self):
         """Does this wizard know about a DomainRequest database record?"""
         return "domain_request_id" in self.storage
 
+    def get_step_enum(self):
+        """Determines which step enum we should use for the wizard"""
+        return PortfolioDomainRequestStep if self.is_portfolio else Step
+
     @property
     def prefix(self):
         """Namespace the wizard to avoid clashes in session variable names."""
@@ -196,29 +288,12 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         else:
             return default
 
-    def mark_as_portfolio_wizard(self):
-        """Swaps the wizard over to the "portfolio" view"""
-        self.is_portfolio = True
-        self.StepEnum = PortfolioDomainRequestStep  # type: ignore
-        self.TITLES = {
-            self.StepEnum.REQUESTING_ENTITY: _("Requesting entity"),
-            self.StepEnum.CURRENT_SITES: _("Current websites"),
-            self.StepEnum.DOTGOV_DOMAIN: _(".gov domain"),
-            self.StepEnum.PURPOSE: _("Purpose of your domain"),
-            self.StepEnum.ADDITIONAL_DETAILS: _("Additional details"),
-            self.StepEnum.REQUIREMENTS: _("Requirements for operating a .gov domain"),
-            self.StepEnum.REVIEW: _("Review and submit your domain request"),
-        }
-        self.WIZARD_CONDITIONS = {}
-
-        # Regenerate the steps helper
-        self.steps = StepsHelper(self)
-
     def get(self, request, *args, **kwargs):
         """This method handles GET requests."""
 
         if not self.is_portfolio and self.request.user.is_org_user(request):
-            self.mark_as_portfolio_wizard()
+            self.is_portfolio = True
+            self.configure_step_options()
 
         current_url = resolve(request.path_info).url_name
 
@@ -351,68 +426,9 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         return DomainRequest.objects.filter(creator=self.request.user, status__in=check_statuses)
 
     def db_check_for_unlocking_steps(self):
-        """Helper for get_context_data
-
+        """Helper for get_context_data.
         Queries the DB for a domain request and returns a list of unlocked steps."""
-
-        # The way this works is as follows:
-        # Each step is assigned a true/false value to determine if it is
-        # "unlocked" or not.  This dictionary of values is looped through
-        # at the end of this function and any step with a "true" value is
-        # added to a simple array that is returned at the end of this function.
-        # This array is eventually passed to the frontend context (eg. domain_request_sidebar.html),
-        # and is used to determine how steps appear in the side nav.
-        # It is worth noting that any step assigned "false" here will be EXCLUDED
-        # from the list of "unlocked" steps.
-        if self.is_portfolio:
-            history_dict = {
-                self.StepEnum.REQUESTING_ENTITY: self.domain_request.organization_name is not None,
-                self.StepEnum.CURRENT_SITES: (
-                    self.domain_request.current_websites.exists() or self.domain_request.requested_domain is not None
-                ),
-                self.StepEnum.DOTGOV_DOMAIN: self.domain_request.requested_domain is not None,
-                self.StepEnum.PURPOSE: self.domain_request.purpose is not None,
-                self.StepEnum.ADDITIONAL_DETAILS: self.domain_request.anything_else is not None,
-                self.StepEnum.REQUIREMENTS: self.domain_request.is_policy_acknowledged is not None,
-                self.StepEnum.REVIEW: self.domain_request.is_policy_acknowledged is not None,
-            }
-        else:
-            history_dict = {
-                self.StepEnum.ORGANIZATION_TYPE: self.domain_request.generic_org_type is not None,
-                self.StepEnum.TRIBAL_GOVERNMENT: self.domain_request.tribe_name is not None,
-                self.StepEnum.ORGANIZATION_FEDERAL: self.domain_request.federal_type is not None,
-                self.StepEnum.ORGANIZATION_ELECTION: self.domain_request.is_election_board is not None,
-                self.StepEnum.ORGANIZATION_CONTACT: (
-                    self.domain_request.federal_agency is not None
-                    or self.domain_request.organization_name is not None
-                    or self.domain_request.address_line1 is not None
-                    or self.domain_request.city is not None
-                    or self.domain_request.state_territory is not None
-                    or self.domain_request.zipcode is not None
-                    or self.domain_request.urbanization is not None
-                ),
-                self.StepEnum.ABOUT_YOUR_ORGANIZATION: self.domain_request.about_your_organization is not None,
-                self.StepEnum.SENIOR_OFFICIAL: self.domain_request.senior_official is not None,
-                self.StepEnum.CURRENT_SITES: (
-                    self.domain_request.current_websites.exists() or self.domain_request.requested_domain is not None
-                ),
-                self.StepEnum.DOTGOV_DOMAIN: self.domain_request.requested_domain is not None,
-                self.StepEnum.PURPOSE: self.domain_request.purpose is not None,
-                self.StepEnum.OTHER_CONTACTS: (
-                    self.domain_request.other_contacts.exists()
-                    or self.domain_request.no_other_contacts_rationale is not None
-                ),
-                self.StepEnum.ADDITIONAL_DETAILS: (
-                    # Additional details is complete as long as "has anything else" and "has cisa rep" are not None
-                    (
-                        self.domain_request.has_anything_else_text is not None
-                        and self.domain_request.has_cisa_representative is not None
-                    )
-                ),
-                self.StepEnum.REQUIREMENTS: self.domain_request.is_policy_acknowledged is not None,
-                self.StepEnum.REVIEW: self.domain_request.is_policy_acknowledged is not None,
-            }
-        return [key for key, value in history_dict.items() if value]
+        return [key for key, is_unlocked_checker in self.unlocking_steps.items() if is_unlocked_checker(self)]
 
     def get_context_data(self):
         """Define context for access on all wizard pages."""
@@ -426,7 +442,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
             modal_button = '<button type="submit" ' 'class="usa-button" ' ">Submit request</button>"
             context_stuff = {
                 "not_form": False,
-                "form_titles": self.TITLES,
+                "form_titles": self.titles,
                 "steps": self.steps,
                 "visited": self.storage.get("step_history", []),
                 "is_federal": self.domain_request.is_federal(),
@@ -443,7 +459,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
             modal_button = '<button type="button" class="usa-button" data-close-modal>Return to request</button>'
             context_stuff = {
                 "not_form": True,
-                "form_titles": self.TITLES,
+                "form_titles": self.titles,
                 "steps": self.steps,
                 "visited": self.storage.get("step_history", []),
                 "is_federal": self.domain_request.is_federal(),
@@ -464,7 +480,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
 
     def get_step_list(self) -> list:
         """Dynamically generated list of steps in the form wizard."""
-        return request_step_list(self)
+        return request_step_list(self, self.get_step_enum())
 
     def goto(self, step):
         if step == "generic_org_type" or step == "portfolio_requesting_entity":
@@ -491,7 +507,8 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
     def post(self, request, *args, **kwargs) -> HttpResponse:
         """This method handles POST requests."""
         if not self.is_portfolio and self.request.user.is_org_user(request):  # type: ignore
-            self.mark_as_portfolio_wizard()
+            self.is_portfolio = True
+            self.configure_step_options()
 
         # which button did the user press?
         button: str = request.POST.get("submit_button", "")
@@ -554,16 +571,13 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
 
 # TODO - this is a WIP until the domain request experience for portfolios is complete
 class PortfolioDomainRequestWizard(DomainRequestWizard):
-    StepEnum: PortfolioDomainRequestStep = PortfolioDomainRequestStep  # type: ignore
-
     TITLES: dict = {
-        StepEnum.REQUESTING_ENTITY: _("Requesting entity"),
-        StepEnum.CURRENT_SITES: _("Current websites"),
-        StepEnum.DOTGOV_DOMAIN: _(".gov domain"),
-        StepEnum.PURPOSE: _("Purpose of your domain"),
-        StepEnum.ADDITIONAL_DETAILS: _("Additional details"),
-        StepEnum.REQUIREMENTS: _("Requirements for operating a .gov domain"),
-        # Step.REVIEW: _("Review and submit your domain request"),
+        PortfolioDomainRequestStep.REQUESTING_ENTITY: _("Requesting entity"),
+        PortfolioDomainRequestStep.CURRENT_SITES: _("Current websites"),
+        PortfolioDomainRequestStep.DOTGOV_DOMAIN: _(".gov domain"),
+        PortfolioDomainRequestStep.PURPOSE: _("Purpose of your domain"),
+        PortfolioDomainRequestStep.ADDITIONAL_DETAILS: _("Additional details"),
+        PortfolioDomainRequestStep.REQUIREMENTS: _("Requirements for operating a .gov domain"),
     }
 
     def __init__(self):
@@ -764,7 +778,7 @@ class Review(DomainRequestWizard):
         if DomainRequest._form_complete(self.domain_request, self.request) is False:
             logger.warning("User arrived at review page with an incomplete form.")
         context = super().get_context_data()
-        context["Step"] = self.StepEnum.__members__
+        context["Step"] = self.get_step_enum().__members__
         context["domain_request"] = self.domain_request
         return context
 
@@ -965,8 +979,8 @@ class PortfolioDomainRequestStatusViewOnly(DomainRequestPortfolioViewonlyView):
         # Create a temp wizard object to grab the step list
         wizard = PortfolioDomainRequestWizard()
         wizard.request = self.request
-        context["Step"] = wizard.StepEnum.__members__
-        context["steps"] = request_step_list(wizard)
+        context["Step"] = PortfolioDomainRequestStep.__members__
+        context["steps"] = request_step_list(wizard, PortfolioDomainRequestStep)
         context["form_titles"] = wizard.TITLES
         return context
 

From d6d63127d0c089df941e48c640621a85eb1b21f4 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 4 Oct 2024 15:20:47 -0600
Subject: [PATCH 067/142] Cleanup PortfolioDomainRequestWizard

---
 src/registrar/views/domain_request.py | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index e620fff5e..d3b54e6ac 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -571,19 +571,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
 
 # TODO - this is a WIP until the domain request experience for portfolios is complete
 class PortfolioDomainRequestWizard(DomainRequestWizard):
-    TITLES: dict = {
-        PortfolioDomainRequestStep.REQUESTING_ENTITY: _("Requesting entity"),
-        PortfolioDomainRequestStep.CURRENT_SITES: _("Current websites"),
-        PortfolioDomainRequestStep.DOTGOV_DOMAIN: _(".gov domain"),
-        PortfolioDomainRequestStep.PURPOSE: _("Purpose of your domain"),
-        PortfolioDomainRequestStep.ADDITIONAL_DETAILS: _("Additional details"),
-        PortfolioDomainRequestStep.REQUIREMENTS: _("Requirements for operating a .gov domain"),
-    }
-
-    def __init__(self):
-        super().__init__()
-        self.steps = StepsHelper(self)
-        self._domain_request = None  # for caching
+    is_portfolio = True
 
 
 # Portfolio pages
@@ -981,7 +969,7 @@ class PortfolioDomainRequestStatusViewOnly(DomainRequestPortfolioViewonlyView):
         wizard.request = self.request
         context["Step"] = PortfolioDomainRequestStep.__members__
         context["steps"] = request_step_list(wizard, PortfolioDomainRequestStep)
-        context["form_titles"] = wizard.TITLES
+        context["form_titles"] = wizard.titles
         return context
 
 

From e0682791084b1f11ea0a0c95cf3b2b22827a6a34 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Fri, 4 Oct 2024 17:58:17 -0400
Subject: [PATCH 068/142] fixed formatted

---
 src/registrar/views/domain_request.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 0b56ce673..b7462f300 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -389,7 +389,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
                 "visited": self.storage.get("step_history", []),
                 "is_federal": self.domain_request.is_federal(),
                 "modal_button": modal_button,
-                "modal_heading": "You are about to submit a domain request for " 
+                "modal_heading": "You are about to submit a domain request for "
                 + str(self.domain_request.requested_domain),
                 "modal_description": "Once you submit this request, you won’t be able to edit it until we review it.\
                 You’ll only be able to withdraw your request.",

From 36e2e6cc315c21528ddba0d7ee6f3843198490ad Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Mon, 7 Oct 2024 08:41:08 -0600
Subject: [PATCH 069/142] Fix tests

---
 src/registrar/tests/test_views_request.py |  4 ++--
 src/registrar/views/domain_request.py     | 12 +++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/registrar/tests/test_views_request.py b/src/registrar/tests/test_views_request.py
index 441d5239e..e7f9d026c 100644
--- a/src/registrar/tests/test_views_request.py
+++ b/src/registrar/tests/test_views_request.py
@@ -43,7 +43,7 @@ class DomainRequestTests(TestWithUser, WebTest):
         super().setUp()
         self.federal_agency, _ = FederalAgency.objects.get_or_create(agency="General Services Administration")
         self.app.set_user(self.user.username)
-        self.TITLES = DomainRequestWizard.titles
+        self.TITLES = DomainRequestWizard.REGULAR_TITLES
 
     def tearDown(self):
         super().tearDown()
@@ -3186,7 +3186,7 @@ class TestPortfolioDomainRequestViewonly(TestWithUser, WebTest):
         super().setUp()
         self.federal_agency, _ = FederalAgency.objects.get_or_create(agency="General Services Administration")
         self.app.set_user(self.user.username)
-        self.TITLES = DomainRequestWizard.titles
+        self.TITLES = DomainRequestWizard.REGULAR_TITLES
 
     def tearDown(self):
         super().tearDown()
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index d3b54e6ac..37894151a 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -123,8 +123,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         Step.DOTGOV_DOMAIN: lambda self: self.domain_request.requested_domain is not None,
         Step.PURPOSE: lambda self: self.domain_request.purpose is not None,
         Step.OTHER_CONTACTS: lambda self: (
-            self.domain_request.other_contacts.exists()
-            or self.domain_request.no_other_contacts_rationale is not None
+            self.domain_request.other_contacts.exists() or self.domain_request.no_other_contacts_rationale is not None
         ),
         Step.ADDITIONAL_DETAILS: lambda self: (
             # Additional details is complete as long as "has anything else" and "has cisa rep" are not None
@@ -152,6 +151,11 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
 
     def __init__(self):
         super().__init__()
+        self.titles = {}
+        self.wizard_conditions = {}
+        self.unlocking_steps = {}
+        self.steps = None
+        # Configure titles, wizard_conditions, unlocking_steps, and steps
         self.configure_step_options()
         self._domain_request = None  # for caching
 
@@ -161,7 +165,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
 
         Using this information, we then set three configuration variables.
         - self.titles => Returns the page titles for each step
-        - self.wizard_conditions => Conditionally shows / hides certain steps  
+        - self.wizard_conditions => Conditionally shows / hides certain steps
         - self.unlocking_steps => Determines what steps are locked/unlocked
 
         Then, we create self.steps.
@@ -293,6 +297,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
 
         if not self.is_portfolio and self.request.user.is_org_user(request):
             self.is_portfolio = True
+            # Configure titles, wizard_conditions, unlocking_steps, and steps
             self.configure_step_options()
 
         current_url = resolve(request.path_info).url_name
@@ -508,6 +513,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         """This method handles POST requests."""
         if not self.is_portfolio and self.request.user.is_org_user(request):  # type: ignore
             self.is_portfolio = True
+            # Configure titles, wizard_conditions, unlocking_steps, and steps
             self.configure_step_options()
 
         # which button did the user press?

From 878b22232efaab40701e7d12c70fcc52e7bd829c Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Mon, 7 Oct 2024 09:02:49 -0600
Subject: [PATCH 070/142] Update domain_request.py

---
 src/registrar/views/domain_request.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 37894151a..9ae288bd2 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -96,7 +96,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         Step.ABOUT_YOUR_ORGANIZATION: lambda w: w.from_model("show_about_your_organization", False),
     }
 
-    PORTFOLIO_WIZARD_CONDITIONS = {}
+    PORTFOLIO_WIZARD_CONDITIONS = {}  # type: ignore
     # endregion
 
     # region: Unlocking steps

From 33936e5bb311d27798387b0b644eb75854af4127 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Mon, 7 Oct 2024 11:09:05 -0400
Subject: [PATCH 071/142] add css styling

---
 src/registrar/assets/sass/_theme/_admin.scss | 7 +++++++
 src/registrar/templates/includes/modal.html  | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/registrar/assets/sass/_theme/_admin.scss b/src/registrar/assets/sass/_theme/_admin.scss
index 5cea72c4c..139fd06b4 100644
--- a/src/registrar/assets/sass/_theme/_admin.scss
+++ b/src/registrar/assets/sass/_theme/_admin.scss
@@ -925,6 +925,13 @@ ul.add-list-reset {
     max-width: 100%; 
 }
 
+.domain-name-wrap-modal {
+    white-space: normal;
+    overflow-wrap: break-word;
+    overflow: visible; 
+    max-width: 100%; 
+  }
+
 .organization-admin-label {
     font-weight: 600;
     font-size: .8125rem;
diff --git a/src/registrar/templates/includes/modal.html b/src/registrar/templates/includes/modal.html
index 3a6535a4c..0a006a698 100644
--- a/src/registrar/templates/includes/modal.html
+++ b/src/registrar/templates/includes/modal.html
@@ -2,7 +2,7 @@
 
 <div class="usa-modal__content">
     <div class="usa-modal__main">
-        <h2 class="usa-modal__heading domain-name-wrap" id="modal-1-heading">
+        <h2 class="usa-modal__heading domain-name-wrap-modal" id="modal-1-heading">
             {{ modal_heading }}
             {% if heading_value is not None %}
             {# Add a breakpoint #}

From 249668527b8e92bda7dda38de23343d2e252e334 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Mon, 7 Oct 2024 11:31:57 -0400
Subject: [PATCH 072/142] reverted changes

---
 src/registrar/templates/includes/modal.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/includes/modal.html b/src/registrar/templates/includes/modal.html
index 0a006a698..3a6535a4c 100644
--- a/src/registrar/templates/includes/modal.html
+++ b/src/registrar/templates/includes/modal.html
@@ -2,7 +2,7 @@
 
 <div class="usa-modal__content">
     <div class="usa-modal__main">
-        <h2 class="usa-modal__heading domain-name-wrap-modal" id="modal-1-heading">
+        <h2 class="usa-modal__heading domain-name-wrap" id="modal-1-heading">
             {{ modal_heading }}
             {% if heading_value is not None %}
             {# Add a breakpoint #}

From da3d7d1c54c7e9ae09272ac9a0315b37a5e6bdb1 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Mon, 7 Oct 2024 12:30:01 -0400
Subject: [PATCH 073/142] added new line because wrap is breaking up the word
 for

---
 src/registrar/assets/sass/_theme/_admin.scss | 7 -------
 src/registrar/views/domain_request.py        | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/registrar/assets/sass/_theme/_admin.scss b/src/registrar/assets/sass/_theme/_admin.scss
index 139fd06b4..5cea72c4c 100644
--- a/src/registrar/assets/sass/_theme/_admin.scss
+++ b/src/registrar/assets/sass/_theme/_admin.scss
@@ -925,13 +925,6 @@ ul.add-list-reset {
     max-width: 100%; 
 }
 
-.domain-name-wrap-modal {
-    white-space: normal;
-    overflow-wrap: break-word;
-    overflow: visible; 
-    max-width: 100%; 
-  }
-
 .organization-admin-label {
     font-weight: 600;
     font-size: .8125rem;
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index b7462f300..493836d3a 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -389,7 +389,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
                 "visited": self.storage.get("step_history", []),
                 "is_federal": self.domain_request.is_federal(),
                 "modal_button": modal_button,
-                "modal_heading": "You are about to submit a domain request for "
+                "modal_heading": "You are about to submit a domain request \n for "
                 + str(self.domain_request.requested_domain),
                 "modal_description": "Once you submit this request, you won’t be able to edit it until we review it.\
                 You’ll only be able to withdraw your request.",

From 57c89497b29e1779c23ec645b789866c126b0e2e Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Mon, 7 Oct 2024 12:52:42 -0400
Subject: [PATCH 074/142] formatting of last active date

---
 src/registrar/assets/js/get-gov.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index 8dd0fcf14..6e8ca61fa 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -1914,10 +1914,12 @@ class MembersTable extends LoadTableBase {
           memberList.innerHTML = '';
 
           data.members.forEach(member => {
-            // const actionUrl = domain.action_url;
             const member_name = member.name;
             const member_email = member.email;
-            const last_active = member.last_active;
+            const options = { year: 'numeric', month: 'short', day: 'numeric' };
+            const last_active = member.last_active ? member.last_active != 'Invited' ? new Date(member.last_active) : 'Invited' : null;
+            const last_active_formatted = last_active ? last_active != 'Invited' ? last_active.toLocaleDateString('en-Us', options) : 'Invited' : '';
+            const last_active_sort_value = last_active ? last_active != 'Invited' ? last_active.getTime() : 'Invited' : '';
             const action_url = member.action_url;
             const action_label = member.action_label;
             const svg_icon = member.svg_icon;
@@ -1932,8 +1934,8 @@ class MembersTable extends LoadTableBase {
               <th scope="row" role="rowheader" data-label="member email">
                 ${member_email ? member_email : member_name} ${admin_tagHTML}
               </th>
-              <td data-sort-value="${last_active}" data-label="last_active">
-                ${last_active}
+              <td data-sort-value="${last_active_sort_value}" data-label="last_active">
+                ${last_active_formatted}
               </td>
               <td>
                 <a href="${action_url}">

From 58002de5e01bcac397d1934859b07aa5440fc75e Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Mon, 7 Oct 2024 13:18:13 -0400
Subject: [PATCH 075/142] updated model

---
 src/registrar/admin.py                        | 12 +++++-----
 src/registrar/forms/portfolio.py              |  8 +++----
 ...itation_additional_permissions_and_more.py | 23 ++++++++++++++++++
 src/registrar/models/portfolio_invitation.py  | 12 +++++-----
 .../includes/member_permissions.html          | 18 --------------
 .../portfolio_member_permissions.html         |  9 ++-----
 src/registrar/tests/test_models.py            | 12 +++++-----
 .../tests/test_views_members_json.py          |  4 ++--
 src/registrar/tests/test_views_portfolio.py   | 24 +++++++++----------
 src/registrar/views/portfolio_members_json.py |  2 +-
 10 files changed, 62 insertions(+), 62 deletions(-)
 create mode 100644 src/registrar/migrations/0130_rename_portfolio_additional_permissions_portfolioinvitation_additional_permissions_and_more.py

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 8718da9ba..9201585d7 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -188,11 +188,11 @@ class PortfolioInvitationAdminForm(UserChangeForm):
         model = models.PortfolioInvitation
         fields = "__all__"
         widgets = {
-            "portfolio_roles": FilteredSelectMultipleArrayWidget(
-                "portfolio_roles", is_stacked=False, choices=UserPortfolioRoleChoices.choices
+            "roles": FilteredSelectMultipleArrayWidget(
+                "roles", is_stacked=False, choices=UserPortfolioRoleChoices.choices
             ),
-            "portfolio_additional_permissions": FilteredSelectMultipleArrayWidget(
-                "portfolio_additional_permissions",
+            "additional_permissions": FilteredSelectMultipleArrayWidget(
+                "additional_permissions",
                 is_stacked=False,
                 choices=UserPortfolioPermissionChoices.choices,
             ),
@@ -1387,8 +1387,8 @@ class PortfolioInvitationAdmin(ListHeaderAdmin):
     list_display = [
         "email",
         "portfolio",
-        "portfolio_roles",
-        "portfolio_additional_permissions",
+        "roles",
+        "additional_permissions",
         "status",
     ]
 
diff --git a/src/registrar/forms/portfolio.py b/src/registrar/forms/portfolio.py
index cdf00c625..51f53340c 100644
--- a/src/registrar/forms/portfolio.py
+++ b/src/registrar/forms/portfolio.py
@@ -133,14 +133,14 @@ class PortfolioInvitedMemberForm(forms.ModelForm):
     Form for updating a portfolio invited member.
     """
 
-    portfolio_roles = forms.MultipleChoiceField(
+    roles = forms.MultipleChoiceField(
         choices=UserPortfolioRoleChoices.choices,
         widget=forms.SelectMultiple(attrs={'class': 'usa-select'}),
         required=False,
         label="Roles",
     )
 
-    portfolio_additional_permissions = forms.MultipleChoiceField(
+    additional_permissions = forms.MultipleChoiceField(
         choices=UserPortfolioPermissionChoices.choices,
         widget=forms.SelectMultiple(attrs={'class': 'usa-select'}),
         required=False,
@@ -150,7 +150,7 @@ class PortfolioInvitedMemberForm(forms.ModelForm):
     class Meta:
         model = PortfolioInvitation
         fields = [
-            "portfolio_roles",
-            "portfolio_additional_permissions",
+            "roles",
+            "additional_permissions",
         ]
 
diff --git a/src/registrar/migrations/0130_rename_portfolio_additional_permissions_portfolioinvitation_additional_permissions_and_more.py b/src/registrar/migrations/0130_rename_portfolio_additional_permissions_portfolioinvitation_additional_permissions_and_more.py
new file mode 100644
index 000000000..338a20493
--- /dev/null
+++ b/src/registrar/migrations/0130_rename_portfolio_additional_permissions_portfolioinvitation_additional_permissions_and_more.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.2.10 on 2024-10-07 17:12
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("registrar", "0129_alter_portfolioinvitation_portfolio_roles_and_more"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="portfolioinvitation",
+            old_name="portfolio_additional_permissions",
+            new_name="additional_permissions",
+        ),
+        migrations.RenameField(
+            model_name="portfolioinvitation",
+            old_name="portfolio_roles",
+            new_name="roles",
+        ),
+    ]
diff --git a/src/registrar/models/portfolio_invitation.py b/src/registrar/models/portfolio_invitation.py
index 46d7bf124..392d8264b 100644
--- a/src/registrar/models/portfolio_invitation.py
+++ b/src/registrar/models/portfolio_invitation.py
@@ -38,7 +38,7 @@ class PortfolioInvitation(TimeStampedModel):
         related_name="portfolios",
     )
 
-    portfolio_roles = ArrayField(
+    roles = ArrayField(
         models.CharField(
             max_length=50,
             choices=UserPortfolioRoleChoices.choices,
@@ -48,7 +48,7 @@ class PortfolioInvitation(TimeStampedModel):
         help_text="Select one or more roles.",
     )
 
-    portfolio_additional_permissions = ArrayField(
+    additional_permissions = ArrayField(
         models.CharField(
             max_length=50,
             choices=UserPortfolioPermissionChoices.choices,
@@ -88,8 +88,8 @@ class PortfolioInvitation(TimeStampedModel):
         user_portfolio_permission, _ = UserPortfolioPermission.objects.get_or_create(
             portfolio=self.portfolio, user=user
         )
-        if self.portfolio_roles and len(self.portfolio_roles) > 0:
-            user_portfolio_permission.roles = self.portfolio_roles
-        if self.portfolio_additional_permissions and len(self.portfolio_additional_permissions) > 0:
-            user_portfolio_permission.additional_permissions = self.portfolio_additional_permissions
+        if self.roles and len(self.roles) > 0:
+            user_portfolio_permission.roles = self.roles
+        if self.additional_permissions and len(self.additional_permissions) > 0:
+            user_portfolio_permission.additional_permissions = self.additional_permissions
         user_portfolio_permission.save()
diff --git a/src/registrar/templates/includes/member_permissions.html b/src/registrar/templates/includes/member_permissions.html
index d2e8d5392..0d38e2073 100644
--- a/src/registrar/templates/includes/member_permissions.html
+++ b/src/registrar/templates/includes/member_permissions.html
@@ -1,14 +1,8 @@
 <h4 class="margin-bottom-0 text-primary">Member access</h4>
 {% if permissions.roles and 'organization_admin' in permissions.roles %}
     <p class="margin-top-0">Admin access</p>
-{% elif permissions.portfolio_roles and 'organization_admin' in permissions.portfolio_roles %}
-    <p class="margin-top-0">Admin access</p>
-
 {% elif permissions.roles and 'organization_member' in permissions.roles %}
     <p class="margin-top-0">Basic access</p>
-{% elif permissions.portfolio_roles and 'organization_member' in permissions.portfolio_roles %}
-    <p class="margin-top-0">Basic access</p>
-
 {% else %}
     <p class="margin-top-0">⎯</p>
 {% endif %}
@@ -16,14 +10,8 @@
 <h4 class="margin-bottom-0 text-primary">Organization domain requests</h4>
 {% if permissions.roles and 'organization_admin' in permissions.roles or 'edit_requests' in permissions.additional_permissions %}
     <p class="margin-top-0">View all requests plus create requests</p>
-{% elif permissions.portfolio_roles and 'organization_admin' in permissions.portfolio_roles or 'edit_requests' in permissions.portfolio_additional_permissions %}
-    <p class="margin-top-0">View all requests plus create requests</p>
-
 {% elif permissions.additional_permissions and 'view_all_requests' in permissions.additional_permissions %}
     <p class="margin-top-0">View all requests</p>
-{% elif permissions.portfolio_additional_permissions and 'view_all_requests' in permissions.portfolio_additional_permissions %}
-    <p class="margin-top-0">View all requests</p>
-
 {% else %}
     <p class="margin-top-0">No access</p>
 {% endif %}
@@ -31,14 +19,8 @@
 <h4 class="margin-bottom-0 text-primary">Organization members</h4>
 {% if permissions.additional_permissions and 'edit_members' in permissions.additional_permissions %}
     <p class="margin-top-0">View all members plus manage members</p>
-{% elif permissions.portfolio_additional_permissions and 'edit_members' in permissions.portfolio_additional_permissions %}
-    <p class="margin-top-0">View all members plus manage members</p>
-
 {% elif permissions.additional_permissions and 'view_members' in permissions.additional_permissions %}
     <p class="margin-top-0">View all members</p>
-{% elif permissions.portfolio_additional_permissions and 'view_members' in permissions.portfolio_additional_permissions %}
-    <p class="margin-top-0">View all members</p>
-
 {% else %}
     <p class="margin-top-0">No access</p>
 {% endif %}
\ No newline at end of file
diff --git a/src/registrar/templates/portfolio_member_permissions.html b/src/registrar/templates/portfolio_member_permissions.html
index ca7b30b44..02d120360 100644
--- a/src/registrar/templates/portfolio_member_permissions.html
+++ b/src/registrar/templates/portfolio_member_permissions.html
@@ -27,13 +27,8 @@
 
         <form class="usa-form usa-form--large" method="post" novalidate>
             {% csrf_token %}
-            {% if form.roles %}
-              {% input_with_errors form.roles %}
-              {% input_with_errors form.additional_permissions %}
-            {% elif form.portfolio_roles %}
-              {% input_with_errors form.portfolio_roles %}
-              {% input_with_errors form.portfolio_additional_permissions %}
-            {% endif %}
+            {% input_with_errors form.roles %}
+            {% input_with_errors form.additional_permissions %}
             <button
               type="submit"
               class="usa-button"
diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index a6cac1389..b5fb381ac 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -1176,8 +1176,8 @@ class TestPortfolioInvitations(TestCase):
         self.invitation, _ = PortfolioInvitation.objects.get_or_create(
             email=self.email,
             portfolio=self.portfolio,
-            portfolio_roles=[self.portfolio_role_base, self.portfolio_role_admin],
-            portfolio_additional_permissions=[self.portfolio_permission_1, self.portfolio_permission_2],
+            roles=[self.portfolio_role_base, self.portfolio_role_admin],
+            additional_permissions=[self.portfolio_permission_1, self.portfolio_permission_2],
         )
 
     def tearDown(self):
@@ -1233,8 +1233,8 @@ class TestPortfolioInvitations(TestCase):
         PortfolioInvitation.objects.get_or_create(
             email=self.email,
             portfolio=portfolio2,
-            portfolio_roles=[self.portfolio_role_base, self.portfolio_role_admin],
-            portfolio_additional_permissions=[self.portfolio_permission_1, self.portfolio_permission_2],
+            roles=[self.portfolio_role_base, self.portfolio_role_admin],
+            additional_permissions=[self.portfolio_permission_1, self.portfolio_permission_2],
         )
         with override_flag("multiple_portfolios", active=True):
             self.user.check_portfolio_invitations_on_login()
@@ -1257,8 +1257,8 @@ class TestPortfolioInvitations(TestCase):
         PortfolioInvitation.objects.get_or_create(
             email=self.email,
             portfolio=portfolio2,
-            portfolio_roles=[self.portfolio_role_base, self.portfolio_role_admin],
-            portfolio_additional_permissions=[self.portfolio_permission_1, self.portfolio_permission_2],
+            roles=[self.portfolio_role_base, self.portfolio_role_admin],
+            additional_permissions=[self.portfolio_permission_1, self.portfolio_permission_2],
         )
         self.user.check_portfolio_invitations_on_login()
         self.user.refresh_from_db()
diff --git a/src/registrar/tests/test_views_members_json.py b/src/registrar/tests/test_views_members_json.py
index 8a029b834..a79d81274 100644
--- a/src/registrar/tests/test_views_members_json.py
+++ b/src/registrar/tests/test_views_members_json.py
@@ -72,8 +72,8 @@ class GetPortfolioMembersJsonTest(TestWithUser, WebTest):
         PortfolioInvitation.objects.create(
             email=cls.email5,
             portfolio=cls.portfolio,
-            portfolio_roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
-            portfolio_additional_permissions=[
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+            additional_permissions=[
                 UserPortfolioPermissionChoices.VIEW_MEMBERS,
                 UserPortfolioPermissionChoices.EDIT_MEMBERS,
             ],
diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index 667da43fb..13a189a8e 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -288,9 +288,9 @@ class TestPortfolio(WebTest):
     def test_accessible_pages_when_user_does_not_have_role(self):
         """Test that admin / memmber roles are associated with the right access"""
         self.app.set_user(self.user.username)
-        portfolio_roles = [UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+        roles = [UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
         portfolio_permission, _ = UserPortfolioPermission.objects.get_or_create(
-            user=self.user, portfolio=self.portfolio, roles=portfolio_roles
+            user=self.user, portfolio=self.portfolio, roles=roles
         )
         with override_flag("organization_feature", active=True):
             # This will redirect the user to the portfolio page.
@@ -398,8 +398,8 @@ class TestPortfolio(WebTest):
         """When organization_feature flag is true and user has a portfolio,
         the portfolio should be set in session."""
         self.client.force_login(self.user)
-        portfolio_roles = [UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
-        UserPortfolioPermission.objects.get_or_create(user=self.user, portfolio=self.portfolio, roles=portfolio_roles)
+        roles = [UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+        UserPortfolioPermission.objects.get_or_create(user=self.user, portfolio=self.portfolio, roles=roles)
         with override_flag("organization_feature", active=True):
             response = self.client.get(reverse("home"))
             # Ensure that middleware processes the session
@@ -420,8 +420,8 @@ class TestPortfolio(WebTest):
         This test also satisfies the condition when multiple_portfolios flag
         is false and user has a portfolio, so won't add a redundant test for that."""
         self.client.force_login(self.user)
-        portfolio_roles = [UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
-        UserPortfolioPermission.objects.get_or_create(user=self.user, portfolio=self.portfolio, roles=portfolio_roles)
+        roles = [UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+        UserPortfolioPermission.objects.get_or_create(user=self.user, portfolio=self.portfolio, roles=roles)
         response = self.client.get(reverse("home"))
         # Ensure that middleware processes the session
         session_middleware = SessionMiddleware(lambda request: None)
@@ -457,8 +457,8 @@ class TestPortfolio(WebTest):
         """When multiple_portfolios flag is true and user has a portfolio,
         the portfolio should be set in session."""
         self.client.force_login(self.user)
-        portfolio_roles = [UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
-        UserPortfolioPermission.objects.get_or_create(user=self.user, portfolio=self.portfolio, roles=portfolio_roles)
+        roles = [UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+        UserPortfolioPermission.objects.get_or_create(user=self.user, portfolio=self.portfolio, roles=roles)
         with override_flag("organization_feature", active=True), override_flag("multiple_portfolios", active=True):
             response = self.client.get(reverse("home"))
             # Ensure that middleware processes the session
@@ -1014,8 +1014,8 @@ class TestPortfolio(WebTest):
     def test_portfolio_cache_updates_when_modified(self):
         """Test that the portfolio in session updates when the portfolio is modified"""
         self.client.force_login(self.user)
-        portfolio_roles = [UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
-        UserPortfolioPermission.objects.get_or_create(user=self.user, portfolio=self.portfolio, roles=portfolio_roles)
+        roles = [UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+        UserPortfolioPermission.objects.get_or_create(user=self.user, portfolio=self.portfolio, roles=roles)
 
         with override_flag("organization_feature", active=True):
             # Initial request to set the portfolio in session
@@ -1043,8 +1043,8 @@ class TestPortfolio(WebTest):
     def test_portfolio_cache_updates_when_flag_disabled_while_logged_in(self):
         """Test that the portfolio in session is set to None when the organization_feature flag is disabled"""
         self.client.force_login(self.user)
-        portfolio_roles = [UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
-        UserPortfolioPermission.objects.get_or_create(user=self.user, portfolio=self.portfolio, roles=portfolio_roles)
+        roles = [UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+        UserPortfolioPermission.objects.get_or_create(user=self.user, portfolio=self.portfolio, roles=roles)
 
         with override_flag("organization_feature", active=True):
             # Initial request to set the portfolio in session
diff --git a/src/registrar/views/portfolio_members_json.py b/src/registrar/views/portfolio_members_json.py
index ec0004654..8b81a26a9 100644
--- a/src/registrar/views/portfolio_members_json.py
+++ b/src/registrar/views/portfolio_members_json.py
@@ -20,7 +20,7 @@ def get_portfolio_members_json(request):
 
     permissions = UserPortfolioPermission.objects.filter(portfolio=portfolio).select_related("user").values_list("pk", "user__first_name", "user__last_name", "user__email", "user__last_login", "roles")
     invitations = PortfolioInvitation.objects.filter(portfolio=portfolio).values_list(
-        'pk', 'email', 'portfolio_roles', 'portfolio_additional_permissions', 'status'
+        'pk', 'email', 'roles', 'additional_permissions', 'status'
     )
 
     # Convert the permissions queryset into a list of dictionaries

From 70caf535c253dd6ec9235886cd5d8dd552b4b07d Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Mon, 7 Oct 2024 15:04:00 -0400
Subject: [PATCH 076/142] added line

---
 src/registrar/views/domain_request.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 493836d3a..e00f3bf0e 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -389,7 +389,8 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
                 "visited": self.storage.get("step_history", []),
                 "is_federal": self.domain_request.is_federal(),
                 "modal_button": modal_button,
-                "modal_heading": "You are about to submit a domain request \n for "
+                "modal_heading": "You are about to submit a domain request \
+                    for "
                 + str(self.domain_request.requested_domain),
                 "modal_description": "Once you submit this request, you won’t be able to edit it until we review it.\
                 You’ll only be able to withdraw your request.",

From cf39c7cc68d2f15baa5c64f64b38370e60ea0ccf Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Mon, 7 Oct 2024 15:07:32 -0400
Subject: [PATCH 077/142] 3 dot menu

---
 .../assets/sass/_theme/_buttons.scss          |  3 +-
 src/registrar/templates/portfolio_member.html | 68 ++++++++++++++++---
 2 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/src/registrar/assets/sass/_theme/_buttons.scss b/src/registrar/assets/sass/_theme/_buttons.scss
index 2e4469e12..ff5ffb386 100644
--- a/src/registrar/assets/sass/_theme/_buttons.scss
+++ b/src/registrar/assets/sass/_theme/_buttons.scss
@@ -254,6 +254,7 @@ a .usa-icon,
 // Note: Can be simplified by adding text-secondary to delete anchors in tables
 button.text-secondary,
 button.text-secondary:hover,
-.dotgov-table a.text-secondary {
+a.text-secondary,
+a.text-secondary:hover {
   color: $theme-color-error;
 }
diff --git a/src/registrar/templates/portfolio_member.html b/src/registrar/templates/portfolio_member.html
index 718970818..e6578cdf2 100644
--- a/src/registrar/templates/portfolio_member.html
+++ b/src/registrar/templates/portfolio_member.html
@@ -21,15 +21,61 @@
   </nav>
   
 
-  <h1>Manage member</h1>
+  <h1 class="margin-bottom-3">Manage member</h1>
 
-  <h2 class="margin-y-3">
-    {% if member %}
-      {{ member.email }}
-    {% elif portfolio_invitation %}
-      {{ portfolio_invitation.email }}
+  <div class="tablet:display-flex tablet:flex-justify">
+    <h2 class="margin-top-0 margin-bottom-3 break-word">
+      {% if member %}
+        {{ member.email }}
+      {% elif portfolio_invitation %}
+        {{ portfolio_invitation.email }}
+      {% endif %}
+    </h2>
+    {% if has_edit_members_portfolio_permission %}
+      <a 
+        role="button" 
+        href="#"
+        class="display-block usa-button text-secondary usa-button--unstyled text-no-underline margin-bottom-3 line-height-sans-5 visible-mobile-flex"
+      >
+        Remove member
+      </a>
+
+      <div class="usa-accordion usa-accordion--more-actions hidden-mobile-flex">
+        <div class="usa-accordion__heading">
+          <button
+            type="button"
+            class="usa-button usa-button--unstyled usa-button--with-icon usa-accordion__button usa-button--more-actions"
+            aria-expanded="false"
+            aria-controls="more-actions"
+          >
+            <svg class="usa-icon top-2px" aria-hidden="true" focusable="false" role="img" width="24">
+              <use xlink:href="/public/img/sprite.svg#more_vert"></use>
+            </svg>
+          </button>
+        </div>
+        <div id="more-actions" class="usa-accordion__content usa-prose shadow-1 left-auto right-0" hidden>
+          <h2>More options</h2>
+          {% if member %}
+            <a 
+              role="button" 
+              href="#"
+              class="usa-button text-secondary usa-button--unstyled text-no-underline margin-top-2 line-height-sans-5"
+            >
+              Remove member
+            </a>
+          {% else %}
+            <a 
+              role="button" 
+              href="#"
+              class="usa-button text-secondary usa-button--unstyled text-no-underline margin-top-2 line-height-sans-5"
+            >
+              Cancel invitation
+            </a>
+          {% endif %}
+        </div>
+      </div>
     {% endif %}
-  </h2>
+  </div>
 
   <address>
     <strong class="text-primary-dark">Last active:</strong>
@@ -38,7 +84,7 @@
       {% elif portfolio_invitation %}
         Invited
       {% else %}
-        --
+        ⎯
       {% endif %}
     <br />
 
@@ -47,10 +93,10 @@
       {% if member.first_name or member.last_name %}
         {{ member.get_formatted_name }}
       {% else %}
-        --
+        ⎯
       {% endif %}
     {% else %}
-      --
+      ⎯
     {% endif %}
     <br />
 
@@ -58,7 +104,7 @@
     {% if member and member.title %}
       {{ member.title }}
     {% else %}
-      --
+      ⎯
     {% endif %}
   </address>
 

From 15db31b3dcea93f0f5cb22426054cacddbf26c1c Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Mon, 7 Oct 2024 15:16:40 -0400
Subject: [PATCH 078/142] assigned domains

---
 src/registrar/models/user_portfolio_permission.py    | 12 +++++++++++-
 .../templates/includes/member_domain_mgmt.html       |  6 ++++++
 src/registrar/templates/includes/summary_item.html   |  2 ++
 src/registrar/templates/portfolio_member.html        | 10 ++++------
 4 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 src/registrar/templates/includes/member_domain_mgmt.html

diff --git a/src/registrar/models/user_portfolio_permission.py b/src/registrar/models/user_portfolio_permission.py
index 6acd651db..847df7857 100644
--- a/src/registrar/models/user_portfolio_permission.py
+++ b/src/registrar/models/user_portfolio_permission.py
@@ -1,11 +1,11 @@
 from django.db import models
 from django.forms import ValidationError
+from registrar.models.user_domain_role import UserDomainRole
 from registrar.utility.waffle import flag_is_active_for_user
 from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices
 from .utility.time_stamped_model import TimeStampedModel
 from django.contrib.postgres.fields import ArrayField
 
-
 class UserPortfolioPermission(TimeStampedModel):
     """This is a linking table that connects a user with a role on a portfolio."""
 
@@ -67,6 +67,16 @@ class UserPortfolioPermission(TimeStampedModel):
     def __str__(self):
         return f"User '{self.user}' on Portfolio '{self.portfolio}' " f"<Roles: {self.roles}>" if self.roles else ""
 
+    def get_managed_domains_count(self):
+        """Return the count of domains managed by the user for this portfolio."""
+        # Filter the UserDomainRole model to get domains where the user has a manager role
+        managed_domains = UserDomainRole.objects.filter(
+            user=self.user,
+            role=UserDomainRole.Roles.MANAGER,
+            domain__domain_info__portfolio=self.portfolio
+        ).count()
+        return managed_domains
+    
     def _get_portfolio_permissions(self):
         """
         Retrieve the permissions for the user's portfolio roles.
diff --git a/src/registrar/templates/includes/member_domain_mgmt.html b/src/registrar/templates/includes/member_domain_mgmt.html
new file mode 100644
index 000000000..34f8bf5e6
--- /dev/null
+++ b/src/registrar/templates/includes/member_domain_mgmt.html
@@ -0,0 +1,6 @@
+<h4 class="margin-bottom-0 text-primary">Assigned domains</h4>
+{% if domain_count > 0 %}
+    <p class="margin-top-0">{{domain_count}}</p>
+{% else %}
+    <p class="margin-top-0">This member does not manage any domains.{% if editable %} To assign this member a domain, click "Manage".{% endif %}</p>
+{% endif %}
diff --git a/src/registrar/templates/includes/summary_item.html b/src/registrar/templates/includes/summary_item.html
index fbe392c4d..aae7b8cf9 100644
--- a/src/registrar/templates/includes/summary_item.html
+++ b/src/registrar/templates/includes/summary_item.html
@@ -26,6 +26,8 @@
       {% endif %}
       {% if permissions %}
         {% include "includes/member_permissions.html" with permissions=value %}
+      {% elif domain_mgmt %}
+        {% include "includes/member_domain_mgmt.html" with domain_count=value %}
       {% elif address %}
         {% include "includes/organization_address.html" with organization=value %}
       {% elif contact %}
diff --git a/src/registrar/templates/portfolio_member.html b/src/registrar/templates/portfolio_member.html
index 718970818..4cb846b5a 100644
--- a/src/registrar/templates/portfolio_member.html
+++ b/src/registrar/templates/portfolio_member.html
@@ -68,12 +68,10 @@
     {% include "includes/summary_item.html" with title='Member access and permissions' permissions='true' value=portfolio_invitation edit_link=edit_url editable=has_edit_members_portfolio_permission %}
   {% endif %}
 
-  {% if has_any_domains_portfolio_permission %}
-    {% if has_edit_members_portfolio_permission %}
-      {% include "includes/summary_item.html" with title='Domain management' value="Asdasd" edit_link='#' editable='true' manage_button='true' %}
-    {% else %}
-      {% include "includes/summary_item.html" with title='Domain management' value="Asdasd" edit_link='#' editable='true' view_button='true' %}
-    {% endif %}
+  {% if portfolio_permission %}
+    {% include "includes/summary_item.html" with title='Domain management' domain_mgmt='true' value=portfolio_permission.get_managed_domains_count edit_link='#' editable=has_edit_members_portfolio_permission manage_button='true' %}
+  {% else %}
+    {% include "includes/summary_item.html" with title='Domain management' domain_mgmt='true' value=0 edit_link='#' editable=has_edit_members_portfolio_permission manage_button='true' %}
   {% endif %}
         
 </div>

From 91355dc7a458ea94bb2d1263833a2e82d84aeaf0 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Mon, 7 Oct 2024 16:27:11 -0400
Subject: [PATCH 079/142] Assigned domains for portfolio invitations

---
 src/registrar/models/portfolio_invitation.py  | 10 ++++++++++
 src/registrar/templates/portfolio_member.html |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/src/registrar/models/portfolio_invitation.py b/src/registrar/models/portfolio_invitation.py
index 392d8264b..22c4c881e 100644
--- a/src/registrar/models/portfolio_invitation.py
+++ b/src/registrar/models/portfolio_invitation.py
@@ -4,6 +4,7 @@ import logging
 from django.contrib.auth import get_user_model
 from django.db import models
 from django_fsm import FSMField, transition
+from registrar.models.domain_invitation import DomainInvitation
 from registrar.models.user_portfolio_permission import UserPortfolioPermission
 from .utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices  # type: ignore
 from .utility.time_stamped_model import TimeStampedModel
@@ -67,6 +68,15 @@ class PortfolioInvitation(TimeStampedModel):
     def __str__(self):
         return f"Invitation for {self.email} on {self.portfolio} is {self.status}"
 
+    def get_managed_domains_count(self):
+        """Return the count of domain invitations managed by the invited user for this portfolio."""
+        # Filter the UserDomainRole model to get domains where the user has a manager role
+        managed_domains = DomainInvitation.objects.filter(
+            email=self.email,
+            domain__domain_info__portfolio=self.portfolio
+        ).count()
+        return managed_domains
+
     @transition(field="status", source=PortfolioInvitationStatus.INVITED, target=PortfolioInvitationStatus.RETRIEVED)
     def retrieve(self):
         """When an invitation is retrieved, create the corresponding permission.
diff --git a/src/registrar/templates/portfolio_member.html b/src/registrar/templates/portfolio_member.html
index 2ce1872a0..fe3039967 100644
--- a/src/registrar/templates/portfolio_member.html
+++ b/src/registrar/templates/portfolio_member.html
@@ -116,6 +116,8 @@
 
   {% if portfolio_permission %}
     {% include "includes/summary_item.html" with title='Domain management' domain_mgmt='true' value=portfolio_permission.get_managed_domains_count edit_link='#' editable=has_edit_members_portfolio_permission manage_button='true' %}
+  {% elif portfolio_invitation %}
+    {% include "includes/summary_item.html" with title='Domain management' domain_mgmt='true' value=portfolio_invitation.get_managed_domains_count edit_link='#' editable=has_edit_members_portfolio_permission manage_button='true' %}
   {% else %}
     {% include "includes/summary_item.html" with title='Domain management' domain_mgmt='true' value=0 edit_link='#' editable=has_edit_members_portfolio_permission manage_button='true' %}
   {% endif %}

From b331011499db2708683f6ddd0bc0c0fc53c5a6e1 Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Mon, 7 Oct 2024 14:17:45 -0700
Subject: [PATCH 080/142] Print statements

---
 src/registrar/admin.py        | 10 +++++++-
 src/registrar/forms/domain.py | 46 ++++++++++++++++++++++++++++++++---
 2 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index ca51e8b72..7f144665c 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -2464,7 +2464,15 @@ class DomainAdmin(ListHeaderAdmin, ImportExportModelAdmin):
     generic_org_type.admin_order_field = "domain_info__generic_org_type"  # type: ignore
 
     def federal_agency(self, obj):
-        return obj.domain_info.federal_agency if obj.domain_info else None
+        # Print the state of obj and obj.domain_info for troubleshooting
+        print(f"federal_agency method called for: {obj}")
+        if obj.domain_info:
+            print(f"Domain info exists: {obj.domain_info}")
+            print(f"Federal agency value: {obj.domain_info.federal_agency}")
+            return obj.domain_info.federal_agency
+        else:
+            print("Domain info does not exist")
+            return None
 
     federal_agency.admin_order_field = "domain_info__federal_agency"  # type: ignore
 
diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index 84fcbe973..502afe9a9 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -4,7 +4,7 @@ import logging
 from django import forms
 from django.core.validators import MinValueValidator, MaxValueValidator, RegexValidator, MaxLengthValidator
 from django.forms import formset_factory
-from registrar.models import DomainRequest
+from registrar.models import DomainRequest, FederalAgency
 from phonenumber_field.widgets import RegionalPhoneNumberWidget
 from registrar.models.suborganization import Suborganization
 from registrar.models.utility.domain_helper import DomainHelper
@@ -527,19 +527,57 @@ class DomainOrgNameAddressForm(forms.ModelForm):
         if field_to_disable is not None:
             DomainHelper.disable_field(self.fields[field_to_disable], disable_required=True)
 
+    # def save(self, commit=True):
+    #     """Override the save() method of the BaseModelForm."""
+    #     if self.has_changed():
+
+    #         # This action should be blocked by the UI, as the text fields are readonly.
+    #         # If they get past this point, we forbid it this way.
+    #         # This could be malicious, so lets reserve information for the backend only.
+    #         if self.is_federal and not self._field_unchanged("federal_agency"):
+    #             raise ValueError("federal_agency cannot be modified when the generic_org_type is federal")
+    #         elif self.is_tribal and not self._field_unchanged("organization_name"):
+    #             raise ValueError("organization_name cannot be modified when the generic_org_type is tribal")
+
+    #     super().save()
+
     def save(self, commit=True):
         """Override the save() method of the BaseModelForm."""
+
+        # print("Save method called")
         if self.has_changed():
+            # print("Form has changed")
+            # print("Generic org type:", self.instance.generic_org_type)
+            # print("Federal agency:", self.instance.federal_agency)
+
+            # address_fields = [
+            #     "address_line1",
+            #     "address_line2",
+            #     "city",
+            #     "state_territory",
+            #     "zipcode",
+            #     "urbanization",
+            # ]
+
+            # if any(field in self.changed_data for field in address_fields):
+            #     print("Address fields have changed")
 
             # This action should be blocked by the UI, as the text fields are readonly.
             # If they get past this point, we forbid it this way.
             # This could be malicious, so lets reserve information for the backend only.
-            if self.is_federal and not self._field_unchanged("federal_agency"):
-                raise ValueError("federal_agency cannot be modified when the generic_org_type is federal")
+
+            if self.is_federal:
+                if not self._field_unchanged("federal_agency"):
+                    raise ValueError("federal_agency cannot be modified when the generic_org_type is federal")
+
             elif self.is_tribal and not self._field_unchanged("organization_name"):
                 raise ValueError("organization_name cannot be modified when the generic_org_type is tribal")
 
-        super().save()
+            else:  # If this error that means Non-Federal Agency is missing
+                non_federal_agency_instance = FederalAgency.get_non_federal_agency()
+                self.instance.federal_agency = non_federal_agency_instance
+
+        return super().save(commit=commit)
 
     def _field_unchanged(self, field_name) -> bool:
         """

From 9c4638492bb5b23a68c47ddccbf89786f2f01f78 Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Mon, 7 Oct 2024 14:19:25 -0700
Subject: [PATCH 081/142] Remove print statements

---
 src/registrar/admin.py        |  5 -----
 src/registrar/forms/domain.py | 30 ------------------------------
 2 files changed, 35 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 7f144665c..62ef06c88 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -2464,14 +2464,9 @@ class DomainAdmin(ListHeaderAdmin, ImportExportModelAdmin):
     generic_org_type.admin_order_field = "domain_info__generic_org_type"  # type: ignore
 
     def federal_agency(self, obj):
-        # Print the state of obj and obj.domain_info for troubleshooting
-        print(f"federal_agency method called for: {obj}")
         if obj.domain_info:
-            print(f"Domain info exists: {obj.domain_info}")
-            print(f"Federal agency value: {obj.domain_info.federal_agency}")
             return obj.domain_info.federal_agency
         else:
-            print("Domain info does not exist")
             return None
 
     federal_agency.admin_order_field = "domain_info__federal_agency"  # type: ignore
diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index 502afe9a9..e17e42029 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -527,40 +527,10 @@ class DomainOrgNameAddressForm(forms.ModelForm):
         if field_to_disable is not None:
             DomainHelper.disable_field(self.fields[field_to_disable], disable_required=True)
 
-    # def save(self, commit=True):
-    #     """Override the save() method of the BaseModelForm."""
-    #     if self.has_changed():
-
-    #         # This action should be blocked by the UI, as the text fields are readonly.
-    #         # If they get past this point, we forbid it this way.
-    #         # This could be malicious, so lets reserve information for the backend only.
-    #         if self.is_federal and not self._field_unchanged("federal_agency"):
-    #             raise ValueError("federal_agency cannot be modified when the generic_org_type is federal")
-    #         elif self.is_tribal and not self._field_unchanged("organization_name"):
-    #             raise ValueError("organization_name cannot be modified when the generic_org_type is tribal")
-
-    #     super().save()
-
     def save(self, commit=True):
         """Override the save() method of the BaseModelForm."""
 
-        # print("Save method called")
         if self.has_changed():
-            # print("Form has changed")
-            # print("Generic org type:", self.instance.generic_org_type)
-            # print("Federal agency:", self.instance.federal_agency)
-
-            # address_fields = [
-            #     "address_line1",
-            #     "address_line2",
-            #     "city",
-            #     "state_territory",
-            #     "zipcode",
-            #     "urbanization",
-            # ]
-
-            # if any(field in self.changed_data for field in address_fields):
-            #     print("Address fields have changed")
 
             # This action should be blocked by the UI, as the text fields are readonly.
             # If they get past this point, we forbid it this way.

From 42a25b0d683c2bf67c4d829e1451050b135b6eaa Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Mon, 7 Oct 2024 18:16:13 -0400
Subject: [PATCH 082/142] move the logic from templates into the views when
 testing for permissions

---
 src/registrar/models/portfolio_invitation.py  | 17 +++++++++++
 .../includes/member_permissions.html          |  8 +++---
 src/registrar/templates/portfolio_member.html |  4 +--
 src/registrar/views/portfolios.py             | 28 ++++++++++++++++---
 4 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/src/registrar/models/portfolio_invitation.py b/src/registrar/models/portfolio_invitation.py
index 22c4c881e..2c8caaee3 100644
--- a/src/registrar/models/portfolio_invitation.py
+++ b/src/registrar/models/portfolio_invitation.py
@@ -76,6 +76,23 @@ class PortfolioInvitation(TimeStampedModel):
             domain__domain_info__portfolio=self.portfolio
         ).count()
         return managed_domains
+    
+    def get_portfolio_permissions(self):
+        """
+        Retrieve the permissions for the user's portfolio roles from the invite.
+        This is similar logic to _get_portfolio_permissions in user_portfolio_permission
+        """
+        # Use a set to avoid duplicate permissions
+        portfolio_permissions = set()
+
+        if self.roles:
+            for role in self.roles:
+                portfolio_permissions.update(UserPortfolioPermission.PORTFOLIO_ROLE_PERMISSIONS.get(role, []))
+
+        if self.additional_permissions:
+            portfolio_permissions.update(self.additional_permissions)
+
+        return list(portfolio_permissions)
 
     @transition(field="status", source=PortfolioInvitationStatus.INVITED, target=PortfolioInvitationStatus.RETRIEVED)
     def retrieve(self):
diff --git a/src/registrar/templates/includes/member_permissions.html b/src/registrar/templates/includes/member_permissions.html
index 0d38e2073..8cf75cfbf 100644
--- a/src/registrar/templates/includes/member_permissions.html
+++ b/src/registrar/templates/includes/member_permissions.html
@@ -8,18 +8,18 @@
 {% endif %}
 
 <h4 class="margin-bottom-0 text-primary">Organization domain requests</h4>
-{% if permissions.roles and 'organization_admin' in permissions.roles or 'edit_requests' in permissions.additional_permissions %}
+{% if member_has_edit_request_portfolio_permission %}
     <p class="margin-top-0">View all requests plus create requests</p>
-{% elif permissions.additional_permissions and 'view_all_requests' in permissions.additional_permissions %}
+{% elif member_has_view_all_requests_portfolio_permission %}
     <p class="margin-top-0">View all requests</p>
 {% else %}
     <p class="margin-top-0">No access</p>
 {% endif %}
 
 <h4 class="margin-bottom-0 text-primary">Organization members</h4>
-{% if permissions.additional_permissions and 'edit_members' in permissions.additional_permissions %}
+{% if member_has_edit_members_portfolio_permission %}
     <p class="margin-top-0">View all members plus manage members</p>
-{% elif permissions.additional_permissions and 'view_members' in permissions.additional_permissions %}
+{% elif member_has_view_members_portfolio_permission %}
     <p class="margin-top-0">View all members</p>
 {% else %}
     <p class="margin-top-0">No access</p>
diff --git a/src/registrar/templates/portfolio_member.html b/src/registrar/templates/portfolio_member.html
index fe3039967..727b14497 100644
--- a/src/registrar/templates/portfolio_member.html
+++ b/src/registrar/templates/portfolio_member.html
@@ -109,9 +109,9 @@
   </address>
 
   {% if portfolio_permission %}
-    {% include "includes/summary_item.html" with title='Member access and permissions' permissions='true' value=portfolio_permission edit_link=edit_url editable=has_edit_members_portfolio_permission %}
+    {% include "includes/summary_item.html" with title='Member access and permissions' permissions='true' value=portfolio_permission member_has_view_all_requests_portfolio_permission=member_has_view_all_requests_portfolio_permission member_has_edit_request_portfolio_permission=member_has_edit_request_portfolio_permission member_has_view_members_portfolio_permission=member_has_view_members_portfolio_permission member_has_edit_members_portfolio_permission=member_has_edit_members_portfolio_permission edit_link=edit_url editable=has_edit_members_portfolio_permission %}
   {% elif portfolio_invitation %}
-    {% include "includes/summary_item.html" with title='Member access and permissions' permissions='true' value=portfolio_invitation edit_link=edit_url editable=has_edit_members_portfolio_permission %}
+    {% include "includes/summary_item.html" with title='Member access and permissions' permissions='true' value=portfolio_invitation member_has_view_all_requests_portfolio_permission=member_has_view_all_requests_portfolio_permission member_has_edit_request_portfolio_permission=member_has_edit_request_portfolio_permission member_has_view_members_portfolio_permission=member_has_view_members_portfolio_permission member_has_edit_members_portfolio_permission=member_has_edit_members_portfolio_permission edit_link=edit_url editable=has_edit_members_portfolio_permission %}
   {% endif %}
 
   {% if portfolio_permission %}
diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py
index 2b231a0b9..cd7923668 100644
--- a/src/registrar/views/portfolios.py
+++ b/src/registrar/views/portfolios.py
@@ -7,7 +7,7 @@ from registrar.forms.portfolio import PortfolioInvitedMemberForm, PortfolioMembe
 from registrar.models import Portfolio, User
 from registrar.models.portfolio_invitation import PortfolioInvitation
 from registrar.models.user_portfolio_permission import UserPortfolioPermission
-from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices
+from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices
 from registrar.views.utility.permission_views import (
     PortfolioDomainRequestsPermissionView,
     PortfolioDomainsPermissionView,
@@ -62,12 +62,22 @@ class PortfolioMemberView(PortfolioMemberPermissionView, View):
 
     def get(self, request, pk):
         portfolio_permission = get_object_or_404(UserPortfolioPermission, pk=pk)
-        user = portfolio_permission.user
-        
+        member = portfolio_permission.user
+
+        # We have to explicitely name these with member_ otherwise we'll have conflicts with context preprocessors
+        member_has_view_all_requests_portfolio_permission =  member.has_view_all_requests_portfolio_permission(portfolio_permission.portfolio)
+        member_has_edit_request_portfolio_permission = member.has_edit_request_portfolio_permission(portfolio_permission.portfolio)
+        member_has_view_members_portfolio_permission =  member.has_view_members_portfolio_permission(portfolio_permission.portfolio)
+        member_has_edit_members_portfolio_permission = member.has_edit_members_portfolio_permission(portfolio_permission.portfolio)
+
         return render(request, self.template_name, {
             'edit_url': reverse('member-permissions', args=[pk]),
             'portfolio_permission': portfolio_permission,
-            'member': user,
+            'member': member,
+            'member_has_view_all_requests_portfolio_permission': member_has_view_all_requests_portfolio_permission,
+            'member_has_edit_request_portfolio_permission': member_has_edit_request_portfolio_permission,
+            'member_has_view_members_portfolio_permission': member_has_view_members_portfolio_permission,
+            'member_has_edit_members_portfolio_permission': member_has_edit_members_portfolio_permission
         })
 
     
@@ -112,9 +122,19 @@ class PortfolioInvitedMemberView(PortfolioInvitedMemberPermissionView, View):
         portfolio_invitation = get_object_or_404(PortfolioInvitation, pk=pk)
         # form = self.form_class(instance=portfolio_invitation)
 
+        # We have to explicitely name these with member_ otherwise we'll have conflicts with context preprocessors
+        member_has_view_all_requests_portfolio_permission = UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS in portfolio_invitation.get_portfolio_permissions()
+        member_has_edit_request_portfolio_permission = UserPortfolioPermissionChoices.EDIT_REQUESTS in portfolio_invitation.get_portfolio_permissions()
+        member_has_view_members_portfolio_permission = UserPortfolioPermissionChoices.VIEW_MEMBERS in portfolio_invitation.get_portfolio_permissions()
+        member_has_edit_members_portfolio_permission = UserPortfolioPermissionChoices.EDIT_MEMBERS in portfolio_invitation.get_portfolio_permissions()
+
         return render(request, self.template_name, {
             'edit_url': reverse('invitedmember-permissions', args=[pk]),
             'portfolio_invitation': portfolio_invitation,
+            'member_has_view_all_requests_portfolio_permission': member_has_view_all_requests_portfolio_permission,
+            'member_has_edit_request_portfolio_permission': member_has_edit_request_portfolio_permission,
+            'member_has_view_members_portfolio_permission': member_has_view_members_portfolio_permission,
+            'member_has_edit_members_portfolio_permission': member_has_edit_members_portfolio_permission
         })
 
 

From 39bba36494d14049b47048a4c27c10f75d3668af Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Mon, 7 Oct 2024 18:25:25 -0400
Subject: [PATCH 083/142] edited css for modal

---
 src/registrar/assets/sass/_theme/_admin.scss | 9 +++++++--
 src/registrar/views/domain_request.py        | 3 +--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/registrar/assets/sass/_theme/_admin.scss b/src/registrar/assets/sass/_theme/_admin.scss
index 5cea72c4c..8f95d6a97 100644
--- a/src/registrar/assets/sass/_theme/_admin.scss
+++ b/src/registrar/assets/sass/_theme/_admin.scss
@@ -917,14 +917,19 @@ ul.add-list-reset {
     font-size: 14px;
 }
 
-.domain-name-wrap {
+.domain-name-wrap,
+.domain-name-wrap-modal {
     white-space: normal;
     word-wrap: break-word;
     overflow: visible; 
-    word-break: break-all;
     max-width: 100%; 
 }
 
+.domain-name-wrap {
+    word-break: break-all;
+}
+
+
 .organization-admin-label {
     font-weight: 600;
     font-size: .8125rem;
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index e00f3bf0e..b7462f300 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -389,8 +389,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
                 "visited": self.storage.get("step_history", []),
                 "is_federal": self.domain_request.is_federal(),
                 "modal_button": modal_button,
-                "modal_heading": "You are about to submit a domain request \
-                    for "
+                "modal_heading": "You are about to submit a domain request for "
                 + str(self.domain_request.requested_domain),
                 "modal_description": "Once you submit this request, you won’t be able to edit it until we review it.\
                 You’ll only be able to withdraw your request.",

From aa5690e894f07b5866fd866642d548902add8284 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Mon, 7 Oct 2024 18:42:35 -0400
Subject: [PATCH 084/142] added class name

---
 src/registrar/templates/includes/modal.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/includes/modal.html b/src/registrar/templates/includes/modal.html
index 3a6535a4c..0a006a698 100644
--- a/src/registrar/templates/includes/modal.html
+++ b/src/registrar/templates/includes/modal.html
@@ -2,7 +2,7 @@
 
 <div class="usa-modal__content">
     <div class="usa-modal__main">
-        <h2 class="usa-modal__heading domain-name-wrap" id="modal-1-heading">
+        <h2 class="usa-modal__heading domain-name-wrap-modal" id="modal-1-heading">
             {{ modal_heading }}
             {% if heading_value is not None %}
             {# Add a breakpoint #}

From 1aaefde0c4d2ca3afdf0caa5a16b85ffa3ea7a6f Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Mon, 7 Oct 2024 19:15:59 -0400
Subject: [PATCH 085/142] moved domain name into separate span

---
 src/registrar/assets/sass/_theme/_admin.scss | 11 +++--------
 src/registrar/templates/domain_detail.html   |  2 +-
 src/registrar/templates/includes/modal.html  |  7 ++++++-
 src/registrar/views/domain_request.py        |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/registrar/assets/sass/_theme/_admin.scss b/src/registrar/assets/sass/_theme/_admin.scss
index 8f95d6a97..708449a97 100644
--- a/src/registrar/assets/sass/_theme/_admin.scss
+++ b/src/registrar/assets/sass/_theme/_admin.scss
@@ -917,20 +917,15 @@ ul.add-list-reset {
     font-size: 14px;
 }
 
-.domain-name-wrap,
-.domain-name-wrap-modal {
+.domain-name-wrap {
     white-space: normal;
     word-wrap: break-word;
     overflow: visible; 
+    word-break: break-all;
     max-width: 100%; 
 }
 
-.domain-name-wrap {
-    word-break: break-all;
-}
-
-
 .organization-admin-label {
     font-weight: 600;
     font-size: .8125rem;
-}
+}
\ No newline at end of file
diff --git a/src/registrar/templates/domain_detail.html b/src/registrar/templates/domain_detail.html
index dca68f6ef..4b6ca6e77 100644
--- a/src/registrar/templates/domain_detail.html
+++ b/src/registrar/templates/domain_detail.html
@@ -5,7 +5,7 @@
 {% block domain_content %}
   {{ 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="text-bold text-primary-dark">{{ 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 %}"
         role="region"
diff --git a/src/registrar/templates/includes/modal.html b/src/registrar/templates/includes/modal.html
index 0a006a698..d918b335d 100644
--- a/src/registrar/templates/includes/modal.html
+++ b/src/registrar/templates/includes/modal.html
@@ -2,8 +2,13 @@
 
 <div class="usa-modal__content">
     <div class="usa-modal__main">
-        <h2 class="usa-modal__heading domain-name-wrap-modal" id="modal-1-heading">
+        <h2 class="usa-modal__heading" id="modal-1-heading">
             {{ modal_heading }}
+            {%if domain_name_modal is not None %}
+                <span class="domain-name-wrap">           
+                    {{ domain_name_modal }}
+                </span>
+            {%endif%}
             {% if heading_value is not None %}
             {# Add a breakpoint #}
             <div aria-hidden="true"></div>
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index b7462f300..c51be5f56 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -389,8 +389,8 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
                 "visited": self.storage.get("step_history", []),
                 "is_federal": self.domain_request.is_federal(),
                 "modal_button": modal_button,
-                "modal_heading": "You are about to submit a domain request for "
-                + str(self.domain_request.requested_domain),
+                "modal_heading": "You are about to submit a domain request for ",
+                "domain_name_modal": str(self.domain_request.requested_domain),
                 "modal_description": "Once you submit this request, you won’t be able to edit it until we review it.\
                 You’ll only be able to withdraw your request.",
                 "review_form_is_complete": True,

From 22d0833be26689a4887c0746ab41b7e6f9460d1f Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Mon, 7 Oct 2024 19:17:29 -0400
Subject: [PATCH 086/142] added back things i changed by accident

---
 src/registrar/assets/sass/_theme/_admin.scss | 2 +-
 src/registrar/templates/domain_detail.html   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/assets/sass/_theme/_admin.scss b/src/registrar/assets/sass/_theme/_admin.scss
index 708449a97..5cea72c4c 100644
--- a/src/registrar/assets/sass/_theme/_admin.scss
+++ b/src/registrar/assets/sass/_theme/_admin.scss
@@ -928,4 +928,4 @@ ul.add-list-reset {
 .organization-admin-label {
     font-weight: 600;
     font-size: .8125rem;
-}
\ No newline at end of file
+}
diff --git a/src/registrar/templates/domain_detail.html b/src/registrar/templates/domain_detail.html
index 4b6ca6e77..dca68f6ef 100644
--- a/src/registrar/templates/domain_detail.html
+++ b/src/registrar/templates/domain_detail.html
@@ -5,7 +5,7 @@
 {% block domain_content %}
   {{ block.super }}
   <div class="margin-top-4 tablet:grid-col-10">
-    <h2 class="text-bold text-primary-dark">{{ domain.name }}</h2>
+    <h2 class="text-bold text-primary-dark domain-name-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 %}"
         role="region"

From d9a79cabad6959b3ac6920492df438d72f4c2141 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Tue, 8 Oct 2024 12:52:14 -0400
Subject: [PATCH 087/142] test models

---
 src/registrar/tests/test_models.py | 69 ++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index b5fb381ac..905c0a06b 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -1182,6 +1182,9 @@ class TestPortfolioInvitations(TestCase):
 
     def tearDown(self):
         super().tearDown()
+        DomainInvitation.objects.all().delete()
+        DomainInformation.objects.all().delete()
+        Domain.objects.all().delete()
         UserPortfolioPermission.objects.all().delete()
         Portfolio.objects.all().delete()
         PortfolioInvitation.objects.all().delete()
@@ -1269,6 +1272,44 @@ class TestPortfolioInvitations(TestCase):
         updated_invitation2, _ = PortfolioInvitation.objects.get_or_create(email=self.email, portfolio=portfolio2)
         self.assertEqual(updated_invitation2.status, PortfolioInvitation.PortfolioInvitationStatus.INVITED)
 
+    @less_console_noise_decorator
+    def test_get_managed_domains_count(self):
+        """Test that the correct number of domains, which are associated with the portfolio and
+        have invited the email of the portfolio invitation, are returned."""
+        # Add three domains, one which is in the portfolio and email is invited to,
+        # one which is in the portfolio and email is not invited to,
+        # and one which is email is invited to and not in the portfolio.
+        # Arrange
+        # domain_in_portfolio should not be included in the count
+        domain_in_portfolio, _ = Domain.objects.get_or_create(name="domain_in_portfolio.gov", state=Domain.State.READY)
+        DomainInformation.objects.get_or_create(creator=self.user, domain=domain_in_portfolio, portfolio=self.portfolio)
+        # domain_in_portfolio_and_invited should be included in the count
+        domain_in_portfolio_and_invited, _ = Domain.objects.get_or_create(name="domain_in_portfolio_and_invited.gov", state=Domain.State.READY)
+        DomainInformation.objects.get_or_create(creator=self.user, domain=domain_in_portfolio_and_invited, portfolio=self.portfolio)
+        DomainInvitation.objects.get_or_create(email=self.email, domain=domain_in_portfolio_and_invited)
+        # domain_invited should not be included in the count
+        domain_invited, _ = Domain.objects.get_or_create(name="domain_invited.gov", state=Domain.State.READY)
+        DomainInformation.objects.get_or_create(creator=self.user, domain=domain_invited)
+        DomainInvitation.objects.get_or_create(email=self.email, domain=domain_invited)
+
+        # Assert
+        self.assertEqual(self.invitation.get_managed_domains_count(), 1)
+
+    @less_console_noise_decorator
+    def test_get_portfolio_permissions(self):
+        """Test that get_portfolio_permissions returns the expected list of permissions,
+        based on the roles and permissions assigned to the invitation."""
+        # Arrange
+        test_permission_list = set()
+        # add the arrays that are defined in UserPortfolioPermission for member and admin
+        test_permission_list.update(UserPortfolioPermission.PORTFOLIO_ROLE_PERMISSIONS.get(UserPortfolioRoleChoices.ORGANIZATION_MEMBER, []))
+        test_permission_list.update(UserPortfolioPermission.PORTFOLIO_ROLE_PERMISSIONS.get(UserPortfolioRoleChoices.ORGANIZATION_ADMIN, []))
+        # add the permissions that are added to the invitation as additional_permissions
+        test_permission_list.update([self.portfolio_permission_1, self.portfolio_permission_2])
+        perm_list = list(test_permission_list)
+        # Verify
+        self.assertEquals(self.invitation.get_portfolio_permissions(), perm_list)
+
 
 class TestUserPortfolioPermission(TestCase):
     @less_console_noise_decorator
@@ -1335,6 +1376,34 @@ class TestUserPortfolioPermission(TestCase):
             "Only one portfolio permission is allowed per user when multiple portfolios are disabled.",
         )
 
+    @less_console_noise_decorator
+    def test_get_managed_domains_count(self):
+        """Test that the correct number of managed domains associated with the portfolio
+        are returned."""
+        # Add three domains, one which is in the portfolio and managed by the user,
+        # one which is in the portfolio and not managed by the user,
+        # and one which is managed by the user and not in the portfolio.
+        # Arrange
+        portfolio, _ = Portfolio.objects.get_or_create(creator=self.user, organization_name="Hotel California")
+        test_user = create_test_user()
+        portfolio_permission, _ = UserPortfolioPermission.objects.get_or_create(
+            portfolio=portfolio, user=test_user, roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+        )
+        # domain_in_portfolio should not be included in the count
+        domain_in_portfolio, _ = Domain.objects.get_or_create(name="domain_in_portfolio.gov", state=Domain.State.READY)
+        DomainInformation.objects.get_or_create(creator=self.user, domain=domain_in_portfolio, portfolio=portfolio)
+        # domain_in_portfolio_and_managed should be included in the count
+        domain_in_portfolio_and_managed, _ = Domain.objects.get_or_create(name="domain_in_portfolio_and_managed.gov", state=Domain.State.READY)
+        DomainInformation.objects.get_or_create(creator=self.user, domain=domain_in_portfolio_and_managed, portfolio=portfolio)
+        UserDomainRole.objects.get_or_create(user=test_user, domain=domain_in_portfolio_and_managed, role=UserDomainRole.Roles.MANAGER)
+        # domain_managed should not be included in the count
+        domain_managed, _ = Domain.objects.get_or_create(name="domain_managed.gov", state=Domain.State.READY)
+        DomainInformation.objects.get_or_create(creator=self.user, domain=domain_managed)
+        UserDomainRole.objects.get_or_create(user=test_user, domain=domain_managed, role=UserDomainRole.Roles.MANAGER)
+
+        # Assert
+        self.assertEqual(portfolio_permission.get_managed_domains_count(), 1)
+
 
 class TestUser(TestCase):
     """Test actions that occur on user login,

From c0fcfd7c446124d44ed921879f89c0ba63f89e9b Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 8 Oct 2024 12:54:33 -0400
Subject: [PATCH 088/142] put back accidentally deleted tests

---
 src/registrar/tests/test_models.py | 58 +++++++++++++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index 54b984f49..a40c35949 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -18,7 +18,7 @@ from registrar.models import (
     UserPortfolioPermission,
     AllowedEmail,
 )
-
+import boto3_mocking
 from registrar.models.portfolio import Portfolio
 from registrar.models.portfolio_invitation import PortfolioInvitation
 from registrar.models.transition_domain import TransitionDomain
@@ -26,6 +26,7 @@ from registrar.models.utility.portfolio_helper import UserPortfolioPermissionCho
 from registrar.models.verified_by_staff import VerifiedByStaff  # type: ignore
 
 from .common import (
+    MockSESClient,
     completed_domain_request,
     create_test_user,
 )
@@ -34,6 +35,61 @@ from waffle.testutils import override_flag
 from api.tests.common import less_console_noise_decorator
 
 
+class TestDomainInformation(TestCase):
+    """Test the DomainInformation model, when approved or otherwise"""
+
+    def setUp(self):
+        super().setUp()
+        self.mock_client = MockSESClient()
+
+    def tearDown(self):
+        super().tearDown()
+        self.mock_client.EMAILS_SENT.clear()
+        Domain.objects.all().delete()
+        DomainInformation.objects.all().delete()
+        DomainRequest.objects.all().delete()
+        User.objects.all().delete()
+        DraftDomain.objects.all().delete()
+
+    @boto3_mocking.patching
+    @less_console_noise_decorator
+    def test_approval_creates_info(self):
+        draft_domain, _ = DraftDomain.objects.get_or_create(name="igorville.gov")
+        user, _ = User.objects.get_or_create()
+        investigator, _ = User.objects.get_or_create(username="frenchtoast", is_staff=True)
+        domain_request = DomainRequest.objects.create(
+            creator=user, requested_domain=draft_domain, notes="test notes", investigator=investigator
+        )
+
+        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
+            # skip using the submit method
+            domain_request.status = DomainRequest.DomainRequestStatus.SUBMITTED
+            domain_request.approve()
+
+            # should be an information present for this domain
+            domain = Domain.objects.get(name="igorville.gov")
+            domain_information = DomainInformation.objects.filter(domain=domain)
+            self.assertTrue(domain_information.exists())
+
+            # Test that both objects are what we expect
+            current_domain_information = domain_information.get().__dict__
+            expected_domain_information = DomainInformation(
+                creator=user,
+                domain=domain,
+                notes="test notes",
+                domain_request=domain_request,
+                federal_agency=FederalAgency.objects.get(agency="Non-Federal Agency"),
+            ).__dict__
+
+            # Test the two records for consistency
+            self.assertEqual(self.clean_dict(current_domain_information), self.clean_dict(expected_domain_information))
+
+    def clean_dict(self, dict_obj):
+        """Cleans dynamic fields in a dictionary"""
+        bad_fields = ["_state", "created_at", "id", "updated_at"]
+        return {k: v for k, v in dict_obj.items() if k not in bad_fields}
+
+
 class TestDomainInvitations(TestCase):
     """Test the retrieval of domain invitations."""
 

From 79b904e3be129b3db07b9dbd0c619d1cc72c27c7 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <107004823+rachidatecs@users.noreply.github.com>
Date: Tue, 8 Oct 2024 12:54:50 -0400
Subject: [PATCH 089/142] Update src/registrar/tests/test_admin_request.py

Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
---
 src/registrar/tests/test_admin_request.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py
index 56cfb3473..fab27c0f9 100644
--- a/src/registrar/tests/test_admin_request.py
+++ b/src/registrar/tests/test_admin_request.py
@@ -1863,7 +1863,7 @@ class TestDomainRequestAdmin(MockEppLib):
 
         # Use ExitStack to combine patch contexts
         with ExitStack() as stack:
-            # Patch Domain.is_active and django.contrib.messages.error simultaneously
+            # Patch django.contrib.messages.error
             stack.enter_context(patch.object(messages, "error"))
 
             new_request.status = DomainRequest.DomainRequestStatus.APPROVED

From b1dd91f7730937d567e3a13cd48fb9948ad478f1 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 8 Oct 2024 12:56:46 -0400
Subject: [PATCH 090/142] add check for original_obj.requested_domain is not
 None

---
 src/registrar/admin.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 939f2056d..a82b159ad 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -2025,6 +2025,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         elif (
             original_obj.status != models.DomainRequest.DomainRequestStatus.APPROVED
             and obj.status == models.DomainRequest.DomainRequestStatus.APPROVED
+            and original_obj.requested_domain is not None
             and Domain.objects.filter(name=original_obj.requested_domain.name).exists()
         ):
             # REDUNDANT CHECK:

From 99c112afd00d9e2de9c54533d4cc98c640edd0f9 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <107004823+rachidatecs@users.noreply.github.com>
Date: Tue, 8 Oct 2024 12:57:04 -0400
Subject: [PATCH 091/142] Update src/registrar/admin.py

Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
---
 src/registrar/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index a82b159ad..8a610a9f0 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -2017,7 +2017,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         if obj_is_not_approved and not obj.domain_is_not_active():
             # REDUNDANT CHECK / ERROR SCREEN AVOIDANCE:
             # This action (moving a request from approved to
-            # another status when the domain is already active (READY),
+            # another status) when the domain is already active (READY),
             # would still not go through even without this check as the rules are
             # duplicated in the model and the error is raised from the model.
             # This avoids an ugly Django error screen.

From dc76782a4327b3c86898dc47da40c43ccbebfbf9 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 8 Oct 2024 13:36:05 -0400
Subject: [PATCH 092/142] remove checks on members nav link

---
 .../templates/includes/header_extended.html          | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/registrar/templates/includes/header_extended.html b/src/registrar/templates/includes/header_extended.html
index 43467602e..79c6aacb7 100644
--- a/src/registrar/templates/includes/header_extended.html
+++ b/src/registrar/templates/includes/header_extended.html
@@ -92,13 +92,11 @@
             {% endif %}
 
             {% if has_organization_members_flag %}
-                {% if has_view_members_portfolio_permission or has_edit_members_portfolio_permission %}
-                    <li class="usa-nav__primary-item">
-                        <a href="/members/" class="usa-nav-link {% if path|is_members_subpage %} usa-current{% endif %}">
-                            Members
-                        </a>
-                    </li>
-                {% endif %}
+                <li class="usa-nav__primary-item">
+                    <a href="/members/" class="usa-nav-link {% if path|is_members_subpage %} usa-current{% endif %}">
+                        Members
+                    </a>
+                </li>
             {% endif %}
 
             <li class="usa-nav__primary-item">

From de9736ec9541cb3139f8f3f173392c729a935c64 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 8 Oct 2024 13:49:30 -0400
Subject: [PATCH 093/142] acc cancel invitation button on mobile view

---
 src/registrar/templates/portfolio_member.html | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/registrar/templates/portfolio_member.html b/src/registrar/templates/portfolio_member.html
index 727b14497..dedeffc80 100644
--- a/src/registrar/templates/portfolio_member.html
+++ b/src/registrar/templates/portfolio_member.html
@@ -32,13 +32,23 @@
       {% endif %}
     </h2>
     {% if has_edit_members_portfolio_permission %}
-      <a 
-        role="button" 
-        href="#"
-        class="display-block usa-button text-secondary usa-button--unstyled text-no-underline margin-bottom-3 line-height-sans-5 visible-mobile-flex"
-      >
-        Remove member
-      </a>
+      {% if member %}
+        <a 
+          role="button" 
+          href="#"
+          class="display-block usa-button text-secondary usa-button--unstyled text-no-underline margin-bottom-3 line-height-sans-5 visible-mobile-flex"
+        >
+          Remove member
+        </a>
+      {% else %}
+        <a 
+          role="button" 
+          href="#"
+          class="display-block usa-button text-secondary usa-button--unstyled text-no-underline margin-bottom-3 line-height-sans-5 visible-mobile-flex"
+        >
+          Cancel invitation
+        </a>
+      {% endif %}
 
       <div class="usa-accordion usa-accordion--more-actions hidden-mobile-flex">
         <div class="usa-accordion__heading">

From ade6733b0e99a7448dcbc9943d01567afcc9ade9 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 8 Oct 2024 12:35:52 -0600
Subject: [PATCH 094/142] Remove bad import

---
 src/registrar/admin.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 0f9714113..c282b3495 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -5,7 +5,11 @@ from django import forms
 from django.db.models import Value, CharField, Q
 from django.db.models.functions import Concat, Coalesce
 from django.http import HttpResponseRedirect
-from registrar.utility.admin_helpers import get_action_needed_reason_default_email, get_rejection_reason_default_email
+from registrar.utility.admin_helpers import (
+    get_action_needed_reason_default_email, 
+    get_rejection_reason_default_email, 
+    get_field_links_as_list,
+)
 from django.conf import settings
 from django.shortcuts import redirect
 from django_fsm import get_available_FIELD_transitions, FSMField
@@ -21,11 +25,6 @@ from epplibwrapper.errors import ErrorCode, RegistryError
 from registrar.models.user_domain_role import UserDomainRole
 from waffle.admin import FlagAdmin
 from waffle.models import Sample, Switch
-from registrar.utility.admin_helpers import (
-    get_all_action_needed_reason_emails,
-    get_action_needed_reason_default_email,
-    get_field_links_as_list,
-)
 from registrar.models import Contact, Domain, DomainRequest, DraftDomain, User, Website, SeniorOfficial
 from registrar.utility.constants import BranchChoices
 from registrar.utility.errors import FSMDomainRequestError, FSMErrorCodes

From 69a98a2f7db4617efcced27e8b1d23ae557dd4ef Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Tue, 8 Oct 2024 14:44:20 -0400
Subject: [PATCH 095/142] fixed tests and view on domains

---
 .../includes/member_domain_mgmt.html          |   2 +-
 src/registrar/templates/portfolio_member.html |   6 +-
 src/registrar/tests/test_views_portfolio.py   | 221 ++++++++++++++++++
 3 files changed, 225 insertions(+), 4 deletions(-)

diff --git a/src/registrar/templates/includes/member_domain_mgmt.html b/src/registrar/templates/includes/member_domain_mgmt.html
index 34f8bf5e6..6bf3f1320 100644
--- a/src/registrar/templates/includes/member_domain_mgmt.html
+++ b/src/registrar/templates/includes/member_domain_mgmt.html
@@ -2,5 +2,5 @@
 {% if domain_count > 0 %}
     <p class="margin-top-0">{{domain_count}}</p>
 {% else %}
-    <p class="margin-top-0">This member does not manage any domains.{% if editable %} To assign this member a domain, click "Manage".{% endif %}</p>
+    <p class="margin-top-0">This member does not manage any domains.{% if manage_button %} To assign this member a domain, click "Manage".{% endif %}</p>
 {% endif %}
diff --git a/src/registrar/templates/portfolio_member.html b/src/registrar/templates/portfolio_member.html
index 727b14497..4e104e618 100644
--- a/src/registrar/templates/portfolio_member.html
+++ b/src/registrar/templates/portfolio_member.html
@@ -115,11 +115,11 @@
   {% endif %}
 
   {% if portfolio_permission %}
-    {% include "includes/summary_item.html" with title='Domain management' domain_mgmt='true' value=portfolio_permission.get_managed_domains_count edit_link='#' editable=has_edit_members_portfolio_permission manage_button='true' %}
+    {% include "includes/summary_item.html" with title='Domain management' domain_mgmt='true' value=portfolio_permission.get_managed_domains_count edit_link='#' editable='true' manage_button=has_edit_members_portfolio_permission view_button='true' %}
   {% elif portfolio_invitation %}
-    {% include "includes/summary_item.html" with title='Domain management' domain_mgmt='true' value=portfolio_invitation.get_managed_domains_count edit_link='#' editable=has_edit_members_portfolio_permission manage_button='true' %}
+    {% include "includes/summary_item.html" with title='Domain management' domain_mgmt='true' value=portfolio_invitation.get_managed_domains_count edit_link='#' editable='true' manage_button=has_edit_members_portfolio_permission view_button='true' %}
   {% else %}
-    {% include "includes/summary_item.html" with title='Domain management' domain_mgmt='true' value=0 edit_link='#' editable=has_edit_members_portfolio_permission manage_button='true' %}
+    {% include "includes/summary_item.html" with title='Domain management' domain_mgmt='true' value=0 edit_link='#' editable='true' manage_button=has_edit_members_portfolio_permission view_button='true' %}
   {% endif %}
         
 </div>
diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index 13a189a8e..f2dc784f7 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -10,6 +10,7 @@ from registrar.models import (
     UserDomainRole,
     User,
 )
+from registrar.models.portfolio_invitation import PortfolioInvitation
 from registrar.models.user_group import UserGroup
 from registrar.models.user_portfolio_permission import UserPortfolioPermission
 from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices
@@ -855,6 +856,226 @@ class TestPortfolio(WebTest):
         # TerminalHelper.colorful_logger(logger.info, TerminalColors.OKCYAN, f"{response.content}")
         self.assertContains(response, '"is_admin": true')
 
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    def test_cannot_view_member_page_when_flag_is_off(self):
+        """Test that user cannot access the member page when waffle flag is off"""
+
+        # Verify that the user cannot access the member page
+        self.client.force_login(self.user)
+        response = self.client.get(reverse("member", kwargs={"pk": 1}), follow=True)
+        # Make sure the page is denied
+        self.assertEqual(response.status_code, 403)
+
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_members", active=True)
+    def test_cannot_view_member_page_when_user_has_no_permission(self):
+        """Test that user cannot access the member page without proper permission"""
+
+        # give user base permissions
+        UserPortfolioPermission.objects.get_or_create(
+            user=self.user,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER],
+        )
+
+        # Verify that the user cannot access the member page
+        self.client.force_login(self.user)
+        response = self.client.get(reverse("member", kwargs={"pk": 1}), follow=True)
+        # Make sure the page is denied
+        self.assertEqual(response.status_code, 403)
+    
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_members", active=True)
+    def test_can_view_member_page_when_user_has_view_members(self):
+        """Test that user can access the member page with view_members permission"""
+
+        # Arrange
+        # give user permissions to view members
+        permission_obj, _ = UserPortfolioPermission.objects.get_or_create(
+            user=self.user,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER],
+            additional_permissions=[
+                UserPortfolioPermissionChoices.VIEW_MEMBERS,
+            ],
+        )
+
+        # Verify the page can be accessed
+        self.client.force_login(self.user)
+        response = self.client.get(reverse("member", kwargs={"pk": permission_obj.pk}), follow=True)
+        self.assertEqual(response.status_code, 200)
+
+        # Assert text within the page is correct
+        self.assertContains(response, "First Last")
+        self.assertContains(response, self.user.email)
+        self.assertContains(response, "Basic access")
+        self.assertContains(response, "No access")
+        self.assertContains(response, "View all members")
+        self.assertContains(response, "This member does not manage any domains.")
+
+        # Assert buttons and links within the page are correct
+        self.assertNotContains(response, "usa-button--more-actions") # test that 3 dot is not present
+        self.assertNotContains(response, "sprite.svg#edit") # test that Edit link is not present
+        self.assertNotContains(response, "sprite.svg#settings") # test that Manage link is not present
+        self.assertContains(response, "sprite.svg#visibility") # test that View link is present
+
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_members", active=True)
+    def test_can_view_member_page_when_user_has_edit_members(self):
+        """Test that user can access the member page with edit_members permission"""
+
+        # Arrange
+        # give user permissions to view AND manage members
+        permission_obj, _ = UserPortfolioPermission.objects.get_or_create(
+            user=self.user,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+            additional_permissions=[
+                UserPortfolioPermissionChoices.EDIT_MEMBERS,
+            ],
+        )
+
+        # Verify the page can be accessed
+        self.client.force_login(self.user)
+        response = self.client.get(reverse("member", kwargs={"pk": permission_obj.pk}), follow=True)
+        self.assertEqual(response.status_code, 200)
+
+        # Assert text within the page is correct
+        self.assertContains(response, "First Last")
+        self.assertContains(response, self.user.email)
+        self.assertContains(response, "Admin access")
+        self.assertContains(response, "View all requests plus create requests")
+        self.assertContains(response, "View all members plus manage members")
+        self.assertContains(response, "This member does not manage any domains. To assign this member a domain, click \"Manage\"")
+
+        # Assert buttons and links within the page are correct
+        self.assertContains(response, "usa-button--more-actions") # test that 3 dot is present
+        self.assertContains(response, "sprite.svg#edit") # test that Edit link is present
+        self.assertContains(response, "sprite.svg#settings") # test that Manage link is present
+        self.assertNotContains(response, "sprite.svg#visibility") # test that View link is not present
+
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    def test_cannot_view_invitedmember_page_when_flag_is_off(self):
+        """Test that user cannot access the invitedmember page when waffle flag is off"""
+
+        # Verify that the user cannot access the member page
+        self.client.force_login(self.user)
+        response = self.client.get(reverse("invitedmember", kwargs={"pk": 1}), follow=True)
+        # Make sure the page is denied
+        self.assertEqual(response.status_code, 403)
+
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_members", active=True)
+    def test_cannot_view_invitedmember_page_when_user_has_no_permission(self):
+        """Test that user cannot access the invitedmember page without proper permission"""
+
+        # give user base permissions
+        UserPortfolioPermission.objects.get_or_create(
+            user=self.user,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER],
+        )
+
+        # Verify that the user cannot access the member page
+        self.client.force_login(self.user)
+        response = self.client.get(reverse("invitedmember", kwargs={"pk": 1}), follow=True)
+        # Make sure the page is denied
+        self.assertEqual(response.status_code, 403)
+    
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_members", active=True)
+    def test_can_view_invitedmember_page_when_user_has_view_members(self):
+        """Test that user can access the invitedmember page with view_members permission"""
+
+        # Arrange
+        # give user permissions to view members
+        UserPortfolioPermission.objects.get_or_create(
+            user=self.user,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER],
+            additional_permissions=[
+                UserPortfolioPermissionChoices.VIEW_MEMBERS,
+            ],
+        )
+        portfolio_invitation, _ = PortfolioInvitation.objects.get_or_create(
+            email="info@example.com",
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER],
+            additional_permissions=[
+                UserPortfolioPermissionChoices.VIEW_MEMBERS,
+            ],
+        )
+
+        # Verify the page can be accessed
+        self.client.force_login(self.user)
+        response = self.client.get(reverse("invitedmember", kwargs={"pk": portfolio_invitation.pk}), follow=True)
+        self.assertEqual(response.status_code, 200)
+
+        # Assert text within the page is correct
+        self.assertContains(response, "Invited")
+        self.assertContains(response, portfolio_invitation.email)
+        self.assertContains(response, "Basic access")
+        self.assertContains(response, "No access")
+        self.assertContains(response, "View all members")
+        self.assertContains(response, "This member does not manage any domains.")
+
+        # Assert buttons and links within the page are correct
+        self.assertNotContains(response, "usa-button--more-actions") # test that 3 dot is not present
+        self.assertNotContains(response, "sprite.svg#edit") # test that Edit link is not present
+        self.assertNotContains(response, "sprite.svg#settings") # test that Manage link is not present
+        self.assertContains(response, "sprite.svg#visibility") # test that View link is present
+
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_members", active=True)
+    def test_can_view_invitedmember_page_when_user_has_edit_members(self):
+        """Test that user can access the invitedmember page with edit_members permission"""
+
+        # Arrange
+        # give user permissions to view AND manage members
+        permission_obj, _ = UserPortfolioPermission.objects.get_or_create(
+            user=self.user,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+            additional_permissions=[
+                UserPortfolioPermissionChoices.EDIT_MEMBERS,
+            ],
+        )
+        portfolio_invitation, _ = PortfolioInvitation.objects.get_or_create(
+            email="info@example.com",
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+            additional_permissions=[
+                UserPortfolioPermissionChoices.EDIT_MEMBERS,
+            ],
+        )
+
+        # Verify the page can be accessed
+        self.client.force_login(self.user)
+        response = self.client.get(reverse("invitedmember", kwargs={"pk": portfolio_invitation.pk}), follow=True)
+        self.assertEqual(response.status_code, 200)
+
+        # Assert text within the page is correct
+        self.assertContains(response, "Invited")
+        self.assertContains(response, portfolio_invitation.email)
+        self.assertContains(response, "Admin access")
+        self.assertContains(response, "View all requests plus create requests")
+        self.assertContains(response, "View all members plus manage members")
+        self.assertContains(response, "This member does not manage any domains. To assign this member a domain, click \"Manage\"")
+
+        # Assert buttons and links within the page are correct
+        self.assertContains(response, "usa-button--more-actions") # test that 3 dot is present
+        self.assertContains(response, "sprite.svg#edit") # test that Edit link is present
+        self.assertContains(response, "sprite.svg#settings") # test that Manage link is present
+        self.assertNotContains(response, "sprite.svg#visibility") # test that View link is not present
+
     @less_console_noise_decorator
     @override_flag("organization_feature", active=True)
     def test_portfolio_domain_requests_page_when_user_has_no_permissions(self):

From 08a273c296c85f907022c55dee2a573f7e6f4c61 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Tue, 8 Oct 2024 14:48:11 -0400
Subject: [PATCH 096/142] linted

---
 src/registrar/forms/portfolio.py              |  15 +-
 src/registrar/models/portfolio_invitation.py  |   5 +-
 .../models/user_portfolio_permission.py       |   7 +-
 src/registrar/tests/test_models.py            |  28 +++-
 .../tests/test_views_members_json.py          |   9 +-
 src/registrar/tests/test_views_portfolio.py   |  44 ++---
 src/registrar/views/portfolio_members_json.py |  88 +++++-----
 src/registrar/views/portfolios.py             | 150 +++++++++++-------
 src/registrar/views/utility/mixins.py         |   4 +-
 .../views/utility/permission_views.py         |   4 +-
 10 files changed, 210 insertions(+), 144 deletions(-)

diff --git a/src/registrar/forms/portfolio.py b/src/registrar/forms/portfolio.py
index 51f53340c..b8984023a 100644
--- a/src/registrar/forms/portfolio.py
+++ b/src/registrar/forms/portfolio.py
@@ -99,7 +99,7 @@ class PortfolioSeniorOfficialForm(forms.ModelForm):
         cleaned_data = super().clean()
         cleaned_data.pop("full_name", None)
         return cleaned_data
-    
+
 
 class PortfolioMemberForm(forms.ModelForm):
     """
@@ -108,18 +108,18 @@ class PortfolioMemberForm(forms.ModelForm):
 
     roles = forms.MultipleChoiceField(
         choices=UserPortfolioRoleChoices.choices,
-        widget=forms.SelectMultiple(attrs={'class': 'usa-select'}),
+        widget=forms.SelectMultiple(attrs={"class": "usa-select"}),
         required=False,
         label="Roles",
     )
 
     additional_permissions = forms.MultipleChoiceField(
         choices=UserPortfolioPermissionChoices.choices,
-        widget=forms.SelectMultiple(attrs={'class': 'usa-select'}),
+        widget=forms.SelectMultiple(attrs={"class": "usa-select"}),
         required=False,
         label="Additional Permissions",
     )
-    
+
     class Meta:
         model = UserPortfolioPermission
         fields = [
@@ -135,22 +135,21 @@ class PortfolioInvitedMemberForm(forms.ModelForm):
 
     roles = forms.MultipleChoiceField(
         choices=UserPortfolioRoleChoices.choices,
-        widget=forms.SelectMultiple(attrs={'class': 'usa-select'}),
+        widget=forms.SelectMultiple(attrs={"class": "usa-select"}),
         required=False,
         label="Roles",
     )
 
     additional_permissions = forms.MultipleChoiceField(
         choices=UserPortfolioPermissionChoices.choices,
-        widget=forms.SelectMultiple(attrs={'class': 'usa-select'}),
+        widget=forms.SelectMultiple(attrs={"class": "usa-select"}),
         required=False,
         label="Additional Permissions",
     )
-    
+
     class Meta:
         model = PortfolioInvitation
         fields = [
             "roles",
             "additional_permissions",
         ]
-
diff --git a/src/registrar/models/portfolio_invitation.py b/src/registrar/models/portfolio_invitation.py
index 2c8caaee3..b1f22ae83 100644
--- a/src/registrar/models/portfolio_invitation.py
+++ b/src/registrar/models/portfolio_invitation.py
@@ -72,11 +72,10 @@ class PortfolioInvitation(TimeStampedModel):
         """Return the count of domain invitations managed by the invited user for this portfolio."""
         # Filter the UserDomainRole model to get domains where the user has a manager role
         managed_domains = DomainInvitation.objects.filter(
-            email=self.email,
-            domain__domain_info__portfolio=self.portfolio
+            email=self.email, domain__domain_info__portfolio=self.portfolio
         ).count()
         return managed_domains
-    
+
     def get_portfolio_permissions(self):
         """
         Retrieve the permissions for the user's portfolio roles from the invite.
diff --git a/src/registrar/models/user_portfolio_permission.py b/src/registrar/models/user_portfolio_permission.py
index 847df7857..80771ca4b 100644
--- a/src/registrar/models/user_portfolio_permission.py
+++ b/src/registrar/models/user_portfolio_permission.py
@@ -6,6 +6,7 @@ from registrar.models.utility.portfolio_helper import UserPortfolioPermissionCho
 from .utility.time_stamped_model import TimeStampedModel
 from django.contrib.postgres.fields import ArrayField
 
+
 class UserPortfolioPermission(TimeStampedModel):
     """This is a linking table that connects a user with a role on a portfolio."""
 
@@ -71,12 +72,10 @@ class UserPortfolioPermission(TimeStampedModel):
         """Return the count of domains managed by the user for this portfolio."""
         # Filter the UserDomainRole model to get domains where the user has a manager role
         managed_domains = UserDomainRole.objects.filter(
-            user=self.user,
-            role=UserDomainRole.Roles.MANAGER,
-            domain__domain_info__portfolio=self.portfolio
+            user=self.user, role=UserDomainRole.Roles.MANAGER, domain__domain_info__portfolio=self.portfolio
         ).count()
         return managed_domains
-    
+
     def _get_portfolio_permissions(self):
         """
         Retrieve the permissions for the user's portfolio roles.
diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index 905c0a06b..f565c001e 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -1284,8 +1284,12 @@ class TestPortfolioInvitations(TestCase):
         domain_in_portfolio, _ = Domain.objects.get_or_create(name="domain_in_portfolio.gov", state=Domain.State.READY)
         DomainInformation.objects.get_or_create(creator=self.user, domain=domain_in_portfolio, portfolio=self.portfolio)
         # domain_in_portfolio_and_invited should be included in the count
-        domain_in_portfolio_and_invited, _ = Domain.objects.get_or_create(name="domain_in_portfolio_and_invited.gov", state=Domain.State.READY)
-        DomainInformation.objects.get_or_create(creator=self.user, domain=domain_in_portfolio_and_invited, portfolio=self.portfolio)
+        domain_in_portfolio_and_invited, _ = Domain.objects.get_or_create(
+            name="domain_in_portfolio_and_invited.gov", state=Domain.State.READY
+        )
+        DomainInformation.objects.get_or_create(
+            creator=self.user, domain=domain_in_portfolio_and_invited, portfolio=self.portfolio
+        )
         DomainInvitation.objects.get_or_create(email=self.email, domain=domain_in_portfolio_and_invited)
         # domain_invited should not be included in the count
         domain_invited, _ = Domain.objects.get_or_create(name="domain_invited.gov", state=Domain.State.READY)
@@ -1302,8 +1306,12 @@ class TestPortfolioInvitations(TestCase):
         # Arrange
         test_permission_list = set()
         # add the arrays that are defined in UserPortfolioPermission for member and admin
-        test_permission_list.update(UserPortfolioPermission.PORTFOLIO_ROLE_PERMISSIONS.get(UserPortfolioRoleChoices.ORGANIZATION_MEMBER, []))
-        test_permission_list.update(UserPortfolioPermission.PORTFOLIO_ROLE_PERMISSIONS.get(UserPortfolioRoleChoices.ORGANIZATION_ADMIN, []))
+        test_permission_list.update(
+            UserPortfolioPermission.PORTFOLIO_ROLE_PERMISSIONS.get(UserPortfolioRoleChoices.ORGANIZATION_MEMBER, [])
+        )
+        test_permission_list.update(
+            UserPortfolioPermission.PORTFOLIO_ROLE_PERMISSIONS.get(UserPortfolioRoleChoices.ORGANIZATION_ADMIN, [])
+        )
         # add the permissions that are added to the invitation as additional_permissions
         test_permission_list.update([self.portfolio_permission_1, self.portfolio_permission_2])
         perm_list = list(test_permission_list)
@@ -1393,9 +1401,15 @@ class TestUserPortfolioPermission(TestCase):
         domain_in_portfolio, _ = Domain.objects.get_or_create(name="domain_in_portfolio.gov", state=Domain.State.READY)
         DomainInformation.objects.get_or_create(creator=self.user, domain=domain_in_portfolio, portfolio=portfolio)
         # domain_in_portfolio_and_managed should be included in the count
-        domain_in_portfolio_and_managed, _ = Domain.objects.get_or_create(name="domain_in_portfolio_and_managed.gov", state=Domain.State.READY)
-        DomainInformation.objects.get_or_create(creator=self.user, domain=domain_in_portfolio_and_managed, portfolio=portfolio)
-        UserDomainRole.objects.get_or_create(user=test_user, domain=domain_in_portfolio_and_managed, role=UserDomainRole.Roles.MANAGER)
+        domain_in_portfolio_and_managed, _ = Domain.objects.get_or_create(
+            name="domain_in_portfolio_and_managed.gov", state=Domain.State.READY
+        )
+        DomainInformation.objects.get_or_create(
+            creator=self.user, domain=domain_in_portfolio_and_managed, portfolio=portfolio
+        )
+        UserDomainRole.objects.get_or_create(
+            user=test_user, domain=domain_in_portfolio_and_managed, role=UserDomainRole.Roles.MANAGER
+        )
         # domain_managed should not be included in the count
         domain_managed, _ = Domain.objects.get_or_create(name="domain_managed.gov", state=Domain.State.READY)
         DomainInformation.objects.get_or_create(creator=self.user, domain=domain_managed)
diff --git a/src/registrar/tests/test_views_members_json.py b/src/registrar/tests/test_views_members_json.py
index a79d81274..9cd4e823c 100644
--- a/src/registrar/tests/test_views_members_json.py
+++ b/src/registrar/tests/test_views_members_json.py
@@ -109,7 +109,14 @@ class GetPortfolioMembersJsonTest(TestWithUser, WebTest):
         self.assertEqual(len(data["members"]), 5)
 
         # Check member fields
-        expected_emails = {self.user.email, self.user2.email, self.user3.email, self.user4.email, self.user4.email, self.email5}
+        expected_emails = {
+            self.user.email,
+            self.user2.email,
+            self.user3.email,
+            self.user4.email,
+            self.user4.email,
+            self.email5,
+        }
         actual_emails = {member["email"] for member in data["members"]}
         self.assertEqual(expected_emails, actual_emails)
 
diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index f2dc784f7..13173565c 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -885,7 +885,7 @@ class TestPortfolio(WebTest):
         response = self.client.get(reverse("member", kwargs={"pk": 1}), follow=True)
         # Make sure the page is denied
         self.assertEqual(response.status_code, 403)
-    
+
     @less_console_noise_decorator
     @override_flag("organization_feature", active=True)
     @override_flag("organization_members", active=True)
@@ -917,10 +917,10 @@ class TestPortfolio(WebTest):
         self.assertContains(response, "This member does not manage any domains.")
 
         # Assert buttons and links within the page are correct
-        self.assertNotContains(response, "usa-button--more-actions") # test that 3 dot is not present
-        self.assertNotContains(response, "sprite.svg#edit") # test that Edit link is not present
-        self.assertNotContains(response, "sprite.svg#settings") # test that Manage link is not present
-        self.assertContains(response, "sprite.svg#visibility") # test that View link is present
+        self.assertNotContains(response, "usa-button--more-actions")  # test that 3 dot is not present
+        self.assertNotContains(response, "sprite.svg#edit")  # test that Edit link is not present
+        self.assertNotContains(response, "sprite.svg#settings")  # test that Manage link is not present
+        self.assertContains(response, "sprite.svg#visibility")  # test that View link is present
 
     @less_console_noise_decorator
     @override_flag("organization_feature", active=True)
@@ -950,13 +950,15 @@ class TestPortfolio(WebTest):
         self.assertContains(response, "Admin access")
         self.assertContains(response, "View all requests plus create requests")
         self.assertContains(response, "View all members plus manage members")
-        self.assertContains(response, "This member does not manage any domains. To assign this member a domain, click \"Manage\"")
+        self.assertContains(
+            response, 'This member does not manage any domains. To assign this member a domain, click "Manage"'
+        )
 
         # Assert buttons and links within the page are correct
-        self.assertContains(response, "usa-button--more-actions") # test that 3 dot is present
-        self.assertContains(response, "sprite.svg#edit") # test that Edit link is present
-        self.assertContains(response, "sprite.svg#settings") # test that Manage link is present
-        self.assertNotContains(response, "sprite.svg#visibility") # test that View link is not present
+        self.assertContains(response, "usa-button--more-actions")  # test that 3 dot is present
+        self.assertContains(response, "sprite.svg#edit")  # test that Edit link is present
+        self.assertContains(response, "sprite.svg#settings")  # test that Manage link is present
+        self.assertNotContains(response, "sprite.svg#visibility")  # test that View link is not present
 
     @less_console_noise_decorator
     @override_flag("organization_feature", active=True)
@@ -987,7 +989,7 @@ class TestPortfolio(WebTest):
         response = self.client.get(reverse("invitedmember", kwargs={"pk": 1}), follow=True)
         # Make sure the page is denied
         self.assertEqual(response.status_code, 403)
-    
+
     @less_console_noise_decorator
     @override_flag("organization_feature", active=True)
     @override_flag("organization_members", active=True)
@@ -1027,10 +1029,10 @@ class TestPortfolio(WebTest):
         self.assertContains(response, "This member does not manage any domains.")
 
         # Assert buttons and links within the page are correct
-        self.assertNotContains(response, "usa-button--more-actions") # test that 3 dot is not present
-        self.assertNotContains(response, "sprite.svg#edit") # test that Edit link is not present
-        self.assertNotContains(response, "sprite.svg#settings") # test that Manage link is not present
-        self.assertContains(response, "sprite.svg#visibility") # test that View link is present
+        self.assertNotContains(response, "usa-button--more-actions")  # test that 3 dot is not present
+        self.assertNotContains(response, "sprite.svg#edit")  # test that Edit link is not present
+        self.assertNotContains(response, "sprite.svg#settings")  # test that Manage link is not present
+        self.assertContains(response, "sprite.svg#visibility")  # test that View link is present
 
     @less_console_noise_decorator
     @override_flag("organization_feature", active=True)
@@ -1068,13 +1070,15 @@ class TestPortfolio(WebTest):
         self.assertContains(response, "Admin access")
         self.assertContains(response, "View all requests plus create requests")
         self.assertContains(response, "View all members plus manage members")
-        self.assertContains(response, "This member does not manage any domains. To assign this member a domain, click \"Manage\"")
+        self.assertContains(
+            response, 'This member does not manage any domains. To assign this member a domain, click "Manage"'
+        )
 
         # Assert buttons and links within the page are correct
-        self.assertContains(response, "usa-button--more-actions") # test that 3 dot is present
-        self.assertContains(response, "sprite.svg#edit") # test that Edit link is present
-        self.assertContains(response, "sprite.svg#settings") # test that Manage link is present
-        self.assertNotContains(response, "sprite.svg#visibility") # test that View link is not present
+        self.assertContains(response, "usa-button--more-actions")  # test that 3 dot is present
+        self.assertContains(response, "sprite.svg#edit")  # test that Edit link is present
+        self.assertContains(response, "sprite.svg#settings")  # test that Manage link is present
+        self.assertNotContains(response, "sprite.svg#visibility")  # test that View link is not present
 
     @less_console_noise_decorator
     @override_flag("organization_feature", active=True)
diff --git a/src/registrar/views/portfolio_members_json.py b/src/registrar/views/portfolio_members_json.py
index 8b81a26a9..948baa07a 100644
--- a/src/registrar/views/portfolio_members_json.py
+++ b/src/registrar/views/portfolio_members_json.py
@@ -2,14 +2,11 @@ from datetime import datetime
 from django.http import JsonResponse
 from django.core.paginator import Paginator
 from django.contrib.auth.decorators import login_required
-from django.db.models import Q
 from django.urls import reverse
 
 from registrar.models.portfolio_invitation import PortfolioInvitation
-from registrar.models.user import User
 from registrar.models.user_portfolio_permission import UserPortfolioPermission
 from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices
-from operator import itemgetter
 
 
 @login_required
@@ -18,21 +15,25 @@ def get_portfolio_members_json(request):
     get all members that are associated with the given portfolio"""
     portfolio = request.GET.get("portfolio")
 
-    permissions = UserPortfolioPermission.objects.filter(portfolio=portfolio).select_related("user").values_list("pk", "user__first_name", "user__last_name", "user__email", "user__last_login", "roles")
+    permissions = (
+        UserPortfolioPermission.objects.filter(portfolio=portfolio)
+        .select_related("user")
+        .values_list("pk", "user__first_name", "user__last_name", "user__email", "user__last_login", "roles")
+    )
     invitations = PortfolioInvitation.objects.filter(portfolio=portfolio).values_list(
-        'pk', 'email', 'roles', 'additional_permissions', 'status'
+        "pk", "email", "roles", "additional_permissions", "status"
     )
 
     # Convert the permissions queryset into a list of dictionaries
     permission_list = [
         {
-            'id': perm[0],
-            'first_name': perm[1],
-            'last_name': perm[2],
-            'email': perm[3],
-            'last_active': perm[4],
-            'roles': perm[5],
-            'source': 'permission'  # Mark the source as permissions
+            "id": perm[0],
+            "first_name": perm[1],
+            "last_name": perm[2],
+            "email": perm[3],
+            "last_active": perm[4],
+            "roles": perm[5],
+            "source": "permission",  # Mark the source as permissions
         }
         for perm in permissions
     ]
@@ -40,15 +41,15 @@ def get_portfolio_members_json(request):
     # Convert the invitations queryset into a list of dictionaries
     invitation_list = [
         {
-            'id': invite[0],
-            'first_name': None,  # No first name in invitations
-            'last_name': None,   # No last name in invitations
-            'email': invite[1],
-            'roles': invite[2],
-            'additional_permissions': invite[3],
-            'status': invite[4],
-            'last_active': 'Invited',
-            'source': 'invitation'  # Mark the source as invitations
+            "id": invite[0],
+            "first_name": None,  # No first name in invitations
+            "last_name": None,  # No last name in invitations
+            "email": invite[1],
+            "roles": invite[2],
+            "additional_permissions": invite[3],
+            "status": invite[4],
+            "last_active": "Invited",
+            "source": "invitation",  # Mark the source as invitations
         }
         for invite in invitations
     ]
@@ -64,12 +65,8 @@ def get_portfolio_members_json(request):
     paginator = Paginator(combined_list, 10)
     page_number = request.GET.get("page", 1)
     page_obj = paginator.get_page(page_number)
-    
-    
-    members = [
-        serialize_members(request, portfolio, item, request.user)
-        for item in page_obj.object_list
-    ]
+
+    members = [serialize_members(request, portfolio, item, request.user) for item in page_obj.object_list]
 
     return JsonResponse(
         {
@@ -90,12 +87,13 @@ def apply_search(data_list, request):
     if search_term:
         # Filter the list based on the search term (case-insensitive)
         data_list = [
-            item for item in data_list
-            if search_term in (item.get('first_name', '') or '').lower()
-            or search_term in (item.get('last_name', '') or '').lower()
-            or search_term in (item.get('email', '') or '').lower()
+            item
+            for item in data_list
+            if search_term in (item.get("first_name", "") or "").lower()
+            or search_term in (item.get("last_name", "") or "").lower()
+            or search_term in (item.get("email", "") or "").lower()
         ]
-    
+
     return data_list
 
 
@@ -115,11 +113,11 @@ def apply_sorting(data_list, request):
             # Second element: the actual value to sort by
             if value is None:
                 return (2, value)  # Position None last
-            if value == 'Invited':
+            if value == "Invited":
                 return (1, value)  # Position 'Invited' before None but after valid datetimes
             if isinstance(value, datetime):
                 return (0, value)  # Position valid datetime values first
-        
+
         # Default case: return the value as is for comparison
         return value
 
@@ -144,22 +142,22 @@ def serialize_members(request, portfolio, item, user):
 
     # ------- USER STATUSES
     is_admin = False
-    if item['roles']:
-        is_admin = UserPortfolioRoleChoices.ORGANIZATION_ADMIN in item['roles']
+    if item["roles"]:
+        is_admin = UserPortfolioRoleChoices.ORGANIZATION_ADMIN in item["roles"]
 
-    action_url = '#'
-    if item['source'] == 'permission':
-        action_url = reverse("member", kwargs={"pk": item['id']})
-    elif item['source'] == 'invitation':
-        action_url = reverse("invitedmember", kwargs={"pk": item['id']})
+    action_url = "#"
+    if item["source"] == "permission":
+        action_url = reverse("member", kwargs={"pk": item["id"]})
+    elif item["source"] == "invitation":
+        action_url = reverse("invitedmember", kwargs={"pk": item["id"]})
 
     # ------- SERIALIZE
     member_json = {
-        "id": item['id'],
-        "name": (item['first_name'] or '') + ' ' + (item['last_name'] or ''),
-        "email": item['email'],
+        "id": item["id"],
+        "name": (item["first_name"] or "") + " " + (item["last_name"] or ""),
+        "email": item["email"],
         "is_admin": is_admin,
-        "last_active": item['last_active'],
+        "last_active": item["last_active"],
         "action_url": action_url,
         "action_label": ("View" if view_only else "Manage"),
         "svg_icon": ("visibility" if view_only else "settings"),
diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py
index cd7923668..cc1a09b25 100644
--- a/src/registrar/views/portfolios.py
+++ b/src/registrar/views/portfolios.py
@@ -3,7 +3,12 @@ from django.http import Http404
 from django.shortcuts import render
 from django.urls import reverse
 from django.contrib import messages
-from registrar.forms.portfolio import PortfolioInvitedMemberForm, PortfolioMemberForm, PortfolioOrgAddressForm, PortfolioSeniorOfficialForm
+from registrar.forms.portfolio import (
+    PortfolioInvitedMemberForm,
+    PortfolioMemberForm,
+    PortfolioOrgAddressForm,
+    PortfolioSeniorOfficialForm,
+)
 from registrar.models import Portfolio, User
 from registrar.models.portfolio_invitation import PortfolioInvitation
 from registrar.models.user_portfolio_permission import UserPortfolioPermission
@@ -65,22 +70,34 @@ class PortfolioMemberView(PortfolioMemberPermissionView, View):
         member = portfolio_permission.user
 
         # We have to explicitely name these with member_ otherwise we'll have conflicts with context preprocessors
-        member_has_view_all_requests_portfolio_permission =  member.has_view_all_requests_portfolio_permission(portfolio_permission.portfolio)
-        member_has_edit_request_portfolio_permission = member.has_edit_request_portfolio_permission(portfolio_permission.portfolio)
-        member_has_view_members_portfolio_permission =  member.has_view_members_portfolio_permission(portfolio_permission.portfolio)
-        member_has_edit_members_portfolio_permission = member.has_edit_members_portfolio_permission(portfolio_permission.portfolio)
+        member_has_view_all_requests_portfolio_permission = member.has_view_all_requests_portfolio_permission(
+            portfolio_permission.portfolio
+        )
+        member_has_edit_request_portfolio_permission = member.has_edit_request_portfolio_permission(
+            portfolio_permission.portfolio
+        )
+        member_has_view_members_portfolio_permission = member.has_view_members_portfolio_permission(
+            portfolio_permission.portfolio
+        )
+        member_has_edit_members_portfolio_permission = member.has_edit_members_portfolio_permission(
+            portfolio_permission.portfolio
+        )
+
+        return render(
+            request,
+            self.template_name,
+            {
+                "edit_url": reverse("member-permissions", args=[pk]),
+                "portfolio_permission": portfolio_permission,
+                "member": member,
+                "member_has_view_all_requests_portfolio_permission": member_has_view_all_requests_portfolio_permission,
+                "member_has_edit_request_portfolio_permission": member_has_edit_request_portfolio_permission,
+                "member_has_view_members_portfolio_permission": member_has_view_members_portfolio_permission,
+                "member_has_edit_members_portfolio_permission": member_has_edit_members_portfolio_permission,
+            },
+        )
 
-        return render(request, self.template_name, {
-            'edit_url': reverse('member-permissions', args=[pk]),
-            'portfolio_permission': portfolio_permission,
-            'member': member,
-            'member_has_view_all_requests_portfolio_permission': member_has_view_all_requests_portfolio_permission,
-            'member_has_edit_request_portfolio_permission': member_has_edit_request_portfolio_permission,
-            'member_has_view_members_portfolio_permission': member_has_view_members_portfolio_permission,
-            'member_has_edit_members_portfolio_permission': member_has_edit_members_portfolio_permission
-        })
 
-    
 class PortfolioMemberEditView(PortfolioMemberEditPermissionView, View):
 
     template_name = "portfolio_member_permissions.html"
@@ -89,29 +106,37 @@ class PortfolioMemberEditView(PortfolioMemberEditPermissionView, View):
     def get(self, request, pk):
         portfolio_permission = get_object_or_404(UserPortfolioPermission, pk=pk)
         user = portfolio_permission.user
-        
+
         form = self.form_class(instance=portfolio_permission)
-        
-        return render(request, self.template_name, {
-            'form': form,
-            'member': user,
-        })
+
+        return render(
+            request,
+            self.template_name,
+            {
+                "form": form,
+                "member": user,
+            },
+        )
 
     def post(self, request, pk):
         portfolio_permission = get_object_or_404(UserPortfolioPermission, pk=pk)
         user = portfolio_permission.user
-        
+
         form = self.form_class(request.POST, instance=portfolio_permission)
-        
+
         if form.is_valid():
             form.save()
-            return redirect('member', pk=pk)
-        
-        return render(request, self.template_name, {
-            'form': form,
-            'member': user,  # Pass the user object again to the template
-        })
-    
+            return redirect("member", pk=pk)
+
+        return render(
+            request,
+            self.template_name,
+            {
+                "form": form,
+                "member": user,  # Pass the user object again to the template
+            },
+        )
+
 
 class PortfolioInvitedMemberView(PortfolioInvitedMemberPermissionView, View):
 
@@ -123,19 +148,31 @@ class PortfolioInvitedMemberView(PortfolioInvitedMemberPermissionView, View):
         # form = self.form_class(instance=portfolio_invitation)
 
         # We have to explicitely name these with member_ otherwise we'll have conflicts with context preprocessors
-        member_has_view_all_requests_portfolio_permission = UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS in portfolio_invitation.get_portfolio_permissions()
-        member_has_edit_request_portfolio_permission = UserPortfolioPermissionChoices.EDIT_REQUESTS in portfolio_invitation.get_portfolio_permissions()
-        member_has_view_members_portfolio_permission = UserPortfolioPermissionChoices.VIEW_MEMBERS in portfolio_invitation.get_portfolio_permissions()
-        member_has_edit_members_portfolio_permission = UserPortfolioPermissionChoices.EDIT_MEMBERS in portfolio_invitation.get_portfolio_permissions()
+        member_has_view_all_requests_portfolio_permission = (
+            UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS in portfolio_invitation.get_portfolio_permissions()
+        )
+        member_has_edit_request_portfolio_permission = (
+            UserPortfolioPermissionChoices.EDIT_REQUESTS in portfolio_invitation.get_portfolio_permissions()
+        )
+        member_has_view_members_portfolio_permission = (
+            UserPortfolioPermissionChoices.VIEW_MEMBERS in portfolio_invitation.get_portfolio_permissions()
+        )
+        member_has_edit_members_portfolio_permission = (
+            UserPortfolioPermissionChoices.EDIT_MEMBERS in portfolio_invitation.get_portfolio_permissions()
+        )
 
-        return render(request, self.template_name, {
-            'edit_url': reverse('invitedmember-permissions', args=[pk]),
-            'portfolio_invitation': portfolio_invitation,
-            'member_has_view_all_requests_portfolio_permission': member_has_view_all_requests_portfolio_permission,
-            'member_has_edit_request_portfolio_permission': member_has_edit_request_portfolio_permission,
-            'member_has_view_members_portfolio_permission': member_has_view_members_portfolio_permission,
-            'member_has_edit_members_portfolio_permission': member_has_edit_members_portfolio_permission
-        })
+        return render(
+            request,
+            self.template_name,
+            {
+                "edit_url": reverse("invitedmember-permissions", args=[pk]),
+                "portfolio_invitation": portfolio_invitation,
+                "member_has_view_all_requests_portfolio_permission": member_has_view_all_requests_portfolio_permission,
+                "member_has_edit_request_portfolio_permission": member_has_edit_request_portfolio_permission,
+                "member_has_view_members_portfolio_permission": member_has_view_members_portfolio_permission,
+                "member_has_edit_members_portfolio_permission": member_has_edit_members_portfolio_permission,
+            },
+        )
 
 
 class PortfolioInvitedMemberEditView(PortfolioInvitedMemberEditPermissionView, View):
@@ -147,23 +184,30 @@ class PortfolioInvitedMemberEditView(PortfolioInvitedMemberEditPermissionView, V
         portfolio_invitation = get_object_or_404(PortfolioInvitation, pk=pk)
         form = self.form_class(instance=portfolio_invitation)
 
-        return render(request, self.template_name, {
-            'form': form,
-            'invitation': portfolio_invitation,
-        })
+        return render(
+            request,
+            self.template_name,
+            {
+                "form": form,
+                "invitation": portfolio_invitation,
+            },
+        )
 
     def post(self, request, pk):
         portfolio_invitation = get_object_or_404(PortfolioInvitation, pk=pk)
         form = self.form_class(request.POST, instance=portfolio_invitation)
         if form.is_valid():
             form.save()
-            return redirect('invitedmember', pk=pk)
-        
-        return render(request, self.template_name, {
-            'form': form,
-            'invitation': portfolio_invitation,  # Pass the user object again to the template
-        })
-    
+            return redirect("invitedmember", pk=pk)
+
+        return render(
+            request,
+            self.template_name,
+            {
+                "form": form,
+                "invitation": portfolio_invitation,  # Pass the user object again to the template
+            },
+        )
 
 
 class PortfolioNoDomainsView(NoPortfolioDomainsPermissionView, View):
diff --git a/src/registrar/views/utility/mixins.py b/src/registrar/views/utility/mixins.py
index 94fc0b1c5..70b7d64a7 100644
--- a/src/registrar/views/utility/mixins.py
+++ b/src/registrar/views/utility/mixins.py
@@ -515,7 +515,7 @@ class PortfolioMemberPermission(PortfolioBasePermission):
             return False
 
         return super().has_permission()
-    
+
 
 class PortfolioMemberEditPermission(PortfolioBasePermission):
     """Permission mixin that allows access to portfolio member pages if user
@@ -551,7 +551,7 @@ class PortfolioInvitedMemberPermission(PortfolioBasePermission):
             return False
 
         return super().has_permission()
-    
+
 
 class PortfolioInvitedMemberEditPermission(PortfolioBasePermission):
     """Permission mixin that allows access to portfolio invited member pages if user
diff --git a/src/registrar/views/utility/permission_views.py b/src/registrar/views/utility/permission_views.py
index 6fb7fee50..c1d25d691 100644
--- a/src/registrar/views/utility/permission_views.py
+++ b/src/registrar/views/utility/permission_views.py
@@ -288,7 +288,9 @@ class PortfolioInvitedMemberPermissionView(PortfolioInvitedMemberPermission, Por
     """
 
 
-class PortfolioInvitedMemberEditPermissionView(PortfolioInvitedMemberEditPermission, PortfolioBasePermissionView, abc.ABC):
+class PortfolioInvitedMemberEditPermissionView(
+    PortfolioInvitedMemberEditPermission, PortfolioBasePermissionView, abc.ABC
+):
     """Abstract base view for portfolio member edit views that enforces permissions.
 
     This abstract view cannot be instantiated. Actual views must specify

From e3d2dc0cb8d24c7fd73011b9c689051e3c9c28e9 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 8 Oct 2024 12:50:37 -0600
Subject: [PATCH 097/142] Remove old migrations (merging)

---
 .../migrations/0131_create_groups_v17.py      | 37 -------------------
 ...er_domaininformation_portfolio_and_more.py | 36 ------------------
 2 files changed, 73 deletions(-)
 delete mode 100644 src/registrar/migrations/0131_create_groups_v17.py
 delete mode 100644 src/registrar/migrations/0132_alter_domaininformation_portfolio_and_more.py

diff --git a/src/registrar/migrations/0131_create_groups_v17.py b/src/registrar/migrations/0131_create_groups_v17.py
deleted file mode 100644
index 04cd5163c..000000000
--- a/src/registrar/migrations/0131_create_groups_v17.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# This migration creates the create_full_access_group and create_cisa_analyst_group groups
-# It is dependent on 0079 (which populates federal agencies)
-# If permissions on the groups need changing, edit CISA_ANALYST_GROUP_PERMISSIONS
-# in the user_group model then:
-# [NOT RECOMMENDED]
-# step 1: docker-compose exec app ./manage.py migrate --fake registrar 0035_contenttypes_permissions
-# step 2: docker-compose exec app ./manage.py migrate registrar 0036_create_groups
-# step 3: fake run the latest migration in the migrations list
-# [RECOMMENDED]
-# Alternatively:
-# step 1: duplicate the migration that loads data
-# step 2: docker-compose exec app ./manage.py migrate
-
-from django.db import migrations
-from registrar.models import UserGroup
-from typing import Any
-
-
-# For linting: RunPython expects a function reference,
-# so let's give it one
-def create_groups(apps, schema_editor) -> Any:
-    UserGroup.create_cisa_analyst_group(apps, schema_editor)
-    UserGroup.create_full_access_group(apps, schema_editor)
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("registrar", "0130_remove_federalagency_initials_federalagency_acronym_and_more"),
-    ]
-
-    operations = [
-        migrations.RunPython(
-            create_groups,
-            reverse_code=migrations.RunPython.noop,
-            atomic=True,
-        ),
-    ]
diff --git a/src/registrar/migrations/0132_alter_domaininformation_portfolio_and_more.py b/src/registrar/migrations/0132_alter_domaininformation_portfolio_and_more.py
deleted file mode 100644
index e0d2b35f9..000000000
--- a/src/registrar/migrations/0132_alter_domaininformation_portfolio_and_more.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# Generated by Django 4.2.10 on 2024-10-02 14:17
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("registrar", "0131_create_groups_v17"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="domaininformation",
-            name="portfolio",
-            field=models.ForeignKey(
-                blank=True,
-                null=True,
-                on_delete=django.db.models.deletion.PROTECT,
-                related_name="information_portfolio",
-                to="registrar.portfolio",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="domainrequest",
-            name="portfolio",
-            field=models.ForeignKey(
-                blank=True,
-                null=True,
-                on_delete=django.db.models.deletion.PROTECT,
-                related_name="DomainRequest_portfolio",
-                to="registrar.portfolio",
-            ),
-        ),
-    ]

From 081c7622463c9a0d79ae506ac7c67a948c89107e Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 8 Oct 2024 12:52:17 -0600
Subject: [PATCH 098/142] Revert "Remove old migrations (merging)"

This reverts commit e3d2dc0cb8d24c7fd73011b9c689051e3c9c28e9.
---
 .../migrations/0131_create_groups_v17.py      | 37 +++++++++++++++++++
 ...er_domaininformation_portfolio_and_more.py | 36 ++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 src/registrar/migrations/0131_create_groups_v17.py
 create mode 100644 src/registrar/migrations/0132_alter_domaininformation_portfolio_and_more.py

diff --git a/src/registrar/migrations/0131_create_groups_v17.py b/src/registrar/migrations/0131_create_groups_v17.py
new file mode 100644
index 000000000..04cd5163c
--- /dev/null
+++ b/src/registrar/migrations/0131_create_groups_v17.py
@@ -0,0 +1,37 @@
+# This migration creates the create_full_access_group and create_cisa_analyst_group groups
+# It is dependent on 0079 (which populates federal agencies)
+# If permissions on the groups need changing, edit CISA_ANALYST_GROUP_PERMISSIONS
+# in the user_group model then:
+# [NOT RECOMMENDED]
+# step 1: docker-compose exec app ./manage.py migrate --fake registrar 0035_contenttypes_permissions
+# step 2: docker-compose exec app ./manage.py migrate registrar 0036_create_groups
+# step 3: fake run the latest migration in the migrations list
+# [RECOMMENDED]
+# Alternatively:
+# step 1: duplicate the migration that loads data
+# step 2: docker-compose exec app ./manage.py migrate
+
+from django.db import migrations
+from registrar.models import UserGroup
+from typing import Any
+
+
+# For linting: RunPython expects a function reference,
+# so let's give it one
+def create_groups(apps, schema_editor) -> Any:
+    UserGroup.create_cisa_analyst_group(apps, schema_editor)
+    UserGroup.create_full_access_group(apps, schema_editor)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("registrar", "0130_remove_federalagency_initials_federalagency_acronym_and_more"),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            create_groups,
+            reverse_code=migrations.RunPython.noop,
+            atomic=True,
+        ),
+    ]
diff --git a/src/registrar/migrations/0132_alter_domaininformation_portfolio_and_more.py b/src/registrar/migrations/0132_alter_domaininformation_portfolio_and_more.py
new file mode 100644
index 000000000..e0d2b35f9
--- /dev/null
+++ b/src/registrar/migrations/0132_alter_domaininformation_portfolio_and_more.py
@@ -0,0 +1,36 @@
+# Generated by Django 4.2.10 on 2024-10-02 14:17
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("registrar", "0131_create_groups_v17"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="domaininformation",
+            name="portfolio",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="information_portfolio",
+                to="registrar.portfolio",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="domainrequest",
+            name="portfolio",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="DomainRequest_portfolio",
+                to="registrar.portfolio",
+            ),
+        ),
+    ]

From a4ffc75efacfa1c7de83aa2eeafb91498eccbdc4 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 8 Oct 2024 12:53:02 -0600
Subject: [PATCH 099/142] Fix migrations

---
 ...129_domainrequest_rejection_reason_email.py | 18 ------------------
 ...request_rejection_reason_email_and_more.py} |  9 +++++++--
 2 files changed, 7 insertions(+), 20 deletions(-)
 delete mode 100644 src/registrar/migrations/0129_domainrequest_rejection_reason_email.py
 rename src/registrar/migrations/{0130_alter_domainrequest_rejection_reason.py => 0133_domainrequest_rejection_reason_email_and_more.py} (75%)

diff --git a/src/registrar/migrations/0129_domainrequest_rejection_reason_email.py b/src/registrar/migrations/0129_domainrequest_rejection_reason_email.py
deleted file mode 100644
index 6aaef7f87..000000000
--- a/src/registrar/migrations/0129_domainrequest_rejection_reason_email.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 4.2.10 on 2024-09-26 21:18
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("registrar", "0128_alter_domaininformation_state_territory_and_more"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="domainrequest",
-            name="rejection_reason_email",
-            field=models.TextField(blank=True, null=True),
-        ),
-    ]
diff --git a/src/registrar/migrations/0130_alter_domainrequest_rejection_reason.py b/src/registrar/migrations/0133_domainrequest_rejection_reason_email_and_more.py
similarity index 75%
rename from src/registrar/migrations/0130_alter_domainrequest_rejection_reason.py
rename to src/registrar/migrations/0133_domainrequest_rejection_reason_email_and_more.py
index 58a09772b..383c3ebfa 100644
--- a/src/registrar/migrations/0130_alter_domainrequest_rejection_reason.py
+++ b/src/registrar/migrations/0133_domainrequest_rejection_reason_email_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.10 on 2024-10-01 15:31
+# Generated by Django 4.2.10 on 2024-10-08 18:52
 
 from django.db import migrations, models
 
@@ -6,10 +6,15 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("registrar", "0129_domainrequest_rejection_reason_email"),
+        ("registrar", "0132_alter_domaininformation_portfolio_and_more"),
     ]
 
     operations = [
+        migrations.AddField(
+            model_name="domainrequest",
+            name="rejection_reason_email",
+            field=models.TextField(blank=True, null=True),
+        ),
         migrations.AlterField(
             model_name="domainrequest",
             name="rejection_reason",

From acd09d3122dc8d8fe5608d379b8ba8b21425e565 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Tue, 8 Oct 2024 15:05:45 -0400
Subject: [PATCH 100/142] fixed migrations

---
 ...ns_portfolioinvitation_additional_permissions_and_more.py} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename src/registrar/migrations/{0130_rename_portfolio_additional_permissions_portfolioinvitation_additional_permissions_and_more.py => 0133_rename_portfolio_additional_permissions_portfolioinvitation_additional_permissions_and_more.py} (78%)

diff --git a/src/registrar/migrations/0130_rename_portfolio_additional_permissions_portfolioinvitation_additional_permissions_and_more.py b/src/registrar/migrations/0133_rename_portfolio_additional_permissions_portfolioinvitation_additional_permissions_and_more.py
similarity index 78%
rename from src/registrar/migrations/0130_rename_portfolio_additional_permissions_portfolioinvitation_additional_permissions_and_more.py
rename to src/registrar/migrations/0133_rename_portfolio_additional_permissions_portfolioinvitation_additional_permissions_and_more.py
index 338a20493..14b7ac22a 100644
--- a/src/registrar/migrations/0130_rename_portfolio_additional_permissions_portfolioinvitation_additional_permissions_and_more.py
+++ b/src/registrar/migrations/0133_rename_portfolio_additional_permissions_portfolioinvitation_additional_permissions_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.10 on 2024-10-07 17:12
+# Generated by Django 4.2.10 on 2024-10-08 19:05
 
 from django.db import migrations
 
@@ -6,7 +6,7 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("registrar", "0129_alter_portfolioinvitation_portfolio_roles_and_more"),
+        ("registrar", "0132_alter_domaininformation_portfolio_and_more"),
     ]
 
     operations = [

From 0ee78e9102c32947b29c5633148da4b7bfa3d37a Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Tue, 8 Oct 2024 15:09:06 -0400
Subject: [PATCH 101/142] comment

---
 src/registrar/templates/portfolio_member.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/registrar/templates/portfolio_member.html b/src/registrar/templates/portfolio_member.html
index 46885174d..5f18442d6 100644
--- a/src/registrar/templates/portfolio_member.html
+++ b/src/registrar/templates/portfolio_member.html
@@ -124,6 +124,7 @@
     {% include "includes/summary_item.html" with title='Member access and permissions' permissions='true' value=portfolio_invitation member_has_view_all_requests_portfolio_permission=member_has_view_all_requests_portfolio_permission member_has_edit_request_portfolio_permission=member_has_edit_request_portfolio_permission member_has_view_members_portfolio_permission=member_has_view_members_portfolio_permission member_has_edit_members_portfolio_permission=member_has_edit_members_portfolio_permission edit_link=edit_url editable=has_edit_members_portfolio_permission %}
   {% endif %}
 
+  {% comment %}view_button is passed below as true in all cases. This is because manage_button logic will trump view_button logic; ie. if manage_button is true, view_button will never be looked at{% endcomment %}
   {% if portfolio_permission %}
     {% include "includes/summary_item.html" with title='Domain management' domain_mgmt='true' value=portfolio_permission.get_managed_domains_count edit_link='#' editable='true' manage_button=has_edit_members_portfolio_permission view_button='true' %}
   {% elif portfolio_invitation %}

From 56d94227e26eeab65ccf829fa7d0a8da351594c2 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Tue, 8 Oct 2024 15:26:09 -0400
Subject: [PATCH 102/142] fixed broken test

---
 src/registrar/tests/test_views_domains_json.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/registrar/tests/test_views_domains_json.py b/src/registrar/tests/test_views_domains_json.py
index 07799104b..c4e5832c0 100644
--- a/src/registrar/tests/test_views_domains_json.py
+++ b/src/registrar/tests/test_views_domains_json.py
@@ -37,6 +37,7 @@ class GetDomainsJsonTest(TestWithUser, WebTest):
         UserDomainRole.objects.all().delete()
         UserPortfolioPermission.objects.all().delete()
         DomainInformation.objects.all().delete()
+        Domain.objects.all().delete()
         Portfolio.objects.all().delete()
         super().tearDown()
 

From 18656a89432951458aa70ed903094ef3bd76aa9f Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Tue, 8 Oct 2024 15:30:18 -0400
Subject: [PATCH 103/142] owasp fix

---
 src/zap.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/zap.conf b/src/zap.conf
index dd9ae1565..710efbc6f 100644
--- a/src/zap.conf
+++ b/src/zap.conf
@@ -73,6 +73,7 @@
 10038	OUTOFSCOPE	http://app:8080/organization/
 10038	OUTOFSCOPE	http://app:8080/suborganization/
 10038	OUTOFSCOPE	http://app:8080/transfer/
+10038   OUTOFSCOPE  http://app:8080/permissions
 # This URL always returns 404, so include it as well.
 10038	OUTOFSCOPE	http://app:8080/todo
 # OIDC isn't configured in the test environment and DEBUG=True so this gives a 500 without CSP headers

From 6c1c0dd7351421a8c13d9b961d0ae453e1a5e4da Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Tue, 8 Oct 2024 15:35:16 -0400
Subject: [PATCH 104/142] zap fix1

---
 src/zap.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zap.conf b/src/zap.conf
index 710efbc6f..8ae245c5f 100644
--- a/src/zap.conf
+++ b/src/zap.conf
@@ -73,7 +73,7 @@
 10038	OUTOFSCOPE	http://app:8080/organization/
 10038	OUTOFSCOPE	http://app:8080/suborganization/
 10038	OUTOFSCOPE	http://app:8080/transfer/
-10038   OUTOFSCOPE  http://app:8080/permissions
+10038   OUTOFSCOPE  http://app:8080/permissionstemp
 # This URL always returns 404, so include it as well.
 10038	OUTOFSCOPE	http://app:8080/todo
 # OIDC isn't configured in the test environment and DEBUG=True so this gives a 500 without CSP headers

From b1ebfec2fb5e8cddbe62420933c794f2a12c7c96 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Tue, 8 Oct 2024 15:35:37 -0400
Subject: [PATCH 105/142] zap fix2

---
 src/zap.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zap.conf b/src/zap.conf
index 8ae245c5f..710efbc6f 100644
--- a/src/zap.conf
+++ b/src/zap.conf
@@ -73,7 +73,7 @@
 10038	OUTOFSCOPE	http://app:8080/organization/
 10038	OUTOFSCOPE	http://app:8080/suborganization/
 10038	OUTOFSCOPE	http://app:8080/transfer/
-10038   OUTOFSCOPE  http://app:8080/permissionstemp
+10038   OUTOFSCOPE  http://app:8080/permissions
 # This URL always returns 404, so include it as well.
 10038	OUTOFSCOPE	http://app:8080/todo
 # OIDC isn't configured in the test environment and DEBUG=True so this gives a 500 without CSP headers

From 40c061af98a6bc3e52270f8d15429bec23ee1cb9 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Tue, 8 Oct 2024 15:37:54 -0400
Subject: [PATCH 106/142] fixed tabs in zap

---
 src/zap.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zap.conf b/src/zap.conf
index 710efbc6f..9a3897c39 100644
--- a/src/zap.conf
+++ b/src/zap.conf
@@ -71,9 +71,9 @@
 10038	OUTOFSCOPE	http://app:8080/domain_requests/
 10038	OUTOFSCOPE	http://app:8080/domains/
 10038	OUTOFSCOPE	http://app:8080/organization/
+10038   OUTOFSCOPE  http://app:8080/permissions
 10038	OUTOFSCOPE	http://app:8080/suborganization/
 10038	OUTOFSCOPE	http://app:8080/transfer/
-10038   OUTOFSCOPE  http://app:8080/permissions
 # This URL always returns 404, so include it as well.
 10038	OUTOFSCOPE	http://app:8080/todo
 # OIDC isn't configured in the test environment and DEBUG=True so this gives a 500 without CSP headers

From 3efd90776457385d7c1f19b113501b44db3ad229 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Tue, 8 Oct 2024 16:02:55 -0400
Subject: [PATCH 107/142] incremental fix for spacing in zap.conf

---
 src/zap.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/zap.conf b/src/zap.conf
index 9a3897c39..dd9ae1565 100644
--- a/src/zap.conf
+++ b/src/zap.conf
@@ -71,7 +71,6 @@
 10038	OUTOFSCOPE	http://app:8080/domain_requests/
 10038	OUTOFSCOPE	http://app:8080/domains/
 10038	OUTOFSCOPE	http://app:8080/organization/
-10038   OUTOFSCOPE  http://app:8080/permissions
 10038	OUTOFSCOPE	http://app:8080/suborganization/
 10038	OUTOFSCOPE	http://app:8080/transfer/
 # This URL always returns 404, so include it as well.

From 2f36be268ea2f24cfe33535f5633e2695ffc14b6 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Tue, 8 Oct 2024 16:03:54 -0400
Subject: [PATCH 108/142] another incremental fix to zap.conf

---
 src/zap.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/zap.conf b/src/zap.conf
index dd9ae1565..1f0548f2d 100644
--- a/src/zap.conf
+++ b/src/zap.conf
@@ -71,6 +71,7 @@
 10038	OUTOFSCOPE	http://app:8080/domain_requests/
 10038	OUTOFSCOPE	http://app:8080/domains/
 10038	OUTOFSCOPE	http://app:8080/organization/
+10038	OUTOFSCOPE	http://app:8080/permissions
 10038	OUTOFSCOPE	http://app:8080/suborganization/
 10038	OUTOFSCOPE	http://app:8080/transfer/
 # This URL always returns 404, so include it as well.

From 50abaab52d20b4fc96b95580426f57d7111b4d58 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 8 Oct 2024 16:35:37 -0400
Subject: [PATCH 109/142] cleanup

---
 src/registrar/admin.py | 77 ------------------------------------------
 1 file changed, 77 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index eb99fc6e2..485a1b07d 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -3104,83 +3104,6 @@ class PortfolioAdmin(ListHeaderAdmin):
 
         return non_admin_users
 
-    def display_admins(self, obj):
-        """Get joined users who are Admin, unpack and return an HTML block.
-
-        'DJA readonly can't handle querysets, so we need to unpack and return html here.
-        Alternatively, we could return querysets in context but that would limit where this
-        data would display in a custom change form without extensive template customization.
-
-        Will be used in the field_readonly block"""
-        admins = self.get_admin_users(obj)
-        if not admins:
-            return format_html("<p>No admins found.</p>")
-
-        admin_details = ""
-        for portfolio_admin in admins:
-            change_url = reverse("admin:registrar_user_change", args=[portfolio_admin.pk])
-            admin_details += "<address class='margin-bottom-2 dja-address-contact-list'>"
-            admin_details += f'<a href="{change_url}">{escape(portfolio_admin)}</a><br>'
-            admin_details += f"{escape(portfolio_admin.title)}<br>"
-            admin_details += f"{escape(portfolio_admin.email)}"
-            admin_details += "<div class='admin-icon-group'>"
-            admin_details += f"<input aria-hidden='true' class='display-none' value='{escape(portfolio_admin.email)}'>"
-            admin_details += (
-                "<button class='usa-button usa-button--unstyled padding-right-1 usa-button--icon padding-left-05"
-                + "copy-to-clipboard text-no-underline' type='button'>"
-            )
-            admin_details += "<svg class='usa-icon'>"
-            admin_details += "<use aria-hidden='true' xlink:href='/public/img/sprite.svg#content_copy'></use>"
-            admin_details += "</svg>"
-            admin_details += "Copy"
-            admin_details += "</button>"
-            admin_details += "</div><br>"
-            admin_details += f"{escape(portfolio_admin.phone)}"
-            admin_details += "</address>"
-        return format_html(admin_details)
-
-    display_admins.short_description = "Administrators"  # type: ignore
-
-    def display_members(self, obj):
-        """Get joined users who have roles/perms that are not Admin, unpack and return an HTML block.
-
-        DJA readonly can't handle querysets, so we need to unpack and return html here.
-        Alternatively, we could return querysets in context but that would limit where this
-        data would display in a custom change form without extensive template customization.
-
-        Will be used in the after_help_text block."""
-        members = self.get_non_admin_users(obj)
-        if not members:
-            return ""
-
-        member_details = (
-            "<table><thead><tr><th>Name</th><th>Title</th><th>Email</th>"
-            + "<th>Phone</th><th>Roles</th></tr></thead><tbody>"
-        )
-        for member in members:
-            full_name = member.get_formatted_name()
-            member_details += "<tr>"
-            member_details += f"<td>{escape(full_name)}</td>"
-            member_details += f"<td>{escape(member.title)}</td>"
-            member_details += f"<td>{escape(member.email)}</td>"
-            member_details += f"<td>{escape(member.phone)}</td>"
-            member_details += "<td>"
-            for role in member.portfolio_role_summary(obj):
-                member_details += f"<span class='usa-tag'>{escape(role)}</span> "
-            member_details += "</td></tr>"
-        member_details += "</tbody></table>"
-        return format_html(member_details)
-
-    display_members.short_description = "Members"  # type: ignore
-
-    def display_members_summary(self, obj):
-        """Will be passed as context and used in the field_readonly block."""
-        members = self.get_non_admin_users(obj)
-        if not members:
-            return {}
-
-        return self.get_field_links_as_list(members, "user", separator=", ")
-
     def get_user_portfolio_permission_non_admins(self, obj):
         """Returns each admin on UserPortfolioPermission for a given portfolio."""
         if obj:

From d907463e859737a3122fc378cb278dab6ef44759 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Wed, 9 Oct 2024 08:28:38 -0600
Subject: [PATCH 110/142] remove unneeded print

---
 src/registrar/tests/test_views_request.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/registrar/tests/test_views_request.py b/src/registrar/tests/test_views_request.py
index e7f9d026c..2753aa134 100644
--- a/src/registrar/tests/test_views_request.py
+++ b/src/registrar/tests/test_views_request.py
@@ -3146,7 +3146,6 @@ class TestDomainRequestWizard(TestWithUser, WebTest):
 
             # Assert that we're on the organization page
             self.assertContains(detail_page, portfolio.organization_name)
-            print(f"what is the page? {detail_page}")
 
             # We should only see one unlocked step
             self.assertContains(detail_page, "#check_circle", count=4)

From 7c69205deb586b27a141aa94875c0b92700875f9 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Wed, 9 Oct 2024 08:34:40 -0600
Subject: [PATCH 111/142] Update test_models.py

---
 src/registrar/tests/test_models.py | 981 -----------------------------
 1 file changed, 981 deletions(-)

diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index 96ca3871f..7664264c3 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -40,987 +40,6 @@ from api.tests.common import less_console_noise_decorator
 logger = logging.getLogger(__name__)
 
 
-@boto3_mocking.patching
-class TestDomainRequest(TestCase):
-    @less_console_noise_decorator
-    def setUp(self):
-
-        self.dummy_user, _ = Contact.objects.get_or_create(
-            email="mayor@igorville.com", first_name="Hello", last_name="World"
-        )
-        self.dummy_user_2, _ = User.objects.get_or_create(
-            username="intern@igorville.com", email="intern@igorville.com", first_name="Lava", last_name="World"
-        )
-        self.started_domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.STARTED,
-            name="started.gov",
-        )
-        self.submitted_domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.SUBMITTED,
-            name="submitted.gov",
-        )
-        self.in_review_domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.IN_REVIEW,
-            name="in-review.gov",
-        )
-        self.action_needed_domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.ACTION_NEEDED,
-            name="action-needed.gov",
-        )
-        self.approved_domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.APPROVED,
-            name="approved.gov",
-        )
-        self.withdrawn_domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.WITHDRAWN,
-            name="withdrawn.gov",
-        )
-        self.rejected_domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.REJECTED,
-            name="rejected.gov",
-        )
-        self.ineligible_domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.INELIGIBLE,
-            name="ineligible.gov",
-        )
-
-        # Store all domain request statuses in a variable for ease of use
-        self.all_domain_requests = [
-            self.started_domain_request,
-            self.submitted_domain_request,
-            self.in_review_domain_request,
-            self.action_needed_domain_request,
-            self.approved_domain_request,
-            self.withdrawn_domain_request,
-            self.rejected_domain_request,
-            self.ineligible_domain_request,
-        ]
-
-        self.mock_client = MockSESClient()
-
-    def tearDown(self):
-        super().tearDown()
-        DomainInformation.objects.all().delete()
-        DomainRequest.objects.all().delete()
-        DraftDomain.objects.all().delete()
-        Domain.objects.all().delete()
-        User.objects.all().delete()
-        self.mock_client.EMAILS_SENT.clear()
-
-    def assertNotRaises(self, exception_type):
-        """Helper method for testing allowed transitions."""
-        with less_console_noise():
-            return self.assertRaises(Exception, None, exception_type)
-
-    @less_console_noise_decorator
-    def test_request_is_withdrawable(self):
-        """Tests the is_withdrawable function"""
-        domain_request_1 = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.SUBMITTED,
-            name="city2.gov",
-        )
-        domain_request_2 = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.IN_REVIEW,
-            name="city3.gov",
-        )
-        domain_request_3 = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.ACTION_NEEDED,
-            name="city4.gov",
-        )
-        domain_request_4 = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.REJECTED,
-            name="city5.gov",
-        )
-        self.assertTrue(domain_request_1.is_withdrawable())
-        self.assertTrue(domain_request_2.is_withdrawable())
-        self.assertTrue(domain_request_3.is_withdrawable())
-        self.assertFalse(domain_request_4.is_withdrawable())
-
-    @less_console_noise_decorator
-    def test_request_is_awaiting_review(self):
-        """Tests the is_awaiting_review function"""
-        domain_request_1 = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.SUBMITTED,
-            name="city2.gov",
-        )
-        domain_request_2 = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.IN_REVIEW,
-            name="city3.gov",
-        )
-        domain_request_3 = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.ACTION_NEEDED,
-            name="city4.gov",
-        )
-        domain_request_4 = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.REJECTED,
-            name="city5.gov",
-        )
-        self.assertTrue(domain_request_1.is_awaiting_review())
-        self.assertTrue(domain_request_2.is_awaiting_review())
-        self.assertFalse(domain_request_3.is_awaiting_review())
-        self.assertFalse(domain_request_4.is_awaiting_review())
-
-    @less_console_noise_decorator
-    def test_federal_agency_set_to_non_federal_on_approve(self):
-        """Ensures that when the federal_agency field is 'none' when .approve() is called,
-        the field is set to the 'Non-Federal Agency' record"""
-        domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.IN_REVIEW,
-            name="city2.gov",
-            federal_agency=None,
-        )
-
-        # Ensure that the federal agency is None
-        self.assertEqual(domain_request.federal_agency, None)
-
-        # Approve the request
-        domain_request.approve()
-        self.assertEqual(domain_request.status, DomainRequest.DomainRequestStatus.APPROVED)
-
-        # After approval, it should be "Non-Federal agency"
-        expected_federal_agency = FederalAgency.objects.filter(agency="Non-Federal Agency").first()
-        self.assertEqual(domain_request.federal_agency, expected_federal_agency)
-
-    def test_empty_create_fails(self):
-        """Can't create a completely empty domain request."""
-        with less_console_noise():
-            with transaction.atomic():
-                with self.assertRaisesRegex(IntegrityError, "creator"):
-                    DomainRequest.objects.create()
-
-    @less_console_noise_decorator
-    def test_minimal_create(self):
-        """Can create with just a creator."""
-        user, _ = User.objects.get_or_create(username="testy")
-        domain_request = DomainRequest.objects.create(creator=user)
-        self.assertEqual(domain_request.status, DomainRequest.DomainRequestStatus.STARTED)
-
-    @less_console_noise_decorator
-    def test_full_create(self):
-        """Can create with all fields."""
-        user, _ = User.objects.get_or_create(username="testy")
-        contact = Contact.objects.create()
-        com_website, _ = Website.objects.get_or_create(website="igorville.com")
-        gov_website, _ = Website.objects.get_or_create(website="igorville.gov")
-        domain, _ = DraftDomain.objects.get_or_create(name="igorville.gov")
-        domain_request = DomainRequest.objects.create(
-            creator=user,
-            investigator=user,
-            generic_org_type=DomainRequest.OrganizationChoices.FEDERAL,
-            federal_type=BranchChoices.EXECUTIVE,
-            is_election_board=False,
-            organization_name="Test",
-            address_line1="100 Main St.",
-            address_line2="APT 1A",
-            state_territory="CA",
-            zipcode="12345-6789",
-            senior_official=contact,
-            requested_domain=domain,
-            purpose="Igorville rules!",
-            anything_else="All of Igorville loves the dotgov program.",
-            is_policy_acknowledged=True,
-        )
-        domain_request.current_websites.add(com_website)
-        domain_request.alternative_domains.add(gov_website)
-        domain_request.other_contacts.add(contact)
-        domain_request.save()
-
-    @less_console_noise_decorator
-    def test_domain_info(self):
-        """Can create domain info with all fields."""
-        user, _ = User.objects.get_or_create(username="testy")
-        contact = Contact.objects.create()
-        domain, _ = Domain.objects.get_or_create(name="igorville.gov")
-        information = DomainInformation.objects.create(
-            creator=user,
-            generic_org_type=DomainInformation.OrganizationChoices.FEDERAL,
-            federal_type=BranchChoices.EXECUTIVE,
-            is_election_board=False,
-            organization_name="Test",
-            address_line1="100 Main St.",
-            address_line2="APT 1A",
-            state_territory="CA",
-            zipcode="12345-6789",
-            senior_official=contact,
-            purpose="Igorville rules!",
-            anything_else="All of Igorville loves the dotgov program.",
-            is_policy_acknowledged=True,
-            domain=domain,
-        )
-        information.other_contacts.add(contact)
-        information.save()
-        self.assertEqual(information.domain.id, domain.id)
-        self.assertEqual(information.id, domain.domain_info.id)
-
-    @less_console_noise_decorator
-    def test_status_fsm_submit_fail(self):
-        user, _ = User.objects.get_or_create(username="testy")
-        domain_request = DomainRequest.objects.create(creator=user)
-
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-            with less_console_noise():
-                with self.assertRaises(ValueError):
-                    # can't submit a domain request with a null domain name
-                    domain_request.submit()
-
-    @less_console_noise_decorator
-    def test_status_fsm_submit_succeed(self):
-        user, _ = User.objects.get_or_create(username="testy")
-        site = DraftDomain.objects.create(name="igorville.gov")
-        domain_request = DomainRequest.objects.create(creator=user, requested_domain=site)
-
-        # no email sent to creator so this emits a log warning
-
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-            with less_console_noise():
-                domain_request.submit()
-        self.assertEqual(domain_request.status, domain_request.DomainRequestStatus.SUBMITTED)
-
-    @less_console_noise_decorator
-    def check_email_sent(
-        self, domain_request, msg, action, expected_count, expected_content=None, expected_email="mayor@igorville.com"
-    ):
-        """Check if an email was sent after performing an action."""
-        email_allowed, _ = AllowedEmail.objects.get_or_create(email=expected_email)
-        with self.subTest(msg=msg, action=action):
-            with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-                # Perform the specified action
-                action_method = getattr(domain_request, action)
-                action_method()
-                domain_request.save()
-                domain_request.refresh_from_db()
-
-            # Check if an email was sent
-            sent_emails = [
-                email
-                for email in MockSESClient.EMAILS_SENT
-                if expected_email in email["kwargs"]["Destination"]["ToAddresses"]
-            ]
-            self.assertEqual(len(sent_emails), expected_count)
-
-            if expected_content:
-                email_content = sent_emails[0]["kwargs"]["Content"]["Simple"]["Body"]["Text"]["Data"]
-                self.assertIn(expected_content, email_content)
-
-        email_allowed.delete()
-
-    @less_console_noise_decorator
-    def test_submit_from_started_sends_email_to_creator(self):
-        """tests that we send an email to the creator"""
-        msg = "Create a domain request and submit it and see if email was sent when the feature flag is on."
-        domain_request = completed_domain_request(user=self.dummy_user_2)
-        self.check_email_sent(
-            domain_request, msg, "submit", 1, expected_content="Lava", expected_email="intern@igorville.com"
-        )
-
-    @less_console_noise_decorator
-    def test_submit_from_withdrawn_sends_email(self):
-        msg = "Create a withdrawn domain request and submit it and see if email was sent."
-        user, _ = User.objects.get_or_create(username="testy")
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.WITHDRAWN, user=user)
-        self.check_email_sent(domain_request, msg, "submit", 1, expected_content="Hi", expected_email=user.email)
-
-    @less_console_noise_decorator
-    def test_submit_from_action_needed_does_not_send_email(self):
-        msg = "Create a domain request with ACTION_NEEDED status and submit it, check if email was not sent."
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.ACTION_NEEDED)
-        self.check_email_sent(domain_request, msg, "submit", 0)
-
-    @less_console_noise_decorator
-    def test_submit_from_in_review_does_not_send_email(self):
-        msg = "Create a withdrawn domain request and submit it and see if email was sent."
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW)
-        self.check_email_sent(domain_request, msg, "submit", 0)
-
-    @less_console_noise_decorator
-    def test_approve_sends_email(self):
-        msg = "Create a domain request and approve it and see if email was sent."
-        user, _ = User.objects.get_or_create(username="testy")
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=user)
-        self.check_email_sent(domain_request, msg, "approve", 1, expected_content="approved", expected_email=user.email)
-
-    @less_console_noise_decorator
-    def test_withdraw_sends_email(self):
-        msg = "Create a domain request and withdraw it and see if email was sent."
-        user, _ = User.objects.get_or_create(username="testy")
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=user)
-        self.check_email_sent(
-            domain_request, msg, "withdraw", 1, expected_content="withdrawn", expected_email=user.email
-        )
-
-    @less_console_noise_decorator
-    def test_reject_with_prejudice_does_not_send_email(self):
-        msg = "Create a domain request and reject it with prejudice and see if email was sent."
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.APPROVED)
-        self.check_email_sent(domain_request, msg, "reject_with_prejudice", 0)
-
-    @less_console_noise_decorator
-    def assert_fsm_transition_raises_error(self, test_cases, method_to_run):
-        """Given a list of test cases, check if each transition throws the intended error"""
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client), less_console_noise():
-            for domain_request, exception_type in test_cases:
-                with self.subTest(domain_request=domain_request, exception_type=exception_type):
-                    with self.assertRaises(exception_type):
-                        # Retrieve the method by name from the domain_request object and call it
-                        method = getattr(domain_request, method_to_run)
-                        # Call the method
-                        method()
-
-    @less_console_noise_decorator
-    def assert_fsm_transition_does_not_raise_error(self, test_cases, method_to_run):
-        """Given a list of test cases, ensure that none of them throw transition errors"""
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client), less_console_noise():
-            for domain_request, exception_type in test_cases:
-                with self.subTest(domain_request=domain_request, exception_type=exception_type):
-                    try:
-                        # Retrieve the method by name from the DomainRequest object and call it
-                        method = getattr(domain_request, method_to_run)
-                        # Call the method
-                        method()
-                    except exception_type:
-                        self.fail(f"{exception_type} was raised, but it was not expected.")
-
-    @less_console_noise_decorator
-    def test_submit_transition_allowed_with_no_investigator(self):
-        """
-        Tests for attempting to transition without an investigator.
-        For submit, this should be valid in all cases.
-        """
-
-        test_cases = [
-            (self.started_domain_request, TransitionNotAllowed),
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.withdrawn_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to none
-        set_domain_request_investigators(self.all_domain_requests, None)
-
-        self.assert_fsm_transition_does_not_raise_error(test_cases, "submit")
-
-    @less_console_noise_decorator
-    def test_submit_transition_allowed_with_investigator_not_staff(self):
-        """
-        Tests for attempting to transition with an investigator user that is not staff.
-        For submit, this should be valid in all cases.
-        """
-
-        test_cases = [
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to a user with no staff privs
-        user, _ = User.objects.get_or_create(username="pancakesyrup", is_staff=False)
-        set_domain_request_investigators(self.all_domain_requests, user)
-
-        self.assert_fsm_transition_does_not_raise_error(test_cases, "submit")
-
-    @less_console_noise_decorator
-    def test_submit_transition_allowed(self):
-        """
-        Test that calling submit from allowable statuses does raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.started_domain_request, TransitionNotAllowed),
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.withdrawn_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_does_not_raise_error(test_cases, "submit")
-
-    @less_console_noise_decorator
-    def test_submit_transition_allowed_twice(self):
-        """
-        Test that rotating between submit and in_review doesn't throw an error
-        """
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-            try:
-                # Make a submission
-                self.in_review_domain_request.submit()
-
-                # Rerun the old method to get back to the original state
-                self.in_review_domain_request.in_review()
-
-                # Make another submission
-                self.in_review_domain_request.submit()
-            except TransitionNotAllowed:
-                self.fail("TransitionNotAllowed was raised, but it was not expected.")
-
-        self.assertEqual(self.in_review_domain_request.status, DomainRequest.DomainRequestStatus.SUBMITTED)
-
-    @less_console_noise_decorator
-    def test_submit_transition_not_allowed(self):
-        """
-        Test that calling submit against transition rules raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.submitted_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-            (self.ineligible_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_raises_error(test_cases, "submit")
-
-    @less_console_noise_decorator
-    def test_in_review_transition_allowed(self):
-        """
-        Test that calling in_review from allowable statuses does raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.submitted_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-            (self.ineligible_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_does_not_raise_error(test_cases, "in_review")
-
-    @less_console_noise_decorator
-    def test_in_review_transition_not_allowed_with_no_investigator(self):
-        """
-        Tests for attempting to transition without an investigator
-        """
-
-        test_cases = [
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-            (self.ineligible_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to none
-        set_domain_request_investigators(self.all_domain_requests, None)
-
-        self.assert_fsm_transition_raises_error(test_cases, "in_review")
-
-    @less_console_noise_decorator
-    def test_in_review_transition_not_allowed_with_investigator_not_staff(self):
-        """
-        Tests for attempting to transition with an investigator that is not staff.
-        This should throw an exception.
-        """
-
-        test_cases = [
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-            (self.ineligible_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to a user with no staff privs
-        user, _ = User.objects.get_or_create(username="pancakesyrup", is_staff=False)
-        set_domain_request_investigators(self.all_domain_requests, user)
-
-        self.assert_fsm_transition_raises_error(test_cases, "in_review")
-
-    @less_console_noise_decorator
-    def test_in_review_transition_not_allowed(self):
-        """
-        Test that calling in_review against transition rules raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.started_domain_request, TransitionNotAllowed),
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.withdrawn_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_raises_error(test_cases, "in_review")
-
-    @less_console_noise_decorator
-    def test_action_needed_transition_allowed(self):
-        """
-        Test that calling action_needed from allowable statuses does raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-            (self.ineligible_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_does_not_raise_error(test_cases, "action_needed")
-
-    @less_console_noise_decorator
-    def test_action_needed_transition_not_allowed_with_no_investigator(self):
-        """
-        Tests for attempting to transition without an investigator
-        """
-
-        test_cases = [
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-            (self.ineligible_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to none
-        set_domain_request_investigators(self.all_domain_requests, None)
-
-        self.assert_fsm_transition_raises_error(test_cases, "action_needed")
-
-    @less_console_noise_decorator
-    def test_action_needed_transition_not_allowed_with_investigator_not_staff(self):
-        """
-        Tests for attempting to transition with an investigator that is not staff
-        """
-
-        test_cases = [
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-            (self.ineligible_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to a user with no staff privs
-        user, _ = User.objects.get_or_create(username="pancakesyrup", is_staff=False)
-        set_domain_request_investigators(self.all_domain_requests, user)
-
-        self.assert_fsm_transition_raises_error(test_cases, "action_needed")
-
-    @less_console_noise_decorator
-    def test_action_needed_transition_not_allowed(self):
-        """
-        Test that calling action_needed against transition rules raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.started_domain_request, TransitionNotAllowed),
-            (self.submitted_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.withdrawn_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_raises_error(test_cases, "action_needed")
-
-    @less_console_noise_decorator
-    def test_approved_transition_allowed(self):
-        """
-        Test that calling action_needed from allowable statuses does raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.submitted_domain_request, TransitionNotAllowed),
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_does_not_raise_error(test_cases, "approve")
-
-    @less_console_noise_decorator
-    def test_approved_transition_not_allowed_with_no_investigator(self):
-        """
-        Tests for attempting to transition without an investigator
-        """
-
-        test_cases = [
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to none
-        set_domain_request_investigators(self.all_domain_requests, None)
-
-        self.assert_fsm_transition_raises_error(test_cases, "approve")
-
-    @less_console_noise_decorator
-    def test_approved_transition_not_allowed_with_investigator_not_staff(self):
-        """
-        Tests for attempting to transition with an investigator that is not staff
-        """
-
-        test_cases = [
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to a user with no staff privs
-        user, _ = User.objects.get_or_create(username="pancakesyrup", is_staff=False)
-        set_domain_request_investigators(self.all_domain_requests, user)
-
-        self.assert_fsm_transition_raises_error(test_cases, "approve")
-
-    @less_console_noise_decorator
-    def test_approved_skips_sending_email(self):
-        """
-        Test that calling .approve with send_email=False doesn't actually send
-        an email
-        """
-
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-            self.submitted_domain_request.approve(send_email=False)
-
-        # Assert that no emails were sent
-        self.assertEqual(len(self.mock_client.EMAILS_SENT), 0)
-
-    @less_console_noise_decorator
-    def test_approved_transition_not_allowed(self):
-        """
-        Test that calling action_needed against transition rules raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.started_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-            (self.withdrawn_domain_request, TransitionNotAllowed),
-            (self.ineligible_domain_request, TransitionNotAllowed),
-        ]
-        self.assert_fsm_transition_raises_error(test_cases, "approve")
-
-    @less_console_noise_decorator
-    def test_withdraw_transition_allowed(self):
-        """
-        Test that calling action_needed from allowable statuses does raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.submitted_domain_request, TransitionNotAllowed),
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_does_not_raise_error(test_cases, "withdraw")
-
-    @less_console_noise_decorator
-    def test_withdraw_transition_allowed_with_no_investigator(self):
-        """
-        Tests for attempting to transition without an investigator.
-        For withdraw, this should be valid in all cases.
-        """
-
-        test_cases = [
-            (self.submitted_domain_request, TransitionNotAllowed),
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to none
-        set_domain_request_investigators(self.all_domain_requests, None)
-
-        self.assert_fsm_transition_does_not_raise_error(test_cases, "withdraw")
-
-    @less_console_noise_decorator
-    def test_withdraw_transition_allowed_with_investigator_not_staff(self):
-        """
-        Tests for attempting to transition when investigator is not staff.
-        For withdraw, this should be valid in all cases.
-        """
-
-        test_cases = [
-            (self.submitted_domain_request, TransitionNotAllowed),
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to a user with no staff privs
-        user, _ = User.objects.get_or_create(username="pancakesyrup", is_staff=False)
-        set_domain_request_investigators(self.all_domain_requests, user)
-
-        self.assert_fsm_transition_does_not_raise_error(test_cases, "withdraw")
-
-    @less_console_noise_decorator
-    def test_withdraw_transition_not_allowed(self):
-        """
-        Test that calling action_needed against transition rules raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.started_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-            (self.withdrawn_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-            (self.ineligible_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_raises_error(test_cases, "withdraw")
-
-    @less_console_noise_decorator
-    def test_reject_transition_allowed(self):
-        """
-        Test that calling action_needed from allowable statuses does raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_does_not_raise_error(test_cases, "reject")
-
-    @less_console_noise_decorator
-    def test_reject_transition_not_allowed_with_no_investigator(self):
-        """
-        Tests for attempting to transition without an investigator
-        """
-
-        test_cases = [
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to none
-        set_domain_request_investigators(self.all_domain_requests, None)
-
-        self.assert_fsm_transition_raises_error(test_cases, "reject")
-
-    @less_console_noise_decorator
-    def test_reject_transition_not_allowed_with_investigator_not_staff(self):
-        """
-        Tests for attempting to transition when investigator is not staff
-        """
-
-        test_cases = [
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to a user with no staff privs
-        user, _ = User.objects.get_or_create(username="pancakesyrup", is_staff=False)
-        set_domain_request_investigators(self.all_domain_requests, user)
-
-        self.assert_fsm_transition_raises_error(test_cases, "reject")
-
-    @less_console_noise_decorator
-    def test_reject_transition_not_allowed(self):
-        """
-        Test that calling action_needed against transition rules raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.started_domain_request, TransitionNotAllowed),
-            (self.submitted_domain_request, TransitionNotAllowed),
-            (self.withdrawn_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-            (self.ineligible_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_raises_error(test_cases, "reject")
-
-    @less_console_noise_decorator
-    def test_reject_with_prejudice_transition_allowed(self):
-        """
-        Test that calling action_needed from allowable statuses does raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_does_not_raise_error(test_cases, "reject_with_prejudice")
-
-    @less_console_noise_decorator
-    def test_reject_with_prejudice_transition_not_allowed_with_no_investigator(self):
-        """
-        Tests for attempting to transition without an investigator
-        """
-
-        test_cases = [
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to none
-        set_domain_request_investigators(self.all_domain_requests, None)
-
-        self.assert_fsm_transition_raises_error(test_cases, "reject_with_prejudice")
-
-    @less_console_noise_decorator
-    def test_reject_with_prejudice_not_allowed_with_investigator_not_staff(self):
-        """
-        Tests for attempting to transition when investigator is not staff
-        """
-
-        test_cases = [
-            (self.in_review_domain_request, TransitionNotAllowed),
-            (self.action_needed_domain_request, TransitionNotAllowed),
-            (self.approved_domain_request, TransitionNotAllowed),
-            (self.rejected_domain_request, TransitionNotAllowed),
-        ]
-
-        # Set all investigators to a user with no staff privs
-        user, _ = User.objects.get_or_create(username="pancakesyrup", is_staff=False)
-        set_domain_request_investigators(self.all_domain_requests, user)
-
-        self.assert_fsm_transition_raises_error(test_cases, "reject_with_prejudice")
-
-    @less_console_noise_decorator
-    def test_reject_with_prejudice_transition_not_allowed(self):
-        """
-        Test that calling action_needed against transition rules raises TransitionNotAllowed.
-        """
-        test_cases = [
-            (self.started_domain_request, TransitionNotAllowed),
-            (self.submitted_domain_request, TransitionNotAllowed),
-            (self.withdrawn_domain_request, TransitionNotAllowed),
-            (self.ineligible_domain_request, TransitionNotAllowed),
-        ]
-
-        self.assert_fsm_transition_raises_error(test_cases, "reject_with_prejudice")
-
-    @less_console_noise_decorator
-    def test_transition_not_allowed_approved_in_review_when_domain_is_active(self):
-        """Create a domain request with status approved, create a matching domain that
-        is active, and call in_review against transition rules"""
-
-        domain = Domain.objects.create(name=self.approved_domain_request.requested_domain.name)
-        self.approved_domain_request.approved_domain = domain
-        self.approved_domain_request.save()
-
-        # Define a custom implementation for is_active
-        def custom_is_active(self):
-            return True  # Override to return True
-
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-            # Use patch to temporarily replace is_active with the custom implementation
-            with patch.object(Domain, "is_active", custom_is_active):
-                # Now, when you call is_active on Domain, it will return True
-                with self.assertRaises(TransitionNotAllowed):
-                    self.approved_domain_request.in_review()
-
-    @less_console_noise_decorator
-    def test_transition_not_allowed_approved_action_needed_when_domain_is_active(self):
-        """Create a domain request with status approved, create a matching domain that
-        is active, and call action_needed against transition rules"""
-
-        domain = Domain.objects.create(name=self.approved_domain_request.requested_domain.name)
-        self.approved_domain_request.approved_domain = domain
-        self.approved_domain_request.save()
-
-        # Define a custom implementation for is_active
-        def custom_is_active(self):
-            return True  # Override to return True
-
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-            # Use patch to temporarily replace is_active with the custom implementation
-            with patch.object(Domain, "is_active", custom_is_active):
-                # Now, when you call is_active on Domain, it will return True
-                with self.assertRaises(TransitionNotAllowed):
-                    self.approved_domain_request.action_needed()
-
-    @less_console_noise_decorator
-    def test_transition_not_allowed_approved_rejected_when_domain_is_active(self):
-        """Create a domain request with status approved, create a matching domain that
-        is active, and call reject against transition rules"""
-
-        domain = Domain.objects.create(name=self.approved_domain_request.requested_domain.name)
-        self.approved_domain_request.approved_domain = domain
-        self.approved_domain_request.save()
-
-        # Define a custom implementation for is_active
-        def custom_is_active(self):
-            return True  # Override to return True
-
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-            # Use patch to temporarily replace is_active with the custom implementation
-            with patch.object(Domain, "is_active", custom_is_active):
-                # Now, when you call is_active on Domain, it will return True
-                with self.assertRaises(TransitionNotAllowed):
-                    self.approved_domain_request.reject()
-
-    @less_console_noise_decorator
-    def test_transition_not_allowed_approved_ineligible_when_domain_is_active(self):
-        """Create a domain request with status approved, create a matching domain that
-        is active, and call reject_with_prejudice against transition rules"""
-
-        domain = Domain.objects.create(name=self.approved_domain_request.requested_domain.name)
-        self.approved_domain_request.approved_domain = domain
-        self.approved_domain_request.save()
-
-        # Define a custom implementation for is_active
-        def custom_is_active(self):
-            return True  # Override to return True
-
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-            # Use patch to temporarily replace is_active with the custom implementation
-            with patch.object(Domain, "is_active", custom_is_active):
-                # Now, when you call is_active on Domain, it will return True
-                with self.assertRaises(TransitionNotAllowed):
-                    self.approved_domain_request.reject_with_prejudice()
-
-    @less_console_noise_decorator
-    def test_approve_from_rejected_clears_rejection_reason(self):
-        """When transitioning from rejected to approved on a domain request,
-        the rejection_reason is cleared."""
-
-        # Create a sample domain request
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.REJECTED)
-        domain_request.rejection_reason = DomainRequest.RejectionReasons.DOMAIN_PURPOSE
-
-        # Approve
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-            domain_request.approve()
-
-        self.assertEqual(domain_request.status, DomainRequest.DomainRequestStatus.APPROVED)
-        self.assertEqual(domain_request.rejection_reason, None)
-
-    @less_console_noise_decorator
-    def test_in_review_from_rejected_clears_rejection_reason(self):
-        """When transitioning from rejected to in_review on a domain request,
-        the rejection_reason is cleared."""
-
-        # Create a sample domain request
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.REJECTED)
-        domain_request.domain_is_not_active = True
-        domain_request.rejection_reason = DomainRequest.RejectionReasons.DOMAIN_PURPOSE
-
-        # Approve
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-            domain_request.in_review()
-
-        self.assertEqual(domain_request.status, DomainRequest.DomainRequestStatus.IN_REVIEW)
-        self.assertEqual(domain_request.rejection_reason, None)
-
-    @less_console_noise_decorator
-    def test_action_needed_from_rejected_clears_rejection_reason(self):
-        """When transitioning from rejected to action_needed on a domain request,
-        the rejection_reason is cleared."""
-
-        # Create a sample domain request
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.REJECTED)
-        domain_request.domain_is_not_active = True
-        domain_request.rejection_reason = DomainRequest.RejectionReasons.DOMAIN_PURPOSE
-
-        # Approve
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-            domain_request.action_needed()
-
-        self.assertEqual(domain_request.status, DomainRequest.DomainRequestStatus.ACTION_NEEDED)
-        self.assertEqual(domain_request.rejection_reason, None)
-
-    @less_console_noise_decorator
-    def test_has_rationale_returns_true(self):
-        """has_rationale() returns true when a domain request has no_other_contacts_rationale"""
-        self.started_domain_request.no_other_contacts_rationale = "You talkin' to me?"
-        self.started_domain_request.save()
-        self.assertEquals(self.started_domain_request.has_rationale(), True)
-
-    @less_console_noise_decorator
-    def test_has_rationale_returns_false(self):
-        """has_rationale() returns false when a domain request has no no_other_contacts_rationale"""
-        self.assertEquals(self.started_domain_request.has_rationale(), False)
-
-    @less_console_noise_decorator
-    def test_has_other_contacts_returns_true(self):
-        """has_other_contacts() returns true when a domain request has other_contacts"""
-        # completed_domain_request has other contacts by default
-        self.assertEquals(self.started_domain_request.has_other_contacts(), True)
-
-    @less_console_noise_decorator
-    def test_has_other_contacts_returns_false(self):
-        """has_other_contacts() returns false when a domain request has no other_contacts"""
-        domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.STARTED, name="no-others.gov", has_other_contacts=False
-        )
-        self.assertEquals(domain_request.has_other_contacts(), False)
-
-
 class TestPermissions(TestCase):
     """Test the User-Domain-Role connection."""
 

From 3ba429333415ad55740b93a8ec5a241e09e6491a Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Wed, 9 Oct 2024 08:37:01 -0600
Subject: [PATCH 112/142] Update test_models.py

---
 src/registrar/tests/test_models.py | 37 ------------------------------
 1 file changed, 37 deletions(-)

diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index 7664264c3..5bfdb2937 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -31,46 +31,9 @@ from .common import (
     create_test_user,
 )
 from waffle.testutils import override_flag
-
-import logging
-
 from api.tests.common import less_console_noise_decorator
 
 
-logger = logging.getLogger(__name__)
-
-
-class TestPermissions(TestCase):
-    """Test the User-Domain-Role connection."""
-
-    def setUp(self):
-        super().setUp()
-        self.mock_client = MockSESClient()
-
-    def tearDown(self):
-        super().tearDown()
-        self.mock_client.EMAILS_SENT.clear()
-
-    @boto3_mocking.patching
-    @less_console_noise_decorator
-    def test_approval_creates_role(self):
-        draft_domain, _ = DraftDomain.objects.get_or_create(name="igorville.gov")
-        user, _ = User.objects.get_or_create()
-        investigator, _ = User.objects.get_or_create(username="frenchtoast", is_staff=True)
-        domain_request = DomainRequest.objects.create(
-            creator=user, requested_domain=draft_domain, investigator=investigator
-        )
-
-        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
-            # skip using the submit method
-            domain_request.status = DomainRequest.DomainRequestStatus.SUBMITTED
-            domain_request.approve()
-
-        # should be a role for this user
-        domain = Domain.objects.get(name="igorville.gov")
-        self.assertTrue(UserDomainRole.objects.get(user=user, domain=domain))
-
-
 class TestDomainInformation(TestCase):
     """Test the DomainInformation model, when approved or otherwise"""
 

From bd603f69fb8a854acdb63dd988601b352374078f Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Wed, 9 Oct 2024 08:41:08 -0600
Subject: [PATCH 113/142] Remove space

---
 src/registrar/tests/test_models.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index 5bfdb2937..33ae90da9 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -31,6 +31,7 @@ from .common import (
     create_test_user,
 )
 from waffle.testutils import override_flag
+
 from api.tests.common import less_console_noise_decorator
 
 

From ec1df251b892920466b3f545c3dbe9a8b16197d5 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Wed, 9 Oct 2024 09:04:37 -0600
Subject: [PATCH 114/142] remove bad test + lint

---
 src/registrar/admin.py                      | 4 ++--
 src/registrar/tests/test_models_requests.py | 7 -------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index fda1db672..ac4a5c07f 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -6,8 +6,8 @@ from django.db.models import Value, CharField, Q
 from django.db.models.functions import Concat, Coalesce
 from django.http import HttpResponseRedirect
 from registrar.utility.admin_helpers import (
-    get_action_needed_reason_default_email, 
-    get_rejection_reason_default_email, 
+    get_action_needed_reason_default_email,
+    get_rejection_reason_default_email,
     get_field_links_as_list,
 )
 from django.conf import settings
diff --git a/src/registrar/tests/test_models_requests.py b/src/registrar/tests/test_models_requests.py
index 9e86f5f9c..3be2225ee 100644
--- a/src/registrar/tests/test_models_requests.py
+++ b/src/registrar/tests/test_models_requests.py
@@ -337,13 +337,6 @@ class TestDomainRequest(TestCase):
             domain_request, msg, "withdraw", 1, expected_content="withdrawn", expected_email=user.email
         )
 
-    @less_console_noise_decorator
-    def test_reject_sends_email(self):
-        msg = "Create a domain request and reject it and see if email was sent."
-        user, _ = User.objects.get_or_create(username="testy")
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.APPROVED, user=user)
-        self.check_email_sent(domain_request, msg, "reject", 1, expected_content="Hi", expected_email=user.email)
-
     @less_console_noise_decorator
     def test_reject_with_prejudice_does_not_send_email(self):
         msg = "Create a domain request and reject it with prejudice and see if email was sent."

From ffb8311fd0baf57fac8d9c0a9b78e85acfd599c1 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Wed, 9 Oct 2024 09:21:29 -0600
Subject: [PATCH 115/142] dummy migration ( will revert commit )

---
 ...olioinvitation_portfolio_roles_and_more.py | 40 +++++++++++++++++++
 .../models/utility/portfolio_helper.py        |  2 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 src/registrar/migrations/0133_alter_portfolioinvitation_portfolio_roles_and_more.py

diff --git a/src/registrar/migrations/0133_alter_portfolioinvitation_portfolio_roles_and_more.py b/src/registrar/migrations/0133_alter_portfolioinvitation_portfolio_roles_and_more.py
new file mode 100644
index 000000000..b1c0ef051
--- /dev/null
+++ b/src/registrar/migrations/0133_alter_portfolioinvitation_portfolio_roles_and_more.py
@@ -0,0 +1,40 @@
+# Generated by Django 4.2.10 on 2024-10-09 15:21
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("registrar", "0132_alter_domaininformation_portfolio_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="portfolioinvitation",
+            name="portfolio_roles",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.CharField(
+                    choices=[("organization_admin", "Admin"), ("organization_member", "Members")], max_length=50
+                ),
+                blank=True,
+                help_text="Select one or more roles.",
+                null=True,
+                size=None,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="userportfoliopermission",
+            name="roles",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.CharField(
+                    choices=[("organization_admin", "Admin"), ("organization_member", "Members")], max_length=50
+                ),
+                blank=True,
+                help_text="Select one or more roles.",
+                null=True,
+                size=None,
+            ),
+        ),
+    ]
diff --git a/src/registrar/models/utility/portfolio_helper.py b/src/registrar/models/utility/portfolio_helper.py
index ddb487f71..1ea6b6806 100644
--- a/src/registrar/models/utility/portfolio_helper.py
+++ b/src/registrar/models/utility/portfolio_helper.py
@@ -7,7 +7,7 @@ class UserPortfolioRoleChoices(models.TextChoices):
     """
 
     ORGANIZATION_ADMIN = "organization_admin", "Admin"
-    ORGANIZATION_MEMBER = "organization_member", "Member"
+    ORGANIZATION_MEMBER = "organization_member", "Members"
 
     @classmethod
     def get_user_portfolio_role_label(cls, user_portfolio_role):

From d90810c844c0763f86b84a8c265e55e3e8f81adc Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Wed, 9 Oct 2024 09:26:47 -0600
Subject: [PATCH 116/142] Revert "dummy migration ( will revert commit )"

This reverts commit ffb8311fd0baf57fac8d9c0a9b78e85acfd599c1.
---
 ...olioinvitation_portfolio_roles_and_more.py | 40 -------------------
 .../models/utility/portfolio_helper.py        |  2 +-
 2 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 src/registrar/migrations/0133_alter_portfolioinvitation_portfolio_roles_and_more.py

diff --git a/src/registrar/migrations/0133_alter_portfolioinvitation_portfolio_roles_and_more.py b/src/registrar/migrations/0133_alter_portfolioinvitation_portfolio_roles_and_more.py
deleted file mode 100644
index b1c0ef051..000000000
--- a/src/registrar/migrations/0133_alter_portfolioinvitation_portfolio_roles_and_more.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# Generated by Django 4.2.10 on 2024-10-09 15:21
-
-import django.contrib.postgres.fields
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("registrar", "0132_alter_domaininformation_portfolio_and_more"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="portfolioinvitation",
-            name="portfolio_roles",
-            field=django.contrib.postgres.fields.ArrayField(
-                base_field=models.CharField(
-                    choices=[("organization_admin", "Admin"), ("organization_member", "Members")], max_length=50
-                ),
-                blank=True,
-                help_text="Select one or more roles.",
-                null=True,
-                size=None,
-            ),
-        ),
-        migrations.AlterField(
-            model_name="userportfoliopermission",
-            name="roles",
-            field=django.contrib.postgres.fields.ArrayField(
-                base_field=models.CharField(
-                    choices=[("organization_admin", "Admin"), ("organization_member", "Members")], max_length=50
-                ),
-                blank=True,
-                help_text="Select one or more roles.",
-                null=True,
-                size=None,
-            ),
-        ),
-    ]
diff --git a/src/registrar/models/utility/portfolio_helper.py b/src/registrar/models/utility/portfolio_helper.py
index 1ea6b6806..ddb487f71 100644
--- a/src/registrar/models/utility/portfolio_helper.py
+++ b/src/registrar/models/utility/portfolio_helper.py
@@ -7,7 +7,7 @@ class UserPortfolioRoleChoices(models.TextChoices):
     """
 
     ORGANIZATION_ADMIN = "organization_admin", "Admin"
-    ORGANIZATION_MEMBER = "organization_member", "Members"
+    ORGANIZATION_MEMBER = "organization_member", "Member"
 
     @classmethod
     def get_user_portfolio_role_label(cls, user_portfolio_role):

From 81b959e778372c44ade528e953bb7d159a54384c Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Wed, 9 Oct 2024 12:37:10 -0400
Subject: [PATCH 117/142] updated test

---
 src/registrar/tests/test_views_request.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/registrar/tests/test_views_request.py b/src/registrar/tests/test_views_request.py
index 8530859e2..68a966881 100644
--- a/src/registrar/tests/test_views_request.py
+++ b/src/registrar/tests/test_views_request.py
@@ -522,7 +522,8 @@ class DomainRequestTests(TestWithUser, WebTest):
         # And the existence of the modal's data parked and ready for the js init.
         # The next assert also tests for the passed requested domain context from
         # the view > domain_request_form > modal
-        self.assertContains(review_page, "You are about to submit a domain request for city.gov")
+        self.assertContains(review_page, "You are about to submit a domain request for")
+        self.assertContains(review_page, "city.gov")
 
         # final submission results in a redirect to the "finished" URL
         self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)

From 2da39e9a98ba4745dbc1a2b30c3174b848225a0b Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Wed, 9 Oct 2024 12:38:51 -0600
Subject: [PATCH 118/142] Fix minor bug

---
 src/registrar/views/domain_request.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 9ae288bd2..1dbe9f082 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -443,7 +443,12 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
             requested_domain_name = self.domain_request.requested_domain.name
 
         context_stuff = {}
-        if DomainRequest._form_complete(self.domain_request, self.request):
+
+        # Note: we will want to consolidate the non_org_steps_complete check into the same check that
+        # org_steps_complete is using at some point.
+        non_org_steps_complete = DomainRequest._form_complete(self.domain_request, self.request)
+        org_steps_complete = len(self.db_check_for_unlocking_steps()) == len(self.steps)
+        if (not self.is_portfolio and non_org_steps_complete) or (self.is_portfolio and org_steps_complete):
             modal_button = '<button type="submit" ' 'class="usa-button" ' ">Submit request</button>"
             context_stuff = {
                 "not_form": False,

From 616bdf2584840df873677f51ef98fbdd5368b59a Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Thu, 10 Oct 2024 06:05:53 -0400
Subject: [PATCH 119/142] fixed some additional instances of incorrect error
 message

---
 src/registrar/forms/domain.py                | 8 +++++++-
 src/registrar/forms/domain_request_wizard.py | 6 +++++-
 src/registrar/forms/portfolio.py             | 3 +++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index c4e9fdcb7..e2dd6abb8 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -35,7 +35,10 @@ class DomainAddUserForm(forms.Form):
     email = forms.EmailField(
         label="Email",
         max_length=None,
-        error_messages={"invalid": ("Enter an email address in the required format, like name@example.com.")},
+        error_messages={
+            "invalid": ("Enter an email address in the required format, like name@example.com."),
+            "required": ("Enter an email address in the required format, like name@example.com.")
+        },
         validators=[
             MaxLengthValidator(
                 320,
@@ -461,6 +464,9 @@ class DomainOrgNameAddressForm(forms.ModelForm):
                 message="Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789.",
             )
         ],
+        error_messages={
+            'required': "Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789.",
+        }
     )
 
     class Meta:
diff --git a/src/registrar/forms/domain_request_wizard.py b/src/registrar/forms/domain_request_wizard.py
index 3dc9c157c..343453084 100644
--- a/src/registrar/forms/domain_request_wizard.py
+++ b/src/registrar/forms/domain_request_wizard.py
@@ -226,7 +226,10 @@ class SeniorOfficialForm(RegistrarForm):
     email = forms.EmailField(
         label="Email",
         max_length=None,
-        error_messages={"invalid": ("Enter an email address in the required format, like name@example.com.")},
+        error_messages={
+            "invalid": ("Enter an email address in the required format, like name@example.com."),
+            "required": ("Enter an email address in the required format, like name@example.com.")
+        },
         validators=[
             MaxLengthValidator(
                 320,
@@ -604,6 +607,7 @@ class CisaRepresentativeForm(BaseDeletableRegistrarForm):
         required=False,
         error_messages={
             "invalid": ("Enter an email address in the required format, like name@example.com."),
+            "required": ("Enter an email address in the required format, like name@example.com.")
         },
         validators=[
             MaxLengthValidator(
diff --git a/src/registrar/forms/portfolio.py b/src/registrar/forms/portfolio.py
index 642b6b46e..d8f052b71 100644
--- a/src/registrar/forms/portfolio.py
+++ b/src/registrar/forms/portfolio.py
@@ -20,6 +20,9 @@ class PortfolioOrgAddressForm(forms.ModelForm):
                 message="Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789.",
             )
         ],
+        error_messages={
+            'required': "Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789.",
+        }
     )
 
     class Meta:

From da96454365d379b831716a231bbefa2959e226f9 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Thu, 10 Oct 2024 06:12:30 -0400
Subject: [PATCH 120/142] formatted code for readability

---
 src/registrar/forms/domain.py                | 6 +++---
 src/registrar/forms/domain_request_wizard.py | 4 ++--
 src/registrar/forms/portfolio.py             | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index e2dd6abb8..5a239af2f 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -37,7 +37,7 @@ class DomainAddUserForm(forms.Form):
         max_length=None,
         error_messages={
             "invalid": ("Enter an email address in the required format, like name@example.com."),
-            "required": ("Enter an email address in the required format, like name@example.com.")
+            "required": ("Enter an email address in the required format, like name@example.com."),
         },
         validators=[
             MaxLengthValidator(
@@ -465,8 +465,8 @@ class DomainOrgNameAddressForm(forms.ModelForm):
             )
         ],
         error_messages={
-            'required': "Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789.",
-        }
+            "required": "Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789.",
+        },
     )
 
     class Meta:
diff --git a/src/registrar/forms/domain_request_wizard.py b/src/registrar/forms/domain_request_wizard.py
index 343453084..b99ae3344 100644
--- a/src/registrar/forms/domain_request_wizard.py
+++ b/src/registrar/forms/domain_request_wizard.py
@@ -228,7 +228,7 @@ class SeniorOfficialForm(RegistrarForm):
         max_length=None,
         error_messages={
             "invalid": ("Enter an email address in the required format, like name@example.com."),
-            "required": ("Enter an email address in the required format, like name@example.com.")
+            "required": ("Enter an email address in the required format, like name@example.com."),
         },
         validators=[
             MaxLengthValidator(
@@ -607,7 +607,7 @@ class CisaRepresentativeForm(BaseDeletableRegistrarForm):
         required=False,
         error_messages={
             "invalid": ("Enter an email address in the required format, like name@example.com."),
-            "required": ("Enter an email address in the required format, like name@example.com.")
+            "required": ("Enter an email address in the required format, like name@example.com."),
         },
         validators=[
             MaxLengthValidator(
diff --git a/src/registrar/forms/portfolio.py b/src/registrar/forms/portfolio.py
index d8f052b71..999d76d51 100644
--- a/src/registrar/forms/portfolio.py
+++ b/src/registrar/forms/portfolio.py
@@ -21,8 +21,8 @@ class PortfolioOrgAddressForm(forms.ModelForm):
             )
         ],
         error_messages={
-            'required': "Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789.",
-        }
+            "required": "Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789.",
+        },
     )
 
     class Meta:

From dbfc54837ad41089132f7ed258d60b6579ee0bea Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Thu, 10 Oct 2024 09:06:10 -0600
Subject: [PATCH 121/142] Fix test + some minor cleanup stuff

---
 src/registrar/models/domain_request.py        | 10 ++++++-
 .../admin/includes/detail_table_fieldset.html |  8 +++---
 src/registrar/tests/test_admin_request.py     |  1 -
 src/registrar/tests/test_models_requests.py   | 27 ++++++++++++++++++-
 4 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index 8f6dc44e8..b9e3315d5 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -704,6 +704,7 @@ class DomainRequest(TimeStampedModel):
         # We should never send an email if no reason was specified.
         # Additionally, Don't send out emails for reasons that shouldn't send them.
         if status_info.get("reason") is None or status_info.get("reason") in status_info.get("excluded_reasons"):
+            logger.warning("send_custom_status_update_email() => Tried sending a status email without a reason.")
             return
 
         # Only send out an email if the underlying reason itself changed or if no email was sent previously.
@@ -1064,8 +1065,15 @@ class DomainRequest(TimeStampedModel):
     def reject(self):
         """Reject an domain request that has been submitted.
 
+        This action is logged.
+
+        This action cleans up the action needed status if moving away from action needed.
+
         As side effects this will delete the domain and domain_information
-        (will cascade), and send an email notification using send_custom_status_update_email.
+        (will cascade) when they exist.
+
+        Afterwards, we send out an email for reject in def save().
+        See the function send_custom_status_update_email.
         """
 
         if self.status == self.DomainRequestStatus.APPROVED:
diff --git a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
index 6a46fd9f2..f9aa9ac19 100644
--- a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
+++ b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
@@ -221,9 +221,9 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html)
         </div>
         
         {% if original_object.action_needed_reason_email %}
-        <input id="last-sent-action-needed-email-content" class="display-none" value="{{original_object.action_needed_reason_email}}">
+            <input id="last-sent-action-needed-email-content" class="display-none" value="{{original_object.action_needed_reason_email}}">
         {% else %}
-        <input id="last-sent-action-needed-email-content" class="display-none" value="None">
+            <input id="last-sent-action-needed-email-content" class="display-none" value="None">
         {% endif %}
 
     {% elif field.field.name == "rejection_reason_email" %}
@@ -310,9 +310,9 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html)
         </div>
         
         {% if original_object.rejection_reason_email %}
-        <input id="last-sent-rejection-email-content" class="display-none" value="{{original_object.rejection_reason_email}}">
+            <input id="last-sent-rejection-email-content" class="display-none" value="{{original_object.rejection_reason_email}}">
         {% else %}
-        <input id="last-sent-rejection-email-content" class="display-none" value="None">
+            <input id="last-sent-rejection-email-content" class="display-none" value="None">
         {% endif %}
     {% else %}
         {{ field.field }}
diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py
index cdff63124..217756359 100644
--- a/src/registrar/tests/test_admin_request.py
+++ b/src/registrar/tests/test_admin_request.py
@@ -637,7 +637,6 @@ class TestDomainRequestAdmin(MockEppLib):
         with less_console_noise():
             # Access the arguments passed to send_email
             call_args = self.mock_client.EMAILS_SENT
-            logger.info(f"what are the call args? {call_args}")
             kwargs = call_args[email_index]["kwargs"]
 
             # Retrieve the email details from the arguments
diff --git a/src/registrar/tests/test_models_requests.py b/src/registrar/tests/test_models_requests.py
index 3be2225ee..ea0303230 100644
--- a/src/registrar/tests/test_models_requests.py
+++ b/src/registrar/tests/test_models_requests.py
@@ -267,7 +267,6 @@ class TestDomainRequest(TestCase):
                 domain_request.submit()
         self.assertEqual(domain_request.status, domain_request.DomainRequestStatus.SUBMITTED)
 
-    @less_console_noise_decorator
     def check_email_sent(
         self, domain_request, msg, action, expected_count, expected_content=None, expected_email="mayor@igorville.com"
     ):
@@ -278,6 +277,7 @@ class TestDomainRequest(TestCase):
                 # Perform the specified action
                 action_method = getattr(domain_request, action)
                 action_method()
+                domain_request.save()
 
             # Check if an email was sent
             sent_emails = [
@@ -337,6 +337,31 @@ class TestDomainRequest(TestCase):
             domain_request, msg, "withdraw", 1, expected_content="withdrawn", expected_email=user.email
         )
 
+    def test_reject_sends_email(self):
+        "Create a domain request and reject it and see if email was sent."
+        user, _ = User.objects.get_or_create(username="testy")
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.APPROVED, user=user)
+        expected_email=user.email
+        email_allowed, _ = AllowedEmail.objects.get_or_create(email=expected_email)
+        with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
+            domain_request.reject()
+            domain_request.rejection_reason = domain_request.RejectionReasons.CONTACTS_NOT_VERIFIED
+            domain_request.rejection_reason_email = "test"
+            domain_request.save()
+
+        # Check if an email was sent
+        sent_emails = [
+            email
+            for email in MockSESClient.EMAILS_SENT
+            if expected_email in email["kwargs"]["Destination"]["ToAddresses"]
+        ]
+        self.assertEqual(len(sent_emails), 1)
+
+        email_content = sent_emails[0]["kwargs"]["Content"]["Simple"]["Body"]["Text"]["Data"]
+        self.assertIn("test", email_content)
+
+        email_allowed.delete()
+
     @less_console_noise_decorator
     def test_reject_with_prejudice_does_not_send_email(self):
         msg = "Create a domain request and reject it with prejudice and see if email was sent."

From 3e54bb1e593aeaebf59191857b3994daace0181c Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Thu, 10 Oct 2024 09:52:56 -0600
Subject: [PATCH 122/142] simplify javascript

---
 src/registrar/assets/js/get-gov-admin.js      | 48 +++++++++++--------
 .../admin/includes/detail_table_fieldset.html | 35 +++++++-------
 2 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/src/registrar/assets/js/get-gov-admin.js b/src/registrar/assets/js/get-gov-admin.js
index 01b370366..fd50fbb0c 100644
--- a/src/registrar/assets/js/get-gov-admin.js
+++ b/src/registrar/assets/js/get-gov-admin.js
@@ -444,30 +444,23 @@ class CustomizableEmailBase {
      * @param {Object} config - must contain the following:
      * @property {HTMLElement} dropdown - The dropdown element.
      * @property {HTMLElement} textarea - The textarea element.
-     * @property {HTMLElement} textareaPlaceholder - The placeholder for the textarea.
-     * @property {HTMLElement} directEditButton - The button to directly edit the email.
-     * @property {HTMLElement} modalTrigger - The trigger for the modal.
-     * @property {HTMLElement} modalConfirm - The confirm button in the modal.
-     * @property {HTMLElement} formLabel - The label for the form.
      * @property {HTMLElement} lastSentEmailContent - The last sent email content element.
      * @property {HTMLElement} textAreaFormGroup - The form group for the textarea.
      * @property {HTMLElement} dropdownFormGroup - The form group for the dropdown.
+     * @property {HTMLElement} modalConfirm - The confirm button in the modal.
      * @property {string} apiUrl - The API URL for fetching email content.
      * @property {string} statusToCheck - The status to check against. Used for show/hide on textAreaFormGroup/dropdownFormGroup.
      * @property {string} sessionVariableName - The session variable name. Used for show/hide on textAreaFormGroup/dropdownFormGroup.
      * @property {string} apiErrorMessage - The error message that the ajax call returns.
      */
-    constructor(config) {        
+    constructor(config) {
+        this.config = config;        
         this.dropdown = config.dropdown;
         this.textarea = config.textarea;
-        this.textareaPlaceholder = config.textareaPlaceholder;
-        this.directEditButton = config.directEditButton;
-        this.modalTrigger = config.modalTrigger;
-        this.modalConfirm = config.modalConfirm;
-        this.formLabel = config.formLabel;
         this.lastSentEmailContent = config.lastSentEmailContent;
         this.apiUrl = config.apiUrl;
         this.apiErrorMessage = config.apiErrorMessage;
+        this.modalConfirm = config.modalConfirm;
 
         // These fields are hidden/shown on pageload depending on the current status
         this.textAreaFormGroup = config.textAreaFormGroup;
@@ -481,6 +474,14 @@ class CustomizableEmailBase {
         this.initialDropdownValue = this.dropdown ? this.dropdown.value : null;
         this.initialEmailValue = this.textarea ? this.textarea.value : null;
 
+        // Find other fields near the textarea 
+        const parentDiv = this.textarea ? this.textarea.closest(".flex-container") : null;
+        this.directEditButton = parentDiv ? parentDiv.querySelector(".edit-email-button") : null;
+        this.modalTrigger = parentDiv ? parentDiv.querySelector(".edit-button-modal-trigger") : null;
+
+        this.textareaPlaceholder = parentDiv ? parentDiv.querySelector(".custom-email-placeholder") : null;
+        this.formLabel = this.textarea ? document.querySelector(`label[for="${this.textarea.id}"]`) : null;
+
         this.isEmailAlreadySentConst;
         if (this.lastSentEmailContent && this.textarea) {
             this.isEmailAlreadySentConst = this.lastSentEmailContent.value.replace(/\s+/g, '') === this.textarea.value.replace(/\s+/g, '');
@@ -642,12 +643,8 @@ class customActionNeededEmail extends CustomizableEmailBase {
         const emailConfig = {
             dropdown: document.getElementById("id_action_needed_reason"),
             textarea: document.getElementById("id_action_needed_reason_email"),
-            textareaPlaceholder: document.querySelector(".field-action_needed_reason_email__placeholder"),
-            directEditButton: document.querySelector('.field-action_needed_reason_email__edit'),
-            modalTrigger: document.querySelector('.field-action_needed_reason_email__modal-trigger'),
-            modalConfirm: document.getElementById('confirm-edit-email'),
-            formLabel: document.querySelector('label[for="id_action_needed_reason_email"]'),
             lastSentEmailContent: document.getElementById("last-sent-action-needed-email-content"),
+            modalConfirm: document.getElementById("action-needed-reason__confirm-edit-email"),
             apiUrl: document.getElementById("get-action-needed-email-for-user-json")?.value || null,
             textAreaFormGroup: document.querySelector('.field-action_needed_reason'),
             dropdownFormGroup: document.querySelector('.field-action_needed_reason_email'),
@@ -690,6 +687,13 @@ document.addEventListener('DOMContentLoaded', function() {
 
     // Initialize UI
     const customEmail = new customActionNeededEmail();
+
+    // Check that every variable was setup correctly
+    const nullItems = Object.entries(customEmail.config).filter(([key, value]) => value === null).map(([key]) => key);
+    if (nullItems.length > 0) {
+        console.error(`Failed to load customActionNeededEmail(). Some variables were null: ${nullItems.join(", ")}`)
+        return;
+    }
     customEmail.loadActionNeededEmail()
 });
 
@@ -699,12 +703,8 @@ class customRejectedEmail extends CustomizableEmailBase {
         const emailConfig = {
             dropdown: document.getElementById("id_rejection_reason"),
             textarea: document.getElementById("id_rejection_reason_email"),
-            textareaPlaceholder: document.querySelector(".field-rejection_reason_email__placeholder"),
-            directEditButton: document.querySelector('.field-rejection_reason_email__edit'),
-            modalTrigger: document.querySelector('.field-rejection_reason_email__modal-trigger'),
-            modalConfirm: document.getElementById('confirm-edit-email'),
-            formLabel: document.querySelector('label[for="id_rejection_reason_email"]'),
             lastSentEmailContent: document.getElementById("last-sent-rejection-email-content"),
+            modalConfirm: document.getElementById("rejection-reason__confirm-edit-email"),
             apiUrl: document.getElementById("get-rejection-email-for-user-json")?.value || null,
             textAreaFormGroup: document.querySelector('.field-rejection_reason'),
             dropdownFormGroup: document.querySelector('.field-rejection_reason_email'),
@@ -749,6 +749,12 @@ document.addEventListener('DOMContentLoaded', function() {
 
     // Initialize UI
     const customEmail = new customRejectedEmail();
+    // Check that every variable was setup correctly
+    const nullItems = Object.entries(customEmail.config).filter(([key, value]) => value === null).map(([key]) => key);
+    if (nullItems.length > 0) {
+        console.error(`Failed to load customRejectedEmail(). Some variables were null: ${nullItems.join(", ")}`)
+        return;
+    }
     customEmail.loadRejectedEmail()
 });
 
diff --git a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
index f9aa9ac19..317604c5e 100644
--- a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
+++ b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
@@ -137,29 +137,28 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html)
 
 {% block field_other %}
     {% if field.field.name == "action_needed_reason_email" %}
+        {{ field.field }}
 
-        <div class="margin-top-05 text-faded field-action_needed_reason_email__placeholder">
+        <div class="margin-top-05 text-faded custom-email-placeholder">
             &ndash;
         </div>
 
-        {{ field.field }}
-
         <button
             aria-label="Edit email in textarea"
             type="button"
-            class="usa-button usa-button--unstyled usa-button--dja-link-color usa-button__small-text margin-left-1 text-no-underline field-action_needed_reason_email__edit flex-align-self-start"
+            class="usa-button usa-button--unstyled usa-button--dja-link-color usa-button__small-text margin-left-1 text-no-underline flex-align-self-start edit-email-button"
             ><img src="/public/admin/img/icon-changelink.svg" alt="Change"> Edit email</button
         >
         <a
-            href="#email-already-sent-modal"
-            class="usa-button usa-button--unstyled usa-button--dja-link-color usa-button__small-text text-no-underline margin-left-1 field-action_needed_reason_email__modal-trigger flex-align-self-start"
-            aria-controls="email-already-sent-modal"
+            href="#action-needed-email-already-sent-modal"
+            class="usa-button usa-button--unstyled usa-button--dja-link-color usa-button__small-text text-no-underline margin-left-1 edit-button-modal-trigger flex-align-self-start"
+            aria-controls="action-needed-email-already-sent-modal"
             data-open-modal
             ><img src="/public/admin/img/icon-changelink.svg" alt="Change"> Edit email</a
         >
         <div
             class="usa-modal"
-            id="email-already-sent-modal"
+            id="action-needed-email-already-sent-modal"
             aria-labelledby="Are you sure you want to edit this email?"
             aria-describedby="The creator of this request already received an email"
             >
@@ -187,8 +186,8 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html)
                             <li class="usa-button-group__item">
                                 <button
                                 type="submit" 
+                                id="action-needed-reason__confirm-edit-email"
                                 class="usa-button" 
-                                id="confirm-edit-email"
                                 data-close-modal
                                 >
                                     Yes, continue editing
@@ -227,28 +226,28 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html)
         {% endif %}
 
     {% elif field.field.name == "rejection_reason_email" %}
-        <div class="margin-top-05 text-faded field-rejection_reason_email__placeholder">
+        {{ field.field }}
+
+        <div class="margin-top-05 text-faded custom-email-placeholder">
             &ndash;
         </div>
 
-        {{ field.field }}
-
         <button
             aria-label="Edit email in textarea"
             type="button"
-            class="usa-button usa-button--unstyled usa-button--dja-link-color usa-button__small-text margin-left-1 text-no-underline field-rejection_reason_email__edit flex-align-self-start"
+            class="usa-button usa-button--unstyled usa-button--dja-link-color usa-button__small-text margin-left-1 text-no-underline flex-align-self-start edit-email-button"
             ><img src="/public/admin/img/icon-changelink.svg" alt="Change"> Edit email</button
         >
         <a
-            href="#email-already-sent-modal"
-            class="usa-button usa-button--unstyled usa-button--dja-link-color usa-button__small-text text-no-underline margin-left-1 field-rejection_reason_email__modal-trigger flex-align-self-start"
-            aria-controls="email-already-sent-modal"
+            href="#rejection-reason-email-already-sent-modal"
+            class="usa-button usa-button--unstyled usa-button--dja-link-color usa-button__small-text text-no-underline margin-left-1 edit-button-modal-trigger flex-align-self-start"
+            aria-controls="rejection-reason-email-already-sent-modal"
             data-open-modal
             ><img src="/public/admin/img/icon-changelink.svg" alt="Change"> Edit email</a
         >
         <div
             class="usa-modal"
-            id="email-already-sent-modal"
+            id="rejection-reason-email-already-sent-modal"
             aria-labelledby="Are you sure you want to edit this email?"
             aria-describedby="The creator of this request already received an email"
             >
@@ -276,8 +275,8 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html)
                             <li class="usa-button-group__item">
                                 <button
                                 type="submit" 
+                                id="rejection-reason__confirm-edit-email"
                                 class="usa-button" 
-                                id="confirm-edit-email"
                                 data-close-modal
                                 >
                                     Yes, continue editing

From 3fb9ab576b0692f9a05343b261228bb70e43c9a8 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Thu, 10 Oct 2024 10:01:03 -0600
Subject: [PATCH 123/142] lint

---
 src/registrar/tests/test_models_requests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/tests/test_models_requests.py b/src/registrar/tests/test_models_requests.py
index ea0303230..2d2c615d7 100644
--- a/src/registrar/tests/test_models_requests.py
+++ b/src/registrar/tests/test_models_requests.py
@@ -341,7 +341,7 @@ class TestDomainRequest(TestCase):
         "Create a domain request and reject it and see if email was sent."
         user, _ = User.objects.get_or_create(username="testy")
         domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.APPROVED, user=user)
-        expected_email=user.email
+        expected_email = user.email
         email_allowed, _ = AllowedEmail.objects.get_or_create(email=expected_email)
         with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
             domain_request.reject()

From c2bd4cfe974491ab00eb91943e6cca9d06f87d61 Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Thu, 10 Oct 2024 09:59:58 -0700
Subject: [PATCH 124/142] Update wording for suborganization

---
 src/registrar/templates/domain_suborganization.html | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/registrar/templates/domain_suborganization.html b/src/registrar/templates/domain_suborganization.html
index e6152ecd8..67726e9d5 100644
--- a/src/registrar/templates/domain_suborganization.html
+++ b/src/registrar/templates/domain_suborganization.html
@@ -11,8 +11,13 @@
 
     <p>
         The name of your suborganization will be publicly listed as the domain registrant. 
-        This list of suborganizations has been populated the .gov program. 
-        If you believe there is an error please contact <a href="mailto:help@get.gov" class="usa-link">help@get.gov</a>.
+    </p>
+    <p>
+        When this field is blank, the domain registrant will be listed as the overarching organization: {{ portfolio }}.
+    </p>
+    <p>
+        If you don’t see your suborganization in the menu or need to edit one of the options, 
+        please contact <a href="mailto:help@get.gov" class="usa-link">help@get.gov</a>.
     </p>
 
     {% if has_any_domains_portfolio_permission and has_edit_suborganization_portfolio_permission %}

From ce5a11548e4f2f243f08faebdb6ea1ded7dcbb80 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 11 Oct 2024 10:45:45 -0400
Subject: [PATCH 125/142] updated javascript for code readability

---
 src/registrar/assets/js/get-gov.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index d44e5f2b7..20c988cdc 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -1932,9 +1932,21 @@ class MembersTable extends LoadTableBase {
             const member_name = member.name;
             const member_email = member.email;
             const options = { year: 'numeric', month: 'short', day: 'numeric' };
-            const last_active = member.last_active ? member.last_active != 'Invited' ? new Date(member.last_active) : 'Invited' : null;
-            const last_active_formatted = last_active ? last_active != 'Invited' ? last_active.toLocaleDateString('en-Us', options) : 'Invited' : '';
-            const last_active_sort_value = last_active ? last_active != 'Invited' ? last_active.getTime() : 'Invited' : '';
+            // set last_active values
+            // default values
+            let last_active = null;
+            let last_active_formatted = '';
+            let last_active_sort_value = '';
+            // member.last_active could be null, Invited, or a date; below sets values for all scenarios
+            if (member.last_active && member.last_active != 'Invited') {
+              last_active = new Date(member.last_active);
+              last_active_formatted = last_active.toLocaleDateString('en-Us', options);
+              last_active_sort_value = last_active.getTime();  
+            } else {
+              last_active = 'Invited';
+              last_active_formatted = 'Invited';
+              last_active_sort_value = 'Invited';
+            }
             const action_url = member.action_url;
             const action_label = member.action_label;
             const svg_icon = member.svg_icon;

From a466b991ff5fd8509916d866d5251b7abf9accc4 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 11 Oct 2024 10:50:24 -0400
Subject: [PATCH 126/142] cleanup of imports

---
 src/registrar/forms/portfolio.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/registrar/forms/portfolio.py b/src/registrar/forms/portfolio.py
index b8984023a..4151ea9bd 100644
--- a/src/registrar/forms/portfolio.py
+++ b/src/registrar/forms/portfolio.py
@@ -4,12 +4,12 @@ import logging
 from django import forms
 from django.core.validators import RegexValidator
 
-from registrar.models.portfolio_invitation import PortfolioInvitation
-from registrar.models.user_portfolio_permission import UserPortfolioPermission
+from registrar.models import (
+    PortfolioInvitation, UserPortfolioPermission,
+    UserPortfolioPermission, DomainInformation, Portfolio, SeniorOfficial
+)
 from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices
 
-from ..models import DomainInformation, Portfolio, SeniorOfficial
-
 logger = logging.getLogger(__name__)
 
 

From 20eb1e593babf95e718b6a31bba186f51cbbaa1b Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 11 Oct 2024 10:58:13 -0400
Subject: [PATCH 127/142] renaming of mgmt template to management

---
 .../{member_domain_mgmt.html => member_domain_management.html}  | 0
 src/registrar/templates/includes/summary_item.html              | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename src/registrar/templates/includes/{member_domain_mgmt.html => member_domain_management.html} (100%)

diff --git a/src/registrar/templates/includes/member_domain_mgmt.html b/src/registrar/templates/includes/member_domain_management.html
similarity index 100%
rename from src/registrar/templates/includes/member_domain_mgmt.html
rename to src/registrar/templates/includes/member_domain_management.html
diff --git a/src/registrar/templates/includes/summary_item.html b/src/registrar/templates/includes/summary_item.html
index aae7b8cf9..0600d7ea7 100644
--- a/src/registrar/templates/includes/summary_item.html
+++ b/src/registrar/templates/includes/summary_item.html
@@ -27,7 +27,7 @@
       {% if permissions %}
         {% include "includes/member_permissions.html" with permissions=value %}
       {% elif domain_mgmt %}
-        {% include "includes/member_domain_mgmt.html" with domain_count=value %}
+        {% include "includes/member_domain_management.html" with domain_count=value %}
       {% elif address %}
         {% include "includes/organization_address.html" with organization=value %}
       {% elif contact %}

From a31c5ebe318574c6fdf251f72b98c5225e95ab7c Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 11 Oct 2024 11:05:37 -0400
Subject: [PATCH 128/142] fixed improper handling of booleans in template

---
 src/registrar/templates/portfolio_member.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/registrar/templates/portfolio_member.html b/src/registrar/templates/portfolio_member.html
index 5f18442d6..0275f84e9 100644
--- a/src/registrar/templates/portfolio_member.html
+++ b/src/registrar/templates/portfolio_member.html
@@ -119,18 +119,18 @@
   </address>
 
   {% if portfolio_permission %}
-    {% include "includes/summary_item.html" with title='Member access and permissions' permissions='true' value=portfolio_permission member_has_view_all_requests_portfolio_permission=member_has_view_all_requests_portfolio_permission member_has_edit_request_portfolio_permission=member_has_edit_request_portfolio_permission member_has_view_members_portfolio_permission=member_has_view_members_portfolio_permission member_has_edit_members_portfolio_permission=member_has_edit_members_portfolio_permission edit_link=edit_url editable=has_edit_members_portfolio_permission %}
+    {% include "includes/summary_item.html" with title='Member access and permissions' permissions=True value=portfolio_permission member_has_view_all_requests_portfolio_permission=member_has_view_all_requests_portfolio_permission member_has_edit_request_portfolio_permission=member_has_edit_request_portfolio_permission member_has_view_members_portfolio_permission=member_has_view_members_portfolio_permission member_has_edit_members_portfolio_permission=member_has_edit_members_portfolio_permission edit_link=edit_url editable=has_edit_members_portfolio_permission %}
   {% elif portfolio_invitation %}
-    {% include "includes/summary_item.html" with title='Member access and permissions' permissions='true' value=portfolio_invitation member_has_view_all_requests_portfolio_permission=member_has_view_all_requests_portfolio_permission member_has_edit_request_portfolio_permission=member_has_edit_request_portfolio_permission member_has_view_members_portfolio_permission=member_has_view_members_portfolio_permission member_has_edit_members_portfolio_permission=member_has_edit_members_portfolio_permission edit_link=edit_url editable=has_edit_members_portfolio_permission %}
+    {% include "includes/summary_item.html" with title='Member access and permissions' permissions=True value=portfolio_invitation member_has_view_all_requests_portfolio_permission=member_has_view_all_requests_portfolio_permission member_has_edit_request_portfolio_permission=member_has_edit_request_portfolio_permission member_has_view_members_portfolio_permission=member_has_view_members_portfolio_permission member_has_edit_members_portfolio_permission=member_has_edit_members_portfolio_permission edit_link=edit_url editable=has_edit_members_portfolio_permission %}
   {% endif %}
 
   {% comment %}view_button is passed below as true in all cases. This is because manage_button logic will trump view_button logic; ie. if manage_button is true, view_button will never be looked at{% endcomment %}
   {% if portfolio_permission %}
-    {% include "includes/summary_item.html" with title='Domain management' domain_mgmt='true' value=portfolio_permission.get_managed_domains_count edit_link='#' editable='true' manage_button=has_edit_members_portfolio_permission view_button='true' %}
+    {% include "includes/summary_item.html" with title='Domain management' domain_mgmt=True value=portfolio_permission.get_managed_domains_count edit_link='#' editable=True manage_button=has_edit_members_portfolio_permission view_button=True %}
   {% elif portfolio_invitation %}
-    {% include "includes/summary_item.html" with title='Domain management' domain_mgmt='true' value=portfolio_invitation.get_managed_domains_count edit_link='#' editable='true' manage_button=has_edit_members_portfolio_permission view_button='true' %}
+    {% include "includes/summary_item.html" with title='Domain management' domain_mgmt=True value=portfolio_invitation.get_managed_domains_count edit_link='#' editable=True manage_button=has_edit_members_portfolio_permission view_button=True %}
   {% else %}
-    {% include "includes/summary_item.html" with title='Domain management' domain_mgmt='true' value=0 edit_link='#' editable='true' manage_button=has_edit_members_portfolio_permission view_button='true' %}
+    {% include "includes/summary_item.html" with title='Domain management' domain_mgmt=True value=0 edit_link='#' editable=True manage_button=has_edit_members_portfolio_permission view_button=True %}
   {% endif %}
         
 </div>

From 5c305c8557dbaf27a85c73f3dbe816cc6a9a7413 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 11 Oct 2024 11:15:43 -0400
Subject: [PATCH 129/142] safer handling of None values in json view

---
 src/registrar/views/portfolio_members_json.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/registrar/views/portfolio_members_json.py b/src/registrar/views/portfolio_members_json.py
index 948baa07a..b4e4d230b 100644
--- a/src/registrar/views/portfolio_members_json.py
+++ b/src/registrar/views/portfolio_members_json.py
@@ -89,9 +89,9 @@ def apply_search(data_list, request):
         data_list = [
             item
             for item in data_list
-            if search_term in (item.get("first_name", "") or "").lower()
-            or search_term in (item.get("last_name", "") or "").lower()
-            or search_term in (item.get("email", "") or "").lower()
+            if search_term in item.get("first_name", "").lower()
+            or search_term in item.get("last_name", "").lower()
+            or search_term in item.get("email", "").lower()
         ]
 
     return data_list
@@ -153,11 +153,11 @@ def serialize_members(request, portfolio, item, user):
 
     # ------- SERIALIZE
     member_json = {
-        "id": item["id"],
-        "name": (item["first_name"] or "") + " " + (item["last_name"] or ""),
-        "email": item["email"],
+        "id": item.get("id",""),
+        "name": item.get("first_name", "") + " " + item.get("last_name", ""),
+        "email": item.get("email",""),
         "is_admin": is_admin,
-        "last_active": item["last_active"],
+        "last_active": item.get("last_active", None),
         "action_url": action_url,
         "action_label": ("View" if view_only else "Manage"),
         "svg_icon": ("visibility" if view_only else "settings"),

From 78a08522237b546236c455be6bb8ca4042640067 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 11 Oct 2024 11:23:42 -0400
Subject: [PATCH 130/142] add member button hidden when user does not have
 permission

---
 src/registrar/templates/portfolio_members.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/registrar/templates/portfolio_members.html b/src/registrar/templates/portfolio_members.html
index 82e06c808..ffdb63099 100644
--- a/src/registrar/templates/portfolio_members.html
+++ b/src/registrar/templates/portfolio_members.html
@@ -18,6 +18,7 @@
           <div class="mobile:grid-col-12 tablet:grid-col-6">
               <h1 id="members-header">Members</h1>
           </div>
+          {% if has_edit_members_portfolio_permission %}
           <div class="mobile:grid-col-12 tablet:grid-col-6">
               <p class="float-right-tablet tablet:margin-y-0">
                   <a href="#" class="usa-button"
@@ -26,6 +27,7 @@
                   </a>
               </p>
           </div>
+          {% endif %}
   </div>
   
     {% include "includes/members_table.html" with portfolio=portfolio %}

From b683bb1d45a80efecc21422e3dc4cc8d469f9cc1 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Fri, 11 Oct 2024 16:09:58 -0400
Subject: [PATCH 131/142] fix first and last name join and lint

---
 src/registrar/forms/portfolio.py              | 8 ++++++--
 src/registrar/views/portfolio_members_json.py | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/registrar/forms/portfolio.py b/src/registrar/forms/portfolio.py
index 4151ea9bd..61c2215fa 100644
--- a/src/registrar/forms/portfolio.py
+++ b/src/registrar/forms/portfolio.py
@@ -5,8 +5,12 @@ from django import forms
 from django.core.validators import RegexValidator
 
 from registrar.models import (
-    PortfolioInvitation, UserPortfolioPermission,
-    UserPortfolioPermission, DomainInformation, Portfolio, SeniorOfficial
+    PortfolioInvitation,
+    UserPortfolioPermission,
+    UserPortfolioPermission,
+    DomainInformation,
+    Portfolio,
+    SeniorOfficial,
 )
 from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices
 
diff --git a/src/registrar/views/portfolio_members_json.py b/src/registrar/views/portfolio_members_json.py
index b4e4d230b..15cda5a9d 100644
--- a/src/registrar/views/portfolio_members_json.py
+++ b/src/registrar/views/portfolio_members_json.py
@@ -153,9 +153,9 @@ def serialize_members(request, portfolio, item, user):
 
     # ------- SERIALIZE
     member_json = {
-        "id": item.get("id",""),
-        "name": item.get("first_name", "") + " " + item.get("last_name", ""),
-        "email": item.get("email",""),
+        "id": item.get("id", ""),
+        "name": " ".join(filter(None, [item.get("first_name", ""), item.get("last_name", "")])),
+        "email": item.get("email", ""),
         "is_admin": is_admin,
         "last_active": item.get("last_active", None),
         "action_url": action_url,

From 1aaafb205a07fc95a82f455f7b480873e0d1ea9f Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Fri, 11 Oct 2024 16:15:38 -0400
Subject: [PATCH 132/142] fix search

---
 src/registrar/views/portfolio_members_json.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/registrar/views/portfolio_members_json.py b/src/registrar/views/portfolio_members_json.py
index 15cda5a9d..7c9e9c4f7 100644
--- a/src/registrar/views/portfolio_members_json.py
+++ b/src/registrar/views/portfolio_members_json.py
@@ -89,9 +89,9 @@ def apply_search(data_list, request):
         data_list = [
             item
             for item in data_list
-            if search_term in item.get("first_name", "").lower()
-            or search_term in item.get("last_name", "").lower()
-            or search_term in item.get("email", "").lower()
+            if item.get("first_name", "") and search_term in item.get("first_name", "").lower()
+            or item.get("last_name", "") and search_term in item.get("last_name", "").lower()
+            or item.get("email", "") and search_term in item.get("email", "").lower()
         ]
 
     return data_list

From b103a307e657620c12102d7b1a64f9e8f4f81958 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Fri, 11 Oct 2024 16:17:24 -0400
Subject: [PATCH 133/142] lint

---
 src/registrar/forms/portfolio.py              | 1 -
 src/registrar/views/portfolio_members_json.py | 9 ++++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/registrar/forms/portfolio.py b/src/registrar/forms/portfolio.py
index 61c2215fa..d24943aac 100644
--- a/src/registrar/forms/portfolio.py
+++ b/src/registrar/forms/portfolio.py
@@ -7,7 +7,6 @@ from django.core.validators import RegexValidator
 from registrar.models import (
     PortfolioInvitation,
     UserPortfolioPermission,
-    UserPortfolioPermission,
     DomainInformation,
     Portfolio,
     SeniorOfficial,
diff --git a/src/registrar/views/portfolio_members_json.py b/src/registrar/views/portfolio_members_json.py
index 7c9e9c4f7..4978d422b 100644
--- a/src/registrar/views/portfolio_members_json.py
+++ b/src/registrar/views/portfolio_members_json.py
@@ -89,9 +89,12 @@ def apply_search(data_list, request):
         data_list = [
             item
             for item in data_list
-            if item.get("first_name", "") and search_term in item.get("first_name", "").lower()
-            or item.get("last_name", "") and search_term in item.get("last_name", "").lower()
-            or item.get("email", "") and search_term in item.get("email", "").lower()
+            if item.get("first_name", "")
+            and search_term in item.get("first_name", "").lower()
+            or item.get("last_name", "")
+            and search_term in item.get("last_name", "").lower()
+            or item.get("email", "")
+            and search_term in item.get("email", "").lower()
         ]
 
     return data_list

From af83636e02ec0f6055dfb67b5c67dfd7f696f413 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Fri, 11 Oct 2024 17:47:03 -0400
Subject: [PATCH 134/142] refactor portfolio_members_json and move back the
 computation to the ORM

---
 src/registrar/assets/js/get-gov.js            |  35 ++--
 src/registrar/views/portfolio_members_json.py | 196 ++++++++----------
 2 files changed, 104 insertions(+), 127 deletions(-)

diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index 20c988cdc..5c1967d15 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -1880,11 +1880,10 @@ class MembersTable extends LoadTableBase {
      * @param {*} sortBy - the sort column option
      * @param {*} order - the sort order {asc, desc}
      * @param {*} scroll - control for the scrollToElement functionality
-     * @param {*} status - control for the status filter
      * @param {*} searchTerm - the search term
      * @param {*} portfolio - the portfolio id
      */
-  loadTable(page, sortBy = this.currentSortBy, order = this.currentOrder, scroll = this.scrollToTable, status = this.currentStatus, searchTerm =this.currentSearchTerm, portfolio = this.portfolioValue) {
+  loadTable(page, sortBy = this.currentSortBy, order = this.currentOrder, scroll = this.scrollToTable, searchTerm =this.currentSearchTerm, portfolio = this.portfolioValue) {
 
       // --------- SEARCH
       let searchParams = new URLSearchParams(
@@ -1892,7 +1891,6 @@ class MembersTable extends LoadTableBase {
           "page": page,
           "sort_by": sortBy,
           "order": order,
-          "status": status,
           "search_term": searchTerm
         }
       );
@@ -1932,21 +1930,34 @@ class MembersTable extends LoadTableBase {
             const member_name = member.name;
             const member_email = member.email;
             const options = { year: 'numeric', month: 'short', day: 'numeric' };
-            // set last_active values
-            // default values
-            let last_active = null;
+            
+            // Handle last_active values
+            let last_active = member.last_active;
             let last_active_formatted = '';
             let last_active_sort_value = '';
-            // member.last_active could be null, Invited, or a date; below sets values for all scenarios
-            if (member.last_active && member.last_active != 'Invited') {
-              last_active = new Date(member.last_active);
-              last_active_formatted = last_active.toLocaleDateString('en-Us', options);
-              last_active_sort_value = last_active.getTime();  
+
+            // Handle 'Invited' or null/empty values differently from valid dates
+            if (last_active && last_active !== 'Invited') {
+              try {
+                // Try to parse the last_active as a valid date
+                last_active = new Date(last_active);
+                if (!isNaN(last_active)) {
+                  last_active_formatted = last_active.toLocaleDateString('en-US', options);
+                  last_active_sort_value = last_active.getTime();  // For sorting purposes
+                } else {
+                  last_active_formatted='Invalid date'                  
+                }
+              } catch (e) {
+                console.error(`Error parsing date: ${last_active}. Error: ${e}`);
+                last_active_formatted='Invalid date'
+              }
             } else {
+              // Handle 'Invited' or null
               last_active = 'Invited';
               last_active_formatted = 'Invited';
-              last_active_sort_value = 'Invited';
+              last_active_sort_value = 'Invited'; // Keep 'Invited' as a sortable string
             }
+
             const action_url = member.action_url;
             const action_label = member.action_label;
             const svg_icon = member.svg_icon;
diff --git a/src/registrar/views/portfolio_members_json.py b/src/registrar/views/portfolio_members_json.py
index 4978d422b..627d82416 100644
--- a/src/registrar/views/portfolio_members_json.py
+++ b/src/registrar/views/portfolio_members_json.py
@@ -1,8 +1,9 @@
-from datetime import datetime
 from django.http import JsonResponse
 from django.core.paginator import Paginator
 from django.contrib.auth.decorators import login_required
+from django.db.models import Value, F, CharField, TextField, Q
 from django.urls import reverse
+from django.db.models.functions import Cast
 
 from registrar.models.portfolio_invitation import PortfolioInvitation
 from registrar.models.user_portfolio_permission import UserPortfolioPermission
@@ -11,58 +12,85 @@ from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices
 
 @login_required
 def get_portfolio_members_json(request):
-    """Given the current request,
-    get all members that are associated with the given portfolio"""
+    """Fetch members (permissions and invitations) for the given portfolio."""
     portfolio = request.GET.get("portfolio")
+    search_term = request.GET.get("search_term", "").lower()
+
+    # Permissions queryset
+    permissions = UserPortfolioPermission.objects.filter(portfolio=portfolio)
+
+    if search_term:
+        permissions = permissions.filter(
+            Q(user__first_name__icontains=search_term)
+            | Q(user__last_name__icontains=search_term)
+            | Q(user__email__icontains=search_term)
+        )
 
     permissions = (
-        UserPortfolioPermission.objects.filter(portfolio=portfolio)
-        .select_related("user")
-        .values_list("pk", "user__first_name", "user__last_name", "user__email", "user__last_login", "roles")
-    )
-    invitations = PortfolioInvitation.objects.filter(portfolio=portfolio).values_list(
-        "pk", "email", "roles", "additional_permissions", "status"
+        permissions.select_related("user")
+        .annotate(
+            first_name=F("user__first_name"),
+            last_name=F("user__last_name"),
+            email_display=F("user__email"),
+            last_active=Cast(F("user__last_login"), output_field=TextField()),  # Cast last_login to text
+            roles_display=F("roles"),
+            additional_permissions_display=F("additional_permissions"),
+            source=Value("permission", output_field=CharField()),
+        )
+        .values(
+            "id",
+            "first_name",
+            "last_name",
+            "email_display",
+            "last_active",
+            "roles_display",
+            "additional_permissions_display",
+            "source",
+        )
     )
 
-    # Convert the permissions queryset into a list of dictionaries
-    permission_list = [
-        {
-            "id": perm[0],
-            "first_name": perm[1],
-            "last_name": perm[2],
-            "email": perm[3],
-            "last_active": perm[4],
-            "roles": perm[5],
-            "source": "permission",  # Mark the source as permissions
-        }
-        for perm in permissions
-    ]
+    # Invitations queryset
+    invitations = PortfolioInvitation.objects.filter(portfolio=portfolio)
 
-    # Convert the invitations queryset into a list of dictionaries
-    invitation_list = [
-        {
-            "id": invite[0],
-            "first_name": None,  # No first name in invitations
-            "last_name": None,  # No last name in invitations
-            "email": invite[1],
-            "roles": invite[2],
-            "additional_permissions": invite[3],
-            "status": invite[4],
-            "last_active": "Invited",
-            "source": "invitation",  # Mark the source as invitations
-        }
-        for invite in invitations
-    ]
+    if search_term:
+        invitations = invitations.filter(Q(email__icontains=search_term))
 
-    # Combine both lists into one unified list
-    combined_list = permission_list + invitation_list
+    invitations = invitations.annotate(
+        first_name=Value(None, output_field=CharField()),
+        last_name=Value(None, output_field=CharField()),
+        email_display=F("email"),
+        last_active=Value("Invited", output_field=TextField()),  # Use "Invited" as a text value
+        roles_display=F("roles"),
+        additional_permissions_display=F("additional_permissions"),
+        source=Value("invitation", output_field=CharField()),
+    ).values(
+        "id",
+        "first_name",
+        "last_name",
+        "email_display",
+        "last_active",
+        "roles_display",
+        "additional_permissions_display",
+        "source",
+    )
 
-    unfiltered_total = len(combined_list)
+    # Union the two querysets after applying search filters
+    combined_queryset = permissions.union(invitations)
 
-    combined_list = apply_search(combined_list, request)
-    combined_list = apply_sorting(combined_list, request)
+    # Apply sorting
+    sort_by = request.GET.get("sort_by", "id")  # Default to 'id'
+    order = request.GET.get("order", "asc")  # Default to 'asc'
 
-    paginator = Paginator(combined_list, 10)
+    # Adjust sort_by to match the annotated fields in the unioned queryset
+    if sort_by == "member":
+        sort_by = "email_display"  # Use email_display instead of email
+
+    if order == "desc":
+        combined_queryset = combined_queryset.order_by(F(sort_by).desc())
+    else:
+        combined_queryset = combined_queryset.order_by(sort_by)
+
+    paginator = Paginator(combined_queryset, 10)
     page_number = request.GET.get("page", 1)
     page_obj = paginator.get_page(page_number)
 
@@ -76,91 +104,29 @@ def get_portfolio_members_json(request):
             "has_previous": page_obj.has_previous(),
             "has_next": page_obj.has_next(),
             "total": paginator.count,
-            "unfiltered_total": unfiltered_total,
+            "unfiltered_total": combined_queryset.count(),
         }
     )
 
 
-def apply_search(data_list, request):
-    search_term = request.GET.get("search_term", "").lower()
-
-    if search_term:
-        # Filter the list based on the search term (case-insensitive)
-        data_list = [
-            item
-            for item in data_list
-            if item.get("first_name", "")
-            and search_term in item.get("first_name", "").lower()
-            or item.get("last_name", "")
-            and search_term in item.get("last_name", "").lower()
-            or item.get("email", "")
-            and search_term in item.get("email", "").lower()
-        ]
-
-    return data_list
-
-
-def apply_sorting(data_list, request):
-    sort_by = request.GET.get("sort_by", "id")  # Default to 'id'
-    order = request.GET.get("order", "asc")  # Default to 'asc'
-
-    if sort_by == "member":
-        sort_by = "email"
-
-    # Custom key function that handles None, 'Invited', and datetime values for last_active
-    def sort_key(item):
-        value = item.get(sort_by)
-        if sort_by == "last_active":
-            # Return a tuple to ensure consistent data types for comparison
-            # First element: ordering value (0 for valid datetime, 1 for 'Invited', 2 for None)
-            # Second element: the actual value to sort by
-            if value is None:
-                return (2, value)  # Position None last
-            if value == "Invited":
-                return (1, value)  # Position 'Invited' before None but after valid datetimes
-            if isinstance(value, datetime):
-                return (0, value)  # Position valid datetime values first
-
-        # Default case: return the value as is for comparison
-        return value
-
-    # Sort the list using the custom key function
-    data_list = sorted(data_list, key=sort_key, reverse=(order == "desc"))
-
-    return data_list
-
-
 def serialize_members(request, portfolio, item, user):
-    # ------- VIEW ONLY
-    # If not view_only (the user has permissions to edit/manage users), show the gear icon with "Manage" link.
-    # If view_only (the user only has view user permissions), show the "View" link (no gear icon).
-    # We check on user_group_permision to account for the upcoming "Manage portfolio" button on admin.
-    user_can_edit_other_users = False
-    for user_group_permission in ["registrar.full_access_permission", "registrar.change_user"]:
-        if user.has_perm(user_group_permission):
-            user_can_edit_other_users = True
-            break
+    # Check if the user can edit other users
+    user_can_edit_other_users = any(
+        user.has_perm(perm) for perm in ["registrar.full_access_permission", "registrar.change_user"]
+    )
 
     view_only = not user.has_edit_members_portfolio_permission(portfolio) or not user_can_edit_other_users
 
-    # ------- USER STATUSES
-    is_admin = False
-    if item["roles"]:
-        is_admin = UserPortfolioRoleChoices.ORGANIZATION_ADMIN in item["roles"]
+    is_admin = UserPortfolioRoleChoices.ORGANIZATION_ADMIN in item.get("roles_display", [])
+    action_url = reverse("member" if item["source"] == "permission" else "invitedmember", kwargs={"pk": item["id"]})
 
-    action_url = "#"
-    if item["source"] == "permission":
-        action_url = reverse("member", kwargs={"pk": item["id"]})
-    elif item["source"] == "invitation":
-        action_url = reverse("invitedmember", kwargs={"pk": item["id"]})
-
-    # ------- SERIALIZE
+    # Serialize member data
     member_json = {
         "id": item.get("id", ""),
         "name": " ".join(filter(None, [item.get("first_name", ""), item.get("last_name", "")])),
-        "email": item.get("email", ""),
+        "email": item.get("email_display", ""),
         "is_admin": is_admin,
-        "last_active": item.get("last_active", None),
+        "last_active": item.get("last_active", ""),
         "action_url": action_url,
         "action_label": ("View" if view_only else "Manage"),
         "svg_icon": ("visibility" if view_only else "settings"),

From 0bd48030e5441c572a3600220840e5391f4f4263 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Fri, 11 Oct 2024 18:08:15 -0400
Subject: [PATCH 135/142] fix active class on member link

---
 src/registrar/templatetags/custom_filters.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/registrar/templatetags/custom_filters.py b/src/registrar/templatetags/custom_filters.py
index a3f35ae8e..592839a46 100644
--- a/src/registrar/templatetags/custom_filters.py
+++ b/src/registrar/templatetags/custom_filters.py
@@ -248,6 +248,10 @@ def is_members_subpage(path):
     # Since our pages aren't unified under a common path, we need this approach for now.
     url_names = [
         "members",
+        "member",
+        "member-permissions",
+        "invitedmember",
+        "invitedmember-permissions"
     ]
     return get_url_name(path) in url_names
 

From 1cd6fdda15046172b49d2170dfea10d80d185a59 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Sat, 12 Oct 2024 09:45:19 -0400
Subject: [PATCH 136/142] refactored members_json, fixed unfiltered_total, and
 member sorting

---
 src/registrar/assets/js/get-gov.js            |   3 +-
 src/registrar/views/portfolio_members_json.py | 184 +++++++++++-------
 2 files changed, 111 insertions(+), 76 deletions(-)

diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index 5c1967d15..baacaee48 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -1929,6 +1929,7 @@ class MembersTable extends LoadTableBase {
           data.members.forEach(member => {
             const member_name = member.name;
             const member_email = member.email;
+            const member_sort_value = member.member_sort_value;
             const options = { year: 'numeric', month: 'short', day: 'numeric' };
             
             // Handle last_active values
@@ -1970,7 +1971,7 @@ class MembersTable extends LoadTableBase {
 
             row.innerHTML = `
               <th scope="row" role="rowheader" data-label="member email">
-                ${member_email ? member_email : member_name} ${admin_tagHTML}
+                ${member_sort_value} ${admin_tagHTML}
               </th>
               <td data-sort-value="${last_active_sort_value}" data-label="last_active">
                 ${last_active_formatted}
diff --git a/src/registrar/views/portfolio_members_json.py b/src/registrar/views/portfolio_members_json.py
index 627d82416..684f0d337 100644
--- a/src/registrar/views/portfolio_members_json.py
+++ b/src/registrar/views/portfolio_members_json.py
@@ -1,7 +1,8 @@
 from django.http import JsonResponse
 from django.core.paginator import Paginator
 from django.contrib.auth.decorators import login_required
-from django.db.models import Value, F, CharField, TextField, Q
+from django.db.models import Value, F, CharField, TextField, Q, Case, When
+from django.db.models.functions import Concat, Coalesce
 from django.urls import reverse
 from django.db.models.functions import Cast
 
@@ -13,84 +14,24 @@ from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices
 @login_required
 def get_portfolio_members_json(request):
     """Fetch members (permissions and invitations) for the given portfolio."""
+    
     portfolio = request.GET.get("portfolio")
-    search_term = request.GET.get("search_term", "").lower()
 
-    # Permissions queryset
-    permissions = UserPortfolioPermission.objects.filter(portfolio=portfolio)
+    # Two initial querysets which will be combined
+    permissions = initial_permissions_search(portfolio)
+    invitations = initial_invitations_search(portfolio)
 
-    if search_term:
-        permissions = permissions.filter(
-            Q(user__first_name__icontains=search_term)
-            | Q(user__last_name__icontains=search_term)
-            | Q(user__email__icontains=search_term)
-        )
+    # Get total across both querysets before applying filters
+    unfiltered_total = permissions.count() + invitations.count()
+    
+    permissions = apply_search_term(permissions, request)
+    invitations = apply_search_term(permissions, request)
 
-    permissions = (
-        permissions.select_related("user")
-        .annotate(
-            first_name=F("user__first_name"),
-            last_name=F("user__last_name"),
-            email_display=F("user__email"),
-            last_active=Cast(F("user__last_login"), output_field=TextField()),  # Cast last_login to text
-            roles_display=F("roles"),
-            additional_permissions_display=F("additional_permissions"),
-            source=Value("permission", output_field=CharField()),
-        )
-        .values(
-            "id",
-            "first_name",
-            "last_name",
-            "email_display",
-            "last_active",
-            "roles_display",
-            "additional_permissions_display",
-            "source",
-        )
-    )
+    # Union the two querysets
+    objects = permissions.union(invitations)
+    objects = apply_sorting(objects, request)
 
-    # Invitations queryset
-    invitations = PortfolioInvitation.objects.filter(portfolio=portfolio)
-
-    if search_term:
-        invitations = invitations.filter(Q(email__icontains=search_term))
-
-    invitations = invitations.annotate(
-        first_name=Value(None, output_field=CharField()),
-        last_name=Value(None, output_field=CharField()),
-        email_display=F("email"),
-        last_active=Value("Invited", output_field=TextField()),  # Use "Invited" as a text value
-        roles_display=F("roles"),
-        additional_permissions_display=F("additional_permissions"),
-        source=Value("invitation", output_field=CharField()),
-    ).values(
-        "id",
-        "first_name",
-        "last_name",
-        "email_display",
-        "last_active",
-        "roles_display",
-        "additional_permissions_display",
-        "source",
-    )
-
-    # Union the two querysets after applying search filters
-    combined_queryset = permissions.union(invitations)
-
-    # Apply sorting
-    sort_by = request.GET.get("sort_by", "id")  # Default to 'id'
-    order = request.GET.get("order", "asc")  # Default to 'asc'
-
-    # Adjust sort_by to match the annotated fields in the unioned queryset
-    if sort_by == "member":
-        sort_by = "email_display"  # Use email_display instead of email
-
-    if order == "desc":
-        combined_queryset = combined_queryset.order_by(F(sort_by).desc())
-    else:
-        combined_queryset = combined_queryset.order_by(sort_by)
-
-    paginator = Paginator(combined_queryset, 10)
+    paginator = Paginator(objects, 10)
     page_number = request.GET.get("page", 1)
     page_obj = paginator.get_page(page_number)
 
@@ -104,10 +45,102 @@ def get_portfolio_members_json(request):
             "has_previous": page_obj.has_previous(),
             "has_next": page_obj.has_next(),
             "total": paginator.count,
-            "unfiltered_total": combined_queryset.count(),
+            "unfiltered_total": unfiltered_total,
         }
     )
 
+def initial_permissions_search(portfolio):
+    """Perform initial search for permissions before applying any filters."""
+    permissions = UserPortfolioPermission.objects.filter(portfolio=portfolio)
+    permissions = (
+        permissions.select_related("user")
+        .annotate(
+            first_name=F("user__first_name"),
+            last_name=F("user__last_name"),
+            email_display=F("user__email"),
+            last_active=Cast(F("user__last_login"), output_field=TextField()),  # Cast last_login to text
+            roles_display=F("roles"),
+            additional_permissions_display=F("additional_permissions"),
+            member_sort_value=Case(
+                # If email is present and not blank, use email
+                When(Q(user__email__isnull=False) & ~Q(user__email=""), then=F("user__email")),
+                # If first name or last name is present, use concatenation of first_name + " " + last_name
+                When(Q(user__first_name__isnull=False) | Q(user__last_name__isnull=False), 
+                 then=Concat(
+                     Coalesce(F("user__first_name"), Value("")),
+                     Value(" "),
+                     Coalesce(F("user__last_name"), Value(""))
+                 )
+            ),
+            # If neither, use an empty string
+            default=Value(""),
+            output_field=CharField()
+        ),
+            source=Value("permission", output_field=CharField()),
+        )
+        .values(
+            "id",
+            "first_name",
+            "last_name",
+            "email_display",
+            "last_active",
+            "roles_display",
+            "additional_permissions_display",
+            "member_sort_value",
+            "source",
+        )
+    )
+    return permissions
+
+def initial_invitations_search(portfolio):
+    """Perform initial invitations search before applying any filters."""
+    invitations = PortfolioInvitation.objects.filter(portfolio=portfolio)
+    invitations = invitations.annotate(
+        first_name=Value(None, output_field=CharField()),
+        last_name=Value(None, output_field=CharField()),
+        email_display=F("email"),
+        last_active=Value("Invited", output_field=TextField()),
+        roles_display=F("roles"),
+        additional_permissions_display=F("additional_permissions"),
+        member_sort_value=F("email"),
+        source=Value("invitation", output_field=CharField()),
+    ).values(
+        "id",
+        "first_name",
+        "last_name",
+        "email_display",
+        "last_active",
+        "roles_display",
+        "additional_permissions_display",
+        "member_sort_value",
+        "source",
+    )
+    return invitations
+    
+
+def apply_search_term(queryset, request):
+    """Apply search term to the queryset."""
+    search_term = request.GET.get("search_term", "").lower()
+    if search_term:
+        queryset = queryset.filter(
+            Q(first_name__icontains=search_term)
+            | Q(last_name__icontains=search_term)
+            | Q(email_display__icontains=search_term)
+        )
+    return queryset
+
+def apply_sorting(queryset, request):
+    """Apply sorting to the queryset."""
+    sort_by = request.GET.get("sort_by", "id")  # Default to 'id'
+    order = request.GET.get("order", "asc")  # Default to 'asc'
+    # Adjust sort_by to match the annotated fields in the unioned queryset
+    if sort_by == "member":
+        sort_by = "member_sort_value"
+    if order == "desc":
+        queryset = queryset.order_by(F(sort_by).desc())
+    else:
+        queryset = queryset.order_by(sort_by)
+    return queryset
 
 def serialize_members(request, portfolio, item, user):
     # Check if the user can edit other users
@@ -125,6 +158,7 @@ def serialize_members(request, portfolio, item, user):
         "id": item.get("id", ""),
         "name": " ".join(filter(None, [item.get("first_name", ""), item.get("last_name", "")])),
         "email": item.get("email_display", ""),
+        "member_sort_value": item.get("member_sort_value", ""),
         "is_admin": is_admin,
         "last_active": item.get("last_active", ""),
         "action_url": action_url,

From d469041a8eaeb80f61b4bb7a22a9340ccad109cb Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Sat, 12 Oct 2024 09:47:18 -0400
Subject: [PATCH 137/142] formatted code for readability

---
 src/registrar/templatetags/custom_filters.py  |  8 +----
 src/registrar/views/portfolio_members_json.py | 31 +++++++++++--------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/registrar/templatetags/custom_filters.py b/src/registrar/templatetags/custom_filters.py
index 592839a46..b29dccb08 100644
--- a/src/registrar/templatetags/custom_filters.py
+++ b/src/registrar/templatetags/custom_filters.py
@@ -246,13 +246,7 @@ def is_members_subpage(path):
     """Checks if the given page is a subpage of members.
     Takes a path name, like '/organization/'."""
     # Since our pages aren't unified under a common path, we need this approach for now.
-    url_names = [
-        "members",
-        "member",
-        "member-permissions",
-        "invitedmember",
-        "invitedmember-permissions"
-    ]
+    url_names = ["members", "member", "member-permissions", "invitedmember", "invitedmember-permissions"]
     return get_url_name(path) in url_names
 
 
diff --git a/src/registrar/views/portfolio_members_json.py b/src/registrar/views/portfolio_members_json.py
index 684f0d337..5194cc493 100644
--- a/src/registrar/views/portfolio_members_json.py
+++ b/src/registrar/views/portfolio_members_json.py
@@ -14,7 +14,7 @@ from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices
 @login_required
 def get_portfolio_members_json(request):
     """Fetch members (permissions and invitations) for the given portfolio."""
-    
+
     portfolio = request.GET.get("portfolio")
 
     # Two initial querysets which will be combined
@@ -23,7 +23,7 @@ def get_portfolio_members_json(request):
 
     # Get total across both querysets before applying filters
     unfiltered_total = permissions.count() + invitations.count()
-    
+
     permissions = apply_search_term(permissions, request)
     invitations = apply_search_term(permissions, request)
 
@@ -49,6 +49,7 @@ def get_portfolio_members_json(request):
         }
     )
 
+
 def initial_permissions_search(portfolio):
     """Perform initial search for permissions before applying any filters."""
     permissions = UserPortfolioPermission.objects.filter(portfolio=portfolio)
@@ -65,17 +66,18 @@ def initial_permissions_search(portfolio):
                 # If email is present and not blank, use email
                 When(Q(user__email__isnull=False) & ~Q(user__email=""), then=F("user__email")),
                 # If first name or last name is present, use concatenation of first_name + " " + last_name
-                When(Q(user__first_name__isnull=False) | Q(user__last_name__isnull=False), 
-                 then=Concat(
-                     Coalesce(F("user__first_name"), Value("")),
-                     Value(" "),
-                     Coalesce(F("user__last_name"), Value(""))
-                 )
+                When(
+                    Q(user__first_name__isnull=False) | Q(user__last_name__isnull=False),
+                    then=Concat(
+                        Coalesce(F("user__first_name"), Value("")),
+                        Value(" "),
+                        Coalesce(F("user__last_name"), Value("")),
+                    ),
+                ),
+                # If neither, use an empty string
+                default=Value(""),
+                output_field=CharField(),
             ),
-            # If neither, use an empty string
-            default=Value(""),
-            output_field=CharField()
-        ),
             source=Value("permission", output_field=CharField()),
         )
         .values(
@@ -92,6 +94,7 @@ def initial_permissions_search(portfolio):
     )
     return permissions
 
+
 def initial_invitations_search(portfolio):
     """Perform initial invitations search before applying any filters."""
     invitations = PortfolioInvitation.objects.filter(portfolio=portfolio)
@@ -116,7 +119,7 @@ def initial_invitations_search(portfolio):
         "source",
     )
     return invitations
-    
+
 
 def apply_search_term(queryset, request):
     """Apply search term to the queryset."""
@@ -129,6 +132,7 @@ def apply_search_term(queryset, request):
         )
     return queryset
 
+
 def apply_sorting(queryset, request):
     """Apply sorting to the queryset."""
     sort_by = request.GET.get("sort_by", "id")  # Default to 'id'
@@ -142,6 +146,7 @@ def apply_sorting(queryset, request):
         queryset = queryset.order_by(sort_by)
     return queryset
 
+
 def serialize_members(request, portfolio, item, user):
     # Check if the user can edit other users
     user_can_edit_other_users = any(

From 7bc0dbf9c2e527131a6374a697f58dc0e06dd6da Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Sat, 12 Oct 2024 10:19:19 -0400
Subject: [PATCH 138/142] fixed a bug

---
 src/registrar/views/portfolio_members_json.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/views/portfolio_members_json.py b/src/registrar/views/portfolio_members_json.py
index 5194cc493..374982795 100644
--- a/src/registrar/views/portfolio_members_json.py
+++ b/src/registrar/views/portfolio_members_json.py
@@ -25,7 +25,7 @@ def get_portfolio_members_json(request):
     unfiltered_total = permissions.count() + invitations.count()
 
     permissions = apply_search_term(permissions, request)
-    invitations = apply_search_term(permissions, request)
+    invitations = apply_search_term(invitations, request)
 
     # Union the two querysets
     objects = permissions.union(invitations)

From 71b8bf38a18684f61a283a9542028bdf0147f7de Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Sat, 12 Oct 2024 10:40:44 -0400
Subject: [PATCH 139/142] properly handle None condition for roles

---
 src/registrar/views/portfolio_members_json.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/views/portfolio_members_json.py b/src/registrar/views/portfolio_members_json.py
index 374982795..2f43a26ee 100644
--- a/src/registrar/views/portfolio_members_json.py
+++ b/src/registrar/views/portfolio_members_json.py
@@ -155,7 +155,7 @@ def serialize_members(request, portfolio, item, user):
 
     view_only = not user.has_edit_members_portfolio_permission(portfolio) or not user_can_edit_other_users
 
-    is_admin = UserPortfolioRoleChoices.ORGANIZATION_ADMIN in item.get("roles_display", [])
+    is_admin = UserPortfolioRoleChoices.ORGANIZATION_ADMIN in (item.get("roles_display", []))
     action_url = reverse("member" if item["source"] == "permission" else "invitedmember", kwargs={"pk": item["id"]})
 
     # Serialize member data

From 857138c4f9bf9625a7d2243c73e286d2f7dec74a Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Sat, 12 Oct 2024 10:53:39 -0400
Subject: [PATCH 140/142] properly handle None condition for roles

---
 src/registrar/views/portfolio_members_json.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/views/portfolio_members_json.py b/src/registrar/views/portfolio_members_json.py
index 2f43a26ee..3c20e1c5f 100644
--- a/src/registrar/views/portfolio_members_json.py
+++ b/src/registrar/views/portfolio_members_json.py
@@ -155,7 +155,7 @@ def serialize_members(request, portfolio, item, user):
 
     view_only = not user.has_edit_members_portfolio_permission(portfolio) or not user_can_edit_other_users
 
-    is_admin = UserPortfolioRoleChoices.ORGANIZATION_ADMIN in (item.get("roles_display", []))
+    is_admin = UserPortfolioRoleChoices.ORGANIZATION_ADMIN in (item.get("roles_display") or [])
     action_url = reverse("member" if item["source"] == "permission" else "invitedmember", kwargs={"pk": item["id"]})
 
     # Serialize member data

From 445af256b659fbc613c10c74570e99ffd8afdf2e Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Tue, 15 Oct 2024 08:09:24 -0400
Subject: [PATCH 141/142] variable name cleanup

---
 src/registrar/assets/js/get-gov.js            |  5 ++---
 src/registrar/views/portfolio_members_json.py | 20 +++++++++----------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index baacaee48..337baf11c 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -1928,8 +1928,7 @@ class MembersTable extends LoadTableBase {
 
           data.members.forEach(member => {
             const member_name = member.name;
-            const member_email = member.email;
-            const member_sort_value = member.member_sort_value;
+            const member_display = member.member_display;
             const options = { year: 'numeric', month: 'short', day: 'numeric' };
             
             // Handle last_active values
@@ -1971,7 +1970,7 @@ class MembersTable extends LoadTableBase {
 
             row.innerHTML = `
               <th scope="row" role="rowheader" data-label="member email">
-                ${member_sort_value} ${admin_tagHTML}
+                ${member_display} ${admin_tagHTML}
               </th>
               <td data-sort-value="${last_active_sort_value}" data-label="last_active">
                 ${last_active_formatted}
diff --git a/src/registrar/views/portfolio_members_json.py b/src/registrar/views/portfolio_members_json.py
index 3c20e1c5f..d2f2276cf 100644
--- a/src/registrar/views/portfolio_members_json.py
+++ b/src/registrar/views/portfolio_members_json.py
@@ -60,9 +60,8 @@ def initial_permissions_search(portfolio):
             last_name=F("user__last_name"),
             email_display=F("user__email"),
             last_active=Cast(F("user__last_login"), output_field=TextField()),  # Cast last_login to text
-            roles_display=F("roles"),
             additional_permissions_display=F("additional_permissions"),
-            member_sort_value=Case(
+            member_display=Case(
                 # If email is present and not blank, use email
                 When(Q(user__email__isnull=False) & ~Q(user__email=""), then=F("user__email")),
                 # If first name or last name is present, use concatenation of first_name + " " + last_name
@@ -86,9 +85,9 @@ def initial_permissions_search(portfolio):
             "last_name",
             "email_display",
             "last_active",
-            "roles_display",
+            "roles",
             "additional_permissions_display",
-            "member_sort_value",
+            "member_display",
             "source",
         )
     )
@@ -103,9 +102,8 @@ def initial_invitations_search(portfolio):
         last_name=Value(None, output_field=CharField()),
         email_display=F("email"),
         last_active=Value("Invited", output_field=TextField()),
-        roles_display=F("roles"),
         additional_permissions_display=F("additional_permissions"),
-        member_sort_value=F("email"),
+        member_display=F("email"),
         source=Value("invitation", output_field=CharField()),
     ).values(
         "id",
@@ -113,9 +111,9 @@ def initial_invitations_search(portfolio):
         "last_name",
         "email_display",
         "last_active",
-        "roles_display",
+        "roles",
         "additional_permissions_display",
-        "member_sort_value",
+        "member_display",
         "source",
     )
     return invitations
@@ -139,7 +137,7 @@ def apply_sorting(queryset, request):
     order = request.GET.get("order", "asc")  # Default to 'asc'
     # Adjust sort_by to match the annotated fields in the unioned queryset
     if sort_by == "member":
-        sort_by = "member_sort_value"
+        sort_by = "member_display"
     if order == "desc":
         queryset = queryset.order_by(F(sort_by).desc())
     else:
@@ -155,7 +153,7 @@ def serialize_members(request, portfolio, item, user):
 
     view_only = not user.has_edit_members_portfolio_permission(portfolio) or not user_can_edit_other_users
 
-    is_admin = UserPortfolioRoleChoices.ORGANIZATION_ADMIN in (item.get("roles_display") or [])
+    is_admin = UserPortfolioRoleChoices.ORGANIZATION_ADMIN in (item.get("roles") or [])
     action_url = reverse("member" if item["source"] == "permission" else "invitedmember", kwargs={"pk": item["id"]})
 
     # Serialize member data
@@ -163,7 +161,7 @@ def serialize_members(request, portfolio, item, user):
         "id": item.get("id", ""),
         "name": " ".join(filter(None, [item.get("first_name", ""), item.get("last_name", "")])),
         "email": item.get("email_display", ""),
-        "member_sort_value": item.get("member_sort_value", ""),
+        "member_display": item.get("member_display", ""),
         "is_admin": is_admin,
         "last_active": item.get("last_active", ""),
         "action_url": action_url,

From 928fe01a6c8995e9d78745d801c371c40c33e393 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Wed, 16 Oct 2024 12:12:16 -0400
Subject: [PATCH 142/142] fixes related to PR review comments

---
 src/registrar/assets/js/get-gov.js            | 10 ++++++----
 src/registrar/templates/portfolio_member.html |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index 337baf11c..8281aa50a 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -1926,6 +1926,8 @@ class MembersTable extends LoadTableBase {
           const memberList = document.querySelector('.members__table tbody');
           memberList.innerHTML = '';
 
+          const invited = 'Invited';
+
           data.members.forEach(member => {
             const member_name = member.name;
             const member_display = member.member_display;
@@ -1937,7 +1939,7 @@ class MembersTable extends LoadTableBase {
             let last_active_sort_value = '';
 
             // Handle 'Invited' or null/empty values differently from valid dates
-            if (last_active && last_active !== 'Invited') {
+            if (last_active && last_active !== invited) {
               try {
                 // Try to parse the last_active as a valid date
                 last_active = new Date(last_active);
@@ -1953,9 +1955,9 @@ class MembersTable extends LoadTableBase {
               }
             } else {
               // Handle 'Invited' or null
-              last_active = 'Invited';
-              last_active_formatted = 'Invited';
-              last_active_sort_value = 'Invited'; // Keep 'Invited' as a sortable string
+              last_active = invited;
+              last_active_formatted = invited;
+              last_active_sort_value = invited; // Keep 'Invited' as a sortable string
             }
 
             const action_url = member.action_url;
diff --git a/src/registrar/templates/portfolio_member.html b/src/registrar/templates/portfolio_member.html
index 0275f84e9..f2ee8f4c5 100644
--- a/src/registrar/templates/portfolio_member.html
+++ b/src/registrar/templates/portfolio_member.html
@@ -119,9 +119,9 @@
   </address>
 
   {% if portfolio_permission %}
-    {% include "includes/summary_item.html" with title='Member access and permissions' permissions=True value=portfolio_permission member_has_view_all_requests_portfolio_permission=member_has_view_all_requests_portfolio_permission member_has_edit_request_portfolio_permission=member_has_edit_request_portfolio_permission member_has_view_members_portfolio_permission=member_has_view_members_portfolio_permission member_has_edit_members_portfolio_permission=member_has_edit_members_portfolio_permission edit_link=edit_url editable=has_edit_members_portfolio_permission %}
+    {% include "includes/summary_item.html" with title='Member access and permissions' permissions=True value=portfolio_permission edit_link=edit_url editable=has_edit_members_portfolio_permission %}
   {% elif portfolio_invitation %}
-    {% include "includes/summary_item.html" with title='Member access and permissions' permissions=True value=portfolio_invitation member_has_view_all_requests_portfolio_permission=member_has_view_all_requests_portfolio_permission member_has_edit_request_portfolio_permission=member_has_edit_request_portfolio_permission member_has_view_members_portfolio_permission=member_has_view_members_portfolio_permission member_has_edit_members_portfolio_permission=member_has_edit_members_portfolio_permission edit_link=edit_url editable=has_edit_members_portfolio_permission %}
+    {% include "includes/summary_item.html" with title='Member access and permissions' permissions=True value=portfolio_invitation edit_link=edit_url editable=has_edit_members_portfolio_permission %}
   {% endif %}
 
   {% comment %}view_button is passed below as true in all cases. This is because manage_button logic will trump view_button logic; ie. if manage_button is true, view_button will never be looked at{% endcomment %}