From 99fde890175608b272f9304d5bfd258d78f10b83 Mon Sep 17 00:00:00 2001
From: Cameron Dixon <cameron.dixon@cisa.dhs.gov>
Date: Thu, 20 Jun 2024 17:16:40 -0400
Subject: [PATCH 01/70] Update domain_invitation_description.html

added more detail to give better direction to analysts
---
 .../includes/descriptions/domain_invitation_description.html  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/templates/django/admin/includes/descriptions/domain_invitation_description.html b/src/registrar/templates/django/admin/includes/descriptions/domain_invitation_description.html
index 7765b9203..3a5609ee8 100644
--- a/src/registrar/templates/django/admin/includes/descriptions/domain_invitation_description.html
+++ b/src/registrar/templates/django/admin/includes/descriptions/domain_invitation_description.html
@@ -5,8 +5,8 @@ accept and become a domain manager.
 </p>
 
 <p>
-An “invited” status indicates that the recipient has not logged in to the registrar since the invitation was sent. 
-A “received” status indicates that the recipient has logged in.
+An “invited” status indicates that the recipient has not logged in to the registrar since the invitation was sent. Deleting an invitation with a "invited" status will prevent the user from signing in.
+A “received” status indicates that the recipient has logged in. Deleting an invitation with a "received" status will stop a user's email address from showing in the domain managers list, but it will not revoke their access from the domain. To remove a user who has already signed in, go to <a class="text-underline" href="{% url 'admin:registrar_user_domain_roles_changelist' %}">User domain roles</a> and delete the role for the correct  domain/manager combination.
 </p>
 
 <p>

From 9d116df83fd29f7f056504b877c599d7296c2d73 Mon Sep 17 00:00:00 2001
From: Cameron Dixon <cameron.dixon@cisa.dhs.gov>
Date: Fri, 21 Jun 2024 21:46:31 -0400
Subject: [PATCH 02/70] Update
 src/registrar/templates/django/admin/includes/descriptions/domain_invitation_description.html

Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
---
 .../includes/descriptions/domain_invitation_description.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/django/admin/includes/descriptions/domain_invitation_description.html b/src/registrar/templates/django/admin/includes/descriptions/domain_invitation_description.html
index 3a5609ee8..03d0cd99a 100644
--- a/src/registrar/templates/django/admin/includes/descriptions/domain_invitation_description.html
+++ b/src/registrar/templates/django/admin/includes/descriptions/domain_invitation_description.html
@@ -6,7 +6,7 @@ accept and become a domain manager.
 
 <p>
 An “invited” status indicates that the recipient has not logged in to the registrar since the invitation was sent. Deleting an invitation with a "invited" status will prevent the user from signing in.
-A “received” status indicates that the recipient has logged in. Deleting an invitation with a "received" status will stop a user's email address from showing in the domain managers list, but it will not revoke their access from the domain. To remove a user who has already signed in, go to <a class="text-underline" href="{% url 'admin:registrar_user_domain_roles_changelist' %}">User domain roles</a> and delete the role for the correct  domain/manager combination.
+A “received” status indicates that the recipient has logged in. Deleting an invitation with a "received" status will stop a user's email address from showing in the domain managers list, but it will not revoke their access from the domain. To remove a user who has already signed in, go to <a class="text-underline" href="{% url 'admin:registrar_userdomainrole_changelist' %}">User domain roles</a> and delete the role for the correct  domain/manager combination.
 </p>
 
 <p>

From 64933e02c60c1ffffdf7f09d7c12430450076870 Mon Sep 17 00:00:00 2001
From: Cameron Dixon <cameron.dixon@cisa.dhs.gov>
Date: Tue, 25 Jun 2024 09:32:46 -0400
Subject: [PATCH 03/70] Update test_admin.py

adding another "invited"
---
 src/registrar/tests/test_admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index 802974b6e..798dfaad8 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -2820,7 +2820,7 @@ class TestDomainInvitationAdmin(TestCase):
             )
 
             # Assert that the filters are added
-            self.assertContains(response, "invited", count=4)
+            self.assertContains(response, "invited", count=5)
             self.assertContains(response, "Invited", count=2)
             self.assertContains(response, "retrieved", count=2)
             self.assertContains(response, "Retrieved", count=2)

From 2e28a0ffe5c22a059bb136bcd64ba16e4f5b0dcb Mon Sep 17 00:00:00 2001
From: Cameron Dixon <cameron.dixon@cisa.dhs.gov>
Date: Tue, 25 Jun 2024 12:53:08 -0400
Subject: [PATCH 04/70] Update
 src/registrar/templates/django/admin/includes/descriptions/domain_invitation_description.html

Co-authored-by: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
---
 .../includes/descriptions/domain_invitation_description.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/django/admin/includes/descriptions/domain_invitation_description.html b/src/registrar/templates/django/admin/includes/descriptions/domain_invitation_description.html
index 03d0cd99a..23c617f1c 100644
--- a/src/registrar/templates/django/admin/includes/descriptions/domain_invitation_description.html
+++ b/src/registrar/templates/django/admin/includes/descriptions/domain_invitation_description.html
@@ -5,7 +5,7 @@ accept and become a domain manager.
 </p>
 
 <p>
-An “invited” status indicates that the recipient has not logged in to the registrar since the invitation was sent. Deleting an invitation with a "invited" status will prevent the user from signing in.
+An “invited” status indicates that the recipient has not logged in to the registrar since the invitation was sent. Deleting an invitation with an "invited" status will prevent the user from signing in.
 A “received” status indicates that the recipient has logged in. Deleting an invitation with a "received" status will stop a user's email address from showing in the domain managers list, but it will not revoke their access from the domain. To remove a user who has already signed in, go to <a class="text-underline" href="{% url 'admin:registrar_userdomainrole_changelist' %}">User domain roles</a> and delete the role for the correct  domain/manager combination.
 </p>
 

From b4214300246ecd0306bff93983370a6ee61b8312 Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Wed, 17 Jul 2024 10:50:01 -0700
Subject: [PATCH 05/70] Test out copy functionality

---
 src/registrar/templates/admin/change_form.html           | 5 +++++
 .../templates/admin/change_form_object_tools.html        | 9 ++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/registrar/templates/admin/change_form.html b/src/registrar/templates/admin/change_form.html
index 78dac9ac0..3efbe554e 100644
--- a/src/registrar/templates/admin/change_form.html
+++ b/src/registrar/templates/admin/change_form.html
@@ -1,4 +1,5 @@
 {% extends "admin/change_form.html" %}
+{% load static i18n %} <!-- Add this line to load static template tag -->
 
 {% comment %} Replace the Django ul markup with a div. We'll edit the child markup accordingly in change_form_object_tools {% endcomment %}
 {% block object-tools %}
@@ -10,3 +11,7 @@
     </div>
 {% endif %}
 {% endblock %}
+
+{% block extrahead %}
+    <script type="application/javascript" src="{% static 'js/copy-summary.js' %}" defer></script>
+{% endblock %}
\ No newline at end of file
diff --git a/src/registrar/templates/admin/change_form_object_tools.html b/src/registrar/templates/admin/change_form_object_tools.html
index 28c655bbc..48a6b101d 100644
--- a/src/registrar/templates/admin/change_form_object_tools.html
+++ b/src/registrar/templates/admin/change_form_object_tools.html
@@ -16,5 +16,12 @@
         <p class="margin-0 padding-0">
             <a href="{% add_preserved_filters history_url %}" class="historylink">{% translate "History" %}</a>
         </p>
+        {% if opts.model_name == 'domainrequest' %}
+        <p class="margin-0 padding-0">
+            <button id="copy-summary-btn" class="button">{% translate "Copy request summary" %}</button>
+            <!-- <a href="{% add_preserved_filters history_url %}" class="historylink">{% translate "Copy request summary" %}</a> -->
+        </p>
+        {% endif %}
     {% endif %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+

From 721e91aac75b77742c229dc7516d03fe865bd3b8 Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Wed, 17 Jul 2024 11:05:09 -0700
Subject: [PATCH 06/70] Add in js file

---
 src/registrar/assets/js/copy-summary.js | 34 +++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 src/registrar/assets/js/copy-summary.js

diff --git a/src/registrar/assets/js/copy-summary.js b/src/registrar/assets/js/copy-summary.js
new file mode 100644
index 000000000..42cedf008
--- /dev/null
+++ b/src/registrar/assets/js/copy-summary.js
@@ -0,0 +1,34 @@
+
+document.addEventListener('DOMContentLoaded', function() {
+    document.getElementById('copy-summary-btn').addEventListener('click', function() {
+        // Generate the summary text
+        const organizationType = document.getElementById('id_organization_type').value;
+        const requestedDomain = document.getElementById('id_requested_domain').value;
+        const existingWebsites = Array.from(document.querySelectorAll('#id_current_websites')).map(el => el.text).join(', ');
+        const alternativeDomains = Array.from(document.querySelectorAll('#id_alternative_domains')).map(el => el.text).join(', ');
+        const submitter = document.getElementById('id_submitter').value;
+        const seniorOfficial = document.getElementById('id_senior_official').value;
+        const otherContacts = Array.from(document.querySelectorAll('#id_other_contacts option:checked')).map(el => el.text).join('\n* ');
+
+        const summary = `*Recommendation:*\n\n` +
+                        `*Organization Type:* ${organizationType}\n\n` +
+                        `*Requested Domain:* ${requestedDomain}\n\n` +
+                        `*Existing website(s):*\n${existingWebsites}\n\n` +
+                        `*Rationale:*\n\n` +
+                        `*Alternate Domain(s):*\n* ${alternativeDomains.split(', ').join('\n* ')}\n\n` +
+                        `*Submitter:*\n\n* ${submitter}\n\n` +
+                        `*Senior Official:*\n\n* ${seniorOfficial}\n\n` +
+                        `*Additional Contact(s):*\n\n* ${otherContacts}\n\n`;
+
+        // Create a temporary textarea element to hold the summary
+        const textArea = document.createElement('textarea');
+        textArea.value = summary;
+        document.body.appendChild(textArea);
+        textArea.select();
+        document.execCommand('copy');
+        document.body.removeChild(textArea);
+
+        alert('Summary copied to clipboard!');
+        alert("hello");
+    });
+});

From e19bcaf55f61cc52d7f43cd38df19378d47290e8 Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Wed, 17 Jul 2024 11:05:42 -0700
Subject: [PATCH 07/70] Remove extra line

---
 src/registrar/assets/js/copy-summary.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/registrar/assets/js/copy-summary.js b/src/registrar/assets/js/copy-summary.js
index 42cedf008..9edad3f6b 100644
--- a/src/registrar/assets/js/copy-summary.js
+++ b/src/registrar/assets/js/copy-summary.js
@@ -29,6 +29,5 @@ document.addEventListener('DOMContentLoaded', function() {
         document.body.removeChild(textArea);
 
         alert('Summary copied to clipboard!');
-        alert("hello");
     });
 });

From 17274a606d7b3a8bb44d34934fd53491e53267e4 Mon Sep 17 00:00:00 2001
From: Erin <121973038+erinysong@users.noreply.github.com>
Date: Wed, 17 Jul 2024 14:09:50 -0700
Subject: [PATCH 08/70] Removed unused comment job from manual deploy

---
 .github/workflows/deploy-sandbox.yaml | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml
index 4bd7f99dd..7f8637a04 100644
--- a/.github/workflows/deploy-sandbox.yaml
+++ b/.github/workflows/deploy-sandbox.yaml
@@ -64,20 +64,4 @@ jobs:
           cf_password: ${{ secrets[env.CF_PASSWORD] }}
           cf_org: cisa-dotgov
           cf_space: ${{ env.ENVIRONMENT }}
-          cf_manifest: ops/manifests/manifest-${{ env.ENVIRONMENT }}.yaml
-  comment:
-    runs-on: ubuntu-latest
-    needs: [variables, deploy]
-    steps:
-      - uses: actions/github-script@v6
-        env:
-          ENVIRONMENT: ${{ needs.variables.outputs.environment }}
-        with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          script: |
-            github.rest.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: '🥳 Successfully deployed to developer sandbox **[${{ env.ENVIRONMENT }}](https://getgov-${{ env.ENVIRONMENT }}.app.cloud.gov/)**.'
-            })
\ No newline at end of file
+          cf_manifest: ops/manifests/manifest-${{ env.ENVIRONMENT }}.yaml
\ No newline at end of file

From f2fd764d6735c4a8bc177c5466ba6cfea6cf668c Mon Sep 17 00:00:00 2001
From: Erin <121973038+erinysong@users.noreply.github.com>
Date: Wed, 17 Jul 2024 14:20:23 -0700
Subject: [PATCH 09/70] Correct removed comment job in deploy workflow

---
 ...anch-to-sandbox.yaml => deploy-manual.yaml} | 16 ----------------
 .github/workflows/deploy-sandbox.yaml          | 18 +++++++++++++++++-
 2 files changed, 17 insertions(+), 17 deletions(-)
 rename .github/workflows/{deploy-branch-to-sandbox.yaml => deploy-manual.yaml} (78%)

diff --git a/.github/workflows/deploy-branch-to-sandbox.yaml b/.github/workflows/deploy-manual.yaml
similarity index 78%
rename from .github/workflows/deploy-branch-to-sandbox.yaml
rename to .github/workflows/deploy-manual.yaml
index 14a3d8ef8..97415a0d9 100644
--- a/.github/workflows/deploy-branch-to-sandbox.yaml
+++ b/.github/workflows/deploy-manual.yaml
@@ -71,20 +71,4 @@ jobs:
           cf_org: cisa-dotgov
           cf_space: ${{ env.ENVIRONMENT }}
           cf_manifest: ops/manifests/manifest-${{ env.ENVIRONMENT }}.yaml
-  comment:
-    runs-on: ubuntu-latest
-    needs: [deploy]
-    steps:
-      - uses: actions/github-script@v6
-        env:
-          ENVIRONMENT: ${{ github.event.inputs.environment }}
-        with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          script: |
-            github.rest.issues.createComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: '🥳 Successfully deployed to developer sandbox **[${{ env.ENVIRONMENT }}](https://getgov-${{ env.ENVIRONMENT }}.app.cloud.gov/)**.'
-            })
-          
 
diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml
index 7f8637a04..4bd7f99dd 100644
--- a/.github/workflows/deploy-sandbox.yaml
+++ b/.github/workflows/deploy-sandbox.yaml
@@ -64,4 +64,20 @@ jobs:
           cf_password: ${{ secrets[env.CF_PASSWORD] }}
           cf_org: cisa-dotgov
           cf_space: ${{ env.ENVIRONMENT }}
-          cf_manifest: ops/manifests/manifest-${{ env.ENVIRONMENT }}.yaml
\ No newline at end of file
+          cf_manifest: ops/manifests/manifest-${{ env.ENVIRONMENT }}.yaml
+  comment:
+    runs-on: ubuntu-latest
+    needs: [variables, deploy]
+    steps:
+      - uses: actions/github-script@v6
+        env:
+          ENVIRONMENT: ${{ needs.variables.outputs.environment }}
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            github.rest.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: '🥳 Successfully deployed to developer sandbox **[${{ env.ENVIRONMENT }}](https://getgov-${{ env.ENVIRONMENT }}.app.cloud.gov/)**.'
+            })
\ No newline at end of file

From 7820c362433d714c1e47a9aa0de7ad75dcd1967b Mon Sep 17 00:00:00 2001
From: Erin <121973038+erinysong@users.noreply.github.com>
Date: Wed, 17 Jul 2024 14:21:55 -0700
Subject: [PATCH 10/70] Revert workflow name for testing purposes

---
 .../{deploy-manual.yaml => deploy-branch-to-sandbox.yaml}         | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/workflows/{deploy-manual.yaml => deploy-branch-to-sandbox.yaml} (100%)

diff --git a/.github/workflows/deploy-manual.yaml b/.github/workflows/deploy-branch-to-sandbox.yaml
similarity index 100%
rename from .github/workflows/deploy-manual.yaml
rename to .github/workflows/deploy-branch-to-sandbox.yaml

From 3e5401a549d0fc4b8abb756730482a1d6e23dbc3 Mon Sep 17 00:00:00 2001
From: Erin <121973038+erinysong@users.noreply.github.com>
Date: Mon, 22 Jul 2024 11:31:20 -0700
Subject: [PATCH 11/70] Add new sandboxes to deploy-manual workflow. Rename
 workflow name to deploy-manual

---
 .../{deploy-branch-to-sandbox.yaml => deploy-manual.yaml}   | 0
 ops/scripts/create_dev_sandbox.sh                           | 6 +++++-
 2 files changed, 5 insertions(+), 1 deletion(-)
 rename .github/workflows/{deploy-branch-to-sandbox.yaml => deploy-manual.yaml} (100%)

diff --git a/.github/workflows/deploy-branch-to-sandbox.yaml b/.github/workflows/deploy-manual.yaml
similarity index 100%
rename from .github/workflows/deploy-branch-to-sandbox.yaml
rename to .github/workflows/deploy-manual.yaml
diff --git a/ops/scripts/create_dev_sandbox.sh b/ops/scripts/create_dev_sandbox.sh
index 676fcf7ae..b3a970584 100755
--- a/ops/scripts/create_dev_sandbox.sh
+++ b/ops/scripts/create_dev_sandbox.sh
@@ -112,10 +112,14 @@ sed -i '' '/          - development/ {a\
           - '"$1"'
 }' .github/workflows/reset-db.yaml
 
-sed -i '' '/          - development/ {a\
+sed -i '' '/          - backup/ {a\
           - '"$1"'
 }' .github/workflows/migrate.yaml
 
+sed -i '' '/          - development/ {a\
+          - '"$1"'
+}' .github/workflows/deploy-manual.yaml
+
 sed -i '' '/${{startsWith(github.head_ref, / {a\
         || startsWith(github.head_ref, '"'$1'"')
 }' .github/workflows/deploy-sandbox.yaml

From bc334bd41fe276eb386753d931a7e284fc44567c Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Mon, 22 Jul 2024 16:25:14 -0600
Subject: [PATCH 12/70] updated button format and javascript

---
 src/registrar/assets/js/copy-summary.js       | 51 ++++++++++++-------
 .../admin/change_form_object_tools.html       | 19 +++----
 2 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/src/registrar/assets/js/copy-summary.js b/src/registrar/assets/js/copy-summary.js
index 9edad3f6b..b268956a5 100644
--- a/src/registrar/assets/js/copy-summary.js
+++ b/src/registrar/assets/js/copy-summary.js
@@ -8,25 +8,42 @@ document.addEventListener('DOMContentLoaded', function() {
         const alternativeDomains = Array.from(document.querySelectorAll('#id_alternative_domains')).map(el => el.text).join(', ');
         const submitter = document.getElementById('id_submitter').value;
         const seniorOfficial = document.getElementById('id_senior_official').value;
-        const otherContacts = Array.from(document.querySelectorAll('#id_other_contacts option:checked')).map(el => el.text).join('\n* ');
+        const otherContacts = Array.from(document.querySelectorAll('#id_other_contacts option:checked')).map(el => el.text).join('\n ');
 
-        const summary = `*Recommendation:*\n\n` +
-                        `*Organization Type:* ${organizationType}\n\n` +
-                        `*Requested Domain:* ${requestedDomain}\n\n` +
-                        `*Existing website(s):*\n${existingWebsites}\n\n` +
-                        `*Rationale:*\n\n` +
-                        `*Alternate Domain(s):*\n* ${alternativeDomains.split(', ').join('\n* ')}\n\n` +
-                        `*Submitter:*\n\n* ${submitter}\n\n` +
-                        `*Senior Official:*\n\n* ${seniorOfficial}\n\n` +
-                        `*Additional Contact(s):*\n\n* ${otherContacts}\n\n`;
+        const summary = `<strong>Recommendation:</strong></br>` +
+                        `<strong>Organization Type:</strong> ${organizationType}</br>` +
+                        `<strong>Requested Domain:</strong> ${requestedDomain}</br>` +
+                        `<strong>Existing website(s):</strong> ${existingWebsites}</br>` +
+                        `<strong>Rationale:</strong>` +
+                        `<strong>Alternate Domain(s):</strong> ${alternativeDomains.split(', ').join('\n ')}</br>` +
+                        `<strong>Submitter:</strong> ${submitter}</br>` +
+                        `<strong>Senior Official:</strong> ${seniorOfficial}</br>` +
+                        `<strong>Additional Contact(s):</strong> ${otherContacts}</br>`;
 
-        // Create a temporary textarea element to hold the summary
-        const textArea = document.createElement('textarea');
-        textArea.value = summary;
-        document.body.appendChild(textArea);
-        textArea.select();
-        document.execCommand('copy');
-        document.body.removeChild(textArea);
+        // Create a temporary element
+        let tempElement = document.createElement('div');
+        tempElement.innerHTML = summary;
+        // Append the element to the body
+        document.body.appendChild(tempElement);
+
+        // Use the Selection and Range APIs to select the element's content
+        let range = document.createRange();
+        range.selectNodeContents(tempElement);
+        let selection = window.getSelection();
+        selection.removeAllRanges();
+        selection.addRange(range);
+
+        // Use the Clipboard API to write the selected HTML content to the clipboard
+        navigator.clipboard.write([
+            new ClipboardItem({
+                'text/html': new Blob([tempElement.innerHTML], { type: 'text/html' })
+            })
+        ]).then(() => {
+            console.log('Bold text copied to clipboard successfully!');
+        }).catch(err => {
+            console.error('Failed to copy text: ', err);
+        });
+        document.body.removeChild(tempElement); 
 
         alert('Summary copied to clipboard!');
     });
diff --git a/src/registrar/templates/admin/change_form_object_tools.html b/src/registrar/templates/admin/change_form_object_tools.html
index 48a6b101d..c2d22e9e2 100644
--- a/src/registrar/templates/admin/change_form_object_tools.html
+++ b/src/registrar/templates/admin/change_form_object_tools.html
@@ -13,15 +13,16 @@
             </li>
         </ul>
     {% else %}
-        <p class="margin-0 padding-0">
-            <a href="{% add_preserved_filters history_url %}" class="historylink">{% translate "History" %}</a>
-        </p>
-        {% if opts.model_name == 'domainrequest' %}
-        <p class="margin-0 padding-0">
-            <button id="copy-summary-btn" class="button">{% translate "Copy request summary" %}</button>
-            <!-- <a href="{% add_preserved_filters history_url %}" class="historylink">{% translate "Copy request summary" %}</a> -->
-        </p>
-        {% endif %}
+        <ul>
+            <li>
+                <a href="{% add_preserved_filters history_url %}" class="historylink">{% translate "History" %}</a>
+            </li>
+            {% if opts.model_name == 'domainrequest' %}
+            <li>
+                <a id="copy-summary-btn" class="historylink" href="#">{% translate "Copy request summary" %}</a>
+            </li>
+            {% endif %}
+        </ul>
     {% endif %}
 {% endblock %}
 

From b245dfb2fe801506b3bbc3a0713d5551be8d8330 Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Tue, 23 Jul 2024 10:55:02 -0600
Subject: [PATCH 13/70] fixed dom extraction

---
 src/registrar/assets/js/copy-summary.js | 39 ++++++++++++++++++-------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/registrar/assets/js/copy-summary.js b/src/registrar/assets/js/copy-summary.js
