From 663fc99df968a93b7d7a1bfe7c9b53d4d15463a4 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Wed, 11 Sep 2024 09:07:48 -0600
Subject: [PATCH 1/4] Update src/registrar/assets/js/get-gov.js

Co-authored-by: CuriousX <nicolle.leclair@gmail.com>
---
 src/registrar/assets/js/get-gov.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index 4bff491c9..7ec82ec20 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -1710,7 +1710,7 @@ document.addEventListener('DOMContentLoaded', function() {
 
               domainRequestsSectionWrapper.appendChild(modal);
 
-              // Request is deletable, modal and modalTrigger are built. Now test is portfolio requests page and enhace the modalTrigger markup
+              // Request is deletable, modal and modalTrigger are built. Now check if we are on the portfolio requests page (by seeing if there is a portfolio value) and enhance the modalTrigger accordingly
               if (portfolioValue) {
                 modalTrigger = `
                 <a 

From a0c73caa77c098cfa1c2a1d1a4a336b3c555c630 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Wed, 11 Sep 2024 09:24:06 -0600
Subject: [PATCH 2/4] Update
 src/registrar/templates/includes/header_extended.html

Co-authored-by: CuriousX <nicolle.leclair@gmail.com>
---
 src/registrar/templates/includes/header_extended.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/includes/header_extended.html b/src/registrar/templates/includes/header_extended.html
index ab0fed9b0..3d2a1c7a0 100644
--- a/src/registrar/templates/includes/header_extended.html
+++ b/src/registrar/templates/includes/header_extended.html
@@ -54,7 +54,7 @@
             
             {% if has_organization_requests_flag %}
             <li class="usa-nav__primary-item">
-                <!-- user hasone of the view permissions plus the edit permission, show the dropdown -->
+                <!-- user has one of the view permissions plus the edit permission, show the dropdown -->
                 {% if has_edit_request_portfolio_permission %}
                     {% url 'domain-requests' as url %}
                     <button

From 87cb111813c68ef5dcee84eae2322d7f81fc6701 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Wed, 11 Sep 2024 09:24:27 -0600
Subject: [PATCH 3/4] Update src/registrar/views/domain_requests_json.py

Co-authored-by: CuriousX <nicolle.leclair@gmail.com>
---
 src/registrar/views/domain_requests_json.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/registrar/views/domain_requests_json.py b/src/registrar/views/domain_requests_json.py
index fe86e7a7f..7b86cd9ef 100644
--- a/src/registrar/views/domain_requests_json.py
+++ b/src/registrar/views/domain_requests_json.py
@@ -10,7 +10,9 @@ from django.db.models import Q
 @login_required
 def get_domain_requests_json(request):
     """Given the current request,
-    get all domain requests that are associated with the request user and exclude the APPROVED ones"""
+    get all domain requests that are associated with the request user and exclude the APPROVED ones.
+    If we are on the portfolio requests page, limit the response to only those requests associated with
+    the given portfolio."""
 
     domain_request_ids = get_domain_request_ids_from_request(request)
 

From 096dce78c3d14c748c8f58714451226fe02f677c Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Wed, 11 Sep 2024 09:25:19 -0600
Subject: [PATCH 4/4] PR suggestions

---
 src/registrar/assets/js/get-gov.js  | 40 +++++++++++++----------------
 src/registrar/context_processors.py |  6 ++---
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index 4bff491c9..f432b5321 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -1426,9 +1426,9 @@ document.addEventListener('DOMContentLoaded', function() {
     // NOTE: We may need to evolve this as we add more filters.
     document.addEventListener('focusin', function(event) {
       const accordion = document.querySelector('.usa-accordion--select');
-      const accordionIsOpen = document.querySelector('.usa-button--filter[aria-expanded="true"]');
+      const accordionThatIsOpen = document.querySelector('.usa-button--filter[aria-expanded="true"]');
       
-      if (accordionIsOpen && !accordion.contains(event.target)) {
+      if (accordionThatIsOpen && !accordion.contains(event.target)) {
         closeFilters();
       }
     });
@@ -1437,9 +1437,9 @@ document.addEventListener('DOMContentLoaded', function() {
     // NOTE: We may need to evolve this as we add more filters.
     document.addEventListener('click', function(event) {
       const accordion = document.querySelector('.usa-accordion--select');
-      const accordionIsOpen = document.querySelector('.usa-button--filter[aria-expanded="true"]');
+      const accordionThatIsOpen = document.querySelector('.usa-button--filter[aria-expanded="true"]');
     
-      if (accordionIsOpen && !accordion.contains(event.target)) {
+      if (accordionThatIsOpen && !accordion.contains(event.target)) {
         closeFilters();
       }
     });
@@ -1607,7 +1607,7 @@ document.addEventListener('DOMContentLoaded', function() {
             const actionLabel = request.action_label;
             const submissionDate = request.last_submitted_date ? new Date(request.last_submitted_date).toLocaleDateString('en-US', options) : `<span class="text-base">Not submitted</span>`;
             
-            // Delete markup will either be a simple trigger or a 3 dots menu with a hidden trigger (in the case of portfolio requests page)
+            // The markup for the delete function either be a simple trigger or a 3 dots menu with a hidden trigger (in the case of portfolio requests page)
             // Even if the request is not deletable, we may need these empty strings for the td if the deletable column is displayed
             let modalTrigger = '';
 
@@ -1884,35 +1884,31 @@ document.addEventListener('DOMContentLoaded', function() {
       });
     }
 
-    function closeMoreActionMenu(accordionIsOpen) {
-      if (accordionIsOpen.getAttribute("aria-expanded") === "true") {
-        accordionIsOpen.click();
+    function closeMoreActionMenu(accordionThatIsOpen) {
+      if (accordionThatIsOpen.getAttribute("aria-expanded") === "true") {
+        accordionThatIsOpen.click();
       }
     }
 
     document.addEventListener('focusin', function(event) {
-      const accordions = document.querySelectorAll('.usa-accordion--more-actions');
-      const openAccordions = document.querySelectorAll('.usa-button--more-actions[aria-expanded="true"]');
-      
-      openAccordions.forEach((openAccordionButton) => {
-        const accordion = openAccordionButton.closest('.usa-accordion--more-actions'); // Find the corresponding accordion
-        if (accordion && !accordion.contains(event.target)) {
-          closeMoreActionMenu(openAccordionButton); // Close the accordion if the focus is outside
-        }
-      });
+      closeOpenAccordions(event);
     });
     
     document.addEventListener('click', function(event) {
-      const accordions = document.querySelectorAll('.usa-accordion--more-actions');
+      closeOpenAccordions(event);
+    });
+
+    function closeOpenAccordions(event) {
       const openAccordions = document.querySelectorAll('.usa-button--more-actions[aria-expanded="true"]');
-    
       openAccordions.forEach((openAccordionButton) => {
-        const accordion = openAccordionButton.closest('.usa-accordion--more-actions'); // Find the corresponding accordion
+        // Find the corresponding accordion
+        const accordion = openAccordionButton.closest('.usa-accordion--more-actions');
         if (accordion && !accordion.contains(event.target)) {
-          closeMoreActionMenu(openAccordionButton); // Close the accordion if the click is outside
+          // Close the accordion if the click is outside
+          closeMoreActionMenu(openAccordionButton);
         }
       });
-    });
+    }
 
     // Initial load
     loadDomainRequests(1);
diff --git a/src/registrar/context_processors.py b/src/registrar/context_processors.py
index f9a8d328d..41046ed1c 100644
--- a/src/registrar/context_processors.py
+++ b/src/registrar/context_processors.py
@@ -60,7 +60,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"""
-    default_context = {
+    portfolio_context = {
         "has_base_portfolio_permission": False,
         "has_any_domains_portfolio_permission": False,
         "has_any_requests_portfolio_permission": False,
@@ -94,8 +94,8 @@ def portfolio_permissions(request):
                 "has_organization_requests_flag": request.user.has_organization_requests_flag(),
                 "has_organization_members_flag": request.user.has_organization_members_flag(),
             }
-        return default_context
+        return portfolio_context
 
     except AttributeError:
         # Handles cases where request.user might not exist
-        return default_context
+        return portfolio_context