index b268956a5..d12efb872 100644
--- a/src/registrar/assets/js/copy-summary.js
+++ b/src/registrar/assets/js/copy-summary.js
@@ -2,23 +2,40 @@
 document.addEventListener('DOMContentLoaded', function() {
     document.getElementById('copy-summary-btn').addEventListener('click', function() {
         // Generate the summary text
-        const organizationType = document.getElementById('id_organization_type').value;
-        const requestedDomain = document.getElementById('id_requested_domain').value;
-        const existingWebsites = Array.from(document.querySelectorAll('#id_current_websites')).map(el => el.text).join(', ');
-        const alternativeDomains = Array.from(document.querySelectorAll('#id_alternative_domains')).map(el => el.text).join(', ');
-        const submitter = document.getElementById('id_submitter').value;
-        const seniorOfficial = document.getElementById('id_senior_official').value;
-        const otherContacts = Array.from(document.querySelectorAll('#id_other_contacts option:checked')).map(el => el.text).join('\n ');
+
+        const organizationTypeElement = document.getElementById('id_organization_type');
+        const organizationType = organizationTypeElement.options[organizationTypeElement.selectedIndex].text;
+
+        const alternativeDomainsDiv = document.querySelector('.form-row.field-alternative_domains .readonly');
+        const alternativeDomainslinks = alternativeDomainsDiv.querySelectorAll('a');
+        const alternativeDomains = Array.from(alternativeDomainslinks).map(link => link.textContent);
+
+        const existingWebsitesDiv = document.querySelector('.form-row.field-current_websites .readonly');
+        const existingWebsiteslinks = existingWebsitesDiv.querySelectorAll('a');
+        const existingWebsites = Array.from(existingWebsiteslinks).map(link => link.textContent);
+
+        const otherContactsDiv = document.querySelector('.form-row.field-other_contacts .readonly');
+        const otherContactslinks = otherContactsDiv.querySelectorAll('a');
+        const otherContacts = Array.from(otherContactslinks).map(link => link.textContent);
+
+        const requestedDomainElement = document.getElementById('id_requested_domain');
+        const requestedDomain = requestedDomainElement.options[requestedDomainElement.selectedIndex].text;
+
+        const submitterElement = document.getElementById('id_submitter');
+        const submitter = submitterElement.options[submitterElement.selectedIndex].text;
+
+        const seniorOfficialElement = document.getElementById('id_senior_official');
+        const seniorOfficial = seniorOfficialElement.options[seniorOfficialElement.selectedIndex].text;
 
         const summary = `<strong>Recommendation:</strong></br>` +
                         `<strong>Organization Type:</strong> ${organizationType}</br>` +
                         `<strong>Requested Domain:</strong> ${requestedDomain}</br>` +
-                        `<strong>Existing website(s):</strong> ${existingWebsites}</br>` +
-                        `<strong>Rationale:</strong>` +
-                        `<strong>Alternate Domain(s):</strong> ${alternativeDomains.split(', ').join('\n ')}</br>` +
+                        `<strong>Existing website(s):</strong> ${existingWebsites.join('</br>')}</br>` +
+                        `<strong>Rationale:</strong></br>` +
+                        `<strong>Alternate Domain(s):</strong> ${alternativeDomains.join('</br>')}</br>` +
                         `<strong>Submitter:</strong> ${submitter}</br>` +
                         `<strong>Senior Official:</strong> ${seniorOfficial}</br>` +
-                        `<strong>Additional Contact(s):</strong> ${otherContacts}</br>`;
+                        `<strong>Additional Contact(s):</strong> ${otherContacts.join('</br>')}</br>`;
 
         // Create a temporary element
         let tempElement = document.createElement('div');

From c33a4b61f579f6e93f238521e0d39a66965e0996 Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Tue, 23 Jul 2024 13:42:02 -0600
Subject: [PATCH 14/70] fixed formatting

---
 src/registrar/assets/js/copy-summary.js       | 63 ++++++++++++++++---
 .../admin/includes/contact_detail_list.html   | 19 +++---
 2 files changed, 65 insertions(+), 17 deletions(-)

diff --git a/src/registrar/assets/js/copy-summary.js b/src/registrar/assets/js/copy-summary.js
index d12efb872..c10adbffa 100644
--- a/src/registrar/assets/js/copy-summary.js
+++ b/src/registrar/assets/js/copy-summary.js
@@ -1,41 +1,86 @@
 
 document.addEventListener('DOMContentLoaded', function() {
     document.getElementById('copy-summary-btn').addEventListener('click', function() {
-        // Generate the summary text
+        /// Generate the summary text
 
+        //------ Organization Type
         const organizationTypeElement = document.getElementById('id_organization_type');
         const organizationType = organizationTypeElement.options[organizationTypeElement.selectedIndex].text;
 
+        //------ Alternative Domains
         const alternativeDomainsDiv = document.querySelector('.form-row.field-alternative_domains .readonly');
         const alternativeDomainslinks = alternativeDomainsDiv.querySelectorAll('a');
         const alternativeDomains = Array.from(alternativeDomainslinks).map(link => link.textContent);
 
+        //------ Existing Websites
         const existingWebsitesDiv = document.querySelector('.form-row.field-current_websites .readonly');
         const existingWebsiteslinks = existingWebsitesDiv.querySelectorAll('a');
         const existingWebsites = Array.from(existingWebsiteslinks).map(link => link.textContent);
 
+        //------ Additional Contacts
+        // 1 - Create a hyperlinks map so we can display contact details and also link to the contact
         const otherContactsDiv = document.querySelector('.form-row.field-other_contacts .readonly');
-        const otherContactslinks = otherContactsDiv.querySelectorAll('a');
-        const otherContacts = Array.from(otherContactslinks).map(link => link.textContent);
+        const otherContactLinks = otherContactsDiv.querySelectorAll('a');
+        const nameToUrlMap = {};
+        otherContactLinks.forEach(link => {
+          const name = link.textContent.trim();
+          const url = link.href;
+          nameToUrlMap[name] = url;
+        });
+    
+        // 2 - Iterate through contact details and assemble html for summary
+        let otherContactsSummary = ""
+        // Get the table rows of contact details
+        const otherContactsTable = document.querySelector('.form-row.field-other_contacts table tbody');
+        const otherContactsRows = otherContactsTable.querySelectorAll('tr');
+        const bulletList = document.createElement('ul');
+        otherContactsRows.forEach(contactRow => {
+        // Extract the contact details
+        const name = contactRow.querySelector('th').textContent.trim();
+        const title = contactRow.querySelectorAll('td')[0].textContent.trim();
+        const email = contactRow.querySelectorAll('td')[1].textContent.trim();
+        const phone = contactRow.querySelectorAll('td')[2].textContent.trim();
+        const url = nameToUrlMap[name] || '#';
+        // Format the contact information
+        const listItem = document.createElement('li');
+        listItem.innerH = `<a href="${url}">${name}</a>, ${title}, ${email}, ${phone}`;
+        bulletList.appendChild(listItem);
+        });
+        otherContactsSummary += bulletList.outerHTML
 
+
+        //------ Requested Domains
         const requestedDomainElement = document.getElementById('id_requested_domain');
         const requestedDomain = requestedDomainElement.options[requestedDomainElement.selectedIndex].text;
 
-        const submitterElement = document.getElementById('id_submitter');
-        const submitter = submitterElement.options[submitterElement.selectedIndex].text;
+        //------ Submitter
+        // Function to extract text by ID and handle missing elements
+        function extractTextById(id) {
+            const element = document.getElementById(id);
+            return element ? element.textContent.trim()+"," : '';
+        }
+        // Extract the submitter name, title, email, and phone number
+        const submitterName = extractTextById('contact_info_name');
+        const submitterTitle = extractTextById('contact_info_title');
+        const submitterEmail = extractTextById('contact_info_email');
+        const submitterPhone = extractTextById('contact_info_phone');
+        // Format the contact information
+        let submitterInfo = `${submitterName} ${submitterTitle} ${submitterEmail} ${submitterPhone}`;
 
+
+        //------ Senior Official
         const seniorOfficialElement = document.getElementById('id_senior_official');
         const seniorOfficial = seniorOfficialElement.options[seniorOfficialElement.selectedIndex].text;
 
         const summary = `<strong>Recommendation:</strong></br>` +
                         `<strong>Organization Type:</strong> ${organizationType}</br>` +
                         `<strong>Requested Domain:</strong> ${requestedDomain}</br>` +
-                        `<strong>Existing website(s):</strong> ${existingWebsites.join('</br>')}</br>` +
+                        `<strong>Existing website(s):</strong> ${existingWebsites.join(',')}</br>` +
                         `<strong>Rationale:</strong></br>` +
-                        `<strong>Alternate Domain(s):</strong> ${alternativeDomains.join('</br>')}</br>` +
-                        `<strong>Submitter:</strong> ${submitter}</br>` +
+                        `<strong>Alternate Domain(s):</strong> ${alternativeDomains.join(',')}</br>` +
+                        `<strong>Submitter:</strong> ${submitterInfo}</br>` +
                         `<strong>Senior Official:</strong> ${seniorOfficial}</br>` +
-                        `<strong>Additional Contact(s):</strong> ${otherContacts.join('</br>')}</br>`;
+                        `<strong>Additional Contact(s):</strong> ${otherContactsSummary}</br>`;
 
         // Create a temporary element
         let tempElement = document.createElement('div');
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 2ee490d76..8358e5440 100644
--- a/src/registrar/templates/django/admin/includes/contact_detail_list.html
+++ b/src/registrar/templates/django/admin/includes/contact_detail_list.html
@@ -2,25 +2,28 @@
 
 <address class="{% if no_title_top_padding %}margin-top-neg-1__detail-list{% endif %} {% if user.has_contact_info %}margin-bottom-1{% endif %} dja-address-contact-list">
 
+
     {% if show_formatted_name %}
         {% if user.get_formatted_name %}
-            <a href="{% url 'admin:registrar_contact_change' user.id %}">{{ user.get_formatted_name }}</a><br />
+            <a id="contact_info_name" href="{% url 'admin:registrar_contact_change' user.id %}">{{ user.get_formatted_name }}</a>
         {% else %}
-            None<br />
+            None
         {% endif %}
     {% endif %}
+    </br>
 
     {% if user.has_contact_info %}
         {# Title #}
         {% if user.title %}
-            {{ user.title }}
-            <br>
+            <span id="contact_info_title">{{ user.title }}</span>
         {% else %}
-            None<br>
+            None
         {% endif %}
+         </br>
+
         {# Email #}
         {% if user.email %}
-            {{ 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">
         {% else %}
@@ -29,7 +32,7 @@
 
         {# Phone #}
         {% if user.phone %}
-            {{ user.phone }}
+            <span id="contact_info_phone">{{ user.phone.as_national }}</span>
             <br>
         {% else %}
             None<br>
@@ -40,6 +43,6 @@
     {% endif %}
 
     {% if user_verification_type %}
-        {{ user_verification_type }}
+        <span id="contact_info_phone">{{ user_verification_type }}</span>
     {% endif %}
 </address>

From 4666da4df709502ff283c8b0592426a4088a4eae Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Tue, 23 Jul 2024 13:50:40 -0600
Subject: [PATCH 15/70] fix wierd typo

---
 src/registrar/assets/js/copy-summary.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/assets/js/copy-summary.js b/src/registrar/assets/js/copy-summary.js
index c10adbffa..cd437f0a6 100644
--- a/src/registrar/assets/js/copy-summary.js
+++ b/src/registrar/assets/js/copy-summary.js
@@ -43,7 +43,7 @@ document.addEventListener('DOMContentLoaded', function() {
         const url = nameToUrlMap[name] || '#';
         // Format the contact information
         const listItem = document.createElement('li');
-        listItem.innerH = `<a href="${url}">${name}</a>, ${title}, ${email}, ${phone}`;
+        listItem.innerHTML = `<a href="${url}">${name}</a>, ${title}, ${email}, ${phone}`;
         bulletList.appendChild(listItem);
         });
         otherContactsSummary += bulletList.outerHTML

From 72fdcfdac05e834adac59e59f83ad2d1804134ef Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Tue, 23 Jul 2024 14:22:10 -0600
Subject: [PATCH 16/70] more formatting fixes

---
 src/registrar/assets/js/copy-summary.js | 33 ++++++++++++++++---------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/registrar/assets/js/copy-summary.js b/src/registrar/assets/js/copy-summary.js
index cd437f0a6..824002f76 100644
--- a/src/registrar/assets/js/copy-summary.js
+++ b/src/registrar/assets/js/copy-summary.js
@@ -55,31 +55,40 @@ document.addEventListener('DOMContentLoaded', function() {
 
         //------ Submitter
         // Function to extract text by ID and handle missing elements
-        function extractTextById(id) {
-            const element = document.getElementById(id);
-            return element ? element.textContent.trim()+"," : '';
+        function extractTextById(id, divElement) {
+            if (divElement) {
+                const element = divElement.querySelector(`#${id}`);
+                return element ? ", " + element.textContent.trim() : '';
+            }
+            return '';
         }
         // Extract the submitter name, title, email, and phone number
-        const submitterName = extractTextById('contact_info_name');
-        const submitterTitle = extractTextById('contact_info_title');
-        const submitterEmail = extractTextById('contact_info_email');
-        const submitterPhone = extractTextById('contact_info_phone');
-        // Format the contact information
+        const submitterDiv = document.querySelector('.form-row.field-submitter');
+        const submitterNameElement = document.getElementById('id_submitter');
+        const submitterName = submitterNameElement.options[submitterNameElement.selectedIndex].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');
         const seniorOfficialElement = document.getElementById('id_senior_official');
-        const seniorOfficial = seniorOfficialElement.options[seniorOfficialElement.selectedIndex].text;
+        const seniorOfficialName = seniorOfficialElement.options[seniorOfficialElement.selectedIndex].text;
+        const seniorOfficialTitle = extractTextById('contact_info_title', seniorOfficialDiv);
+        const seniorOfficialEmail = extractTextById('contact_info_email', seniorOfficialDiv);
+        const seniorOfficialPhone = extractTextById('contact_info_phone', seniorOfficialDiv);
+        let seniorOfficialInfo = `${seniorOfficialName} ${seniorOfficialTitle} ${seniorOfficialEmail} ${seniorOfficialPhone}`;
 
         const summary = `<strong>Recommendation:</strong></br>` +
                         `<strong>Organization Type:</strong> ${organizationType}</br>` +
                         `<strong>Requested Domain:</strong> ${requestedDomain}</br>` +
-                        `<strong>Existing website(s):</strong> ${existingWebsites.join(',')}</br>` +
+                        `<strong>Existing website(s):</strong> ${existingWebsites.join(', ')}</br>` +
                         `<strong>Rationale:</strong></br>` +
-                        `<strong>Alternate Domain(s):</strong> ${alternativeDomains.join(',')}</br>` +
+                        `<strong>Alternate Domain(s):</strong> ${alternativeDomains.join(', ')}</br>` +
                         `<strong>Submitter:</strong> ${submitterInfo}</br>` +
-                        `<strong>Senior Official:</strong> ${seniorOfficial}</br>` +
+                        `<strong>Senior Official:</strong> ${seniorOfficialInfo}</br>` +
                         `<strong>Additional Contact(s):</strong> ${otherContactsSummary}</br>`;
 
         // Create a temporary element

From 711c71c1147cfbc5a01d6e3c1c8240bfabd9ae98 Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Tue, 23 Jul 2024 14:37:58 -0600
Subject: [PATCH 17/70] Catching edge-cases

---
 src/registrar/assets/js/copy-summary.js       | 55 ++++++++++---------
 .../admin/includes/contact_detail_list.html   |  2 +-
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/src/registrar/assets/js/copy-summary.js b/src/registrar/assets/js/copy-summary.js
index 824002f76..de15596d2 100644
--- a/src/registrar/assets/js/copy-summary.js
+++ b/src/registrar/assets/js/copy-summary.js
@@ -1,7 +1,7 @@
 
 document.addEventListener('DOMContentLoaded', function() {
     document.getElementById('copy-summary-btn').addEventListener('click', function() {
-        /// Generate the summary text
+        /// Generate a rich HTML summary text and copy to clipboard
 
         //------ Organization Type
         const organizationTypeElement = document.getElementById('id_organization_type');
@@ -20,33 +20,38 @@ document.addEventListener('DOMContentLoaded', function() {
         //------ Additional Contacts
         // 1 - Create a hyperlinks map so we can display contact details and also link to the contact
         const otherContactsDiv = document.querySelector('.form-row.field-other_contacts .readonly');
-        const otherContactLinks = otherContactsDiv.querySelectorAll('a');
-        const nameToUrlMap = {};
-        otherContactLinks.forEach(link => {
-          const name = link.textContent.trim();
-          const url = link.href;
-          nameToUrlMap[name] = url;
-        });
+        let otherContactLinks = [];
+        if (otherContactsDiv) {
+            otherContactLinks = otherContactsDiv.querySelectorAll('a');
+            const nameToUrlMap = {};
+            otherContactLinks.forEach(link => {
+              const name = link.textContent.trim();
+              const url = link.href;
+              nameToUrlMap[name] = url;
+            });
+        }
     
         // 2 - Iterate through contact details and assemble html for summary
         let otherContactsSummary = ""
         // Get the table rows of contact details
         const otherContactsTable = document.querySelector('.form-row.field-other_contacts table tbody');
-        const otherContactsRows = otherContactsTable.querySelectorAll('tr');
-        const bulletList = document.createElement('ul');
-        otherContactsRows.forEach(contactRow => {
-        // Extract the contact details
-        const name = contactRow.querySelector('th').textContent.trim();
-        const title = contactRow.querySelectorAll('td')[0].textContent.trim();
-        const email = contactRow.querySelectorAll('td')[1].textContent.trim();
-        const phone = contactRow.querySelectorAll('td')[2].textContent.trim();
-        const url = nameToUrlMap[name] || '#';
-        // Format the contact information
-        const listItem = document.createElement('li');
-        listItem.innerHTML = `<a href="${url}">${name}</a>, ${title}, ${email}, ${phone}`;
-        bulletList.appendChild(listItem);
-        });
-        otherContactsSummary += bulletList.outerHTML
+        if (otherContactsTable) {
+            const otherContactsRows = otherContactsTable.querySelectorAll('tr');
+            const bulletList = document.createElement('ul');
+            otherContactsRows.forEach(contactRow => {
+            // Extract the contact details
+            const name = contactRow.querySelector('th').textContent.trim();
+            const title = contactRow.querySelectorAll('td')[0].textContent.trim();
+            const email = contactRow.querySelectorAll('td')[1].textContent.trim();
+            const phone = contactRow.querySelectorAll('td')[2].textContent.trim();
+            const url = nameToUrlMap[name] || '#';
+            // Format the contact information
+            const listItem = document.createElement('li');
+            listItem.innerHTML = `<a href="${url}">${name}</a>, ${title}, ${email}, ${phone}`;
+            bulletList.appendChild(listItem);
+            });
+            otherContactsSummary += bulletList.outerHTML
+        }
 
 
         //------ Requested Domains
@@ -69,7 +74,7 @@ document.addEventListener('DOMContentLoaded', function() {
         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}`;
+        let submitterInfo = `${submitterName}${submitterTitle}${submitterEmail}${submitterPhone}`;
 
 
         //------ Senior Official
@@ -79,7 +84,7 @@ document.addEventListener('DOMContentLoaded', function() {
         const seniorOfficialTitle = extractTextById('contact_info_title', seniorOfficialDiv);
         const seniorOfficialEmail = extractTextById('contact_info_email', seniorOfficialDiv);
         const seniorOfficialPhone = extractTextById('contact_info_phone', seniorOfficialDiv);
-        let seniorOfficialInfo = `${seniorOfficialName} ${seniorOfficialTitle} ${seniorOfficialEmail} ${seniorOfficialPhone}`;
+        let seniorOfficialInfo = `${seniorOfficialName}${seniorOfficialTitle}${seniorOfficialEmail}${seniorOfficialPhone}`;
 
         const summary = `<strong>Recommendation:</strong></br>` +
                         `<strong>Organization Type:</strong> ${organizationType}</br>` +
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 8358e5440..418d1464b 100644
--- a/src/registrar/templates/django/admin/includes/contact_detail_list.html
+++ b/src/registrar/templates/django/admin/includes/contact_detail_list.html
@@ -32,7 +32,7 @@
 
         {# Phone #}
         {% if user.phone %}
-            <span id="contact_info_phone">{{ user.phone.as_national }}</span>
+            <span id="contact_info_phone">{{ user.phone }}</span>
             <br>
         {% else %}
             None<br>

From ee18be87c7ed8e64277046713cf88447e7003f55 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 30 Jul 2024 11:39:48 -0400
Subject: [PATCH 18/70] use css for read only styles

---
 src/registrar/assets/sass/_theme/_forms.scss  | 10 +++
 ...rtfolio_additional_permissions_and_more.py | 52 ++++++++++++
 src/registrar/models/user.py                  | 17 ++--
 .../includes/finish_profile_form.html         |  8 +-
 .../templates/includes/input_read_only.html   |  7 ++
 .../templates/includes/input_with_errors.html |  8 +-
 ...donly_input.html => toggleable_input.html} |  0
 ...edit_button.html => toggleable_label.html} |  0
 .../templates/portfolio_organization.html     | 78 ++++++++++--------
 src/registrar/templatetags/field_helpers.py   |  4 +-
 src/registrar/tests/test_views_portfolio.py   | 80 ++++++++++---------
 src/registrar/views/portfolios.py             |  3 +
 12 files changed, 179 insertions(+), 88 deletions(-)
 create mode 100644 src/registrar/migrations/0114_alter_user_portfolio_additional_permissions_and_more.py
 create mode 100644 src/registrar/templates/includes/input_read_only.html
 rename src/registrar/templates/includes/{readonly_input.html => toggleable_input.html} (100%)
 rename src/registrar/templates/includes/{label_with_edit_button.html => toggleable_label.html} (100%)

diff --git a/src/registrar/assets/sass/_theme/_forms.scss b/src/registrar/assets/sass/_theme/_forms.scss
index c025bdb29..0aedfcdba 100644
--- a/src/registrar/assets/sass/_theme/_forms.scss
+++ b/src/registrar/assets/sass/_theme/_forms.scss
@@ -82,3 +82,13 @@ legend.float-left-tablet + button.float-right-tablet {
     color: var(--close-button-hover-bg);
   }
 }
+
+.read-only-label {
+  font-size: size('body', 'sm');
+  color: color('primary');
+  margin-bottom: units(0.5);
+}
+
+.read-only-value {
+  margin-top: units(0);
+}
diff --git a/src/registrar/migrations/0114_alter_user_portfolio_additional_permissions_and_more.py b/src/registrar/migrations/0114_alter_user_portfolio_additional_permissions_and_more.py
new file mode 100644
index 000000000..f70c5388c
--- /dev/null
+++ b/src/registrar/migrations/0114_alter_user_portfolio_additional_permissions_and_more.py
@@ -0,0 +1,52 @@
+# Generated by Django 4.2.10 on 2024-07-30 02:51
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("registrar", "0113_user_portfolio_user_portfolio_additional_permissions_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="user",
+            name="portfolio_additional_permissions",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.CharField(
+                    choices=[
+                        ("view_all_domains", "View all domains and domain reports"),
+                        ("view_managed_domains", "View managed domains"),
+                        ("edit_domains", "User is a manager on a domain"),
+                        ("view_member", "View members"),
+                        ("edit_member", "Create and edit members"),
+                        ("view_all_requests", "View all requests"),
+                        ("view_created_requests", "View created requests"),
+                        ("edit_requests", "Create and edit requests"),
+                        ("edit_portfolio", "Edit organization"),
+                    ],
+                    max_length=50,
+                ),
+                blank=True,
+                help_text="Select one or more additional permissions.",
+                null=True,
+                size=None,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="user",
+            name="portfolio_roles",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.CharField(
+                    choices=[("organization_admin", "Admin"), ("organization_admin_read_only", "Admin read only")],
+                    max_length=50,
+                ),
+                blank=True,
+                help_text="Select one or more roles.",
+                null=True,
+                size=None,
+            ),
+        ),
+    ]
diff --git a/src/registrar/models/user.py b/src/registrar/models/user.py
index b135e30c7..dd826bc11 100644
--- a/src/registrar/models/user.py
+++ b/src/registrar/models/user.py
@@ -69,7 +69,7 @@ class User(AbstractUser):
 
         ORGANIZATION_ADMIN = "organization_admin", "Admin"
         ORGANIZATION_ADMIN_READ_ONLY = "organization_admin_read_only", "Admin read only"
-        ORGANIZATION_MEMBER = "organization_member", "Member"
+        # ORGANIZATION_MEMBER is an abstract role where user.portfolio is true
 
     class UserPortfolioPermissionChoices(models.TextChoices):
         """ """
@@ -89,7 +89,7 @@ class User(AbstractUser):
         VIEW_CREATED_REQUESTS = "view_created_requests", "View created requests"
         EDIT_REQUESTS = "edit_requests", "Create and edit requests"
 
-        VIEW_PORTFOLIO = "view_portfolio", "View organization"
+        # VIEW_PORTFOLIO is an abstract permission that returns true when user.portfolio is true
         EDIT_PORTFOLIO = "edit_portfolio", "Edit organization"
 
     PORTFOLIO_ROLE_PERMISSIONS = {
@@ -99,17 +99,12 @@ class User(AbstractUser):
             UserPortfolioPermissionChoices.EDIT_MEMBER,
             UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS,
             UserPortfolioPermissionChoices.EDIT_REQUESTS,
-            UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
             UserPortfolioPermissionChoices.EDIT_PORTFOLIO,
         ],
         UserPortfolioRoleChoices.ORGANIZATION_ADMIN_READ_ONLY: [
             UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS,
             UserPortfolioPermissionChoices.VIEW_MEMBER,
             UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS,
-            UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
-        ],
-        UserPortfolioRoleChoices.ORGANIZATION_MEMBER: [
-            UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
         ],
     }
 
@@ -280,10 +275,14 @@ class User(AbstractUser):
 
         return portfolio_permission in portfolio_permissions
 
-    # the methods below are checks for individual portfolio permissions.  they are defined here
+    # the methods below are checks for individual portfolio permissions. They are defined here
     # to make them easier to call elsewhere throughout the application
     def has_base_portfolio_permission(self):
-        return self._has_portfolio_permission(User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO)
+        """Base role/permission, the user is simply linked to a portfolio"""
+        return self.portfolio is not None
+
+    def has_edit_org_portfolio_permission(self):
+        return self._has_portfolio_permission(User.UserPortfolioPermissionChoices.EDIT_PORTFOLIO)
 
     def has_domains_portfolio_permission(self):
         return (
diff --git a/src/registrar/templates/includes/finish_profile_form.html b/src/registrar/templates/includes/finish_profile_form.html
index 88f7a73af..8369511a5 100644
--- a/src/registrar/templates/includes/finish_profile_form.html
+++ b/src/registrar/templates/includes/finish_profile_form.html
@@ -35,7 +35,7 @@
 
         <input type="hidden" name="redirect" value="{{ form.initial.redirect }}">
 
-        {% with show_edit_button=True show_readonly=True group_classes="usa-form-editable usa-form-editable--no-border padding-top-2" %}
+        {% with toggleable_input=True toggleable_label=True group_classes="usa-form-editable usa-form-editable--no-border padding-top-2" %}
             {% input_with_errors form.full_name %}
         {% endwith %}
         
@@ -54,7 +54,7 @@
         </div>
 
         {% public_site_url "help/account-management/#get-help-with-login.gov" as login_help_url %}
-        {% with show_readonly=True add_class="display-none" group_classes="usa-form-editable usa-form-editable padding-top-2 bold-usa-label" %}
+        {% with toggleable_input=True add_class="display-none" group_classes="usa-form-editable usa-form-editable padding-top-2 bold-usa-label" %}
             {% with link_href=login_help_url %}
                 {% with sublabel_text="We recommend using your work email for your .gov account. If the wrong email is displayed below, you’ll need to update your Login.gov account and log back in. Get help with your Login.gov account." %}
                     {% with link_text="Get help with your Login.gov account" target_blank=True do_not_show_max_chars=True %}
@@ -64,11 +64,11 @@
             {% endwith %}
         {% endwith %}
 
-        {% with show_edit_button=True show_readonly=True group_classes="usa-form-editable padding-top-2" %}
+        {% with toggleable_input=True toggleable_label=True group_classes="usa-form-editable padding-top-2" %}
             {% input_with_errors form.title %}
         {% endwith %}
 
-        {% with show_edit_button=True show_readonly=True group_classes="usa-form-editable padding-top-2" %}
+        {% with toggleable_input=True toggleable_label=True group_classes="usa-form-editable padding-top-2" %}
             {% with add_class="usa-input--medium" %}
                 {% input_with_errors form.phone %}
             {% endwith %}
diff --git a/src/registrar/templates/includes/input_read_only.html b/src/registrar/templates/includes/input_read_only.html
new file mode 100644
index 000000000..b76f82e8b
--- /dev/null
+++ b/src/registrar/templates/includes/input_read_only.html
@@ -0,0 +1,7 @@
+{% comment %}
+Template include for read-only form fields 
+{% endcomment %}
+
+
+<h4 class="read-only-label">{{ field.label }}</h4>
+<p class="read-only-value">{{ field.value }}</p>
diff --git a/src/registrar/templates/includes/input_with_errors.html b/src/registrar/templates/includes/input_with_errors.html
index 623ec0a33..d1e53968e 100644
--- a/src/registrar/templates/includes/input_with_errors.html
+++ b/src/registrar/templates/includes/input_with_errors.html
@@ -27,8 +27,8 @@ error messages, if necessary.
 {% endif %}
 
   {% if not field.widget_type == "checkbox" %}
-    {% if show_edit_button %}
-      {% include "includes/label_with_edit_button.html" with bold_label=True %}
+    {% if toggleable_label %}
+      {% include "includes/toggleable_label.html" with bold_label=True %}
     {% else %}
       {% include "django/forms/label.html" %}
     {% endif %}
@@ -63,8 +63,8 @@ error messages, if necessary.
     <div class="display-flex flex-align-center">
   {% endif %}
 
-  {% if show_readonly %}
-    {% include "includes/readonly_input.html" %}
+  {% if toggleable_input %}
+    {% include "includes/toggleable_input.html" %}
   {% endif %}
 
   {# this is the input field, itself #}
diff --git a/src/registrar/templates/includes/readonly_input.html b/src/registrar/templates/includes/toggleable_input.html
similarity index 100%
rename from src/registrar/templates/includes/readonly_input.html
rename to src/registrar/templates/includes/toggleable_input.html
diff --git a/src/registrar/templates/includes/label_with_edit_button.html b/src/registrar/templates/includes/toggleable_label.html
similarity index 100%
rename from src/registrar/templates/includes/label_with_edit_button.html
rename to src/registrar/templates/includes/toggleable_label.html
diff --git a/src/registrar/templates/portfolio_organization.html b/src/registrar/templates/portfolio_organization.html
index 0dede3c32..cc9cf5b6a 100644
--- a/src/registrar/templates/portfolio_organization.html
+++ b/src/registrar/templates/portfolio_organization.html
@@ -23,42 +23,56 @@
 
         <p>The name of your federal agency will be publicly listed as the domain registrant.</p>
 
-        <p>
-            The federal agency for your organization can’t be updated here.
-            To suggest an update, email <a href="mailto:help@get.gov" class="usa-link">help@get.gov</a>.
-        </p>
-
-        {% include "includes/form_errors.html" with form=form %}
-
-        {% include "includes/required_fields.html" %}
-
-        <form class="usa-form usa-form--large" method="post" novalidate id="form-container">
-            {% csrf_token %}
-
+        {% if has_edit_org_portfolio_permission %}
             <p>
-                <strong class="text-primary display-block margin-bottom-1">Federal agency</strong>
-                {{ portfolio }}
+                The federal agency for your organization can’t be updated here.
+                To suggest an update, email <a href="mailto:help@get.gov" class="usa-link">help@get.gov</a>.
             </p>
 
-            {% input_with_errors form.address_line1 %}
+            {% include "includes/form_errors.html" with form=form %}
+            {% include "includes/required_fields.html" %}
+            <form class="usa-form usa-form--large" method="post" novalidate id="form-container">
+                {% csrf_token %}
+                <h4 class="read-only-label">Federal agency</h4>
+                <p class="read-only-value">
+                    {{ portfolio }}
+                </p>
+                {% input_with_errors form.address_line1 %}
+                {% input_with_errors form.address_line2 %}
+                {% input_with_errors form.city %}
+                {% input_with_errors form.state_territory %}
+                {% with add_class="usa-input--small" %}
+                    {% input_with_errors form.zipcode %}
+                {% endwith %}
+                <button
+                type="submit"
+                class="usa-button"
+                >
+                Save
+                </button>
+            </form>
+        {% else %}
+            <h4 class="read-only-label">Federal agency</h4>
+            <p class="read-only-value">
+                {{ portfolio }}
+            </p>
+            {% if form.address_line1.value is not None %}
+                {% include "includes/input_read_only.html" with field=form.address_line1 %}
+            {% endif %}
+            {% if form.address_line2.value is not None %}
+                {% include "includes/input_read_only.html" with field=form.address_line2 %}
+            {% endif %}
+            {% if form.city.value is not None %}
+                {% include "includes/input_read_only.html" with field=form.city %}
+            {% endif %}
+            {% if form.state_territory.value is not None %}
+                {% include "includes/input_read_only.html" with field=form.state_territory %}
+            {% endif %}
+            {% if form.zipcode.value is not None %}
+                {% include "includes/input_read_only.html" with field=form.zipcode %}
+            {% endif %}
+        {% endif %}
 
-            {% input_with_errors form.address_line2 %}
-
-            {% input_with_errors form.city %}
-
-            {% input_with_errors form.state_territory %}
-
-            {% with add_class="usa-input--small" %}
-            {% input_with_errors form.zipcode %}
-            {% endwith %}
-
-            <button
-            type="submit"
-            class="usa-button"
-            >
-            Save
-            </button>
-        </form>
     </div>
 </div>
 {% endblock %}
diff --git a/src/registrar/templatetags/field_helpers.py b/src/registrar/templatetags/field_helpers.py
index b72f77e21..68a803711 100644
--- a/src/registrar/templatetags/field_helpers.py
+++ b/src/registrar/templatetags/field_helpers.py
@@ -26,7 +26,7 @@ def input_with_errors(context, field=None):  # noqa: C901
         add_group_class: append to input element's surrounding tag's `class` attribute
         attr_* - adds or replaces any single html attribute for the input
         add_error_attr_* - like `attr_*` but only if field.errors is not empty
-        show_edit_button: shows a simple edit button, and adds display-none to the input field.
+        toggleable_input: shows a simple edit button, and adds display-none to the input field.
 
     Example usage:
         ```
@@ -92,7 +92,7 @@ def input_with_errors(context, field=None):  # noqa: C901
         elif key == "add_group_class":
             group_classes.append(value)
 
-        elif key == "show_edit_button":
+        elif key == "toggleable_input":
             # Hide the primary input field.
             # Used such that we can toggle it with JS
             if "display-none" not in classes:
diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index 3596bf567..c4cdcc2b2 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -37,25 +37,10 @@ class TestPortfolio(WebTest):
         User.objects.all().delete()
         super().tearDown()
 
-    @less_console_noise_decorator
-    def test_middleware_does_not_redirect_if_no_permission(self):
-        """Test that user with no portfolio permission is not redirected when attempting to access home"""
-        self.app.set_user(self.user.username)
-        self.user.portfolio = self.portfolio
-        self.user.save()
-        self.user.refresh_from_db()
-        with override_flag("organization_feature", active=True):
-            # This will redirect the user to the portfolio page.
-            # Follow implicity checks if our redirect is working.
-            portfolio_page = self.app.get(reverse("home"))
-            # Assert that we're on the right page
-            self.assertNotContains(portfolio_page, self.portfolio.organization_name)
-
     @less_console_noise_decorator
     def test_middleware_does_not_redirect_if_no_portfolio(self):
         """Test that user with no assigned portfolio is not redirected when attempting to access home"""
         self.app.set_user(self.user.username)
-        self.user.portfolio_additional_permissions = [User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO]
         self.user.save()
         self.user.refresh_from_db()
         with override_flag("organization_feature", active=True):
@@ -67,10 +52,9 @@ class TestPortfolio(WebTest):
 
     @less_console_noise_decorator
     def test_middleware_redirects_to_portfolio_organization_page(self):
-        """Test that user with VIEW_PORTFOLIO is redirected to portfolio organization page"""
+        """Test that user with a portfolio is redirected to portfolio organization page"""
         self.app.set_user(self.user.username)
         self.user.portfolio = self.portfolio
-        self.user.portfolio_additional_permissions = [User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO]
         self.user.save()
         self.user.refresh_from_db()
         with override_flag("organization_feature", active=True):
@@ -83,11 +67,10 @@ class TestPortfolio(WebTest):
 
     @less_console_noise_decorator
     def test_middleware_redirects_to_portfolio_domains_page(self):
-        """Test that user with VIEW_PORTFOLIO and VIEW_ALL_DOMAINS is redirected to portfolio domains page"""
+        """Test that user with a portfolio and VIEW_ALL_DOMAINS is redirected to portfolio domains page"""
         self.app.set_user(self.user.username)
         self.user.portfolio = self.portfolio
         self.user.portfolio_additional_permissions = [
-            User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
             User.UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS,
         ]
         self.user.save()
@@ -134,20 +117,47 @@ class TestPortfolio(WebTest):
             self.assertEqual(response.status_code, 403)
 
     @less_console_noise_decorator
-    def test_portfolio_organization_page_403_when_user_not_have_permission(self):
-        """Test that user without proper permission is not allowed access to portfolio organization page"""
+    def test_portfolio_organization_page_read_only(self):
+        """Test that user with a portfolio can access the portfolio organization page, read only"""
         self.app.set_user(self.user.username)
         self.user.portfolio = self.portfolio
+        self.portfolio.city = "Los Angeles"
+        self.portfolio.save()
         self.user.save()
         self.user.refresh_from_db()
         with override_flag("organization_feature", active=True):
-            # This will redirect the user to the portfolio page.
-            # Follow implicity checks if our redirect is working.
-            response = self.app.get(
-                reverse("portfolio-organization", kwargs={"portfolio_id": self.portfolio.pk}), status=403
-            )
-            # Assert the response is a 403 Forbidden
-            self.assertEqual(response.status_code, 403)
+            response = self.app.get(reverse("portfolio-organization", kwargs={"portfolio_id": self.portfolio.pk}))
+            # Assert the response is a 200
+            self.assertEqual(response.status_code, 200)
+            # The label for Federal agency will always be a h4
+            self.assertContains(response, '<h4 class="usa-prose text-primary margin-bottom-05">Federal agency</h4>')
+            # The read only label for city will be a h4
+            self.assertContains(response, '<h4 class="usa-prose text-primary margin-bottom-05">City</h4>')
+            self.assertNotContains(response, 'for="id_city"')
+            self.assertContains(response, '<p class="margin-top-0">Los Angeles</p>')
+
+    @less_console_noise_decorator
+    def test_portfolio_organization_page_edit_access(self):
+        """Test that user with a portfolio can access the portfolio organization page, read only"""
+        self.app.set_user(self.user.username)
+        self.user.portfolio = self.portfolio
+        self.user.portfolio_additional_permissions = [
+            User.UserPortfolioPermissionChoices.EDIT_PORTFOLIO,
+        ]
+        self.portfolio.city = "Los Angeles"
+        self.portfolio.save()
+        self.user.save()
+        self.user.refresh_from_db()
+        with override_flag("organization_feature", active=True):
+            response = self.app.get(reverse("portfolio-organization", kwargs={"portfolio_id": self.portfolio.pk}))
+            # Assert the response is a 200
+            self.assertEqual(response.status_code, 200)
+            # The label for Federal agency will always be a h4
+            self.assertContains(response, '<h4 class="usa-prose text-primary margin-bottom-05">Federal agency</h4>')
+            # The read only label for city will be a h4
+            self.assertNotContains(response, '<h4 class="usa-prose text-primary margin-bottom-05">City</h4>')
+            self.assertNotContains(response, '<p class="margin-top-0">Los Angeles</p>>')
+            self.assertContains(response, 'for="id_city"')
 
     @less_console_noise_decorator
     def test_navigation_links_hidden_when_user_not_have_permission(self):
@@ -155,7 +165,6 @@ class TestPortfolio(WebTest):
         self.app.set_user(self.user.username)
         self.user.portfolio = self.portfolio
         self.user.portfolio_additional_permissions = [
-            User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
             User.UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS,
             User.UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS,
         ]
@@ -176,9 +185,9 @@ class TestPortfolio(WebTest):
                 portfolio_page, reverse("portfolio-domain-requests", kwargs={"portfolio_id": self.portfolio.pk})
             )
 
-            # reducing portfolio permissions to just VIEW_PORTFOLIO, which should remove domains
+            # removing non-basic portfolio perms, which should remove domains
             # and domain requests from nav
-            self.user.portfolio_additional_permissions = [User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO]
+            self.user.portfolio_additional_permissions = []
             self.user.save()
             self.user.refresh_from_db()
 
@@ -194,16 +203,13 @@ class TestPortfolio(WebTest):
                 portfolio_page, reverse("portfolio-domain-requests", kwargs={"portfolio_id": self.portfolio.pk})
             )
 
-
-class TestPortfolioOrganization(TestPortfolio):
-
+    @less_console_noise_decorator
     def test_portfolio_org_name(self):
         """Can load portfolio's org name page."""
         with override_flag("organization_feature", active=True):
             self.app.set_user(self.user.username)
             self.user.portfolio = self.portfolio
             self.user.portfolio_additional_permissions = [
-                User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
                 User.UserPortfolioPermissionChoices.EDIT_PORTFOLIO,
             ]
             self.user.save()
@@ -214,13 +220,13 @@ class TestPortfolioOrganization(TestPortfolio):
                 page, "The name of your federal agency will be publicly listed as the domain registrant."
             )
 
+    @less_console_noise_decorator
     def test_domain_org_name_address_content(self):
         """Org name and address information appears on the page."""
         with override_flag("organization_feature", active=True):
             self.app.set_user(self.user.username)
             self.user.portfolio = self.portfolio
             self.user.portfolio_additional_permissions = [
-                User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
                 User.UserPortfolioPermissionChoices.EDIT_PORTFOLIO,
             ]
             self.user.save()
@@ -232,13 +238,13 @@ class TestPortfolioOrganization(TestPortfolio):
             # Once in the sidenav, once in the main nav, once in the form
             self.assertContains(page, "Hotel California", count=3)
 
+    @less_console_noise_decorator
     def test_domain_org_name_address_form(self):
         """Submitting changes works on the org name address page."""
         with override_flag("organization_feature", active=True):
             self.app.set_user(self.user.username)
             self.user.portfolio = self.portfolio
             self.user.portfolio_additional_permissions = [
-                User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
                 User.UserPortfolioPermissionChoices.EDIT_PORTFOLIO,
             ]
             self.user.save()
diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py
index abd9648ba..c04044664 100644
--- a/src/registrar/views/portfolios.py
+++ b/src/registrar/views/portfolios.py
@@ -64,6 +64,9 @@ class PortfolioOrganizationView(PortfolioBasePermissionView, FormMixin):
         """Add additional context data to the template."""
         context = super().get_context_data(**kwargs)
         # no need to add portfolio to request context here
+
+        context["has_edit_org_portfolio_permission"] = self.request.user.has_edit_org_portfolio_permission()
+
         context["has_profile_feature_flag"] = flag_is_active(self.request, "profile_feature")
         context["has_organization_feature_flag"] = flag_is_active(self.request, "organization_feature")
         return context

From f183090e24bd05461fb7c2b1b084914df26bd0e7 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 30 Jul 2024 12:04:25 -0400
Subject: [PATCH 19/70] fix unit tests

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

diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index c4cdcc2b2..f28b10516 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -130,9 +130,9 @@ class TestPortfolio(WebTest):
             # Assert the response is a 200
             self.assertEqual(response.status_code, 200)
             # The label for Federal agency will always be a h4
-            self.assertContains(response, '<h4 class="usa-prose text-primary margin-bottom-05">Federal agency</h4>')
+            self.assertContains(response, '<h4 class="read-only-label">Federal agency</h4>')
             # The read only label for city will be a h4
-            self.assertContains(response, '<h4 class="usa-prose text-primary margin-bottom-05">City</h4>')
+            self.assertContains(response, '<h4 class="read-only-label">City</h4>')
             self.assertNotContains(response, 'for="id_city"')
             self.assertContains(response, '<p class="margin-top-0">Los Angeles</p>')
 
@@ -153,9 +153,9 @@ class TestPortfolio(WebTest):
             # Assert the response is a 200
             self.assertEqual(response.status_code, 200)
             # The label for Federal agency will always be a h4
-            self.assertContains(response, '<h4 class="usa-prose text-primary margin-bottom-05">Federal agency</h4>')
+            self.assertContains(response, '<h4 class="read-only-label">Federal agency</h4>')
             # The read only label for city will be a h4
-            self.assertNotContains(response, '<h4 class="usa-prose text-primary margin-bottom-05">City</h4>')
+            self.assertNotContains(response, '<h4 class="read-only-label">City</h4>')
             self.assertNotContains(response, '<p class="margin-top-0">Los Angeles</p>>')
             self.assertContains(response, 'for="id_city"')
 

From 44fea22cf976efccc1aaf7be47b544c239282c10 Mon Sep 17 00:00:00 2001
From: Alysia Broddrick <abroddrick@truss.works>
Date: Tue, 30 Jul 2024 09:13:50 -0700
Subject: [PATCH 20/70] Add new developer sandbox 'ad' infrastructure

---
 .github/workflows/migrate.yaml   |  1 +
 .github/workflows/reset-db.yaml  |  1 +
 ops/manifests/manifest-ad.yaml   | 32 ++++++++++++++++++++++++++++++++
 src/registrar/config/settings.py |  1 +
 4 files changed, 35 insertions(+)
 create mode 100644 ops/manifests/manifest-ad.yaml

diff --git a/.github/workflows/migrate.yaml b/.github/workflows/migrate.yaml
index 3ebee59f9..70ff8ee95 100644
--- a/.github/workflows/migrate.yaml
+++ b/.github/workflows/migrate.yaml
@@ -16,6 +16,7 @@ on:
           - stable
           - staging
           - development
+          - ad
           - ms
           - ag
           - litterbox
diff --git a/.github/workflows/reset-db.yaml b/.github/workflows/reset-db.yaml
index 49e4b5e5f..b6fa0fec5 100644
--- a/.github/workflows/reset-db.yaml
+++ b/.github/workflows/reset-db.yaml
@@ -16,6 +16,7 @@ on:
         options:
           - staging
           - development
+          - ad
           - ms
           - ag
           - litterbox
diff --git a/ops/manifests/manifest-ad.yaml b/ops/manifests/manifest-ad.yaml
new file mode 100644
index 000000000..73d6f96ff
--- /dev/null
+++ b/ops/manifests/manifest-ad.yaml
@@ -0,0 +1,32 @@
+---
+applications:
+- name: getgov-ad
+  buildpacks:
+    - python_buildpack
+  path: ../../src
+  instances: 1
+  memory: 512M
+  stack: cflinuxfs4
+  timeout: 180
+  command: ./run.sh
+  health-check-type: http
+  health-check-http-endpoint: /health
+  health-check-invocation-timeout: 40
+  env:
+    # Send stdout and stderr straight to the terminal without buffering
+    PYTHONUNBUFFERED: yup
+    # Tell Django where to find its configuration
+    DJANGO_SETTINGS_MODULE: registrar.config.settings
+    # Tell Django where it is being hosted
+    DJANGO_BASE_URL: https://getgov-ad.app.cloud.gov
+    # Tell Django how much stuff to log
+    DJANGO_LOG_LEVEL: INFO
+    # default public site location
+    GETGOV_PUBLIC_SITE_URL: https://get.gov
+    # Flag to disable/enable features in prod environments
+    IS_PRODUCTION: False
+  routes:
+    - route: getgov-ad.app.cloud.gov
+  services:
+  - getgov-credentials
+  - getgov-ad-database
diff --git a/src/registrar/config/settings.py b/src/registrar/config/settings.py
index 3da0a104a..8dc2587b9 100644
--- a/src/registrar/config/settings.py
+++ b/src/registrar/config/settings.py
@@ -665,6 +665,7 @@ ALLOWED_HOSTS = [
     "getgov-stable.app.cloud.gov",
     "getgov-staging.app.cloud.gov",
     "getgov-development.app.cloud.gov",
+    "getgov-ad.app.cloud.gov",
     "getgov-ms.app.cloud.gov",
     "getgov-ag.app.cloud.gov",
     "getgov-litterbox.app.cloud.gov",

From 6e900bc501cf00238b006fff9719f54de287bc13 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 30 Jul 2024 12:35:17 -0400
Subject: [PATCH 21/70] fix unit tests

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

diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index f28b10516..089b710aa 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -134,7 +134,7 @@ class TestPortfolio(WebTest):
             # The read only label for city will be a h4
             self.assertContains(response, '<h4 class="read-only-label">City</h4>')
             self.assertNotContains(response, 'for="id_city"')
-            self.assertContains(response, '<p class="margin-top-0">Los Angeles</p>')
+            self.assertContains(response, '<p class="read-only-value">Los Angeles</p>')
 
     @less_console_noise_decorator
     def test_portfolio_organization_page_edit_access(self):
@@ -156,7 +156,7 @@ class TestPortfolio(WebTest):
             self.assertContains(response, '<h4 class="read-only-label">Federal agency</h4>')
             # The read only label for city will be a h4
             self.assertNotContains(response, '<h4 class="read-only-label">City</h4>')
-            self.assertNotContains(response, '<p class="margin-top-0">Los Angeles</p>>')
+            self.assertNotContains(response, '<p class="read-only-value">Los Angeles</p>>')
             self.assertContains(response, 'for="id_city"')
 
     @less_console_noise_decorator

From 53e1fe96931b584b824bf474c7c30126681d4614 Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Tue, 30 Jul 2024 13:31:38 -0600
Subject: [PATCH 22/70] update code for extracting "other contact" details

---
 src/registrar/assets/js/copy-summary.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/registrar/assets/js/copy-summary.js b/src/registrar/assets/js/copy-summary.js
index de15596d2..2416b07bb 100644
--- a/src/registrar/assets/js/copy-summary.js
+++ b/src/registrar/assets/js/copy-summary.js
@@ -34,16 +34,16 @@ document.addEventListener('DOMContentLoaded', function() {
         // 2 - Iterate through contact details and assemble html for summary
         let otherContactsSummary = ""
         // Get the table rows of contact details
-        const otherContactsTable = document.querySelector('.form-row.field-other_contacts table tbody');
-        if (otherContactsTable) {
-            const otherContactsRows = otherContactsTable.querySelectorAll('tr');
-            const bulletList = document.createElement('ul');
-            otherContactsRows.forEach(contactRow => {
-            // Extract the contact details
-            const name = contactRow.querySelector('th').textContent.trim();
-            const title = contactRow.querySelectorAll('td')[0].textContent.trim();
-            const email = contactRow.querySelectorAll('td')[1].textContent.trim();
-            const phone = contactRow.querySelectorAll('td')[2].textContent.trim();
+        // Select all contact elements
+        const contacts = document.querySelectorAll('.dja-detail-list dl');
+
+        // Iterate through each contact element
+        contacts.forEach(contact => {
+            const name = contact.querySelector('a#contact_info_name').innerText;
+            const title = contact.querySelector('span#contact_info_title').innerText;
+            const email = contact.querySelector('span#contact_info_email').innerText;
+            const phone = contact.querySelector('span#contact_info_phone').innerText;
+
             const url = nameToUrlMap[name] || '#';
             // Format the contact information
             const listItem = document.createElement('li');
@@ -51,7 +51,7 @@ document.addEventListener('DOMContentLoaded', function() {
             bulletList.appendChild(listItem);
             });
             otherContactsSummary += bulletList.outerHTML
-        }
+        });
 
 
         //------ Requested Domains

From 6c82ec9dc296438a352890585f1d778ca8647ab4 Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Tue, 30 Jul 2024 13:33:14 -0700
Subject: [PATCH 23/70] Update for organization to have election

---
 src/registrar/models/domain_request.py | 8 ++++++++
 src/registrar/utility/csv_export.py    | 5 +++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index a7252e16b..1ff1e501a 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -215,6 +215,14 @@ class DomainRequest(TimeStampedModel):
             }
             return org_election_map
 
+        @classmethod
+        def get_org_label(cls, org_name: str):
+            # Translating the key that is given to the direct readable value
+            if not org_name:
+                return None
+
+            return cls(org_name).label if org_name else None
+
     class OrganizationChoicesVerbose(models.TextChoices):
         """
         Tertiary organization choices
diff --git a/src/registrar/utility/csv_export.py b/src/registrar/utility/csv_export.py
index 5fbd255aa..d852df5db 100644
--- a/src/registrar/utility/csv_export.py
+++ b/src/registrar/utility/csv_export.py
@@ -374,8 +374,9 @@ class DomainExport(BaseExport):
         if first_ready_on is None:
             first_ready_on = "(blank)"
 
-        domain_org_type = model.get("generic_org_type")
-        human_readable_domain_org_type = DomainRequest.OrganizationChoices.get_org_label(domain_org_type)
+        # organization_type has generic_org_type AND is_election
+        domain_org_type = model.get("organization_type")
+        human_readable_domain_org_type = DomainRequest.OrgChoicesElectionOffice.get_org_label(domain_org_type)
         domain_federal_type = model.get("federal_type")
         human_readable_domain_federal_type = BranchChoices.get_branch_label(domain_federal_type)
         domain_type = human_readable_domain_org_type

From e446aa9511fa98b3655cbe79ec601c75a89d10e1 Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Tue, 30 Jul 2024 16:05:15 -0600
Subject: [PATCH 24/70] copy logic updates, icon updates

---
 src/registrar/assets/js/copy-summary.js              | 12 +++++-------
 .../templates/admin/change_form_object_tools.html    |  8 +++++++-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/registrar/assets/js/copy-summary.js b/src/registrar/assets/js/copy-summary.js
index 2416b07bb..178f61185 100644
--- a/src/registrar/assets/js/copy-summary.js
+++ b/src/registrar/assets/js/copy-summary.js
@@ -21,9 +21,9 @@ document.addEventListener('DOMContentLoaded', function() {
         // 1 - Create a hyperlinks map so we can display contact details and also link to the contact
         const otherContactsDiv = document.querySelector('.form-row.field-other_contacts .readonly');
         let otherContactLinks = [];
+        const nameToUrlMap = {};
         if (otherContactsDiv) {
             otherContactLinks = otherContactsDiv.querySelectorAll('a');
-            const nameToUrlMap = {};
             otherContactLinks.forEach(link => {
               const name = link.textContent.trim();
               const url = link.href;
@@ -38,20 +38,20 @@ document.addEventListener('DOMContentLoaded', function() {
         const contacts = document.querySelectorAll('.dja-detail-list dl');
 
         // Iterate through each contact element
+        const bulletList = document.createElement('ul');
         contacts.forEach(contact => {
             const name = contact.querySelector('a#contact_info_name').innerText;
             const title = contact.querySelector('span#contact_info_title').innerText;
             const email = contact.querySelector('span#contact_info_email').innerText;
             const phone = contact.querySelector('span#contact_info_phone').innerText;
-
             const url = nameToUrlMap[name] || '#';
+
             // Format the contact information
             const listItem = document.createElement('li');
             listItem.innerHTML = `<a href="${url}">${name}</a>, ${title}, ${email}, ${phone}`;
             bulletList.appendChild(listItem);
-            });
-            otherContactsSummary += bulletList.outerHTML
         });
+        otherContactsSummary += bulletList.outerHTML
 
 
         //------ Requested Domains
@@ -115,12 +115,10 @@ document.addEventListener('DOMContentLoaded', function() {
                 'text/html': new Blob([tempElement.innerHTML], { type: 'text/html' })
             })
         ]).then(() => {
-            console.log('Bold text copied to clipboard successfully!');
+            console.log('Summary copied to clipboard successfully!');
         }).catch(err => {
             console.error('Failed to copy text: ', err);
         });
         document.body.removeChild(tempElement); 
-
-        alert('Summary copied to clipboard!');
     });
 });
diff --git a/src/registrar/templates/admin/change_form_object_tools.html b/src/registrar/templates/admin/change_form_object_tools.html
index c2d22e9e2..1094f4c86 100644
--- a/src/registrar/templates/admin/change_form_object_tools.html
+++ b/src/registrar/templates/admin/change_form_object_tools.html
@@ -1,4 +1,5 @@
 {% load i18n admin_urls %}
+{% load i18n static %}
 
 {% comment %} Replace li with p for more semantic HTML if we have a single child {% endcomment %}
 {% block object-tools-items %}
@@ -19,7 +20,12 @@
             </li>
             {% if opts.model_name == 'domainrequest' %}
             <li>
-                <a id="copy-summary-btn" class="historylink" href="#">{% translate "Copy request summary" %}</a>
+                <a id="copy-summary-btn" class="historylink " href="#">
+                    <svg class="usa-icon" >
+                        <use aria-hidden="true" xlink:href="{%static 'img/sprite.svg'%}#content_copy"></use>
+                    </svg>
+                    <span>{% translate "Copy request summary" %}</span>
+                </a>
             </li>
             {% endif %}
         </ul>

From 0953e50bb0d01155436f1ec5ab49e971d19cbbe6 Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Tue, 30 Jul 2024 17:39:02 -0600
Subject: [PATCH 25/70] styling updates

---
 src/registrar/assets/sass/_theme/_buttons.scss              | 5 +++++
 src/registrar/templates/admin/change_form_object_tools.html | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/registrar/assets/sass/_theme/_buttons.scss b/src/registrar/assets/sass/_theme/_buttons.scss
index 7fa379c0b..577c9ce29 100644
--- a/src/registrar/assets/sass/_theme/_buttons.scss
+++ b/src/registrar/assets/sass/_theme/_buttons.scss
@@ -128,6 +128,11 @@ a.withdraw:active {
   vertical-align: bottom;
 }
 
+a.historylink .usa-icon {
+  vertical-align: middle;
+  margin: 0px;
+}
+
 a.usa-button--unstyled:visited {
   color: color('primary');
 }
diff --git a/src/registrar/templates/admin/change_form_object_tools.html b/src/registrar/templates/admin/change_form_object_tools.html
index 1094f4c86..03c519241 100644
--- a/src/registrar/templates/admin/change_form_object_tools.html
+++ b/src/registrar/templates/admin/change_form_object_tools.html
@@ -22,7 +22,7 @@
             <li>
                 <a id="copy-summary-btn" class="historylink " href="#">
                     <svg class="usa-icon" >
-                        <use aria-hidden="true" xlink:href="{%static 'img/sprite.svg'%}#content_copy"></use>
+                        <use xlink:href="{%static 'img/sprite.svg'%}#content_copy"></use>
                     </svg>
                     <span>{% translate "Copy request summary" %}</span>
                 </a>

From 7f212edda5d61ad0b82ead1df71818369fb4959b Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 30 Jul 2024 19:58:39 -0400
Subject: [PATCH 26/70] revert some of the tweaks

---
 ..._user_portfolio_additional_permissions.py} | 17 +-------
 src/registrar/models/user.py                  | 14 +++---
 src/registrar/tests/test_views_portfolio.py   | 43 ++++++++++++++++++-
 3 files changed, 51 insertions(+), 23 deletions(-)
 rename src/registrar/migrations/{0114_alter_user_portfolio_additional_permissions_and_more.py => 0114_alter_user_portfolio_additional_permissions.py} (70%)

diff --git a/src/registrar/migrations/0114_alter_user_portfolio_additional_permissions_and_more.py b/src/registrar/migrations/0114_alter_user_portfolio_additional_permissions.py
similarity index 70%
rename from src/registrar/migrations/0114_alter_user_portfolio_additional_permissions_and_more.py
rename to src/registrar/migrations/0114_alter_user_portfolio_additional_permissions.py
index f70c5388c..27f6e699f 100644
--- a/src/registrar/migrations/0114_alter_user_portfolio_additional_permissions_and_more.py
+++ b/src/registrar/migrations/0114_alter_user_portfolio_additional_permissions.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.10 on 2024-07-30 02:51
+# Generated by Django 4.2.10 on 2024-07-30 23:58
 
 import django.contrib.postgres.fields
 from django.db import migrations, models
@@ -26,6 +26,7 @@ class Migration(migrations.Migration):
                         ("view_created_requests", "View created requests"),
                         ("edit_requests", "Create and edit requests"),
                         ("edit_portfolio", "Edit organization"),
+                        ("view_portfolio", "View organization"),
                     ],
                     max_length=50,
                 ),
@@ -35,18 +36,4 @@ class Migration(migrations.Migration):
                 size=None,
             ),
         ),
-        migrations.AlterField(
-            model_name="user",
-            name="portfolio_roles",
-            field=django.contrib.postgres.fields.ArrayField(
-                base_field=models.CharField(
-                    choices=[("organization_admin", "Admin"), ("organization_admin_read_only", "Admin read only")],
-                    max_length=50,
-                ),
-                blank=True,
-                help_text="Select one or more roles.",
-                null=True,
-                size=None,
-            ),
-        ),
     ]
diff --git a/src/registrar/models/user.py b/src/registrar/models/user.py
index dd826bc11..48e6dc420 100644
--- a/src/registrar/models/user.py
+++ b/src/registrar/models/user.py
@@ -64,15 +64,15 @@ class User(AbstractUser):
 
     class UserPortfolioRoleChoices(models.TextChoices):
         """
-        Roles make it easier for admins to look at
+        Roles make it easier for admins to look at groups of users
         """
 
         ORGANIZATION_ADMIN = "organization_admin", "Admin"
         ORGANIZATION_ADMIN_READ_ONLY = "organization_admin_read_only", "Admin read only"
-        # ORGANIZATION_MEMBER is an abstract role where user.portfolio is true
+        ORGANIZATION_MEMBER = "organization_member", "Member"
 
     class UserPortfolioPermissionChoices(models.TextChoices):
-        """ """
+        """We test against permissions to manage access"""
 
         VIEW_ALL_DOMAINS = "view_all_domains", "View all domains and domain reports"
         VIEW_MANAGED_DOMAINS = "view_managed_domains", "View managed domains"
@@ -89,8 +89,8 @@ class User(AbstractUser):
         VIEW_CREATED_REQUESTS = "view_created_requests", "View created requests"
         EDIT_REQUESTS = "edit_requests", "Create and edit requests"
 
-        # VIEW_PORTFOLIO is an abstract permission that returns true when user.portfolio is true
         EDIT_PORTFOLIO = "edit_portfolio", "Edit organization"
+        VIEW_PORTFOLIO = "view_portfolio", "View organization"
 
     PORTFOLIO_ROLE_PERMISSIONS = {
         UserPortfolioRoleChoices.ORGANIZATION_ADMIN: [
@@ -106,6 +106,9 @@ class User(AbstractUser):
             UserPortfolioPermissionChoices.VIEW_MEMBER,
             UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS,
         ],
+        UserPortfolioRoleChoices.ORGANIZATION_MEMBER: [
+            UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
+        ],
     }
 
     # #### Constants for choice fields ####
@@ -278,8 +281,7 @@ class User(AbstractUser):
     # the methods below are checks for individual portfolio permissions. They are defined here
     # to make them easier to call elsewhere throughout the application
     def has_base_portfolio_permission(self):
-        """Base role/permission, the user is simply linked to a portfolio"""
-        return self.portfolio is not None
+        return self._has_portfolio_permission(User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO)
 
     def has_edit_org_portfolio_permission(self):
         return self._has_portfolio_permission(User.UserPortfolioPermissionChoices.EDIT_PORTFOLIO)
diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index 089b710aa..21b794cf7 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -37,10 +37,25 @@ class TestPortfolio(WebTest):
         User.objects.all().delete()
         super().tearDown()
 
+    @less_console_noise_decorator
+    def test_middleware_does_not_redirect_if_no_permission(self):
+        """Test that user with no portfolio permission is not redirected when attempting to access home"""
+        self.app.set_user(self.user.username)
+        self.user.portfolio = self.portfolio
+        self.user.save()
+        self.user.refresh_from_db()
+        with override_flag("organization_feature", active=True):
+            # This will redirect the user to the portfolio page.
+            # Follow implicity checks if our redirect is working.
+            portfolio_page = self.app.get(reverse("home"))
+            # Assert that we're on the right page
+            self.assertNotContains(portfolio_page, self.portfolio.organization_name)
+
     @less_console_noise_decorator
     def test_middleware_does_not_redirect_if_no_portfolio(self):
         """Test that user with no assigned portfolio is not redirected when attempting to access home"""
         self.app.set_user(self.user.username)
+        self.user.portfolio_additional_permissions = [User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO]
         self.user.save()
         self.user.refresh_from_db()
         with override_flag("organization_feature", active=True):
@@ -52,9 +67,10 @@ class TestPortfolio(WebTest):
 
     @less_console_noise_decorator
     def test_middleware_redirects_to_portfolio_organization_page(self):
-        """Test that user with a portfolio is redirected to portfolio organization page"""
+        """Test that user with a portfolio and VIEW_PORTFOLIO is redirected to portfolio organization page"""
         self.app.set_user(self.user.username)
         self.user.portfolio = self.portfolio
+        self.user.portfolio_additional_permissions = [User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO]
         self.user.save()
         self.user.refresh_from_db()
         with override_flag("organization_feature", active=True):
@@ -67,10 +83,12 @@ class TestPortfolio(WebTest):
 
     @less_console_noise_decorator
     def test_middleware_redirects_to_portfolio_domains_page(self):
-        """Test that user with a portfolio and VIEW_ALL_DOMAINS is redirected to portfolio domains page"""
+        """Test that user with a portfolio, VIEW_PORTFOLIO, VIEW_ALL_DOMAINS
+        is redirected to portfolio domains page"""
         self.app.set_user(self.user.username)
         self.user.portfolio = self.portfolio
         self.user.portfolio_additional_permissions = [
+            User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
             User.UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS,
         ]
         self.user.save()
@@ -116,12 +134,29 @@ class TestPortfolio(WebTest):
             # Assert the response is a 403 Forbidden
             self.assertEqual(response.status_code, 403)
 
+    @less_console_noise_decorator
+    def test_portfolio_organization_page_403_when_user_not_have_permission(self):
+        """Test that user without proper permission is not allowed access to portfolio organization page"""
+        self.app.set_user(self.user.username)
+        self.user.portfolio = self.portfolio
+        self.user.save()
+        self.user.refresh_from_db()
+        with override_flag("organization_feature", active=True):
+            # This will redirect the user to the portfolio page.
+            # Follow implicity checks if our redirect is working.
+            response = self.app.get(
+                reverse("portfolio-organization", kwargs={"portfolio_id": self.portfolio.pk}), status=403
+            )
+            # Assert the response is a 403 Forbidden
+            self.assertEqual(response.status_code, 403)
+
     @less_console_noise_decorator
     def test_portfolio_organization_page_read_only(self):
         """Test that user with a portfolio can access the portfolio organization page, read only"""
         self.app.set_user(self.user.username)
         self.user.portfolio = self.portfolio
         self.portfolio.city = "Los Angeles"
+        self.user.portfolio_additional_permissions = [User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO]
         self.portfolio.save()
         self.user.save()
         self.user.refresh_from_db()
@@ -142,6 +177,7 @@ class TestPortfolio(WebTest):
         self.app.set_user(self.user.username)
         self.user.portfolio = self.portfolio
         self.user.portfolio_additional_permissions = [
+            User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
             User.UserPortfolioPermissionChoices.EDIT_PORTFOLIO,
         ]
         self.portfolio.city = "Los Angeles"
@@ -210,6 +246,7 @@ class TestPortfolio(WebTest):
             self.app.set_user(self.user.username)
             self.user.portfolio = self.portfolio
             self.user.portfolio_additional_permissions = [
+                User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
                 User.UserPortfolioPermissionChoices.EDIT_PORTFOLIO,
             ]
             self.user.save()
@@ -227,6 +264,7 @@ class TestPortfolio(WebTest):
             self.app.set_user(self.user.username)
             self.user.portfolio = self.portfolio
             self.user.portfolio_additional_permissions = [
+                User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
                 User.UserPortfolioPermissionChoices.EDIT_PORTFOLIO,
             ]
             self.user.save()
@@ -245,6 +283,7 @@ class TestPortfolio(WebTest):
             self.app.set_user(self.user.username)
             self.user.portfolio = self.portfolio
             self.user.portfolio_additional_permissions = [
+                User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
                 User.UserPortfolioPermissionChoices.EDIT_PORTFOLIO,
             ]
             self.user.save()

From 867ccd097e32c29493da3e75241bbe4053b262b9 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 30 Jul 2024 20:21:41 -0400
Subject: [PATCH 27/70] remove migration

---
 ...r_user_portfolio_additional_permissions.py | 39 -------------------
 src/registrar/models/user.py                  |  2 +-
 2 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 src/registrar/migrations/0114_alter_user_portfolio_additional_permissions.py

diff --git a/src/registrar/migrations/0114_alter_user_portfolio_additional_permissions.py b/src/registrar/migrations/0114_alter_user_portfolio_additional_permissions.py
deleted file mode 100644
index 27f6e699f..000000000
--- a/src/registrar/migrations/0114_alter_user_portfolio_additional_permissions.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# Generated by Django 4.2.10 on 2024-07-30 23:58
-
-import django.contrib.postgres.fields
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("registrar", "0113_user_portfolio_user_portfolio_additional_permissions_and_more"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="user",
-            name="portfolio_additional_permissions",
-            field=django.contrib.postgres.fields.ArrayField(
-                base_field=models.CharField(
-                    choices=[
-                        ("view_all_domains", "View all domains and domain reports"),
-                        ("view_managed_domains", "View managed domains"),
-                        ("edit_domains", "User is a manager on a domain"),
-                        ("view_member", "View members"),
-                        ("edit_member", "Create and edit members"),
-                        ("view_all_requests", "View all requests"),
-                        ("view_created_requests", "View created requests"),
-                        ("edit_requests", "Create and edit requests"),
-                        ("edit_portfolio", "Edit organization"),
-                        ("view_portfolio", "View organization"),
-                    ],
-                    max_length=50,
-                ),
-                blank=True,
-                help_text="Select one or more additional permissions.",
-                null=True,
-                size=None,
-            ),
-        ),
-    ]
diff --git a/src/registrar/models/user.py b/src/registrar/models/user.py
index 48e6dc420..f4d7635cd 100644
--- a/src/registrar/models/user.py
+++ b/src/registrar/models/user.py
@@ -89,8 +89,8 @@ class User(AbstractUser):
         VIEW_CREATED_REQUESTS = "view_created_requests", "View created requests"
         EDIT_REQUESTS = "edit_requests", "Create and edit requests"
 
-        EDIT_PORTFOLIO = "edit_portfolio", "Edit organization"
         VIEW_PORTFOLIO = "view_portfolio", "View organization"
+        EDIT_PORTFOLIO = "edit_portfolio", "Edit organization"
 
     PORTFOLIO_ROLE_PERMISSIONS = {
         UserPortfolioRoleChoices.ORGANIZATION_ADMIN: [

From 6a94da8a5d96cc0788cb375525ec763bfc3e3373 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 30 Jul 2024 20:22:53 -0400
Subject: [PATCH 28/70] cleanup

---
 src/registrar/models/user.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/registrar/models/user.py b/src/registrar/models/user.py
index f4d7635cd..19097a96e 100644
--- a/src/registrar/models/user.py
+++ b/src/registrar/models/user.py
@@ -99,12 +99,14 @@ class User(AbstractUser):
             UserPortfolioPermissionChoices.EDIT_MEMBER,
             UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS,
             UserPortfolioPermissionChoices.EDIT_REQUESTS,
+            UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
             UserPortfolioPermissionChoices.EDIT_PORTFOLIO,
         ],
         UserPortfolioRoleChoices.ORGANIZATION_ADMIN_READ_ONLY: [
             UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS,
             UserPortfolioPermissionChoices.VIEW_MEMBER,
             UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS,
+            UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
         ],
         UserPortfolioRoleChoices.ORGANIZATION_MEMBER: [
             UserPortfolioPermissionChoices.VIEW_PORTFOLIO,

From 7b56562417f3a5c2eb5b8e8982eabf9c3092860e Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Tue, 30 Jul 2024 18:45:44 -0600
Subject: [PATCH 29/70] Fixed error with javascript file, more styling

---
 src/registrar/assets/js/copy-summary.js       | 124 -------------
 src/registrar/assets/js/get-gov-admin.js      | 163 +++++++++++++++++-
 .../assets/sass/_theme/_buttons.scss          |   7 +-
 src/registrar/assets/sass/_theme/_links.scss  |   5 +
 .../templates/admin/change_form.html          |   4 -
 .../admin/change_form_object_tools.html       |   6 +-
 6 files changed, 165 insertions(+), 144 deletions(-)
 delete mode 100644 src/registrar/assets/js/copy-summary.js

diff --git a/src/registrar/assets/js/copy-summary.js b/src/registrar/assets/js/copy-summary.js
deleted file mode 100644
index 178f61185..000000000
--- a/src/registrar/assets/js/copy-summary.js
+++ /dev/null
@@ -1,124 +0,0 @@
-
-document.addEventListener('DOMContentLoaded', function() {
-    document.getElementById('copy-summary-btn').addEventListener('click', function() {
-        /// Generate a rich HTML summary text and copy to clipboard
-
-        //------ Organization Type
-        const organizationTypeElement = document.getElementById('id_organization_type');
-        const organizationType = organizationTypeElement.options[organizationTypeElement.selectedIndex].text;
-
-        //------ Alternative Domains
-        const alternativeDomainsDiv = document.querySelector('.form-row.field-alternative_domains .readonly');
-        const alternativeDomainslinks = alternativeDomainsDiv.querySelectorAll('a');
-        const alternativeDomains = Array.from(alternativeDomainslinks).map(link => link.textContent);
-
-        //------ Existing Websites
-        const existingWebsitesDiv = document.querySelector('.form-row.field-current_websites .readonly');
-        const existingWebsiteslinks = existingWebsitesDiv.querySelectorAll('a');
-        const existingWebsites = Array.from(existingWebsiteslinks).map(link => link.textContent);
-
-        //------ Additional Contacts
-        // 1 - Create a hyperlinks map so we can display contact details and also link to the contact
-        const otherContactsDiv = document.querySelector('.form-row.field-other_contacts .readonly');
-        let otherContactLinks = [];
-        const nameToUrlMap = {};
-        if (otherContactsDiv) {
-            otherContactLinks = otherContactsDiv.querySelectorAll('a');
-            otherContactLinks.forEach(link => {
-              const name = link.textContent.trim();
-              const url = link.href;
-              nameToUrlMap[name] = url;
-            });
-        }
-    
-        // 2 - Iterate through contact details and assemble html for summary
-        let otherContactsSummary = ""
-        // Get the table rows of contact details
-        // Select all contact elements
-        const contacts = document.querySelectorAll('.dja-detail-list dl');
-
-        // Iterate through each contact element
-        const bulletList = document.createElement('ul');
-        contacts.forEach(contact => {
-            const name = contact.querySelector('a#contact_info_name').innerText;
-            const title = contact.querySelector('span#contact_info_title').innerText;
-            const email = contact.querySelector('span#contact_info_email').innerText;
-            const phone = contact.querySelector('span#contact_info_phone').innerText;
-            const url = nameToUrlMap[name] || '#';
-
-            // Format the contact information
-            const listItem = document.createElement('li');
-            listItem.innerHTML = `<a href="${url}">${name}</a>, ${title}, ${email}, ${phone}`;
-            bulletList.appendChild(listItem);
-        });
-        otherContactsSummary += bulletList.outerHTML
-
-
-        //------ Requested Domains
-        const requestedDomainElement = document.getElementById('id_requested_domain');
-        const requestedDomain = requestedDomainElement.options[requestedDomainElement.selectedIndex].text;
-
-        //------ Submitter
-        // Function to extract text by ID and handle missing elements
-        function extractTextById(id, divElement) {
-            if (divElement) {
-                const element = divElement.querySelector(`#${id}`);
-                return element ? ", " + element.textContent.trim() : '';
-            }
-            return '';
-        }
-        // Extract the submitter name, title, email, and phone number
-        const submitterDiv = document.querySelector('.form-row.field-submitter');
-        const submitterNameElement = document.getElementById('id_submitter');
-        const submitterName = submitterNameElement.options[submitterNameElement.selectedIndex].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');
-        const seniorOfficialElement = document.getElementById('id_senior_official');
-        const seniorOfficialName = seniorOfficialElement.options[seniorOfficialElement.selectedIndex].text;
-        const seniorOfficialTitle = extractTextById('contact_info_title', seniorOfficialDiv);
-        const seniorOfficialEmail = extractTextById('contact_info_email', seniorOfficialDiv);
-        const seniorOfficialPhone = extractTextById('contact_info_phone', seniorOfficialDiv);
-        let seniorOfficialInfo = `${seniorOfficialName}${seniorOfficialTitle}${seniorOfficialEmail}${seniorOfficialPhone}`;
-
-        const summary = `<strong>Recommendation:</strong></br>` +
-                        `<strong>Organization Type:</strong> ${organizationType}</br>` +
-                        `<strong>Requested Domain:</strong> ${requestedDomain}</br>` +
-                        `<strong>Existing website(s):</strong> ${existingWebsites.join(', ')}</br>` +
-                        `<strong>Rationale:</strong></br>` +
-                        `<strong>Alternate Domain(s):</strong> ${alternativeDomains.join(', ')}</br>` +
-                        `<strong>Submitter:</strong> ${submitterInfo}</br>` +
-                        `<strong>Senior Official:</strong> ${seniorOfficialInfo}</br>` +
-                        `<strong>Additional Contact(s):</strong> ${otherContactsSummary}</br>`;
-
-        // Create a temporary element
-        let tempElement = document.createElement('div');
-        tempElement.innerHTML = summary;
-        // Append the element to the body
-        document.body.appendChild(tempElement);
-
-        // Use the Selection and Range APIs to select the element's content
-        let range = document.createRange();
-        range.selectNodeContents(tempElement);
-        let selection = window.getSelection();
-        selection.removeAllRanges();
-        selection.addRange(range);
-
-        // Use the Clipboard API to write the selected HTML content to the clipboard
-        navigator.clipboard.write([
-            new ClipboardItem({
-                'text/html': new Blob([tempElement.innerHTML], { type: 'text/html' })
-            })
-        ]).then(() => {
-            console.log('Summary copied to clipboard successfully!');
-        }).catch(err => {
-            console.error('Failed to copy text: ', err);
-        });
-        document.body.removeChild(tempElement); 
-    });
-});
diff --git a/src/registrar/assets/js/get-gov-admin.js b/src/registrar/assets/js/get-gov-admin.js
index d8bc21899..fe25b2feb 100644
--- a/src/registrar/assets/js/get-gov-admin.js
+++ b/src/registrar/assets/js/get-gov-admin.js
@@ -207,6 +207,7 @@ function addOrRemoveSessionBoolean(name, add){
     
 
 })();
+
 /** An IIFE for pages in DjangoAdmin that use a clipboard button
 */
 (function (){
@@ -233,21 +234,17 @@ function addOrRemoveSessionBoolean(name, add){
                     buttonIcon.setAttribute('xlink:href', baseHref + '#check');
 
                     // Change the button text
-                    nearestSpan = button.querySelector("span")
+                    let nearestSpan = button.querySelector("span")
+                    let original_text = nearestSpan.innerText
                     nearestSpan.innerText = "Copied to clipboard"
 
                     setTimeout(function() {
                         // Change back to the copy icon
                         buttonIcon.setAttribute('xlink:href', currentHref); 
-                        if (button.classList.contains('usa-button__small-text')) {
-                            nearestSpan.innerText = "Copy email";
-                        } else {
-                            nearestSpan.innerText = "Copy";
-                        }
+                        nearestSpan.innerText = original_text;
                     }, 2000);
 
                 }
-
             }).catch(function(error) {
                 console.error('Clipboard copy failed', error);
             });
@@ -605,3 +602,155 @@ function initializeWidgetOnList(list, parentId) {
         }
     }
 })();
+
+
+/** An IIFE for copy summary button (appears in DomainRegistry models)
+*/
+(function (){
+    const copyButton = document.getElementById('copy-summary-btn');
+
+    if (copyButton) {
+        copyButton.addEventListener('click', function() {
+            /// Generate a rich HTML summary text and copy to clipboard
+
+            //------ Organization Type
+            const organizationTypeElement = document.getElementById('id_organization_type');
+            const organizationType = organizationTypeElement.options[organizationTypeElement.selectedIndex].text;
+
+            //------ Alternative Domains
+            const alternativeDomainsDiv = document.querySelector('.form-row.field-alternative_domains .readonly');
+            const alternativeDomainslinks = alternativeDomainsDiv.querySelectorAll('a');
+            const alternativeDomains = Array.from(alternativeDomainslinks).map(link => link.textContent);
+
+            //------ Existing Websites
+            const existingWebsitesDiv = document.querySelector('.form-row.field-current_websites .readonly');
+            const existingWebsiteslinks = existingWebsitesDiv.querySelectorAll('a');
+            const existingWebsites = Array.from(existingWebsiteslinks).map(link => link.textContent);
+
+            //------ Additional Contacts
+            // 1 - Create a hyperlinks map so we can display contact details and also link to the contact
+            const otherContactsDiv = document.querySelector('.form-row.field-other_contacts .readonly');
+            let otherContactLinks = [];
+            const nameToUrlMap = {};
+            if (otherContactsDiv) {
+                otherContactLinks = otherContactsDiv.querySelectorAll('a');
+                otherContactLinks.forEach(link => {
+                const name = link.textContent.trim();
+                const url = link.href;
+                nameToUrlMap[name] = url;
+                });
+            }
+        
+            // 2 - Iterate through contact details and assemble html for summary
+            let otherContactsSummary = ""
+            // Get the table rows of contact details
+            // Select all contact elements
+            const contacts = document.querySelectorAll('.dja-detail-list dl');
+
+            // Iterate through each contact element
+            const bulletList = document.createElement('ul');
+            contacts.forEach(contact => {
+                const name = contact.querySelector('a#contact_info_name').innerText;
+                const title = contact.querySelector('span#contact_info_title').innerText;
+                const email = contact.querySelector('span#contact_info_email').innerText;
+                const phone = contact.querySelector('span#contact_info_phone').innerText;
+                const url = nameToUrlMap[name] || '#';
+
+                // Format the contact information
+                const listItem = document.createElement('li');
+                listItem.innerHTML = `<a href="${url}">${name}</a>, ${title}, ${email}, ${phone}`;
+                bulletList.appendChild(listItem);
+            });
+            otherContactsSummary += bulletList.outerHTML
+
+
+            //------ Requested Domains
+            const requestedDomainElement = document.getElementById('id_requested_domain');
+            const requestedDomain = requestedDomainElement.options[requestedDomainElement.selectedIndex].text;
+
+            //------ Submitter
+            // Function to extract text by ID and handle missing elements
+            function extractTextById(id, divElement) {
+                if (divElement) {
+                    const element = divElement.querySelector(`#${id}`);
+                    return element ? ", " + element.textContent.trim() : '';
+                }
+                return '';
+            }
+            // Extract the submitter name, title, email, and phone number
+            const submitterDiv = document.querySelector('.form-row.field-submitter');
+            const submitterNameElement = document.getElementById('id_submitter');
+            const submitterName = submitterNameElement.options[submitterNameElement.selectedIndex].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');
+            const seniorOfficialElement = document.getElementById('id_senior_official');
+            const seniorOfficialName = seniorOfficialElement.options[seniorOfficialElement.selectedIndex].text;
+            const seniorOfficialTitle = extractTextById('contact_info_title', seniorOfficialDiv);
+            const seniorOfficialEmail = extractTextById('contact_info_email', seniorOfficialDiv);
+            const seniorOfficialPhone = extractTextById('contact_info_phone', seniorOfficialDiv);
+            let seniorOfficialInfo = `${seniorOfficialName}${seniorOfficialTitle}${seniorOfficialEmail}${seniorOfficialPhone}`;
+
+            const summary = `<strong>Recommendation:</strong></br>` +
+                            `<strong>Organization Type:</strong> ${organizationType}</br>` +
+                            `<strong>Requested Domain:</strong> ${requestedDomain}</br>` +
+                            `<strong>Existing website(s):</strong> ${existingWebsites.join(', ')}</br>` +
+                            `<strong>Rationale:</strong></br>` +
+                            `<strong>Alternate Domain(s):</strong> ${alternativeDomains.join(', ')}</br>` +
+                            `<strong>Submitter:</strong> ${submitterInfo}</br>` +
+                            `<strong>Senior Official:</strong> ${seniorOfficialInfo}</br>` +
+                            `<strong>Additional Contact(s):</strong> ${otherContactsSummary}</br>`;
+
+            // Create a temporary element
+            let tempElement = document.createElement('div');
+            tempElement.innerHTML = summary;
+            // Append the element to the body
+            document.body.appendChild(tempElement);
+
+            // Use the Selection and Range APIs to select the element's content
+            let range = document.createRange();
+            range.selectNodeContents(tempElement);
+            let selection = window.getSelection();
+            selection.removeAllRanges();
+            selection.addRange(range);
+
+            // Use the Clipboard API to write the selected HTML content to the clipboard
+            navigator.clipboard.write([
+                new ClipboardItem({
+                    'text/html': new Blob([tempElement.innerHTML], { type: 'text/html' })
+                })
+            ]).then(() => {
+                // Change the icon to a checkmark on successful copy
+                let buttonIcon = copyButton.querySelector('.usa-button__clipboard use');
+                if (buttonIcon) {
+                    let currentHref = buttonIcon.getAttribute('xlink:href');
+                    let baseHref = currentHref.split('#')[0];
+
+                    // Append the new icon reference
+                    buttonIcon.setAttribute('xlink:href', baseHref + '#check');
+
+                    // Change the button text
+                    nearestSpan = copyButton.querySelector("span")
+                    original_text = nearestSpan.innerText
+                    nearestSpan.innerText = "Copied to clipboard"
+
+                    setTimeout(function() {
+                        // Change back to the copy icon
+                        buttonIcon.setAttribute('xlink:href', currentHref); 
+                        nearestSpan.innerText = original_text
+                    }, 2000);
+
+                }
+                console.log('Summary copied to clipboard successfully!');
+            }).catch(err => {
+                console.error('Failed to copy text: ', err);
+            });
+            document.body.removeChild(tempElement); 
+        });
+    }
+})();
\ No newline at end of file
diff --git a/src/registrar/assets/sass/_theme/_buttons.scss b/src/registrar/assets/sass/_theme/_buttons.scss
index 577c9ce29..d246366d8 100644
--- a/src/registrar/assets/sass/_theme/_buttons.scss
+++ b/src/registrar/assets/sass/_theme/_buttons.scss
@@ -128,11 +128,6 @@ a.withdraw:active {
   vertical-align: bottom;
 }
 
-a.historylink .usa-icon {
-  vertical-align: middle;
-  margin: 0px;
-}
-
 a.usa-button--unstyled:visited {
   color: color('primary');
 }
@@ -218,4 +213,4 @@ a.usa-button--unstyled:visited {
 
 .margin-right-neg-4px {
   margin-right: -4px;
-}
+}
\ No newline at end of file
diff --git a/src/registrar/assets/sass/_theme/_links.scss b/src/registrar/assets/sass/_theme/_links.scss
index e9b71733a..35546face 100644
--- a/src/registrar/assets/sass/_theme/_links.scss
+++ b/src/registrar/assets/sass/_theme/_links.scss
@@ -15,3 +15,8 @@
         margin-right: units(0.5);
     }
 }
+
+.modelLink-icon {
+    margin-bottom: 2px;
+    vertical-align: middle;
+}
\ No newline at end of file
diff --git a/src/registrar/templates/admin/change_form.html b/src/registrar/templates/admin/change_form.html
index 3efbe554e..f2ac7f2df 100644
--- a/src/registrar/templates/admin/change_form.html
+++ b/src/registrar/templates/admin/change_form.html
@@ -10,8 +10,4 @@
         {% endblock %}
     </div>
 {% endif %}
-{% endblock %}
-
-{% block extrahead %}
-    <script type="application/javascript" src="{% static 'js/copy-summary.js' %}" defer></script>
 {% endblock %}
\ No newline at end of file
diff --git a/src/registrar/templates/admin/change_form_object_tools.html b/src/registrar/templates/admin/change_form_object_tools.html
index 03c519241..ec50f493a 100644
--- a/src/registrar/templates/admin/change_form_object_tools.html
+++ b/src/registrar/templates/admin/change_form_object_tools.html
@@ -16,12 +16,12 @@
     {% else %}
         <ul>
             <li>
-                <a href="{% add_preserved_filters history_url %}" class="historylink">{% translate "History" %}</a>
+                <a href="{% add_preserved_filters history_url %}">{% translate "History" %}</a>
             </li>
             {% if opts.model_name == 'domainrequest' %}
             <li>
-                <a id="copy-summary-btn" class="historylink " href="#">
-                    <svg class="usa-icon" >
+                <a id="copy-summary-btn" class="usa-button__clipboard" type="button" href="#">
+                    <svg class="usa-icon modelLink-icon" >
                         <use xlink:href="{%static 'img/sprite.svg'%}#content_copy"></use>
                     </svg>
                     <span>{% translate "Copy request summary" %}</span>

From 892c8331b382212dffd9c0cc060811e647028b09 Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Tue, 30 Jul 2024 19:41:26 -0600
Subject: [PATCH 30/70] Fixed logic for different display options of "other
 contacts"

---
 src/registrar/assets/js/get-gov-admin.js     | 42 ++++++++++++++------
 src/registrar/assets/sass/_theme/_links.scss |  8 +---
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/registrar/assets/js/get-gov-admin.js b/src/registrar/assets/js/get-gov-admin.js
index fe25b2feb..1fa687dd9 100644
--- a/src/registrar/assets/js/get-gov-admin.js
+++ b/src/registrar/assets/js/get-gov-admin.js
@@ -643,24 +643,42 @@ function initializeWidgetOnList(list, parentId) {
         
             // 2 - Iterate through contact details and assemble html for summary
             let otherContactsSummary = ""
-            // Get the table rows of contact details
-            // Select all contact elements
-            const contacts = document.querySelectorAll('.dja-detail-list dl');
-
-            // Iterate through each contact element
             const bulletList = document.createElement('ul');
-            contacts.forEach(contact => {
-                const name = contact.querySelector('a#contact_info_name').innerText;
-                const title = contact.querySelector('span#contact_info_title').innerText;
-                const email = contact.querySelector('span#contact_info_email').innerText;
-                const phone = contact.querySelector('span#contact_info_phone').innerText;
-                const url = nameToUrlMap[name] || '#';
 
+            // CASE 1 - Contacts are not in a table (this happens if there is only one or two other contacts)
+            const contacts = document.querySelectorAll('.field-other_contacts .dja-detail-list dl');
+            if (contacts) {
+                contacts.forEach(contact => {
+                    const name = contact.querySelector('a#contact_info_name').innerText;
+                    const title = contact.querySelector('span#contact_info_title').innerText;
+                    const email = contact.querySelector('span#contact_info_email').innerText;
+                    const phone = contact.querySelector('span#contact_info_phone').innerText;
+                    const url = nameToUrlMap[name] || '#';
+                    // Format the contact information
+                    const listItem = document.createElement('li');
+                    listItem.innerHTML = `<a href="${url}">${name}</a>, ${title}, ${email}, ${phone}`;
+                    bulletList.appendChild(listItem);
+                });
+
+            }
+
+            // CASE 2 - Contacts are in a table (this happens if there is more than 2 contacts)
+            const otherContactsTable = document.querySelector('.form-row.field-other_contacts table tbody');
+            if (otherContactsTable) {
+                const otherContactsRows = otherContactsTable.querySelectorAll('tr');
+                otherContactsRows.forEach(contactRow => {
+                // Extract the contact details
+                const name = contactRow.querySelector('th').textContent.trim();
+                const title = contactRow.querySelectorAll('td')[0].textContent.trim();
+                const email = contactRow.querySelectorAll('td')[1].textContent.trim();
+                const phone = contactRow.querySelectorAll('td')[2].textContent.trim();
+                const url = nameToUrlMap[name] || '#';
                 // Format the contact information
                 const listItem = document.createElement('li');
                 listItem.innerHTML = `<a href="${url}">${name}</a>, ${title}, ${email}, ${phone}`;
                 bulletList.appendChild(listItem);
-            });
+                });
+            }
             otherContactsSummary += bulletList.outerHTML
 
 
diff --git a/src/registrar/assets/sass/_theme/_links.scss b/src/registrar/assets/sass/_theme/_links.scss
index 35546face..bf750d26a 100644
--- a/src/registrar/assets/sass/_theme/_links.scss
+++ b/src/registrar/assets/sass/_theme/_links.scss
@@ -11,12 +11,6 @@
     }
     .usa-icon {
         // align icon with x height
-        margin-top: units(0.5);
-        margin-right: units(0.5);
+        vertical-align: middle;
     }
 }
-
-.modelLink-icon {
-    margin-bottom: 2px;
-    vertical-align: middle;
-}
\ No newline at end of file

From 9a5b07c79fd8e8baa0641fcfe600b01eea156a40 Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Tue, 30 Jul 2024 19:49:47 -0600
Subject: [PATCH 31/70] Added logic for case when there are NO additional
 contacts

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

diff --git a/src/registrar/assets/js/get-gov-admin.js b/src/registrar/assets/js/get-gov-admin.js
index 1fa687dd9..61b9a0487 100644
--- a/src/registrar/assets/js/get-gov-admin.js
+++ b/src/registrar/assets/js/get-gov-admin.js
@@ -649,15 +649,18 @@ function initializeWidgetOnList(list, parentId) {
             const contacts = document.querySelectorAll('.field-other_contacts .dja-detail-list dl');
             if (contacts) {
                 contacts.forEach(contact => {
-                    const name = contact.querySelector('a#contact_info_name').innerText;
-                    const title = contact.querySelector('span#contact_info_title').innerText;
-                    const email = contact.querySelector('span#contact_info_email').innerText;
-                    const phone = contact.querySelector('span#contact_info_phone').innerText;
-                    const url = nameToUrlMap[name] || '#';
-                    // Format the contact information
-                    const listItem = document.createElement('li');
-                    listItem.innerHTML = `<a href="${url}">${name}</a>, ${title}, ${email}, ${phone}`;
-                    bulletList.appendChild(listItem);
+                    // Check if the <dl> element is not empty
+                    if (contact.children.length > 0) {
+                        const name = contact.querySelector('a#contact_info_name').innerText;
+                        const title = contact.querySelector('span#contact_info_title').innerText;
+                        const email = contact.querySelector('span#contact_info_email').innerText;
+                        const phone = contact.querySelector('span#contact_info_phone').innerText;
+                        const url = nameToUrlMap[name] || '#';
+                        // Format the contact information
+                        const listItem = document.createElement('li');
+                        listItem.innerHTML = `<a href="${url}">${name}</a>, ${title}, ${email}, ${phone}`;
+                        bulletList.appendChild(listItem);
+                    }
                 });
 
             }

From f7caee0d11875d1f51ffd9bbc57e2fdfe398d67c Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Tue, 30 Jul 2024 20:23:45 -0600
Subject: [PATCH 32/70] fixed unit tests

---
 src/registrar/assets/sass/_theme/_links.scss | 2 +-
 src/registrar/tests/test_admin_request.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/assets/sass/_theme/_links.scss b/src/registrar/assets/sass/_theme/_links.scss
index bf750d26a..dc68a161e 100644
--- a/src/registrar/assets/sass/_theme/_links.scss
+++ b/src/registrar/assets/sass/_theme/_links.scss
@@ -11,6 +11,6 @@
     }
     .usa-icon {
         // align icon with x height
-        vertical-align: middle;
+        vertical-align: middle;      
     }
 }
diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py
index 7a7c75ffc..a03e1ea54 100644
--- a/src/registrar/tests/test_admin_request.py
+++ b/src/registrar/tests/test_admin_request.py
@@ -1411,7 +1411,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, "usa-button__clipboard", count=4)
+        self.assertContains(response, "usa-button__clipboard", count=5)
 
         # Test that Creator counts display properly
         self.assertNotContains(response, "Approved domains")

From d3b88ccb2b8084181949b7c959437882c2168ddd Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Wed, 31 Jul 2024 10:31:07 -0600
Subject: [PATCH 33/70] Styling updates

---
 src/registrar/assets/js/get-gov-admin.js                    | 2 +-
 src/registrar/assets/sass/_theme/_admin.scss                | 5 +++++
 src/registrar/assets/sass/_theme/_links.scss                | 4 +++-
 src/registrar/assets/sass/_theme/styles.scss                | 2 +-
 src/registrar/templates/admin/change_form_object_tools.html | 2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/registrar/assets/js/get-gov-admin.js b/src/registrar/assets/js/get-gov-admin.js
index 61b9a0487..e4b51f503 100644
--- a/src/registrar/assets/js/get-gov-admin.js
+++ b/src/registrar/assets/js/get-gov-admin.js
@@ -646,7 +646,7 @@ function initializeWidgetOnList(list, parentId) {
             const bulletList = document.createElement('ul');
 
             // CASE 1 - Contacts are not in a table (this happens if there is only one or two other contacts)
-            const contacts = document.querySelectorAll('.field-other_contacts .dja-detail-list dl');
+            const contacts = document.querySelectorAll('.field-other_contacts .dja-detail-list dt');
             if (contacts) {
                 contacts.forEach(contact => {
                     // Check if the <dl> element is not empty
diff --git a/src/registrar/assets/sass/_theme/_admin.scss b/src/registrar/assets/sass/_theme/_admin.scss
index d7d116046..1c1ff8ddc 100644
--- a/src/registrar/assets/sass/_theme/_admin.scss
+++ b/src/registrar/assets/sass/_theme/_admin.scss
@@ -377,6 +377,11 @@ input.admin-confirm-button {
     }
 }
 
+.usa-icon {
+    // align icon with x height
+    vertical-align: middle;      
+}
+
 .module--custom {
     a {
         font-size: 13px;
diff --git a/src/registrar/assets/sass/_theme/_links.scss b/src/registrar/assets/sass/_theme/_links.scss
index dc68a161e..fd1c3dee9 100644
--- a/src/registrar/assets/sass/_theme/_links.scss
+++ b/src/registrar/assets/sass/_theme/_links.scss
@@ -11,6 +11,8 @@
     }
     .usa-icon {
         // align icon with x height
-        vertical-align: middle;      
+        margin-top: units(0.5);
+        margin-right: units(0.5);
     }
 }
+
diff --git a/src/registrar/assets/sass/_theme/styles.scss b/src/registrar/assets/sass/_theme/styles.scss
index 4775b60c9..f9df015b4 100644
--- a/src/registrar/assets/sass/_theme/styles.scss
+++ b/src/registrar/assets/sass/_theme/styles.scss
@@ -27,4 +27,4 @@
 
 /*--------------------------------------------------
 --- Admin ---------------------------------*/
-@forward "admin";
+@forward "admin";
\ No newline at end of file
diff --git a/src/registrar/templates/admin/change_form_object_tools.html b/src/registrar/templates/admin/change_form_object_tools.html
index ec50f493a..ac765bde6 100644
--- a/src/registrar/templates/admin/change_form_object_tools.html
+++ b/src/registrar/templates/admin/change_form_object_tools.html
@@ -21,7 +21,7 @@
             {% if opts.model_name == 'domainrequest' %}
             <li>
                 <a id="copy-summary-btn" class="usa-button__clipboard" type="button" href="#">
-                    <svg class="usa-icon modelLink-icon" >
+                    <svg class="usa-icon" >
                         <use xlink:href="{%static 'img/sprite.svg'%}#content_copy"></use>
                     </svg>
                     <span>{% translate "Copy request summary" %}</span>

From f1d896e6b6f8b19e6f6f50fd12d498d08481ea59 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Wed, 31 Jul 2024 13:22:32 -0400
Subject: [PATCH 34/70] cleanup

---
 src/registrar/assets/js/get-gov-admin.js      | 31 ++++--------------
 src/registrar/assets/sass/_theme/_admin.scss  | 32 +++++++------------
 .../admin/change_form_object_tools.html       |  2 +-
 .../templates/admin/input_with_clipboard.html |  4 +--
 .../admin/includes/detail_table_fieldset.html |  2 +-
 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, 26 insertions(+), 51 deletions(-)

diff --git a/src/registrar/assets/js/get-gov-admin.js b/src/registrar/assets/js/get-gov-admin.js
index e4b51f503..ebb74842d 100644
--- a/src/registrar/assets/js/get-gov-admin.js
+++ b/src/registrar/assets/js/get-gov-admin.js
@@ -212,11 +212,6 @@ function addOrRemoveSessionBoolean(name, add){
 */
 (function (){
 
-    function copyInnerTextToClipboard(elem) {
-        let text = elem.innerText
-        navigator.clipboard.writeText(text)
-    }
-
     function copyToClipboardAndChangeIcon(button) {
         // Assuming the input is the previous sibling of the button
         let input = button.previousElementSibling;
@@ -225,7 +220,7 @@ function addOrRemoveSessionBoolean(name, add){
         if (input) {
             navigator.clipboard.writeText(input.value).then(function() {
                 // Change the icon to a checkmark on successful copy
-                let buttonIcon = button.querySelector('.usa-button__clipboard use');
+                let buttonIcon = button.querySelector('.copy-to-clipboard use');
                 if (buttonIcon) {
                     let currentHref = buttonIcon.getAttribute('xlink:href');
                     let baseHref = currentHref.split('#')[0];
@@ -252,7 +247,7 @@ function addOrRemoveSessionBoolean(name, add){
     }
     
     function handleClipboardButtons() {
-        clipboardButtons = document.querySelectorAll(".usa-button__clipboard")
+        clipboardButtons = document.querySelectorAll(".copy-to-clipboard")
         clipboardButtons.forEach((button) => {
 
             // Handle copying the text to your clipboard,
@@ -275,20 +270,7 @@ function addOrRemoveSessionBoolean(name, add){
         });
     }
 
-    function handleClipboardLinks() {
-        let emailButtons = document.querySelectorAll(".usa-button__clipboard-link");
-        if (emailButtons){
-            emailButtons.forEach((button) => {
-                button.addEventListener("click", ()=>{
-                    copyInnerTextToClipboard(button);
-                })
-            });
-        }
-    }
-
     handleClipboardButtons();
-    handleClipboardLinks();
-
 })();
 
 
@@ -607,7 +589,7 @@ function initializeWidgetOnList(list, parentId) {
 /** An IIFE for copy summary button (appears in DomainRegistry models)
 */
 (function (){
-    const copyButton = document.getElementById('copy-summary-btn');
+    const copyButton = document.getElementById('id-copy-to-clipboard-summary');
 
     if (copyButton) {
         copyButton.addEventListener('click', function() {
@@ -743,11 +725,11 @@ function initializeWidgetOnList(list, parentId) {
             // Use the Clipboard API to write the selected HTML content to the clipboard
             navigator.clipboard.write([
                 new ClipboardItem({
-                    'text/html': new Blob([tempElement.innerHTML], { type: 'text/html' })
+                    'text/plain': new Blob([tempElement.innerHTML], { type: 'text/plain' })
                 })
             ]).then(() => {
                 // Change the icon to a checkmark on successful copy
-                let buttonIcon = copyButton.querySelector('.usa-button__clipboard use');
+                let buttonIcon = copyButton.querySelector('use');
                 if (buttonIcon) {
                     let currentHref = buttonIcon.getAttribute('xlink:href');
                     let baseHref = currentHref.split('#')[0];
@@ -768,10 +750,11 @@ function initializeWidgetOnList(list, parentId) {
 
                 }
                 console.log('Summary copied to clipboard successfully!');
+                console.log(tempElement.innerHTML);
             }).catch(err => {
                 console.error('Failed to copy text: ', err);
             });
             document.body.removeChild(tempElement); 
         });
     }
-})();
\ No newline at end of file
+})();
diff --git a/src/registrar/assets/sass/_theme/_admin.scss b/src/registrar/assets/sass/_theme/_admin.scss
index 1c1ff8ddc..711bfe960 100644
--- a/src/registrar/assets/sass/_theme/_admin.scss
+++ b/src/registrar/assets/sass/_theme/_admin.scss
@@ -369,19 +369,11 @@ input.admin-confirm-button {
         padding: 10px 8px;
         line-height: normal;
     }
-    .usa-icon {
-        top: 2px;
-    }
     a.button:active, a.button:focus {
         text-decoration: none;
     }
 }
 
-.usa-icon {
-    // align icon with x height
-    vertical-align: middle;      
-}
-
 .module--custom {
     a {
         font-size: 13px;
@@ -452,15 +444,12 @@ address.margin-top-neg-1__detail-list {
     }
 }
 
-td button.usa-button__clipboard-link, address.dja-address-contact-list {
+address.dja-address-contact-list {
     font-size: unset;
 }
 
 address.dja-address-contact-list {
     color: var(--body-quiet-color);
-    button.usa-button__clipboard-link {
-        font-size: unset;
-    }
 }
 
 // Mimic the normal label size
@@ -469,11 +458,18 @@ address.dja-address-contact-list {
         font-size: 0.875rem;
         color: var(--body-quiet-color);
     }
+}
 
-    address button.usa-button__clipboard-link, td button.usa-button__clipboard-link {
-        font-size: 0.875rem !important;
-    }
+// Targets the unstyled buttons in the form
+.button--clipboard {
+    color: var(--link-fg);
+}
 
+// Targets the DJA buttom with a nested icon
+button .usa-icon,
+.button .usa-icon,
+.button--clipboard .usa-icon {
+    vertical-align: middle;      
 }
 
 .errors span.select2-selection {
@@ -668,7 +664,7 @@ address.dja-address-contact-list {
     align-items: center;
     
 
-    .usa-button__icon {
+    .usa-button--icon {
         position: absolute;
         right: auto;
         left: 4px;
@@ -686,10 +682,6 @@ address.dja-address-contact-list {
     }
 }
 
-button.usa-button__clipboard {
-    color: var(--link-fg);
-}
-
 .no-outline-on-click:focus {
     outline: none !important;
 }
diff --git a/src/registrar/templates/admin/change_form_object_tools.html b/src/registrar/templates/admin/change_form_object_tools.html
index ac765bde6..198140c19 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="copy-summary-btn" class="usa-button__clipboard" type="button" href="#">
+                <a id="id-copy-to-clipboard-summary" class="button--clipboard" 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 20a029bed..ea2fbce33 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 usa-button__clipboard" 
+    class="usa-button usa-button--unstyled padding-left-1 usa-button--icon button--clipboard copy-to-clipboard" 
     type="button"
     >
         <div class="no-outline-on-click">
@@ -25,7 +25,7 @@ Template for an input field with a clipboard
 <div class="admin-icon-group admin-icon-group__clipboard-link">
     <input aria-hidden="true" class="display-none" value="{{ field.email }}" />
     <button 
-    class="usa-button usa-button--unstyled padding-right-1 usa-button__icon usa-button__clipboard text-no-underline" 
+    class="usa-button usa-button--unstyled padding-right-1 usa-button--icon button--clipboard copy-to-clipboard text-no-underline" 
     type="button"
     >
         <svg 
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 51dd9b518..067b69c07 100644
--- a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
+++ b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
@@ -219,7 +219,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 usa-button__clipboard usa-button__small-text text-no-underline" 
+                                    class="usa-button usa-button--unstyled padding-right-1 usa-button--icon button--clipboard copy-to-clipboard usa-button__small-text text-no-underline" 
                                     type="button"
                                     >
                                         <svg 
diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index c145e1f98..7db18f293 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -584,7 +584,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, "usa-button__clipboard", count=4)
+        self.assertContains(response, "button--clipboard", count=4)
 
         # 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 e63a9d8a9..e156dd377 100644
--- a/src/registrar/tests/test_admin_domain.py
+++ b/src/registrar/tests/test_admin_domain.py
@@ -444,7 +444,7 @@ class TestDomainAdminWithClient(TestCase):
         self.assertContains(response, "(555) 555 5557")
 
         # Test for the copy link
-        self.assertContains(response, "usa-button__clipboard")
+        self.assertContains(response, "button--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 a03e1ea54..c4fc8bcee 100644
--- a/src/registrar/tests/test_admin_request.py
+++ b/src/registrar/tests/test_admin_request.py
@@ -1411,7 +1411,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, "usa-button__clipboard", count=5)
+        self.assertContains(response, "button--clipboard", count=5)
 
         # Test that Creator counts display properly
         self.assertNotContains(response, "Approved domains")

From 3fef7664e43c4341088038829f8718c9eb8e1b5f Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Wed, 31 Jul 2024 13:59:00 -0400
Subject: [PATCH 35/70] cleanup

---
 src/registrar/templates/includes/finish_profile_form.html | 4 ----
 src/registrar/tests/test_views_portfolio.py               | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/registrar/templates/includes/finish_profile_form.html b/src/registrar/templates/includes/finish_profile_form.html
index 58bc604ae..1806c2603 100644
--- a/src/registrar/templates/includes/finish_profile_form.html
+++ b/src/registrar/templates/includes/finish_profile_form.html
@@ -68,10 +68,6 @@
             {% endwith %}
         {% endwith %}
 
-        {% with toggleable_input=True toggleable_label=True group_classes="usa-form-editable padding-top-2" %}
-            {% input_with_errors form.title %}
-        {% endwith %}
-
         {% with toggleable_input=True toggleable_label=True group_classes="usa-form-editable padding-top-2" %}
             {% with add_class="usa-input--medium" %}
                 {% input_with_errors form.phone %}
diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index 21b794cf7..0554d9908 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -201,6 +201,7 @@ class TestPortfolio(WebTest):
         self.app.set_user(self.user.username)
         self.user.portfolio = self.portfolio
         self.user.portfolio_additional_permissions = [
+            User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
             User.UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS,
             User.UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS,
         ]

From 723d8ecc80655fe21fed8ce3d7540eb558a36b94 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Wed, 31 Jul 2024 15:05:46 -0400
Subject: [PATCH 36/70] added uuid

---
 src/registrar/fixtures_users.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/registrar/fixtures_users.py b/src/registrar/fixtures_users.py
index 74fd4d15d..a96cb3483 100644
--- a/src/registrar/fixtures_users.py
+++ b/src/registrar/fixtures_users.py
@@ -22,6 +22,11 @@ class UserFixture:
     """
 
     ADMINS = [
+        {
+            "username": "aad084c3-66cc-4632-80eb-41cdf5c5bcbf",
+            "first_name": "Aditi",
+            "last_name": "Green",
+         },
         {
             "username": "be17c826-e200-4999-9389-2ded48c43691",
             "first_name": "Matthew",
@@ -120,6 +125,11 @@ class UserFixture:
     ]
 
     STAFF = [
+        {
+            "username": "ffec5987-aa84-411b-a05a-a7ee5cbcde54",
+            "first_name": "Aditi-Analyst",
+            "last_name": "Green-Analyst"
+        },
         {
             "username": "d6bf296b-fac5-47ff-9c12-f88ccc5c1b99",
             "first_name": "Matthew-Analyst",

From 4bc19d020c8418925779dd991cd78bf3e6f0b62f Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Wed, 31 Jul 2024 14:06:38 -0600
Subject: [PATCH 37/70] Fixed compiler, fixed edge case where copy-paste
 doesn't work in plain text situations

---
 src/package-lock.json                    |  9 ++--
 src/package.json                         |  4 +-
 src/registrar/assets/js/get-gov-admin.js | 58 ++++++++++--------------
 3 files changed, 32 insertions(+), 39 deletions(-)

diff --git a/src/package-lock.json b/src/package-lock.json
index 2ff464d5e..08e70dd51 100644
--- a/src/package-lock.json
+++ b/src/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "@uswds/uswds": "^3.8.0",
+        "@uswds/uswds": "^3.8.1",
         "pa11y-ci": "^3.0.1",
         "sass": "^1.54.8"
       },
@@ -187,9 +187,10 @@
       }
     },
     "node_modules/@uswds/uswds": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/@uswds/uswds/-/uswds-3.8.0.tgz",
-      "integrity": "sha512-rMwCXe/u4HGkfskvS1Iuabapi/EXku3ChaIFW7y/dUhc7R1TXQhbbfp8YXEjmXPF0yqJnv9T08WPgS0fQqWZ8w==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@uswds/uswds/-/uswds-3.8.1.tgz",
+      "integrity": "sha512-bKG/B9mJF1v0yoqth48wQDzST5Xyu3OxxpePIPDyhKWS84oDrCehnu3Z88JhSjdIAJMl8dtjtH8YvdO9kZUpAg==",
+      "license": "SEE LICENSE IN LICENSE.md",
       "dependencies": {
         "classlist-polyfill": "1.2.0",
         "object-assign": "4.1.1",
diff --git a/src/package.json b/src/package.json
index 58ae3a4ed..e16bc8198 100644
--- a/src/package.json
+++ b/src/package.json
@@ -10,11 +10,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@uswds/uswds": "^3.8.0",
+    "@uswds/uswds": "^3.8.1",
     "pa11y-ci": "^3.0.1",
     "sass": "^1.54.8"
   },
   "devDependencies": {
     "@uswds/compile": "^1.0.0-beta.3"
   }
-}
\ No newline at end of file
+}
diff --git a/src/registrar/assets/js/get-gov-admin.js b/src/registrar/assets/js/get-gov-admin.js
index ebb74842d..0a6eb8423 100644
--- a/src/registrar/assets/js/get-gov-admin.js
+++ b/src/registrar/assets/js/get-gov-admin.js
@@ -628,21 +628,19 @@ function initializeWidgetOnList(list, parentId) {
             const bulletList = document.createElement('ul');
 
             // CASE 1 - Contacts are not in a table (this happens if there is only one or two other contacts)
-            const contacts = document.querySelectorAll('.field-other_contacts .dja-detail-list dt');
+            const contacts = document.querySelectorAll('.field-other_contacts .dja-detail-list dd');
             if (contacts) {
                 contacts.forEach(contact => {
                     // Check if the <dl> element is not empty
-                    if (contact.children.length > 0) {
-                        const name = contact.querySelector('a#contact_info_name').innerText;
-                        const title = contact.querySelector('span#contact_info_title').innerText;
-                        const email = contact.querySelector('span#contact_info_email').innerText;
-                        const phone = contact.querySelector('span#contact_info_phone').innerText;
-                        const url = nameToUrlMap[name] || '#';
-                        // Format the contact information
-                        const listItem = document.createElement('li');
-                        listItem.innerHTML = `<a href="${url}">${name}</a>, ${title}, ${email}, ${phone}`;
-                        bulletList.appendChild(listItem);
-                    }
+                    const name = contact.querySelector('a#contact_info_name')?.innerText;
+                    const title = contact.querySelector('span#contact_info_title')?.innerText;
+                    const email = contact.querySelector('span#contact_info_email')?.innerText;
+                    const phone = contact.querySelector('span#contact_info_phone')?.innerText;
+                    const url = nameToUrlMap[name] || '#';
+                    // Format the contact information
+                    const listItem = document.createElement('li');
+                    listItem.innerHTML = `<a href="${url}">${name}</a>, ${title}, ${email}, ${phone}`;
+                    bulletList.appendChild(listItem);
                 });
 
             }
@@ -699,35 +697,29 @@ function initializeWidgetOnList(list, parentId) {
             const seniorOfficialPhone = extractTextById('contact_info_phone', seniorOfficialDiv);
             let seniorOfficialInfo = `${seniorOfficialName}${seniorOfficialTitle}${seniorOfficialEmail}${seniorOfficialPhone}`;
 
-            const summary = `<strong>Recommendation:</strong></br>` +
+            const html_summary = `<strong>Recommendation:</strong></br>` +
                             `<strong>Organization Type:</strong> ${organizationType}</br>` +
                             `<strong>Requested Domain:</strong> ${requestedDomain}</br>` +
-                            `<strong>Existing website(s):</strong> ${existingWebsites.join(', ')}</br>` +
+                            `<strong>Current Websites:</strong> ${existingWebsites.join(', ')}</br>` +
                             `<strong>Rationale:</strong></br>` +
-                            `<strong>Alternate Domain(s):</strong> ${alternativeDomains.join(', ')}</br>` +
+                            `<strong>Alternative Domains:</strong> ${alternativeDomains.join(', ')}</br>` +
                             `<strong>Submitter:</strong> ${submitterInfo}</br>` +
                             `<strong>Senior Official:</strong> ${seniorOfficialInfo}</br>` +
-                            `<strong>Additional Contact(s):</strong> ${otherContactsSummary}</br>`;
+                            `<strong>Other Employees:</strong> ${otherContactsSummary}</br>`;
+            const plain_summary = html_summary.replace(/<\/?[^>]+(>|$)/g, '');
 
-            // Create a temporary element
-            let tempElement = document.createElement('div');
-            tempElement.innerHTML = summary;
-            // Append the element to the body
-            document.body.appendChild(tempElement);
+            // Create Blobs with the summary content
+            const html_blob = new Blob([html_summary], { type: 'text/html' });
+            const plain_blob = new Blob([plain_summary], { type: 'text/plain' });
 
-            // Use the Selection and Range APIs to select the element's content
-            let range = document.createRange();
-            range.selectNodeContents(tempElement);
-            let selection = window.getSelection();
-            selection.removeAllRanges();
-            selection.addRange(range);
+            // Create a ClipboardItem with the Blobs
+            const clipboardItem = new ClipboardItem({
+                'text/html': html_blob,
+                'text/plain': plain_blob
+            });
 
-            // Use the Clipboard API to write the selected HTML content to the clipboard
-            navigator.clipboard.write([
-                new ClipboardItem({
-                    'text/plain': new Blob([tempElement.innerHTML], { type: 'text/plain' })
-                })
-            ]).then(() => {
+            // Write the ClipboardItem to the clipboard
+            navigator.clipboard.write([clipboardItem]).then(() => {
                 // Change the icon to a checkmark on successful copy
                 let buttonIcon = copyButton.querySelector('use');
                 if (buttonIcon) {

From 6523fca640b88ecac5de5befbd4403832663c80f Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Wed, 31 Jul 2024 18:16:51 -0400
Subject: [PATCH 38/70] test clean up

---
 src/registrar/tests/test_views_portfolio.py | 43 ++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index 0554d9908..a870f771a 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -224,7 +224,48 @@ class TestPortfolio(WebTest):
 
             # removing non-basic portfolio perms, which should remove domains
             # and domain requests from nav
-            self.user.portfolio_additional_permissions = []
+            self.user.portfolio_additional_permissions = [User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO]
+            self.user.save()
+            self.user.refresh_from_db()
+
+            portfolio_page = self.app.get(reverse("home")).follow()
+
+            self.assertContains(portfolio_page, self.portfolio.organization_name)
+            self.assertContains(portfolio_page, "<h1>Organization</h1>")
+            self.assertNotContains(portfolio_page, '<h1 id="domains-header">Domains</h1>')
+            self.assertNotContains(
+                portfolio_page, reverse("portfolio-domains", kwargs={"portfolio_id": self.portfolio.pk})
+            )
+            self.assertNotContains(
+                portfolio_page, reverse("portfolio-domain-requests", kwargs={"portfolio_id": self.portfolio.pk})
+            )
+
+    @less_console_noise_decorator
+    def test_navigation_links_hidden_when_user_not_have_role(self):
+        """Test that admin / memmber roles are associated with the right access"""
+        self.app.set_user(self.user.username)
+        self.user.portfolio = self.portfolio
+        self.user.portfolio_roles = [User.UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+        self.user.save()
+        self.user.refresh_from_db()
+        with override_flag("organization_feature", active=True):
+            # This will redirect the user to the portfolio page.
+            # Follow implicity checks if our redirect is working.
+            portfolio_page = self.app.get(reverse("home")).follow()
+            # Assert that we're on the right page
+            self.assertContains(portfolio_page, self.portfolio.organization_name)
+            self.assertNotContains(portfolio_page, "<h1>Organization</h1>")
+            self.assertContains(portfolio_page, '<h1 id="domains-header">Domains</h1>')
+            self.assertContains(
+                portfolio_page, reverse("portfolio-domains", kwargs={"portfolio_id": self.portfolio.pk})
+            )
+            self.assertContains(
+                portfolio_page, reverse("portfolio-domain-requests", kwargs={"portfolio_id": self.portfolio.pk})
+            )
+
+            # removing non-basic portfolio role, which should remove domains
+            # and domain requests from nav
+            self.user.portfolio_roles = [User.UserPortfolioRoleChoices.ORGANIZATION_MEMBER]
             self.user.save()
             self.user.refresh_from_db()
 

From b866886cff7c23faa6125b02390bd416e933e39a Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Wed, 31 Jul 2024 16:23:32 -0700
Subject: [PATCH 39/70] Revert newly created sandboxes to populate after
 development

---
 ops/scripts/create_dev_sandbox.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ops/scripts/create_dev_sandbox.sh b/ops/scripts/create_dev_sandbox.sh
index b3a970584..fab062b30 100755
--- a/ops/scripts/create_dev_sandbox.sh
+++ b/ops/scripts/create_dev_sandbox.sh
@@ -112,7 +112,7 @@ sed -i '' '/          - development/ {a\
           - '"$1"'
 }' .github/workflows/reset-db.yaml
 
-sed -i '' '/          - backup/ {a\
+sed -i '' '/          - development/ {a\
           - '"$1"'
 }' .github/workflows/migrate.yaml
 

From fd5b763b421a79ac00f9f44251f4a3eba4879733 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Wed, 31 Jul 2024 16:34:34 -0700
Subject: [PATCH 40/70] Add new sandboxes under backup in deploy-manual

---
 ops/scripts/create_dev_sandbox.sh  | 2 +-
 ops/scripts/destroy_dev_sandbox.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ops/scripts/create_dev_sandbox.sh b/ops/scripts/create_dev_sandbox.sh
index fab062b30..6cbad9c4f 100755
--- a/ops/scripts/create_dev_sandbox.sh
+++ b/ops/scripts/create_dev_sandbox.sh
@@ -116,7 +116,7 @@ sed -i '' '/          - development/ {a\
           - '"$1"'
 }' .github/workflows/migrate.yaml
 
-sed -i '' '/          - development/ {a\
+sed -i '' '/          - backup/ {a\
           - '"$1"'
 }' .github/workflows/deploy-manual.yaml
 
diff --git a/ops/scripts/destroy_dev_sandbox.sh b/ops/scripts/destroy_dev_sandbox.sh
index 9e233b2f1..c8a00937f 100755
--- a/ops/scripts/destroy_dev_sandbox.sh
+++ b/ops/scripts/destroy_dev_sandbox.sh
@@ -49,6 +49,7 @@ rm ops/manifests/manifest-$1.yaml
 sed -i '' "/getgov-$1.app.cloud.gov/d" src/registrar/config/settings.py
 sed -i '' "/- $1/d" .github/workflows/reset-db.yaml
 sed -i '' "/- $1/d" .github/workflows/migrate.yaml
+sed -i '' "/- $1/d" .github/workflows/deploy-manual.yaml
 
 echo "Cleaning up services, applications, and the Cloud.gov space for $1..."
 cf delete getgov-$1

From 1a30772e384cb4055d3cc18a591a9a515a465352 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Wed, 31 Jul 2024 16:41:09 -0700
Subject: [PATCH 41/70] Add docs to manually deploy

---
 docs/operations/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/operations/README.md b/docs/operations/README.md
index 9aaee4c86..cc73d82cb 100644
--- a/docs/operations/README.md
+++ b/docs/operations/README.md
@@ -45,6 +45,8 @@ When deploying to your personal sandbox, you should make sure all of the USWDS a
 
 For ease of use, you can run the `deploy.sh <sandbox name>` script in the `/src` directory to build the assets and deploy to your sandbox. Similarly, you could run `build.sh <sandbox name>` script to just compile and collect the assets without deploying.
 
+You may also manually deploy to a sandbox using our [manual deploy workflow](https://github.com/cisagov/manage.get.gov/actions/workflows/deploy-manual.yaml) on GitHub Actions. Select Run workflow and enter the branch you want to deploy to your sandbox of choice.
+
 Your sandbox space should've been setup as part of the onboarding process. If this was not the case, please have an admin follow the instructions below.
 
 ## Creating a sandbox or new environment

From 8f84f33756012e117eab9d3fe7b567d5df9c8adb Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Wed, 31 Jul 2024 20:34:34 -0400
Subject: [PATCH 42/70] portfolio invitation model

---
 src/registrar/admin.py                        | 74 ++++++++++++++-
 .../migrations/0114_portfolioinvitation.py    | 84 ++++++++++++++++
 src/registrar/models/__init__.py              |  5 +-
 src/registrar/models/portfolio_invitation.py  | 95 +++++++++++++++++++
 src/registrar/models/user.py                  | 65 ++++++-------
 .../models/utility/portfolio_helper.py        | 33 +++++++
 .../templates/admin/model_descriptions.html   |  2 +
 .../portfolio_invitation_description.html     | 11 +++
 src/registrar/tests/test_admin.py             | 73 ++++++++++++++
 src/registrar/tests/test_models.py            | 65 ++++++++++++-
 10 files changed, 465 insertions(+), 42 deletions(-)
 create mode 100644 src/registrar/migrations/0114_portfolioinvitation.py
 create mode 100644 src/registrar/models/portfolio_invitation.py
 create mode 100644 src/registrar/models/utility/portfolio_helper.py
 create mode 100644 src/registrar/templates/django/admin/includes/descriptions/portfolio_invitation_description.html

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 46f6cc68c..5dd0b1852 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -11,6 +11,7 @@ from django.shortcuts import redirect
 from django_fsm import get_available_FIELD_transitions, FSMField
 from registrar.models.domain_group import DomainGroup
 from registrar.models.suborganization import Suborganization
+from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices
 from waffle.decorators import flag_is_active
 from django.contrib import admin, messages
 from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
@@ -131,12 +132,12 @@ class MyUserAdminForm(UserChangeForm):
             "groups": NoAutocompleteFilteredSelectMultiple("groups", False),
             "user_permissions": NoAutocompleteFilteredSelectMultiple("user_permissions", False),
             "portfolio_roles": FilteredSelectMultipleArrayWidget(
-                "portfolio_roles", is_stacked=False, choices=User.UserPortfolioRoleChoices.choices
+                "portfolio_roles", is_stacked=False, choices=UserPortfolioRoleChoices.choices
             ),
             "portfolio_additional_permissions": FilteredSelectMultipleArrayWidget(
                 "portfolio_additional_permissions",
                 is_stacked=False,
-                choices=User.UserPortfolioPermissionChoices.choices,
+                choices=UserPortfolioPermissionChoices.choices,
             ),
         }
 
@@ -169,6 +170,24 @@ class MyUserAdminForm(UserChangeForm):
             )
 
 
+class PortfolioInvitationAdminForm(UserChangeForm):
+    """This form utilizes the custom widget for its class's ManyToMany UIs."""
+
+    class Meta:
+        model = models.PortfolioInvitation
+        fields = "__all__"
+        widgets = {
+            "portfolio_roles": FilteredSelectMultipleArrayWidget(
+                "portfolio_roles", is_stacked=False, choices=UserPortfolioRoleChoices.choices
+            ),
+            "portfolio_additional_permissions": FilteredSelectMultipleArrayWidget(
+                "portfolio_additional_permissions",
+                is_stacked=False,
+                choices=UserPortfolioPermissionChoices.choices,
+            ),
+        }
+
+
 class DomainInformationAdminForm(forms.ModelForm):
     """This form utilizes the custom widget for its class's ManyToMany UIs."""
 
@@ -1299,6 +1318,56 @@ class DomainInvitationAdmin(ListHeaderAdmin):
         return super().changelist_view(request, extra_context=extra_context)
 
 
+class PortfolioInvitationAdmin(ListHeaderAdmin):
+    """Custom portfolio invitation admin class."""
+
+    form = PortfolioInvitationAdminForm
+
+    class Meta:
+        model = models.PortfolioInvitation
+        fields = "__all__"
+
+    _meta = Meta()
+
+    # Columns
+    list_display = [
+        "email",
+        "portfolio",
+        "portfolio_roles",
+        "portfolio_additional_permissions",
+        "status",
+    ]
+
+    # Search
+    search_fields = [
+        "email",
+        "portfolio__name",
+    ]
+
+    # Filters
+    list_filter = ("status",)
+
+    search_help_text = "Search by email or portfolio."
+
+    # Mark the FSM field 'status' as readonly
+    # to allow admin users to create Domain Invitations
+    # without triggering the FSM Transition Not Allowed
+    # error.
+    readonly_fields = ["status"]
+
+    autocomplete_fields = ["portfolio"]
+
+    change_form_template = "django/admin/email_clipboard_change_form.html"
+
+    # Select portfolio invitations to change -> Portfolio invitations
+    def changelist_view(self, request, extra_context=None):
+        if extra_context is None:
+            extra_context = {}
+        extra_context["tabtitle"] = "Portfolio invitations"
+        # Get the filtered values
+        return super().changelist_view(request, extra_context=extra_context)
+
+
 class DomainInformationResource(resources.ModelResource):
     """defines how each field in the referenced model should be mapped to the corresponding fields in the
     import/export file"""
@@ -2900,6 +2969,7 @@ admin.site.register(models.PublicContact, PublicContactAdmin)
 admin.site.register(models.DomainRequest, DomainRequestAdmin)
 admin.site.register(models.TransitionDomain, TransitionDomainAdmin)
 admin.site.register(models.VerifiedByStaff, VerifiedByStaffAdmin)
+admin.site.register(models.PortfolioInvitation, PortfolioInvitationAdmin)
 admin.site.register(models.Portfolio, PortfolioAdmin)
 admin.site.register(models.DomainGroup, DomainGroupAdmin)
 admin.site.register(models.Suborganization, SuborganizationAdmin)
diff --git a/src/registrar/migrations/0114_portfolioinvitation.py b/src/registrar/migrations/0114_portfolioinvitation.py
new file mode 100644
index 000000000..afd1dd714
--- /dev/null
+++ b/src/registrar/migrations/0114_portfolioinvitation.py
@@ -0,0 +1,84 @@
+# Generated by Django 4.2.10 on 2024-07-31 22:49
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+import django.db.models.deletion
+import django_fsm
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("registrar", "0113_user_portfolio_user_portfolio_additional_permissions_and_more"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="PortfolioInvitation",
+            fields=[
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+                ("email", models.EmailField(max_length=254)),
+                (
+                    "portfolio_roles",
+                    django.contrib.postgres.fields.ArrayField(
+                        base_field=models.CharField(
+                            choices=[
+                                ("organization_admin", "Admin"),
+                                ("organization_admin_read_only", "Admin read only"),
+                                ("organization_member", "Member"),
+                            ],
+                            max_length=50,
+                        ),
+                        blank=True,
+                        help_text="Select one or more roles.",
+                        null=True,
+                        size=None,
+                    ),
+                ),
+                (
+                    "portfolio_additional_permissions",
+                    django.contrib.postgres.fields.ArrayField(
+                        base_field=models.CharField(
+                            choices=[
+                                ("view_all_domains", "View all domains and domain reports"),
+                                ("view_managed_domains", "View managed domains"),
+                                ("edit_domains", "User is a manager on a domain"),
+                                ("view_member", "View members"),
+                                ("edit_member", "Create and edit members"),
+                                ("view_all_requests", "View all requests"),
+                                ("view_created_requests", "View created requests"),
+                                ("edit_requests", "Create and edit requests"),
+                                ("view_portfolio", "View organization"),
+                                ("edit_portfolio", "Edit organization"),
+                            ],
+                            max_length=50,
+                        ),
+                        blank=True,
+                        help_text="Select one or more additional permissions.",
+                        null=True,
+                        size=None,
+                    ),
+                ),
+                (
+                    "status",
+                    django_fsm.FSMField(
+                        choices=[("invited", "Invited"), ("retrieved", "Retrieved")],
+                        default="invited",
+                        max_length=50,
+                        protected=True,
+                    ),
+                ),
+                (
+                    "portfolio",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, related_name="portfolios", to="registrar.portfolio"
+                    ),
+                ),
+            ],
+            options={
+                "indexes": [models.Index(fields=["status"], name="registrar_p_status_aa4218_idx")],
+            },
+        ),
+    ]
diff --git a/src/registrar/models/__init__.py b/src/registrar/models/__init__.py
index a68633aff..1e0aad0b1 100644
--- a/src/registrar/models/__init__.py
+++ b/src/registrar/models/__init__.py
@@ -1,4 +1,4 @@
-from auditlog.registry import auditlog  # type: ignore
+from auditlog.registry import auditlog
 from .contact import Contact
 from .domain_request import DomainRequest
 from .domain_information import DomainInformation
@@ -16,6 +16,7 @@ from .website import Website
 from .transition_domain import TransitionDomain
 from .verified_by_staff import VerifiedByStaff
 from .waffle_flag import WaffleFlag
+from .portfolio_invitation import PortfolioInvitation
 from .portfolio import Portfolio
 from .domain_group import DomainGroup
 from .suborganization import Suborganization
@@ -40,6 +41,7 @@ __all__ = [
     "TransitionDomain",
     "VerifiedByStaff",
     "WaffleFlag",
+    "PortfolioInvitation",
     "Portfolio",
     "DomainGroup",
     "Suborganization",
@@ -63,6 +65,7 @@ auditlog.register(Website)
 auditlog.register(TransitionDomain)
 auditlog.register(VerifiedByStaff)
 auditlog.register(WaffleFlag)
+auditlog.register(PortfolioInvitation)
 auditlog.register(Portfolio)
 auditlog.register(DomainGroup)
 auditlog.register(Suborganization)
diff --git a/src/registrar/models/portfolio_invitation.py b/src/registrar/models/portfolio_invitation.py
new file mode 100644
index 000000000..2ad780429
--- /dev/null
+++ b/src/registrar/models/portfolio_invitation.py
@@ -0,0 +1,95 @@
+"""People are invited by email to administer domains."""
+
+import logging
+
+from django.contrib.auth import get_user_model
+from django.db import models
+
+from django_fsm import FSMField, transition
+from .utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices  # type: ignore
+
+from .utility.time_stamped_model import TimeStampedModel
+from django.contrib.postgres.fields import ArrayField
+
+
+logger = logging.getLogger(__name__)
+
+
+class PortfolioInvitation(TimeStampedModel):
+    class Meta:
+        """Contains meta information about this class"""
+
+        indexes = [
+            models.Index(fields=["status"]),
+        ]
+
+    # Constants for status field
+    class PortfolioInvitationStatus(models.TextChoices):
+        INVITED = "invited", "Invited"
+        RETRIEVED = "retrieved", "Retrieved"
+
+    email = models.EmailField(
+        null=False,
+        blank=False,
+    )
+
+    portfolio = models.ForeignKey(
+        "registrar.Portfolio",
+        on_delete=models.CASCADE,  # delete portfolio, then get rid of invitations
+        null=False,
+        related_name="portfolios",
+    )
+
+    portfolio_roles = ArrayField(
+        models.CharField(
+            max_length=50,
+            choices=UserPortfolioRoleChoices.choices,
+        ),
+        null=True,
+        blank=True,
+        help_text="Select one or more roles.",
+    )
+
+    portfolio_additional_permissions = ArrayField(
+        models.CharField(
+            max_length=50,
+            choices=UserPortfolioPermissionChoices.choices,
+        ),
+        null=True,
+        blank=True,
+        help_text="Select one or more additional permissions.",
+    )
+
+    status = FSMField(
+        choices=PortfolioInvitationStatus.choices,
+        default=PortfolioInvitationStatus.INVITED,
+        protected=True,  # can't alter state except through transition methods!
+    )
+
+    def __str__(self):
+        return f"Invitation for {self.email} on {self.portfolio} is {self.status}"
+
+    @transition(field="status", source=PortfolioInvitationStatus.INVITED, target=PortfolioInvitationStatus.RETRIEVED)
+    def retrieve(self):
+        """When an invitation is retrieved, create the corresponding permission.
+
+        Raises:
+            RuntimeError if no matching user can be found.
+        """
+
+        # get a user with this email address
+        User = get_user_model()
+        try:
+            user = User.objects.get(email=self.email)
+        except User.DoesNotExist:
+            # should not happen because a matching user should exist before
+            # we retrieve this invitation
+            raise RuntimeError("Cannot find the user to retrieve this portfolio invitation.")
+
+        # and create a role for that user on this portfolio
+        user.portfolio = self.portfolio
+        if self.portfolio_roles and len(self.portfolio_roles) > 0:
+            user.portfolio_roles = self.portfolio_roles
+        if self.portfolio_additional_permissions and len(self.portfolio_additional_permissions) > 0:
+            user.portfolio_additional_permissions = self.portfolio_additional_permissions
+        user.save()
diff --git a/src/registrar/models/user.py b/src/registrar/models/user.py
index b135e30c7..9c39c4d85 100644
--- a/src/registrar/models/user.py
+++ b/src/registrar/models/user.py
@@ -5,8 +5,10 @@ from django.db import models
 from django.db.models import Q
 
 from registrar.models.user_domain_role import UserDomainRole
+from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices
 
 from .domain_invitation import DomainInvitation
+from .portfolio_invitation import PortfolioInvitation
 from .transition_domain import TransitionDomain
 from .verified_by_staff import VerifiedByStaff
 from .domain import Domain
@@ -62,36 +64,6 @@ class User(AbstractUser):
         # after they login.
         FIXTURE_USER = "fixture_user", "Created by fixtures"
 
-    class UserPortfolioRoleChoices(models.TextChoices):
-        """
-        Roles make it easier for admins to look at
-        """
-
-        ORGANIZATION_ADMIN = "organization_admin", "Admin"
-        ORGANIZATION_ADMIN_READ_ONLY = "organization_admin_read_only", "Admin read only"
-        ORGANIZATION_MEMBER = "organization_member", "Member"
-
-    class UserPortfolioPermissionChoices(models.TextChoices):
-        """ """
-
-        VIEW_ALL_DOMAINS = "view_all_domains", "View all domains and domain reports"
-        VIEW_MANAGED_DOMAINS = "view_managed_domains", "View managed domains"
-        # EDIT_DOMAINS is really self.domains. We add is hear and leverage it in has_permission
-        # so we have one way to test for portfolio and domain edit permissions
-        # Do we need to check for portfolio domains specifically?
-        # NOTE: A user on an org can currently invite a user outside the org
-        EDIT_DOMAINS = "edit_domains", "User is a manager on a domain"
-
-        VIEW_MEMBER = "view_member", "View members"
-        EDIT_MEMBER = "edit_member", "Create and edit members"
-
-        VIEW_ALL_REQUESTS = "view_all_requests", "View all requests"
-        VIEW_CREATED_REQUESTS = "view_created_requests", "View created requests"
-        EDIT_REQUESTS = "edit_requests", "Create and edit requests"
-
-        VIEW_PORTFOLIO = "view_portfolio", "View organization"
-        EDIT_PORTFOLIO = "edit_portfolio", "Edit organization"
-
     PORTFOLIO_ROLE_PERMISSIONS = {
         UserPortfolioRoleChoices.ORGANIZATION_ADMIN: [
             UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS,
@@ -270,7 +242,7 @@ class User(AbstractUser):
 
         # EDIT_DOMAINS === user is a manager on a domain (has UserDomainRole)
         # NOTE: Should we check whether the domain is in the portfolio?
-        if portfolio_permission == self.UserPortfolioPermissionChoices.EDIT_DOMAINS and self.domains.exists():
+        if portfolio_permission == UserPortfolioPermissionChoices.EDIT_DOMAINS and self.domains.exists():
             return True
 
         if not self.portfolio:
@@ -283,22 +255,22 @@ class User(AbstractUser):
     # the methods below are checks for individual portfolio permissions.  they are defined here
     # to make them easier to call elsewhere throughout the application
     def has_base_portfolio_permission(self):
-        return self._has_portfolio_permission(User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO)
+        return self._has_portfolio_permission(UserPortfolioPermissionChoices.VIEW_PORTFOLIO)
 
     def has_domains_portfolio_permission(self):
         return (
-            self._has_portfolio_permission(User.UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS)
-            or self._has_portfolio_permission(User.UserPortfolioPermissionChoices.VIEW_MANAGED_DOMAINS)
+            self._has_portfolio_permission(UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS)
+            or self._has_portfolio_permission(UserPortfolioPermissionChoices.VIEW_MANAGED_DOMAINS)
             # or self._has_portfolio_permission(User.UserPortfolioPermissionChoices.EDIT_DOMAINS)
         )
 
     def has_edit_domains_portfolio_permission(self):
-        return self._has_portfolio_permission(User.UserPortfolioPermissionChoices.EDIT_DOMAINS)
+        return self._has_portfolio_permission(UserPortfolioPermissionChoices.EDIT_DOMAINS)
 
     def has_domain_requests_portfolio_permission(self):
         return (
-            self._has_portfolio_permission(User.UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS)
-            or self._has_portfolio_permission(User.UserPortfolioPermissionChoices.VIEW_CREATED_REQUESTS)
+            self._has_portfolio_permission(UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS)
+            or self._has_portfolio_permission(UserPortfolioPermissionChoices.VIEW_CREATED_REQUESTS)
             # or self._has_portfolio_permission(User.UserPortfolioPermissionChoices.EDIT_REQUESTS)
         )
 
@@ -409,6 +381,24 @@ class User(AbstractUser):
                 new_domain_invitation = DomainInvitation(email=transition_domain_email.lower(), domain=new_domain)
                 new_domain_invitation.save()
 
+    def check_portfolio_invitations_on_login(self):
+        """When a user first arrives on the site, we need to retrieve any portfolio
+        invitations that match their email address."""
+        for invitation in PortfolioInvitation.objects.filter(
+            email__iexact=self.email, status=PortfolioInvitation.PortfolioInvitationStatus.INVITED
+        ):
+            if self.portfolio is None:
+                try:
+                    invitation.retrieve()
+                    invitation.save()
+                except RuntimeError:
+                    # retrieving should not fail because of a missing user, but
+                    # if it does fail, log the error so a new user can continue
+                    # logging in
+                    logger.warn("Failed to retrieve invitation %s", invitation, exc_info=True)
+            else:
+                logger.warn("User already has a portfolio, did not retrieve invitation %s", invitation, exc_info=True)
+
     def on_each_login(self):
         """Callback each time the user is authenticated.
 
@@ -420,6 +410,7 @@ class User(AbstractUser):
         """
 
         self.check_domain_invitations_on_login()
+        self.check_portfolio_invitations_on_login()
 
     def is_org_user(self, request):
         has_organization_feature_flag = flag_is_active(request, "organization_feature")
diff --git a/src/registrar/models/utility/portfolio_helper.py b/src/registrar/models/utility/portfolio_helper.py
new file mode 100644
index 000000000..cadf12135
--- /dev/null
+++ b/src/registrar/models/utility/portfolio_helper.py
@@ -0,0 +1,33 @@
+from django.db import models
+
+
+class UserPortfolioRoleChoices(models.TextChoices):
+    """
+    Roles make it easier for admins to look at
+    """
+
+    ORGANIZATION_ADMIN = "organization_admin", "Admin"
+    ORGANIZATION_ADMIN_READ_ONLY = "organization_admin_read_only", "Admin read only"
+    ORGANIZATION_MEMBER = "organization_member", "Member"
+
+
+class UserPortfolioPermissionChoices(models.TextChoices):
+    """ """
+
+    VIEW_ALL_DOMAINS = "view_all_domains", "View all domains and domain reports"
+    VIEW_MANAGED_DOMAINS = "view_managed_domains", "View managed domains"
+    # EDIT_DOMAINS is really self.domains. We add is hear and leverage it in has_permission
+    # so we have one way to test for portfolio and domain edit permissions
+    # Do we need to check for portfolio domains specifically?
+    # NOTE: A user on an org can currently invite a user outside the org
+    EDIT_DOMAINS = "edit_domains", "User is a manager on a domain"
+
+    VIEW_MEMBER = "view_member", "View members"
+    EDIT_MEMBER = "edit_member", "Create and edit members"
+
+    VIEW_ALL_REQUESTS = "view_all_requests", "View all requests"
+    VIEW_CREATED_REQUESTS = "view_created_requests", "View created requests"
+    EDIT_REQUESTS = "edit_requests", "Create and edit requests"
+
+    VIEW_PORTFOLIO = "view_portfolio", "View organization"
+    EDIT_PORTFOLIO = "edit_portfolio", "Edit organization"
diff --git a/src/registrar/templates/admin/model_descriptions.html b/src/registrar/templates/admin/model_descriptions.html
index c075e03a5..4b61e21bd 100644
--- a/src/registrar/templates/admin/model_descriptions.html
+++ b/src/registrar/templates/admin/model_descriptions.html
@@ -30,6 +30,8 @@
         {% include "django/admin/includes/descriptions/verified_by_staff_description.html" %}
     {% elif opts.model_name == 'website' %}
         {% include "django/admin/includes/descriptions/website_description.html" %}
+    {% elif opts.model_name == 'portfolioinvitation' %}
+        {% include "django/admin/includes/descriptions/portfolio_invitation_description.html" %}
     {% else %}
         <p>This table does not have a description yet.</p>
     {% endif %}
diff --git a/src/registrar/templates/django/admin/includes/descriptions/portfolio_invitation_description.html b/src/registrar/templates/django/admin/includes/descriptions/portfolio_invitation_description.html
new file mode 100644
index 000000000..51515bcb2
--- /dev/null
+++ b/src/registrar/templates/django/admin/includes/descriptions/portfolio_invitation_description.html
@@ -0,0 +1,11 @@
+<p>
+Portfolio invitations contain all individuals who have been invited to become members of an organization. 
+Invitations are sent via email, and the recipient must log in to the registrar to officially 
+accept and become a member. 
+</p>
+
+<p>
+An “invited” status indicates that the recipient has not logged in to the registrar since the invitation was sent
+or that the recipient has logged in but is already a member of an organization. 
+A “received” status indicates that the recipient has logged in.
+</p>
diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index c145e1f98..aa139b74e 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -13,6 +13,7 @@ from registrar.admin import (
     ContactAdmin,
     DomainInformationAdmin,
     MyHostAdmin,
+    PortfolioInvitationAdmin,
     UserDomainRoleAdmin,
     VerifiedByStaffAdmin,
     FsmModelResource,
@@ -38,6 +39,7 @@ from registrar.models import (
     UserGroup,
     TransitionDomain,
 )
+from registrar.models.portfolio_invitation import PortfolioInvitation
 from registrar.models.senior_official import SeniorOfficial
 from registrar.models.user_domain_role import UserDomainRole
 from registrar.models.verified_by_staff import VerifiedByStaff
@@ -177,6 +179,77 @@ class TestDomainInvitationAdmin(TestCase):
             self.assertContains(response, retrieved_html, count=1)
 
 
+class TestPortfolioInvitationAdmin(TestCase):
+    """Tests for the PortfolioInvitationAdmin class as super user
+
+    Notes:
+      all tests share superuser; do not change this model in tests
+      tests have available superuser, client, and admin
+    """
+
+    @classmethod
+    def setUpClass(cls):
+        cls.factory = RequestFactory()
+        cls.admin = ListHeaderAdmin(model=PortfolioInvitationAdmin, admin_site=AdminSite())
+        cls.superuser = create_superuser()
+
+    def setUp(self):
+        """Create a client object"""
+        self.client = Client(HTTP_HOST="localhost:8080")
+
+    def tearDown(self):
+        """Delete all DomainInvitation objects"""
+        PortfolioInvitation.objects.all().delete()
+        Contact.objects.all().delete()
+
+    @classmethod
+    def tearDownClass(self):
+        User.objects.all().delete()
+
+    @less_console_noise_decorator
+    def test_has_model_description(self):
+        """Tests if this model has a model description on the table view"""
+        self.client.force_login(self.superuser)
+        response = self.client.get(
+            "/admin/registrar/portfolioinvitation/",
+            follow=True,
+        )
+
+        # Make sure that the page is loaded correctly
+        self.assertEqual(response.status_code, 200)
+
+        # Test for a description snippet
+        self.assertContains(
+            response,
+            "Portfolio invitations contain all individuals who have been invited to become members of an organization.",
+        )
+        self.assertContains(response, "Show more")
+
+    def test_get_filters(self):
+        """Ensures that our filters are displaying correctly"""
+        with less_console_noise():
+            self.client.force_login(self.superuser)
+
+            response = self.client.get(
+                "/admin/registrar/portfolioinvitation/",
+                {},
+                follow=True,
+            )
+
+            # Assert that the filters are added
+            self.assertContains(response, "invited", count=4)
+            self.assertContains(response, "Invited", count=2)
+            self.assertContains(response, "retrieved", count=2)
+            self.assertContains(response, "Retrieved", count=2)
+
+            # Check for the HTML context specificially
+            invited_html = '<a href="?status__exact=invited">Invited</a>'
+            retrieved_html = '<a href="?status__exact=retrieved">Retrieved</a>'
+
+            self.assertContains(response, invited_html, count=1)
+            self.assertContains(response, retrieved_html, count=1)
+
+
 class TestHostAdmin(TestCase):
     """Tests for the HostAdmin class as super user
 
diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index 741ec5361..994f45480 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -20,7 +20,9 @@ from registrar.models import (
 
 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
 
@@ -1071,8 +1073,8 @@ class TestDomainInformation(TestCase):
         return {k: v for k, v in dict_obj.items() if k not in bad_fields}
 
 
-class TestInvitations(TestCase):
-    """Test the retrieval of invitations."""
+class TestDomainInvitations(TestCase):
+    """Test the retrieval of domain invitations."""
 
     @less_console_noise_decorator
     def setUp(self):
@@ -1116,6 +1118,65 @@ class TestInvitations(TestCase):
         self.assertTrue(UserDomainRole.objects.get(user=self.user, domain=self.domain))
 
 
+class TestPortfolioInvitations(TestCase):
+    """Test the retrieval of portfolio invitations."""
+
+    @less_console_noise_decorator
+    def setUp(self):
+        self.email = "mayor@igorville.gov"
+        self.email2 = "creator@igorville.gov"
+        self.user, _ = User.objects.get_or_create(email=self.email)
+        self.user2, _ = User.objects.get_or_create(email=self.email2, username="creator")
+        self.portfolio, _ = Portfolio.objects.get_or_create(creator=self.user2, organization_name="Hotel California")
+        self.portfolio_role_base = UserPortfolioRoleChoices.ORGANIZATION_MEMBER
+        self.portfolio_role_admin = UserPortfolioRoleChoices.ORGANIZATION_ADMIN
+        self.portfolio_permission_1 = UserPortfolioPermissionChoices.VIEW_CREATED_REQUESTS
+        self.portfolio_permission_2 = UserPortfolioPermissionChoices.EDIT_REQUESTS
+        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],
+        )
+
+    def tearDown(self):
+        super().tearDown()
+        Portfolio.objects.all().delete()
+        PortfolioInvitation.objects.all().delete()
+        User.objects.all().delete()
+
+    @less_console_noise_decorator
+    def test_retrieval(self):
+        self.assertFalse(self.user.portfolio)
+        self.invitation.retrieve()
+        self.user.refresh_from_db()
+        self.assertEqual(self.user.portfolio.organization_name, "Hotel California")
+        self.assertEqual(self.user.portfolio_roles, [self.portfolio_role_base, self.portfolio_role_admin])
+        self.assertEqual(
+            self.user.portfolio_additional_permissions, [self.portfolio_permission_1, self.portfolio_permission_2]
+        )
+        self.assertEqual(self.invitation.status, PortfolioInvitation.PortfolioInvitationStatus.RETRIEVED)
+
+    @less_console_noise_decorator
+    def test_retrieve_missing_user_error(self):
+        # get rid of matching users
+        User.objects.filter(email=self.email).delete()
+        with self.assertRaises(RuntimeError):
+            self.invitation.retrieve()
+
+    @less_console_noise_decorator
+    def test_retrieve_user_already_member_error(self):
+        self.assertFalse(self.user.portfolio)
+        portfolio2, _ = Portfolio.objects.get_or_create(creator=self.user2, organization_name="Tokyo Hotel")
+        self.user.portfolio = portfolio2
+        self.assertEqual(self.user.portfolio.organization_name, "Tokyo Hotel")
+        self.user.save()
+        self.user.check_portfolio_invitations_on_login()
+        self.user.refresh_from_db()
+        self.assertEqual(self.user.portfolio.organization_name, "Tokyo Hotel")
+        self.assertEqual(self.invitation.status, PortfolioInvitation.PortfolioInvitationStatus.INVITED)
+
+
 class TestUser(TestCase):
     """Test actions that occur on user login,
     test class method that controls how users get validated."""

From fe5af5010010dc65ada5f64c06fd75949a5dcae1 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Wed, 31 Jul 2024 21:42:11 -0400
Subject: [PATCH 43/70] initial implementation

---
 src/registrar/config/settings.py              |  1 -
 src/registrar/config/urls.py                  | 19 +++++----
 src/registrar/context_processors.py           | 10 +++--
 src/registrar/registrar_middleware.py         |  4 +-
 src/registrar/templates/domain_detail.html    | 29 +++++++++-----
 src/registrar/templates/domain_sidebar.html   |  2 +-
 .../templates/includes/header_extended.html   | 11 +++---
 src/registrar/templatetags/custom_filters.py  |  5 +++
 src/registrar/views/__init__.py               |  1 +
 src/registrar/views/domain.py                 | 11 ++++++
 src/registrar/views/portfolios.py             | 39 ++++---------------
 src/registrar/views/utility/mixins.py         |  8 +++-
 .../views/utility/permission_views.py         | 19 +++++++++
 13 files changed, 94 insertions(+), 65 deletions(-)

diff --git a/src/registrar/config/settings.py b/src/registrar/config/settings.py
index 3da0a104a..2f20aeb66 100644
--- a/src/registrar/config/settings.py
+++ b/src/registrar/config/settings.py
@@ -241,7 +241,6 @@ TEMPLATES = [
                 "registrar.context_processors.is_demo_site",
                 "registrar.context_processors.is_production",
                 "registrar.context_processors.org_user_status",
-                "registrar.context_processors.add_portfolio_to_context",
                 "registrar.context_processors.add_path_to_context",
                 "registrar.context_processors.add_has_profile_feature_flag_to_context",
                 "registrar.context_processors.portfolio_permissions",
diff --git a/src/registrar/config/urls.py b/src/registrar/config/urls.py
index b91e0980c..651346b10 100644
--- a/src/registrar/config/urls.py
+++ b/src/registrar/config/urls.py
@@ -25,7 +25,6 @@ from registrar.views.domain_request import Step
 from registrar.views.domain_requests_json import get_domain_requests_json
 from registrar.views.domains_json import get_domains_json
 from registrar.views.utility import always_404
-from registrar.views.portfolios import PortfolioDomainsView, PortfolioDomainRequestsView, PortfolioOrganizationView
 from api.views import available, get_current_federal, get_current_full
 
 
@@ -60,19 +59,19 @@ for step, view in [
 urlpatterns = [
     path("", views.index, name="home"),
     path(
-        "portfolio/<int:portfolio_id>/domains/",
-        PortfolioDomainsView.as_view(),
-        name="portfolio-domains",
+        "domains/",
+        views.PortfolioDomainsView.as_view(),
+        name="domains",
     ),
     path(
-        "portfolio/<int:portfolio_id>/domain_requests/",
-        PortfolioDomainRequestsView.as_view(),
-        name="portfolio-domain-requests",
+        "requests/",
+        views.PortfolioDomainRequestsView.as_view(),
+        name="domain-requests",
     ),
     path(
-        "portfolio/<int:portfolio_id>/organization/",
-        PortfolioOrganizationView.as_view(),
-        name="portfolio-organization",
+        "organization/",
+        views.PortfolioOrganizationView.as_view(),
+        name="organization",
     ),
     path(
         "admin/logout/",
diff --git a/src/registrar/context_processors.py b/src/registrar/context_processors.py
index 06ef07050..861a4e701 100644
--- a/src/registrar/context_processors.py
+++ b/src/registrar/context_processors.py
@@ -50,10 +50,6 @@ def org_user_status(request):
     }
 
 
-def add_portfolio_to_context(request):
-    return {"portfolio": getattr(request, "portfolio", None)}
-
-
 def add_path_to_context(request):
     return {"path": getattr(request, "path", None)}
 
@@ -70,11 +66,15 @@ def portfolio_permissions(request):
                 "has_base_portfolio_permission": False,
                 "has_domains_portfolio_permission": False,
                 "has_domain_requests_portfolio_permission": False,
+                "portfolio": None,
+                "has_organization_feature_flag": False,
             }
         return {
             "has_base_portfolio_permission": request.user.has_base_portfolio_permission(),
             "has_domains_portfolio_permission": request.user.has_domains_portfolio_permission(),
             "has_domain_requests_portfolio_permission": request.user.has_domain_requests_portfolio_permission(),
+            "portfolio": request.user.portfolio,
+            "has_organization_feature_flag": flag_is_active(request, "organization_feature"),
         }
     except AttributeError:
         # Handles cases where request.user might not exist
@@ -82,4 +82,6 @@ def portfolio_permissions(request):
             "has_base_portfolio_permission": False,
             "has_domains_portfolio_permission": False,
             "has_domain_requests_portfolio_permission": False,
+            "portfolio": None,
+            "has_organization_feature_flag": False,
         }
diff --git a/src/registrar/registrar_middleware.py b/src/registrar/registrar_middleware.py
index dd9b5541a..2af331bc9 100644
--- a/src/registrar/registrar_middleware.py
+++ b/src/registrar/registrar_middleware.py
@@ -149,10 +149,10 @@ class CheckPortfolioMiddleware:
                 request.portfolio = portfolio
 
                 if request.user.has_domains_portfolio_permission():
-                    portfolio_redirect = reverse("portfolio-domains", kwargs={"portfolio_id": portfolio.id})
+                    portfolio_redirect = reverse("domains")
                 else:
                     # View organization is the lowest access
-                    portfolio_redirect = reverse("portfolio-organization", kwargs={"portfolio_id": portfolio.id})
+                    portfolio_redirect = reverse("organization")
 
                 return HttpResponseRedirect(portfolio_redirect)
 
diff --git a/src/registrar/templates/domain_detail.html b/src/registrar/templates/domain_detail.html
index 08137c094..414b28a22 100644
--- a/src/registrar/templates/domain_detail.html
+++ b/src/registrar/templates/domain_detail.html
@@ -40,39 +40,50 @@
 
     {% include "includes/domain_dates.html" %}
 
+    {% if is_portfolio_user and not is_domain_manager %}
+    <div class="usa-alert usa-alert--info usa-alert--slim">
+      <div class="usa-alert__body">
+        <p class="usa-alert__text ">
+          To manage information for this domain, you must add yourself as a domain manager.
+        </p>
+      </div>
+    </div>
+    {% endif %}
+
+
     {% url 'domain-dns-nameservers' pk=domain.id as url %}
     {% if domain.nameservers|length > 0 %}
-      {% include "includes/summary_item.html" with title='DNS name servers' domains='true' value=domain.nameservers list='true' edit_link=url editable=domain.is_editable %}
+      {% include "includes/summary_item.html" with title='DNS name servers' domains='true' value=domain.nameservers list='true' edit_link=url editable=is_editable %}
     {% else %}
-      {% if domain.is_editable %}
+      {% if is_editable %}
       <h2 class="margin-top-3"> DNS name servers </h2>
       <p> No DNS name servers have been added yet. Before your domain can be used we’ll need information about your domain name servers.</p>
       <a class="usa-button margin-bottom-1" href="{{url}}"> Add DNS name servers </a>
       {% else %}
-        {% include "includes/summary_item.html" with title='DNS name servers' domains='true' value='' edit_link=url editable=domain.is_editable %}
+        {% include "includes/summary_item.html" with title='DNS name servers' domains='true' value='' edit_link=url editable=is_editable %}
       {% endif %}
     {% endif %}
 
     {% url 'domain-org-name-address' pk=domain.id as url %}
-    {% include "includes/summary_item.html" with title='Organization name and mailing address' value=domain.domain_info address='true' edit_link=url editable=domain.is_editable %}
+    {% include "includes/summary_item.html" with title='Organization name and mailing address' value=domain.domain_info address='true' edit_link=url editable=is_editable %}
 
     {% url 'domain-senior-official' pk=domain.id as url %}
-    {% include "includes/summary_item.html" with title='Senior official' value=domain.domain_info.senior_official contact='true' edit_link=url editable=domain.is_editable %}
+    {% include "includes/summary_item.html" with title='Senior official' value=domain.domain_info.senior_official contact='true' edit_link=url editable=is_editable %}
 
     {# Conditionally display profile #}
     {% if not has_profile_feature_flag %}
     {% url 'domain-your-contact-information' pk=domain.id as url %}
-    {% include "includes/summary_item.html" with title='Your contact information' value=request.user contact='true' edit_link=url editable=domain.is_editable %}
+    {% include "includes/summary_item.html" with title='Your contact information' value=request.user contact='true' edit_link=url editable=is_editable %}
     {% endif %}
 
     {% url 'domain-security-email' pk=domain.id as url %}
     {% if security_email is not None and security_email not in hidden_security_emails%}
-      {% include "includes/summary_item.html" with title='Security email' value=security_email edit_link=url editable=domain.is_editable %}
+      {% include "includes/summary_item.html" with title='Security email' value=security_email edit_link=url editable=is_editable %}
     {% else %}
-      {% include "includes/summary_item.html" with title='Security email' value='None provided' edit_link=url editable=domain.is_editable %}
+      {% include "includes/summary_item.html" with title='Security email' value='None provided' edit_link=url editable=is_editable %}
     {% endif %}
     {% url 'domain-users' pk=domain.id as url %}
-    {% include "includes/summary_item.html" with title='Domain managers' users='true' list=True value=domain.permissions.all edit_link=url editable=domain.is_editable %}
+    {% include "includes/summary_item.html" with title='Domain managers' users='true' list=True value=domain.permissions.all edit_link=url editable=is_editable %}
 
   </div>
 {% endblock %}  {# domain_content #}
diff --git a/src/registrar/templates/domain_sidebar.html b/src/registrar/templates/domain_sidebar.html
index d61e5f45c..603822d0d 100644
--- a/src/registrar/templates/domain_sidebar.html
+++ b/src/registrar/templates/domain_sidebar.html
@@ -12,7 +12,7 @@
         </a>
       </li>
 
-      {% if domain.is_editable %}
+      {% if is_editable %}
       <li class="usa-sidenav__item">
         {% url 'domain-dns' pk=domain.id as url %}
         <a href="{{ url }}" {% if request.path|startswith:url %}class="usa-current"{% endif %}>
diff --git a/src/registrar/templates/includes/header_extended.html b/src/registrar/templates/includes/header_extended.html
index c5fc02ebb..c516b9744 100644
--- a/src/registrar/templates/includes/header_extended.html
+++ b/src/registrar/templates/includes/header_extended.html
@@ -1,4 +1,5 @@
 {% load static %}
+{% load custom_filters %}
 
 <header class="usa-header usa-header--extended">
     <div class="usa-navbar">
@@ -14,8 +15,8 @@
         <ul class="usa-nav__primary usa-accordion">
             {% if has_domains_portfolio_permission %}
                 <li class="usa-nav__primary-item">
-                    {% url 'portfolio-domains' portfolio.id as url %}
-                    <a href="{{ url }}" class="usa-nav-link{% if request.path == url %} usa-current{% endif %}"> 
+                    {% url 'domains' as url %}
+                    <a href="{{ url }}" class="usa-nav-link{% if 'domain'|in_path:request.path %} usa-current{% endif %}"> 
                     Domains
                     </a>
                 </li>
@@ -27,8 +28,8 @@
             </li>
             {% if has_domain_requests_portfolio_permission %}
                 <li class="usa-nav__primary-item">
-                    {% url 'portfolio-domain-requests' portfolio.id as url %}
-                    <a href="{{ url }}" class="usa-nav-link{% if request.path == url %} usa-current{% endif %}"> 
+                    {% url 'domain-requests' as url %}
+                    <a href="{{ url }}" class="usa-nav-link{% if 'request'|in_path:request.path %} usa-current{% endif %}"> 
                     Domain requests
                     </a>
                 </li>
@@ -39,7 +40,7 @@
                 </a>
             </li>
             <li class="usa-nav__primary-item">
-                {% url 'portfolio-organization' portfolio.id as url %}
+                {% url 'organization' as url %}
                 <!-- Move the padding from the a to the span so that the descenders do not get cut off -->
                 <a href="{{ url }}" class="usa-nav-link padding-y-0">
                     <span class="ellipsis ellipsis--23 ellipsis--desktop-50 padding-y-1 desktop:padding-y-2">
diff --git a/src/registrar/templatetags/custom_filters.py b/src/registrar/templatetags/custom_filters.py
index 62afa1acb..8338eaf9d 100644
--- a/src/registrar/templatetags/custom_filters.py
+++ b/src/registrar/templatetags/custom_filters.py
@@ -145,3 +145,8 @@ def format_phone(value):
             phone_number = PhoneNumber.from_string(value)
         return phone_number.as_national
     return value
+
+
+@register.filter
+def in_path(url, path):
+    return url in path
diff --git a/src/registrar/views/__init__.py b/src/registrar/views/__init__.py
index 37977f334..a00cc1d73 100644
--- a/src/registrar/views/__init__.py
+++ b/src/registrar/views/__init__.py
@@ -17,3 +17,4 @@ from .domain import (
 from .user_profile import UserProfileView, FinishProfileSetupView
 from .health import *
 from .index import *
+from .portfolios import *
diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index 766bef7c2..da34ce646 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -170,6 +170,17 @@ class DomainView(DomainBaseView):
         context["security_email"] = security_email
         return context
 
+    def can_access_domain_via_portfolio(self, pk):
+        """Most views should not allow permission to portfolio users.
+        If particular views allow permissions, they will need to override
+        this function."""
+        if self.request.user.has_domains_portfolio_permission():
+            if Domain.objects.filter(id=pk).exists():
+                domain = Domain.objects.get(id=pk)
+                if domain.domain_info.portfolio == self.request.user.portfolio:
+                    return True
+        return False
+
     def in_editable_state(self, pk):
         """Override in_editable_state from DomainPermission
         Allow detail page to be viewable"""
diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py
index f693e2cc9..4af06cbe8 100644
--- a/src/registrar/views/portfolios.py
+++ b/src/registrar/views/portfolios.py
@@ -1,11 +1,9 @@
-from django.shortcuts import get_object_or_404, render
-from registrar.models.portfolio import Portfolio
+from django.shortcuts import render
 from registrar.views.utility.permission_views import (
     PortfolioDomainRequestsPermissionView,
     PortfolioDomainsPermissionView,
     PortfolioBasePermissionView,
 )
-from waffle.decorators import flag_is_active
 from django.views.generic import View
 
 
@@ -13,46 +11,23 @@ class PortfolioDomainsView(PortfolioDomainsPermissionView, View):
 
     template_name = "portfolio_domains.html"
 
-    def get(self, request, portfolio_id):
-        context = {}
-
-        if self.request.user.is_authenticated:
-            context["has_profile_feature_flag"] = flag_is_active(request, "profile_feature")
-            context["has_organization_feature_flag"] = flag_is_active(request, "organization_feature")
-            portfolio = get_object_or_404(Portfolio, id=portfolio_id)
-            context["portfolio"] = portfolio
-
-        return render(request, "portfolio_domains.html", context)
+    def get(self, request):
+        return render(request, "portfolio_domains.html")
 
 
 class PortfolioDomainRequestsView(PortfolioDomainRequestsPermissionView, View):
 
     template_name = "portfolio_requests.html"
 
-    def get(self, request, portfolio_id):
-        context = {}
-
+    def get(self, request):
         if self.request.user.is_authenticated:
-            context["has_profile_feature_flag"] = flag_is_active(request, "profile_feature")
-            context["has_organization_feature_flag"] = flag_is_active(request, "organization_feature")
-            portfolio = get_object_or_404(Portfolio, id=portfolio_id)
-            context["portfolio"] = portfolio
             request.session["new_request"] = True
-
-        return render(request, "portfolio_requests.html", context)
+        return render(request, "portfolio_requests.html")
 
 
 class PortfolioOrganizationView(PortfolioBasePermissionView, View):
 
     template_name = "portfolio_organization.html"
 
-    def get(self, request, portfolio_id):
-        context = {}
-
-        if self.request.user.is_authenticated:
-            context["has_profile_feature_flag"] = flag_is_active(request, "profile_feature")
-            context["has_organization_feature_flag"] = flag_is_active(request, "organization_feature")
-            portfolio = get_object_or_404(Portfolio, id=portfolio_id)
-            context["portfolio"] = portfolio
-
-        return render(request, "portfolio_organization.html", context)
+    def get(self, request):
+        return render(request, "portfolio_organization.html")
diff --git a/src/registrar/views/utility/mixins.py b/src/registrar/views/utility/mixins.py
index 5f8485ec5..5b8f81087 100644
--- a/src/registrar/views/utility/mixins.py
+++ b/src/registrar/views/utility/mixins.py
@@ -184,11 +184,17 @@ class DomainPermission(PermissionsLoginMixin):
 
         # user needs to have a role on the domain
         if not UserDomainRole.objects.filter(user=self.request.user, domain__id=pk).exists():
-            return False
+            return self.can_access_domain_via_portfolio(pk)
 
         # if we need to check more about the nature of role, do it here.
         return True
 
+    def can_access_domain_via_portfolio(self, pk):
+        """Most views should not allow permission to portfolio users.
+        If particular views allow permissions, they will need to override
+        this function."""
+        return False
+
     def in_editable_state(self, pk):
         """Is the domain in an editable state"""
 
diff --git a/src/registrar/views/utility/permission_views.py b/src/registrar/views/utility/permission_views.py
index 181934787..501658e9f 100644
--- a/src/registrar/views/utility/permission_views.py
+++ b/src/registrar/views/utility/permission_views.py
@@ -43,6 +43,9 @@ class DomainPermissionView(DomainPermission, DetailView, abc.ABC):
         context["is_analyst_or_superuser"] = user.has_perm("registrar.analyst_access_permission") or user.has_perm(
             "registrar.full_access_permission"
         )
+        context["is_domain_manager"] = UserDomainRole.objects.filter(user=user, domain=self.object).exists()
+        context["is_portfolio_user"] = self.can_access_domain_via_portfolio(self.object.pk)
+        context["is_editable"] = self.is_editable()
         # Stored in a variable for the linter
         action = "analyst_action"
         action_location = "analyst_action_location"
@@ -54,6 +57,22 @@ class DomainPermissionView(DomainPermission, DetailView, abc.ABC):
 
         return context
 
+    def is_editable(self):
+        """Returns whether domain is editable in the context of the view"""
+        logger.info("checking if is_editable")
+        domain_editable = self.object.is_editable()
+        if not domain_editable:
+            return False
+
+        # if user is domain manager or analyst or admin, return True
+        if (
+            self.can_access_other_user_domains(self.object.id)
+            or UserDomainRole.objects.filter(user=self.request.user, domain=self.object).exists()
+        ):
+            return True
+
+        return False
+
     # Abstract property enforces NotImplementedError on an attribute.
     @property
     @abc.abstractmethod

From 7860d8c58727569ed176a4d0852a4003e3810c2a Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Wed, 31 Jul 2024 22:25:59 -0400
Subject: [PATCH 44/70] updated existing tests

---
 src/registrar/tests/test_views_portfolio.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index 3596bf567..ebda0bcf3 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -112,7 +112,7 @@ class TestPortfolio(WebTest):
             # This will redirect the user to the portfolio page.
             # Follow implicity checks if our redirect is working.
             response = self.app.get(
-                reverse("portfolio-domains", kwargs={"portfolio_id": self.portfolio.pk}), status=403
+                reverse("domains"), status=403
             )
             # Assert the response is a 403 Forbidden
             self.assertEqual(response.status_code, 403)
@@ -128,7 +128,7 @@ class TestPortfolio(WebTest):
             # This will redirect the user to the portfolio page.
             # Follow implicity checks if our redirect is working.
             response = self.app.get(
-                reverse("portfolio-domain-requests", kwargs={"portfolio_id": self.portfolio.pk}), status=403
+                reverse("domain-requests"), status=403
             )
             # Assert the response is a 403 Forbidden
             self.assertEqual(response.status_code, 403)
@@ -144,7 +144,7 @@ class TestPortfolio(WebTest):
             # This will redirect the user to the portfolio page.
             # Follow implicity checks if our redirect is working.
             response = self.app.get(
-                reverse("portfolio-organization", kwargs={"portfolio_id": self.portfolio.pk}), status=403
+                reverse("organization"), status=403
             )
             # Assert the response is a 403 Forbidden
             self.assertEqual(response.status_code, 403)
@@ -170,10 +170,10 @@ class TestPortfolio(WebTest):
             self.assertNotContains(portfolio_page, "<h1>Organization</h1>")
             self.assertContains(portfolio_page, '<h1 id="domains-header">Domains</h1>')
             self.assertContains(
-                portfolio_page, reverse("portfolio-domains", kwargs={"portfolio_id": self.portfolio.pk})
+                portfolio_page, reverse("domains")
             )
             self.assertContains(
-                portfolio_page, reverse("portfolio-domain-requests", kwargs={"portfolio_id": self.portfolio.pk})
+                portfolio_page, reverse("domain-requests")
             )
 
             # reducing portfolio permissions to just VIEW_PORTFOLIO, which should remove domains
@@ -188,10 +188,10 @@ class TestPortfolio(WebTest):
             self.assertContains(portfolio_page, "<h1>Organization</h1>")
             self.assertNotContains(portfolio_page, '<h1 id="domains-header">Domains</h1>')
             self.assertNotContains(
-                portfolio_page, reverse("portfolio-domains", kwargs={"portfolio_id": self.portfolio.pk})
+                portfolio_page, reverse("domains")
             )
             self.assertNotContains(
-                portfolio_page, reverse("portfolio-domain-requests", kwargs={"portfolio_id": self.portfolio.pk})
+                portfolio_page, reverse("domain-requests")
             )
 
 
@@ -209,7 +209,7 @@ class TestPortfolioOrganization(TestPortfolio):
             self.user.save()
             self.user.refresh_from_db()
 
-            page = self.app.get(reverse("portfolio-organization", kwargs={"portfolio_id": self.portfolio.pk}))
+            page = self.app.get(reverse("organization"))
             self.assertContains(
                 page, "The name of your federal agency will be publicly listed as the domain registrant."
             )
@@ -228,7 +228,7 @@ class TestPortfolioOrganization(TestPortfolio):
 
             self.portfolio.organization_name = "Hotel California"
             self.portfolio.save()
-            page = self.app.get(reverse("portfolio-organization", kwargs={"portfolio_id": self.portfolio.pk}))
+            page = self.app.get(reverse("organization"))
             # Once in the sidenav, once in the main nav, once in the form
             self.assertContains(page, "Hotel California", count=3)
 
@@ -247,7 +247,7 @@ class TestPortfolioOrganization(TestPortfolio):
             self.portfolio.address_line1 = "1600 Penn Ave"
             self.portfolio.save()
             portfolio_org_name_page = self.app.get(
-                reverse("portfolio-organization", kwargs={"portfolio_id": self.portfolio.pk})
+                reverse("organization")
             )
             session_id = self.app.cookies[settings.SESSION_COOKIE_NAME]
 

From 978ea903e708692c0b71fc777b3dff9c0c4a8213 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Wed, 31 Jul 2024 22:40:35 -0400
Subject: [PATCH 45/70] formatted for code readability

---
 src/registrar/tests/test_views_portfolio.py | 32 ++++++---------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index ebda0bcf3..09f34efcf 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -111,9 +111,7 @@ class TestPortfolio(WebTest):
         with override_flag("organization_feature", active=True):
             # This will redirect the user to the portfolio page.
             # Follow implicity checks if our redirect is working.
-            response = self.app.get(
-                reverse("domains"), status=403
-            )
+            response = self.app.get(reverse("domains"), status=403)
             # Assert the response is a 403 Forbidden
             self.assertEqual(response.status_code, 403)
 
@@ -127,9 +125,7 @@ class TestPortfolio(WebTest):
         with override_flag("organization_feature", active=True):
             # This will redirect the user to the portfolio page.
             # Follow implicity checks if our redirect is working.
-            response = self.app.get(
-                reverse("domain-requests"), status=403
-            )
+            response = self.app.get(reverse("domain-requests"), status=403)
             # Assert the response is a 403 Forbidden
             self.assertEqual(response.status_code, 403)
 
@@ -143,9 +139,7 @@ class TestPortfolio(WebTest):
         with override_flag("organization_feature", active=True):
             # This will redirect the user to the portfolio page.
             # Follow implicity checks if our redirect is working.
-            response = self.app.get(
-                reverse("organization"), status=403
-            )
+            response = self.app.get(reverse("organization"), status=403)
             # Assert the response is a 403 Forbidden
             self.assertEqual(response.status_code, 403)
 
@@ -169,12 +163,8 @@ class TestPortfolio(WebTest):
             self.assertContains(portfolio_page, self.portfolio.organization_name)
             self.assertNotContains(portfolio_page, "<h1>Organization</h1>")
             self.assertContains(portfolio_page, '<h1 id="domains-header">Domains</h1>')
-            self.assertContains(
-                portfolio_page, reverse("domains")
-            )
-            self.assertContains(
-                portfolio_page, reverse("domain-requests")
-            )
+            self.assertContains(portfolio_page, reverse("domains"))
+            self.assertContains(portfolio_page, reverse("domain-requests"))
 
             # reducing portfolio permissions to just VIEW_PORTFOLIO, which should remove domains
             # and domain requests from nav
@@ -187,12 +177,8 @@ class TestPortfolio(WebTest):
             self.assertContains(portfolio_page, self.portfolio.organization_name)
             self.assertContains(portfolio_page, "<h1>Organization</h1>")
             self.assertNotContains(portfolio_page, '<h1 id="domains-header">Domains</h1>')
-            self.assertNotContains(
-                portfolio_page, reverse("domains")
-            )
-            self.assertNotContains(
-                portfolio_page, reverse("domain-requests")
-            )
+            self.assertNotContains(portfolio_page, reverse("domains"))
+            self.assertNotContains(portfolio_page, reverse("domain-requests"))
 
 
 class TestPortfolioOrganization(TestPortfolio):
@@ -246,9 +232,7 @@ class TestPortfolioOrganization(TestPortfolio):
 
             self.portfolio.address_line1 = "1600 Penn Ave"
             self.portfolio.save()
-            portfolio_org_name_page = self.app.get(
-                reverse("organization")
-            )
+            portfolio_org_name_page = self.app.get(reverse("organization"))
             session_id = self.app.cookies[settings.SESSION_COOKIE_NAME]
 
             portfolio_org_name_page.form["address_line1"] = "6 Downing st"

From 1ccd59a0aa02fbb99c9206d757f5e6b7d1da71ae Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Wed, 31 Jul 2024 22:46:26 -0400
Subject: [PATCH 46/70] formatted for readability

---
 src/registrar/views/portfolios.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py
index 3d6a41fbb..bec634715 100644
--- a/src/registrar/views/portfolios.py
+++ b/src/registrar/views/portfolios.py
@@ -11,7 +11,6 @@ from registrar.views.utility.permission_views import (
 )
 from django.views.generic import View
 from django.views.generic.edit import FormMixin
-from waffle.decorators import flag_is_active
 
 
 logger = logging.getLogger(__name__)

From f22316ccc2b326ed079fd0488897a603064221cc Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Thu, 1 Aug 2024 08:14:26 -0400
Subject: [PATCH 47/70] fix unit tests

---
 src/registrar/tests/test_models.py          |  3 ++-
 src/registrar/tests/test_views_portfolio.py | 27 +++++++++++----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index 994f45480..c1059012b 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -1196,6 +1196,7 @@ class TestUser(TestCase):
         DomainRequest.objects.all().delete()
         DraftDomain.objects.all().delete()
         TransitionDomain.objects.all().delete()
+        Portfolio.objects.all().delete()
         User.objects.all().delete()
         UserDomainRole.objects.all().delete()
 
@@ -1359,7 +1360,7 @@ class TestUser(TestCase):
         """
         portfolio, _ = Portfolio.objects.get_or_create(creator=self.user, organization_name="Hotel California")
 
-        self.user.portfolio_additional_permissions = [User.UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS]
+        self.user.portfolio_additional_permissions = [UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS]
         self.user.save()
         self.user.refresh_from_db()
 
diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index 3596bf567..f1db5b29e 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.utility.portfolio_helper import UserPortfolioPermissionChoices
 from .common import create_test_user
 from waffle.testutils import override_flag
 
@@ -55,7 +56,7 @@ class TestPortfolio(WebTest):
     def test_middleware_does_not_redirect_if_no_portfolio(self):
         """Test that user with no assigned portfolio is not redirected when attempting to access home"""
         self.app.set_user(self.user.username)
-        self.user.portfolio_additional_permissions = [User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO]
+        self.user.portfolio_additional_permissions = [UserPortfolioPermissionChoices.VIEW_PORTFOLIO]
         self.user.save()
         self.user.refresh_from_db()
         with override_flag("organization_feature", active=True):
@@ -70,7 +71,7 @@ class TestPortfolio(WebTest):
         """Test that user with VIEW_PORTFOLIO is redirected to portfolio organization page"""
         self.app.set_user(self.user.username)
         self.user.portfolio = self.portfolio
-        self.user.portfolio_additional_permissions = [User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO]
+        self.user.portfolio_additional_permissions = [UserPortfolioPermissionChoices.VIEW_PORTFOLIO]
         self.user.save()
         self.user.refresh_from_db()
         with override_flag("organization_feature", active=True):
@@ -87,8 +88,8 @@ class TestPortfolio(WebTest):
         self.app.set_user(self.user.username)
         self.user.portfolio = self.portfolio
         self.user.portfolio_additional_permissions = [
-            User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
-            User.UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS,
+            UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
+            UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS,
         ]
         self.user.save()
         self.user.refresh_from_db()
@@ -155,9 +156,9 @@ class TestPortfolio(WebTest):
         self.app.set_user(self.user.username)
         self.user.portfolio = self.portfolio
         self.user.portfolio_additional_permissions = [
-            User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
-            User.UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS,
-            User.UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS,
+            UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
+            UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS,
+            UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS,
         ]
         self.user.save()
         self.user.refresh_from_db()
@@ -203,8 +204,8 @@ class TestPortfolioOrganization(TestPortfolio):
             self.app.set_user(self.user.username)
             self.user.portfolio = self.portfolio
             self.user.portfolio_additional_permissions = [
-                User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
-                User.UserPortfolioPermissionChoices.EDIT_PORTFOLIO,
+                UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
+                UserPortfolioPermissionChoices.EDIT_PORTFOLIO,
             ]
             self.user.save()
             self.user.refresh_from_db()
@@ -220,8 +221,8 @@ class TestPortfolioOrganization(TestPortfolio):
             self.app.set_user(self.user.username)
             self.user.portfolio = self.portfolio
             self.user.portfolio_additional_permissions = [
-                User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
-                User.UserPortfolioPermissionChoices.EDIT_PORTFOLIO,
+                UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
+                UserPortfolioPermissionChoices.EDIT_PORTFOLIO,
             ]
             self.user.save()
             self.user.refresh_from_db()
@@ -238,8 +239,8 @@ class TestPortfolioOrganization(TestPortfolio):
             self.app.set_user(self.user.username)
             self.user.portfolio = self.portfolio
             self.user.portfolio_additional_permissions = [
-                User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
-                User.UserPortfolioPermissionChoices.EDIT_PORTFOLIO,
+                UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
+                UserPortfolioPermissionChoices.EDIT_PORTFOLIO,
             ]
             self.user.save()
             self.user.refresh_from_db()

From 108adce05e30b3b620408ac091446b542d4a0998 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Thu, 1 Aug 2024 08:28:36 -0400
Subject: [PATCH 48/70] fix migrations

---
 ...14_portfolioinvitation.py => 0115_portfolioinvitation.py} | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename src/registrar/migrations/{0114_portfolioinvitation.py => 0115_portfolioinvitation.py} (93%)

diff --git a/src/registrar/migrations/0114_portfolioinvitation.py b/src/registrar/migrations/0115_portfolioinvitation.py
similarity index 93%
rename from src/registrar/migrations/0114_portfolioinvitation.py
rename to src/registrar/migrations/0115_portfolioinvitation.py
index afd1dd714..82a171f10 100644
--- a/src/registrar/migrations/0114_portfolioinvitation.py
+++ b/src/registrar/migrations/0115_portfolioinvitation.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.10 on 2024-07-31 22:49
+# Generated by Django 4.2.10 on 2024-08-01 12:28
 
 import django.contrib.postgres.fields
 from django.db import migrations, models
@@ -9,7 +9,7 @@ import django_fsm
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("registrar", "0113_user_portfolio_user_portfolio_additional_permissions_and_more"),
+        ("registrar", "0114_alter_user_portfolio_additional_permissions"),
     ]
 
     operations = [
@@ -44,7 +44,6 @@ class Migration(migrations.Migration):
                             choices=[
                                 ("view_all_domains", "View all domains and domain reports"),
                                 ("view_managed_domains", "View managed domains"),
-                                ("edit_domains", "User is a manager on a domain"),
                                 ("view_member", "View members"),
                                 ("edit_member", "Create and edit members"),
                                 ("view_all_requests", "View all requests"),

From ca24078f50f39fccbccb6a9cd9a9efe91e20c8c6 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Thu, 1 Aug 2024 08:37:21 -0400
Subject: [PATCH 49/70] fix unit tests

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

diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index f1db5b29e..29515d18f 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -179,7 +179,7 @@ class TestPortfolio(WebTest):
 
             # reducing portfolio permissions to just VIEW_PORTFOLIO, which should remove domains
             # and domain requests from nav
-            self.user.portfolio_additional_permissions = [User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO]
+            self.user.portfolio_additional_permissions = [UserPortfolioPermissionChoices.VIEW_PORTFOLIO]
             self.user.save()
             self.user.refresh_from_db()
 
@@ -195,9 +195,7 @@ class TestPortfolio(WebTest):
                 portfolio_page, reverse("portfolio-domain-requests", kwargs={"portfolio_id": self.portfolio.pk})
             )
 
-
-class TestPortfolioOrganization(TestPortfolio):
-
+    @less_console_noise_decorator
     def test_portfolio_org_name(self):
         """Can load portfolio's org name page."""
         with override_flag("organization_feature", active=True):
@@ -215,6 +213,7 @@ class TestPortfolioOrganization(TestPortfolio):
                 page, "The name of your federal agency will be publicly listed as the domain registrant."
             )
 
+    @less_console_noise_decorator
     def test_domain_org_name_address_content(self):
         """Org name and address information appears on the page."""
         with override_flag("organization_feature", active=True):
@@ -233,6 +232,7 @@ class TestPortfolioOrganization(TestPortfolio):
             # Once in the sidenav, once in the main nav, once in the form
             self.assertContains(page, "Hotel California", count=3)
 
+    @less_console_noise_decorator
     def test_domain_org_name_address_form(self):
         """Submitting changes works on the org name address page."""
         with override_flag("organization_feature", active=True):

From 7b46e39a89ad50df6627c5680ac94ea7d14018f4 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Thu, 1 Aug 2024 08:42:57 -0400
Subject: [PATCH 50/70] fix unit tests

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

diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index 5fffa878f..b50525e27 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -1379,7 +1379,7 @@ class TestUser(TestCase):
         self.assertTrue(user_can_view_all_domains)
         self.assertFalse(user_can_view_all_requests)
 
-        self.user.portfolio_roles = [User.UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+        self.user.portfolio_roles = [UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
         self.user.save()
         self.user.refresh_from_db()
 

From 70d30f9cee2f9495ae4a76643542f9ea7f0a1ee2 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Thu, 1 Aug 2024 08:52:02 -0400
Subject: [PATCH 51/70] fix unit tests

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

diff --git a/src/registrar/models/user.py b/src/registrar/models/user.py
index d81c17123..33d8fa1ac 100644
--- a/src/registrar/models/user.py
+++ b/src/registrar/models/user.py
@@ -254,13 +254,13 @@ class User(AbstractUser):
 
     def has_domains_portfolio_permission(self):
         return self._has_portfolio_permission(
-            User.UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS
-        ) or self._has_portfolio_permission(User.UserPortfolioPermissionChoices.VIEW_MANAGED_DOMAINS)
+            UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS
+        ) or self._has_portfolio_permission(UserPortfolioPermissionChoices.VIEW_MANAGED_DOMAINS)
 
     def has_domain_requests_portfolio_permission(self):
         return self._has_portfolio_permission(
-            User.UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS
-        ) or self._has_portfolio_permission(User.UserPortfolioPermissionChoices.VIEW_CREATED_REQUESTS)
+            UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS
+        ) or self._has_portfolio_permission(UserPortfolioPermissionChoices.VIEW_CREATED_REQUESTS)
 
     @classmethod
     def needs_identity_verification(cls, email, uuid):

From 7f112c12956a0df3c7feefb366955366252453c0 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Thu, 1 Aug 2024 09:48:51 -0400
Subject: [PATCH 52/70] test functionality

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

diff --git a/src/registrar/tests/test_views_domain.py b/src/registrar/tests/test_views_domain.py
index 8aca75682..e24085b30 100644
--- a/src/registrar/tests/test_views_domain.py
+++ b/src/registrar/tests/test_views_domain.py
@@ -6,6 +6,7 @@ from django.urls import reverse
 from django.contrib.auth import get_user_model
 
 from api.tests.common import less_console_noise_decorator
+from registrar.models.portfolio import Portfolio
 from .common import MockEppLib, MockSESClient, create_user  # type: ignore
 from django_webtest import WebTest  # type: ignore
 import boto3_mocking  # type: ignore
@@ -138,6 +139,7 @@ class TestWithDomainPermissions(TestWithUser):
             Host.objects.all().delete()
             Domain.objects.all().delete()
             UserDomainRole.objects.all().delete()
+            Portfolio.objects.all().delete()
         except ValueError:  # pass if already deleted
             pass
         super().tearDown()
@@ -310,6 +312,33 @@ class TestDomainDetail(TestDomainOverview):
             self.assertContains(detail_page, "noinformation.gov")
             self.assertContains(detail_page, "Domain missing domain information")
 
+    @less_console_noise_decorator
+    def test_domain_readonly_on_detail_page(self):
+        """Test that a domain, which is part of a portfolio, but for which the user is not a domain manager,
+        properly displays read only"""
+
+        portfolio, _ = Portfolio.objects.get_or_create(organization_name="Test org", creator=self.user)
+        # need to create a different user than self.user because the user needs permission assignments
+        user = get_user_model().objects.create(
+            first_name="Test",
+            last_name="User",
+            email="bogus@example.gov",
+            phone="8003111234",
+            title="test title",
+            portfolio=portfolio,
+            portfolio_roles=[User.UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+        )
+        domain, _ = Domain.objects.get_or_create(name="bogusdomain.gov")
+        DomainInformation.objects.get_or_create(creator=user, domain=domain, portfolio=portfolio)
+        self.client.force_login(user)
+        detail_page = self.client.get(f"/domain/{domain.id}")
+        # Check that alert message displays properly
+        self.assertContains(
+            detail_page, "To manage information for this domain, you must add yourself as a domain manager."
+        )
+        # Check that user does not have option to Edit domain
+        self.assertNotContains(detail_page, "Edit")
+
 
 class TestDomainManagers(TestDomainOverview):
     def tearDown(self):

From 2edcabe76fa9f90413192c527583623f055f7dd5 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Thu, 1 Aug 2024 08:34:56 -0600
Subject: [PATCH 53/70] Readd deleted content

---
 src/registrar/templates/includes/domains_table.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/registrar/templates/includes/domains_table.html b/src/registrar/templates/includes/domains_table.html
index 528f56151..348ab21d7 100644
--- a/src/registrar/templates/includes/domains_table.html
+++ b/src/registrar/templates/includes/domains_table.html
@@ -1,11 +1,9 @@
 {% load static %}
 
 <section class="section--outlined domains{% if portfolio is not None %} margin-top-0{% endif %}" id="domains">
-    <div class="grid-row">
+  <div class="section--outlined__header margin-bottom-3 {% if portfolio is None %} section--outlined__header--no-portfolio justify-content-space-between{% else %} grid-row{% endif %}">
       {% if portfolio is None %}
-        <div class="mobile:grid-col-12 desktop:grid-col-6">
-          <h2 id="domains-header" class="flex-6">Domains</h2>
-        </div>
+        <h2 id="domains-header" class="display-inline-block">Domains</h2>
         <span class="display-none" id="no-portfolio-js-flag"></span>
       {% else %}
         <!-- Embedding the portfolio value in a data attribute -->

From 9faaeb7d91619e5bd6d1ad93a0e332803ca50505 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Thu, 1 Aug 2024 10:50:56 -0400
Subject: [PATCH 54/70] reformatted file

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

diff --git a/src/registrar/fixtures_users.py b/src/registrar/fixtures_users.py
index a96cb3483..7ce63d364 100644
--- a/src/registrar/fixtures_users.py
+++ b/src/registrar/fixtures_users.py
@@ -26,7 +26,7 @@ class UserFixture:
             "username": "aad084c3-66cc-4632-80eb-41cdf5c5bcbf",
             "first_name": "Aditi",
             "last_name": "Green",
-         },
+        },
         {
             "username": "be17c826-e200-4999-9389-2ded48c43691",
             "first_name": "Matthew",
@@ -128,7 +128,7 @@ class UserFixture:
         {
             "username": "ffec5987-aa84-411b-a05a-a7ee5cbcde54",
             "first_name": "Aditi-Analyst",
-            "last_name": "Green-Analyst"
+            "last_name": "Green-Analyst",
         },
         {
             "username": "d6bf296b-fac5-47ff-9c12-f88ccc5c1b99",

From c6943daa21b6c281f8179c1de8f8289b162bbe7c Mon Sep 17 00:00:00 2001
From: Cameron Dixon <cameron.dixon@cisa.dhs.gov>
Date: Thu, 1 Aug 2024 12:21:29 -0400
Subject: [PATCH 55/70] Update
 src/registrar/templates/django/admin/includes/descriptions/domain_invitation_description.html

Co-authored-by: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
---
 .../includes/descriptions/domain_invitation_description.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/django/admin/includes/descriptions/domain_invitation_description.html b/src/registrar/templates/django/admin/includes/descriptions/domain_invitation_description.html
index 23c617f1c..ff277a444 100644
--- a/src/registrar/templates/django/admin/includes/descriptions/domain_invitation_description.html
+++ b/src/registrar/templates/django/admin/includes/descriptions/domain_invitation_description.html
@@ -6,7 +6,7 @@ accept and become a domain manager.
 
 <p>
 An “invited” status indicates that the recipient has not logged in to the registrar since the invitation was sent. Deleting an invitation with an "invited" status will prevent the user from signing in.
-A “received” status indicates that the recipient has logged in. Deleting an invitation with a "received" status will stop a user's email address from showing in the domain managers list, but it will not revoke their access from the domain. To remove a user who has already signed in, go to <a class="text-underline" href="{% url 'admin:registrar_userdomainrole_changelist' %}">User domain roles</a> and delete the role for the correct  domain/manager combination.
+A “received” status indicates that the recipient has logged in. Deleting an invitation with a "received" status will not revoke that user's access from the domain. To remove a user who has already signed in, go to <a class="text-underline" href="{% url 'admin:registrar_userdomainrole_changelist' %}">User domain roles</a> and delete the role for the correct  domain/manager combination.
 </p>
 
 <p>

From 056bc214523953f1bec677a0c5ad8c746cf7893d Mon Sep 17 00:00:00 2001
From: Alysia Broddrick <abroddrick@truss.works>
Date: Thu, 1 Aug 2024 10:58:45 -0700
Subject: [PATCH 56/70] added missing ad mentions

---
 .github/workflows/deploy-branch-to-sandbox.yaml | 1 +
 .github/workflows/deploy-sandbox.yaml           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/deploy-branch-to-sandbox.yaml b/.github/workflows/deploy-branch-to-sandbox.yaml
index f57961fa8..652aec207 100644
--- a/.github/workflows/deploy-branch-to-sandbox.yaml
+++ b/.github/workflows/deploy-branch-to-sandbox.yaml
@@ -29,6 +29,7 @@ on:
           - hotgov
           - litterbox
           - ms
+          - ad
       # GitHub Actions has no "good" way yet to dynamically input branches
       branch:
         description: 'Branch to deploy'
diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml
index 57561919c..fe0a19089 100644
--- a/.github/workflows/deploy-sandbox.yaml
+++ b/.github/workflows/deploy-sandbox.yaml
@@ -29,6 +29,7 @@ jobs:
         || startsWith(github.head_ref, 'litterbox/')
         || startsWith(github.head_ref, 'ag/')
         || startsWith(github.head_ref, 'ms/')
+        || startsWith(github.head_ref, 'ad/')
     outputs:
       environment: ${{ steps.var.outputs.environment}}
     runs-on: "ubuntu-latest"

From 165e27307bd0fb79cff17d1d9abed05cc2aaad3b Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Thu, 1 Aug 2024 14:10:20 -0400
Subject: [PATCH 57/70] fix federal agency

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

diff --git a/src/registrar/templates/portfolio_organization.html b/src/registrar/templates/portfolio_organization.html
index cc9cf5b6a..b17d18b62 100644
--- a/src/registrar/templates/portfolio_organization.html
+++ b/src/registrar/templates/portfolio_organization.html
@@ -35,7 +35,7 @@
                 {% csrf_token %}
                 <h4 class="read-only-label">Federal agency</h4>
                 <p class="read-only-value">
-                    {{ portfolio }}
+                    {{ portfolio.federal_agency }}
                 </p>
                 {% input_with_errors form.address_line1 %}
                 {% input_with_errors form.address_line2 %}
@@ -54,7 +54,7 @@
         {% else %}
             <h4 class="read-only-label">Federal agency</h4>
             <p class="read-only-value">
-                {{ portfolio }}
+                {{ portfolio.federal_agency }}
             </p>
             {% if form.address_line1.value is not None %}
                 {% include "includes/input_read_only.html" with field=form.address_line1 %}

From aedb05dd34852358504c7fe7ff17117f14c2342e Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Thu, 1 Aug 2024 14:16:45 -0400
Subject: [PATCH 58/70] fix unit test

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

diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index a870f771a..3ec8efc62 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -315,8 +315,9 @@ class TestPortfolio(WebTest):
             self.portfolio.organization_name = "Hotel California"
             self.portfolio.save()
             page = self.app.get(reverse("portfolio-organization", kwargs={"portfolio_id": self.portfolio.pk}))
-            # Once in the sidenav, once in the main nav, once in the form
-            self.assertContains(page, "Hotel California", count=3)
+            # Once in the sidenav, once in the main nav
+            self.assertContains(page, "Hotel California", count=2)
+            self.assertContains(page, "Non-Federal Agency")
 
     @less_console_noise_decorator
     def test_domain_org_name_address_form(self):

From 3e70b344e3db77848f0486e64089c6430e915be9 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Thu, 1 Aug 2024 14:26:13 -0400
Subject: [PATCH 59/70] cleanup

---
 src/registrar/models/user.py                              | 2 +-
 src/registrar/templates/includes/finish_profile_form.html | 2 +-
 src/registrar/templates/portfolio_organization.html       | 7 ++-----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/registrar/models/user.py b/src/registrar/models/user.py
index 19097a96e..c5895cdf0 100644
--- a/src/registrar/models/user.py
+++ b/src/registrar/models/user.py
@@ -64,7 +64,7 @@ class User(AbstractUser):
 
     class UserPortfolioRoleChoices(models.TextChoices):
         """
-        Roles make it easier for admins to look at groups of users
+        Roles are containers of UserPortfolioPermissionChoices
         """
 
         ORGANIZATION_ADMIN = "organization_admin", "Admin"
diff --git a/src/registrar/templates/includes/finish_profile_form.html b/src/registrar/templates/includes/finish_profile_form.html
index 1806c2603..42a2de1a5 100644
--- a/src/registrar/templates/includes/finish_profile_form.html
+++ b/src/registrar/templates/includes/finish_profile_form.html
@@ -53,7 +53,7 @@
             {% endwith %}
         </div>
 
-        {% with show_edit_button=True show_readonly=True group_classes="usa-form-editable padding-top-2" %}
+        {% with toggleable_input=True toggleable_label=True group_classes="usa-form-editable padding-top-2" %}
             {% input_with_errors form.title %}
         {% endwith %}
         
diff --git a/src/registrar/templates/portfolio_organization.html b/src/registrar/templates/portfolio_organization.html
index b17d18b62..51adba3d9 100644
--- a/src/registrar/templates/portfolio_organization.html
+++ b/src/registrar/templates/portfolio_organization.html
@@ -31,7 +31,7 @@
 
             {% include "includes/form_errors.html" with form=form %}
             {% include "includes/required_fields.html" %}
-            <form class="usa-form usa-form--large" method="post" novalidate id="form-container">
+            <form class="usa-form usa-form--large" method="post" novalidate>
                 {% csrf_token %}
                 <h4 class="read-only-label">Federal agency</h4>
                 <p class="read-only-value">
@@ -44,10 +44,7 @@
                 {% with add_class="usa-input--small" %}
                     {% input_with_errors form.zipcode %}
                 {% endwith %}
-                <button
-                type="submit"
-                class="usa-button"
-                >
+                <button type="submit" class="usa-button">
                 Save
                 </button>
             </form>

From 4b2919d10850e8eed88bfa5e0c844852998af8bd Mon Sep 17 00:00:00 2001
From: "Rebecca H." <rebecca.hsieh@truss.works>
Date: Thu, 1 Aug 2024 11:55:36 -0700
Subject: [PATCH 60/70] Update src/registrar/models/domain_request.py

Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
---
 src/registrar/models/domain_request.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index 1ff1e501a..363de213b 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -218,9 +218,6 @@ class DomainRequest(TimeStampedModel):
         @classmethod
         def get_org_label(cls, org_name: str):
             # Translating the key that is given to the direct readable value
-            if not org_name:
-                return None
-
             return cls(org_name).label if org_name else None
 
     class OrganizationChoicesVerbose(models.TextChoices):

From 5b22860295e318dfd2c76735743c3fa49a0702ab Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Thu, 1 Aug 2024 13:03:53 -0600
Subject: [PATCH 61/70] un-smushed plain text by adding \n.  linted

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

diff --git a/src/registrar/assets/js/get-gov-admin.js b/src/registrar/assets/js/get-gov-admin.js
index 0a6eb8423..04f5417b0 100644
--- a/src/registrar/assets/js/get-gov-admin.js
+++ b/src/registrar/assets/js/get-gov-admin.js
@@ -706,7 +706,9 @@ function initializeWidgetOnList(list, parentId) {
                             `<strong>Submitter:</strong> ${submitterInfo}</br>` +
                             `<strong>Senior Official:</strong> ${seniorOfficialInfo}</br>` +
                             `<strong>Other Employees:</strong> ${otherContactsSummary}</br>`;
-            const plain_summary = html_summary.replace(/<\/?[^>]+(>|$)/g, '');
+            
+            //Replace </br> with \n, then strip out all remaining html tags (replace <...> with '')
+            const plain_summary = html_summary.replace(/<\/br>|<br>/g, '\n').replace(/<\/?[^>]+(>|$)/g, '');
 
             // Create Blobs with the summary content
             const html_blob = new Blob([html_summary], { type: 'text/html' });
@@ -742,11 +744,9 @@ function initializeWidgetOnList(list, parentId) {
 
                 }
                 console.log('Summary copied to clipboard successfully!');
-                console.log(tempElement.innerHTML);
             }).catch(err => {
                 console.error('Failed to copy text: ', err);
             });
-            document.body.removeChild(tempElement); 
         });
     }
 })();

From 1dfe34d9c6a370cd3e66cb1e77f272109e67fe7a Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Thu, 1 Aug 2024 18:09:54 -0400
Subject: [PATCH 62/70] fixed view icon

---
 src/registrar/views/domains_json.py   | 10 +++-------
 src/registrar/views/utility/mixins.py |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/registrar/views/domains_json.py b/src/registrar/views/domains_json.py
index d4c09d808..5bb9b037f 100644
--- a/src/registrar/views/domains_json.py
+++ b/src/registrar/views/domains_json.py
@@ -124,7 +124,7 @@ def serialize_domain(domain, user):
 
     # Check if there is a UserDomainRole for this domain and user
     user_domain_role_exists = UserDomainRole.objects.filter(domain_id=domain.id, user=user).exists()
-
+    view_only = not user_domain_role_exists or domain.state in [Domain.State.DELETED, Domain.State.ON_HOLD]
     return {
         "id": domain.id,
         "name": domain.name,
@@ -133,11 +133,7 @@ def serialize_domain(domain, user):
         "state_display": domain.state_display(),
         "get_state_help_text": domain.get_state_help_text(),
         "action_url": reverse("domain", kwargs={"pk": domain.id}),
-        "action_label": (
-            "View"
-            if not user_domain_role_exists or domain.state in [Domain.State.DELETED, Domain.State.ON_HOLD]
-            else "Manage"
-        ),
-        "svg_icon": ("visibility" if domain.state in [Domain.State.DELETED, Domain.State.ON_HOLD] else "settings"),
+        "action_label": ("View" if view_only else "Manage"),
+        "svg_icon": ("visibility" if view_only else "settings"),
         "suborganization": suborganization_name,
     }
diff --git a/src/registrar/views/utility/mixins.py b/src/registrar/views/utility/mixins.py
index 5b8f81087..16a896100 100644
--- a/src/registrar/views/utility/mixins.py
+++ b/src/registrar/views/utility/mixins.py
@@ -191,7 +191,7 @@ class DomainPermission(PermissionsLoginMixin):
 
     def can_access_domain_via_portfolio(self, pk):
         """Most views should not allow permission to portfolio users.
-        If particular views allow permissions, they will need to override
+        If particular views allow access to the domain pages, they will need to override
         this function."""
         return False
 

From e614a0e6be27d60a770e2161bd7abf6e5b263a9f Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Thu, 1 Aug 2024 18:41:43 -0400
Subject: [PATCH 63/70] improved handling of edge case where no portfolio
 defined

---
 src/registrar/views/portfolios.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py
index bec634715..4b7374d81 100644
--- a/src/registrar/views/portfolios.py
+++ b/src/registrar/views/portfolios.py
@@ -1,5 +1,6 @@
 import logging
-from django.shortcuts import get_object_or_404, render
+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
@@ -50,8 +51,11 @@ class PortfolioOrganizationView(PortfolioBasePermissionView, FormMixin):
         return context
 
     def get_object(self, queryset=None):
-        """Get the portfolio object based on the URL parameter."""
-        return get_object_or_404(Portfolio, id=self.request.user.portfolio.id)
+        """Get the portfolio object based on the request user."""
+        portfolio = self.request.user.portfolio
+        if portfolio is None:
+            raise Http404("No organization found for this user")
+        return portfolio
 
     def get_form_kwargs(self):
         """Include the instance in the form kwargs."""

From e0392920b8aba0abac84d307d9433b39c13b1ecf Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Thu, 1 Aug 2024 18:54:41 -0400
Subject: [PATCH 64/70] fixed a test for view icon

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

diff --git a/src/registrar/tests/test_views_domains_json.py b/src/registrar/tests/test_views_domains_json.py
index 09a233768..70ae23b43 100644
--- a/src/registrar/tests/test_views_domains_json.py
+++ b/src/registrar/tests/test_views_domains_json.py
@@ -181,7 +181,8 @@ class GetDomainsJsonTest(TestWithUser, WebTest):
             # Check svg_icon
             svg_icon_expected = (
                 "visibility"
-                if expected_domains[i].state
+                if not user_domain_role_exists
+                or expected_domains[i].state
                 in [
                     Domain.State.DELETED,
                     Domain.State.ON_HOLD,

From 77c16734793c73c22d21d29904537035a500849b Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 2 Aug 2024 13:10:46 -0400
Subject: [PATCH 65/70] update to context_processor

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

diff --git a/src/registrar/context_processors.py b/src/registrar/context_processors.py
index 861a4e701..ee5f8aee1 100644
--- a/src/registrar/context_processors.py
+++ b/src/registrar/context_processors.py
@@ -61,7 +61,7 @@ def add_has_profile_feature_flag_to_context(request):
 def portfolio_permissions(request):
     """Make portfolio permissions for the request user available in global context"""
     try:
-        if not request.user or not request.user.is_authenticated:
+        if not request.user or not request.user.is_authenticated or not flag_is_active(request, "organization_feature"):
             return {
                 "has_base_portfolio_permission": False,
                 "has_domains_portfolio_permission": False,
@@ -74,7 +74,7 @@ def portfolio_permissions(request):
             "has_domains_portfolio_permission": request.user.has_domains_portfolio_permission(),
             "has_domain_requests_portfolio_permission": request.user.has_domain_requests_portfolio_permission(),
             "portfolio": request.user.portfolio,
-            "has_organization_feature_flag": flag_is_active(request, "organization_feature"),
+            "has_organization_feature_flag": True,
         }
     except AttributeError:
         # Handles cases where request.user might not exist

From d8fd49fa10264c5193b82da0a0c48162e647b32d Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Fri, 2 Aug 2024 13:19:09 -0400
Subject: [PATCH 66/70] cleanup

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

diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index 49a5679c1..f21321e96 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -300,7 +300,7 @@ class TestPortfolio(WebTest):
 
             self.portfolio.organization_name = "Hotel California"
             self.portfolio.save()
-            page = self.app.get(reverse("portfolio-organization"))
+            page = self.app.get(reverse("organization"))
             # Once in the sidenav, once in the main nav
             self.assertContains(page, "Hotel California", count=2)
             self.assertContains(page, "Non-Federal Agency")

From 53d9f69420837f1d6cb06dbc26d5f332dd343e75 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Fri, 2 Aug 2024 13:46:00 -0400
Subject: [PATCH 67/70] clean up merge errors

---
 src/registrar/tests/test_views_portfolio.py | 12 ++++++------
 src/registrar/views/portfolios.py           |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index f21321e96..05d0b61ef 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -155,7 +155,7 @@ class TestPortfolio(WebTest):
         self.user.save()
         self.user.refresh_from_db()
         with override_flag("organization_feature", active=True):
-            response = self.app.get(reverse("portfolio-organization", kwargs={"portfolio_id": self.portfolio.pk}))
+            response = self.app.get(reverse("organization"))
             # Assert the response is a 200
             self.assertEqual(response.status_code, 200)
             # The label for Federal agency will always be a h4
@@ -179,7 +179,7 @@ class TestPortfolio(WebTest):
         self.user.save()
         self.user.refresh_from_db()
         with override_flag("organization_feature", active=True):
-            response = self.app.get(reverse("portfolio-organization", kwargs={"portfolio_id": self.portfolio.pk}))
+            response = self.app.get(reverse("organization"))
             # Assert the response is a 200
             self.assertEqual(response.status_code, 200)
             # The label for Federal agency will always be a h4
@@ -243,10 +243,10 @@ class TestPortfolio(WebTest):
             self.assertNotContains(portfolio_page, "<h1>Organization</h1>")
             self.assertContains(portfolio_page, '<h1 id="domains-header">Domains</h1>')
             self.assertContains(
-                portfolio_page, reverse("portfolio-domains", kwargs={"portfolio_id": self.portfolio.pk})
+                portfolio_page, reverse("domains")
             )
             self.assertContains(
-                portfolio_page, reverse("portfolio-domain-requests", kwargs={"portfolio_id": self.portfolio.pk})
+                portfolio_page, reverse("domain-requests")
             )
 
             # removing non-basic portfolio role, which should remove domains
@@ -261,10 +261,10 @@ class TestPortfolio(WebTest):
             self.assertContains(portfolio_page, "<h1>Organization</h1>")
             self.assertNotContains(portfolio_page, '<h1 id="domains-header">Domains</h1>')
             self.assertNotContains(
-                portfolio_page, reverse("portfolio-domains", kwargs={"portfolio_id": self.portfolio.pk})
+                portfolio_page, reverse("domains")
             )
             self.assertNotContains(
-                portfolio_page, reverse("portfolio-domain-requests", kwargs={"portfolio_id": self.portfolio.pk})
+                portfolio_page, reverse("domain-requests")
             )
 
     @less_console_noise_decorator
diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py
index 4b7374d81..63ebbaa01 100644
--- a/src/registrar/views/portfolios.py
+++ b/src/registrar/views/portfolios.py
@@ -48,6 +48,7 @@ class PortfolioOrganizationView(PortfolioBasePermissionView, FormMixin):
     def get_context_data(self, **kwargs):
         """Add additional context data to the template."""
         context = super().get_context_data(**kwargs)
+        context["has_edit_org_portfolio_permission"] = self.request.user.has_edit_org_portfolio_permission()
         return context
 
     def get_object(self, queryset=None):

From 94cda46baf174ab91aa982395b04d1836df81bc9 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Fri, 2 Aug 2024 13:53:17 -0400
Subject: [PATCH 68/70] solidify domains permissions

---
 .../templates/includes/domains_table.html          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/registrar/templates/includes/domains_table.html b/src/registrar/templates/includes/domains_table.html
index 348ab21d7..64eddec41 100644
--- a/src/registrar/templates/includes/domains_table.html
+++ b/src/registrar/templates/includes/domains_table.html
@@ -1,15 +1,15 @@
 {% load static %}
 
-<section class="section--outlined domains{% if portfolio is not None %} margin-top-0{% endif %}" id="domains">
-  <div class="section--outlined__header margin-bottom-3 {% if portfolio is None %} section--outlined__header--no-portfolio justify-content-space-between{% else %} grid-row{% endif %}">
-      {% if portfolio is None %}
+<section class="section--outlined domains{% if not has_domains_portfolio_permission %} margin-top-0{% endif %}" id="domains">
+  <div class="section--outlined__header margin-bottom-3 {% if not has_domains_portfolio_permission %} section--outlined__header--no-portfolio justify-content-space-between{% else %} grid-row{% endif %}">
+      {% if not has_domains_portfolio_permission %}
         <h2 id="domains-header" class="display-inline-block">Domains</h2>
         <span class="display-none" id="no-portfolio-js-flag"></span>
       {% else %}
         <!-- Embedding the portfolio value in a data attribute -->
         <span id="portfolio-js-value" data-portfolio="{{ portfolio.id }}"></span>
       {% endif %}
-      <div class="section--outlined__search {% if portfolio %} mobile:grid-col-12 desktop:grid-col-6{% endif %}">
+      <div class="section--outlined__search {% if has_domains_portfolio_permission %} mobile:grid-col-12 desktop:grid-col-6{% endif %}">
         <section aria-label="Domains search component" class="margin-top-2">
           <form class="usa-search usa-search--small" method="POST" role="search">
             {% csrf_token %}
@@ -37,7 +37,7 @@
           </form>
         </section>
       </div>
-      <div class="section--outlined__utility-button mobile-lg:padding-right-105 {% if portfolio %} mobile:grid-col-12 desktop:grid-col-6 desktop:padding-left-3{% endif %}">
+      <div class="section--outlined__utility-button mobile-lg:padding-right-105 {% if has_domains_portfolio_permission %} mobile:grid-col-12 desktop:grid-col-6 desktop:padding-left-3{% endif %}">
         <section aria-label="Domains report component" class="mobile-lg:margin-top-205">
           <a href="{% url 'export_data_type_user' %}" class="usa-button usa-button--unstyled" role="button">
             <svg class="usa-icon usa-icon--big margin-right-neg-4px" aria-hidden="true" focusable="false" role="img" width="24" height="24">
@@ -47,7 +47,7 @@
         </section>
       </div>
     </div>
-    {% if portfolio %}
+    {% if has_domains_portfolio_permission %}
     <div class="display-flex flex-align-center"> 
       <span class="margin-right-2 margin-top-neg-1 usa-prose text-base-darker">Filter by</span>
       <div class="usa-accordion usa-accordion--select margin-right-2">
@@ -150,7 +150,7 @@
             <th data-sortable="name" scope="col" role="columnheader">Domain name</th>
             <th data-sortable="expiration_date" scope="col" role="columnheader">Expires</th>
             <th data-sortable="state_display" scope="col" role="columnheader">Status</th>
-            {% if portfolio %}
+            {% if has_domains_portfolio_permission %}
               <th data-sortable="suborganization" scope="col" role="columnheader">Suborganization</th>
             {% endif %}
             <th 

From cfc0973a849fd3a3a7522d740e8a7e784cd6925b Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Fri, 2 Aug 2024 13:55:14 -0400
Subject: [PATCH 69/70] solidify requests table perms

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

diff --git a/src/registrar/templates/includes/domain_requests_table.html b/src/registrar/templates/includes/domain_requests_table.html
index ad91699ef..30c206741 100644
--- a/src/registrar/templates/includes/domain_requests_table.html
+++ b/src/registrar/templates/includes/domain_requests_table.html
@@ -2,7 +2,7 @@
 
 <section class="section--outlined domain-requests" id="domain-requests">
     <div class="grid-row">
-      {% if portfolio is None %}
+      {% if not has_domain_requests_portfolio_permission %}
         <div class="mobile:grid-col-12 desktop:grid-col-6">
           <h2 id="domain-requests-header" class="flex-6">Domain requests</h2>
         </div>

From 85f51ef142178e5d35ce4b96f24c41a07521a5f3 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Fri, 2 Aug 2024 14:11:21 -0400
Subject: [PATCH 70/70] Fix unit tests

---
 src/registrar/tests/test_views_domain.py    | 3 ++-
 src/registrar/tests/test_views_portfolio.py | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/registrar/tests/test_views_domain.py b/src/registrar/tests/test_views_domain.py
index e24085b30..00fcc8fe0 100644
--- a/src/registrar/tests/test_views_domain.py
+++ b/src/registrar/tests/test_views_domain.py
@@ -7,6 +7,7 @@ from django.contrib.auth import get_user_model
 
 from api.tests.common import less_console_noise_decorator
 from registrar.models.portfolio import Portfolio
+from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices
 from .common import MockEppLib, MockSESClient, create_user  # type: ignore
 from django_webtest import WebTest  # type: ignore
 import boto3_mocking  # type: ignore
@@ -326,7 +327,7 @@ class TestDomainDetail(TestDomainOverview):
             phone="8003111234",
             title="test title",
             portfolio=portfolio,
-            portfolio_roles=[User.UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+            portfolio_roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
         )
         domain, _ = Domain.objects.get_or_create(name="bogusdomain.gov")
         DomainInformation.objects.get_or_create(creator=user, domain=domain, portfolio=portfolio)
diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index 49b4db271..f72130d94 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -151,7 +151,7 @@ class TestPortfolio(WebTest):
         self.app.set_user(self.user.username)
         self.user.portfolio = self.portfolio
         self.portfolio.city = "Los Angeles"
-        self.user.portfolio_additional_permissions = [User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO]
+        self.user.portfolio_additional_permissions = [UserPortfolioPermissionChoices.VIEW_PORTFOLIO]
         self.portfolio.save()
         self.user.save()
         self.user.refresh_from_db()
@@ -172,8 +172,8 @@ class TestPortfolio(WebTest):
         self.app.set_user(self.user.username)
         self.user.portfolio = self.portfolio
         self.user.portfolio_additional_permissions = [
-            User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
-            User.UserPortfolioPermissionChoices.EDIT_PORTFOLIO,
+            UserPortfolioPermissionChoices.VIEW_PORTFOLIO,
+            UserPortfolioPermissionChoices.EDIT_PORTFOLIO,
         ]
         self.portfolio.city = "Los Angeles"
         self.portfolio.save()