From a1fca00b8fa2163da37911b68e853424b3fd8799 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Fri, 5 Jul 2024 15:28:33 -0400
Subject: [PATCH 01/12] wip

---
 src/registrar/assets/js/get-gov.js            |   4 +
 src/registrar/assets/sass/_theme/_base.scss   |  84 +++++--------
 src/registrar/assets/sass/_theme/_header.scss | 115 ++++++++++++++++++
 src/registrar/assets/sass/_theme/styles.scss  |   1 +
 src/registrar/config/settings.py              |   4 +
 src/registrar/context_processors.py           |  29 ++++-
 src/registrar/models/user.py                  |  10 ++
 src/registrar/registrar_middleware.py         |  22 ++--
 src/registrar/templates/base.html             |  50 ++------
 src/registrar/templates/dashboard_base.html   |   1 +
 src/registrar/templates/home.html             |  26 +---
 .../includes/domain_requests_table.html       |   3 +
 .../templates/includes/domains_table.html     |   6 +-
 .../templates/includes/header_basic.html      |  41 +++++++
 .../templates/includes/header_extended.html   |  74 +++++++++++
 src/registrar/templates/portfolio.html        |  24 ----
 src/registrar/templates/portfolio_base.html   |  41 +++++++
 .../templates/portfolio_domains.html          |   4 +-
 .../templates/portfolio_requests.html         |   6 +-
 .../templates/portfolio_sidebar.html          |  37 ------
 src/registrar/views/domain.py                 |   7 --
 src/registrar/views/domain_request.py         |  23 +---
 src/registrar/views/domains_json.py           |   3 +-
 src/registrar/views/index.py                  |   2 -
 src/registrar/views/portfolios.py             |  17 ---
 src/registrar/views/user_profile.py           |   6 +-
 src/registrar/views/utility/error_views.py    |   4 -
 27 files changed, 393 insertions(+), 251 deletions(-)
 create mode 100644 src/registrar/assets/sass/_theme/_header.scss
 create mode 100644 src/registrar/templates/includes/header_basic.html
 create mode 100644 src/registrar/templates/includes/header_extended.html
 delete mode 100644 src/registrar/templates/portfolio.html
 create mode 100644 src/registrar/templates/portfolio_base.html
 delete mode 100644 src/registrar/templates/portfolio_sidebar.html

diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index 7052d786f..fe2946867 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -1173,6 +1173,7 @@ document.addEventListener('DOMContentLoaded', function() {
             const expirationDateFormatted = expirationDate ? expirationDate.toLocaleDateString('en-US', options) : '';
             const expirationDateSortValue = expirationDate ? expirationDate.getTime() : '';
             const actionUrl = domain.action_url;
+            const suborganization = domain.suborganization ? domain.suborganization : '';
 
             const row = document.createElement('tr');
             row.innerHTML = `
@@ -1195,6 +1196,9 @@ document.addEventListener('DOMContentLoaded', function() {
                   <use aria-hidden="true" xlink:href="/public/img/sprite.svg#info_outline"></use>
                 </svg>
               </td>
+              <td>
+                  <span class="${suborganization ? 'ellipsis ellipsis--30 vertical-align-middle' : ''}">${suborganization}</span>
+              </td>
               <td>
                 <a href="${actionUrl}">
                   <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24">
diff --git a/src/registrar/assets/sass/_theme/_base.scss b/src/registrar/assets/sass/_theme/_base.scss
index b2bad1edb..2aa3da565 100644
--- a/src/registrar/assets/sass/_theme/_base.scss
+++ b/src/registrar/assets/sass/_theme/_base.scss
@@ -31,50 +31,6 @@ body {
   background-color: color('primary-lightest');
   padding-top: units(5);
 }
- 
-.usa-logo {
-  @include at-media(desktop) {
-    margin-top: units(2);
-  }
-}
- 
-.usa-logo__text {
-  @include typeset('sans', 'xl', 2);
-  color: color('primary-darker');
-}
-
-.usa-nav__primary {
-  margin-top:units(1);
-}
-
-.usa-nav__primary-username {
-  display: inline-block;
-  padding: units(1) units(2);
-  max-width: 208px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  @include at-media(desktop) {
-    padding: units(2);
-    max-width: 500px;
-  }
-}
-
-@include at-media(desktop) {
-  .usa-nav__primary-item:not(:first-child) {
-    position: relative;
-  }
-
-  .usa-nav__primary-item:not(:first-child)::before {
-    content: '';
-    position: absolute;
-    top: 50%;
-    left: 0;
-    width: 0; /* No width since it's a border */
-    height: 40%;
-    border-left: solid 1px color('base-light');
-    transform: translateY(-50%);
-  }
-}
 
 .section--outlined {
   background-color: color('white');
@@ -207,19 +163,37 @@ abbr[title] {
   }
 }
 
-// Define some styles for the .gov header/logo
-.usa-logo button {
-  color: #{$dhs-dark-gray-85};
-  font-weight: 700;
-  font-family: family('sans');
-  font-size: 1.6rem;
-  line-height: 1.1;
-}
 
-.usa-logo button.usa-button--unstyled.disabled-button:hover{
-  color: #{$dhs-dark-gray-85};
-}
 
 .padding--8-8-9 {
   padding: 8px 8px 9px !important;
 }
+
+.ellipsis {
+  display: inline-block;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.ellipsis--23 {
+  max-width: 23ch;
+}
+
+.ellipsis--30 {
+  max-width: 30ch;
+}
+
+.ellipsis--50 {
+  max-width: 50ch;
+}
+
+.vertical-align-middle {
+  vertical-align: middle;
+}
+
+@include at-media(desktop) {
+  .ellipsis--desktop-50 {
+    max-width: 50ch;
+  }
+}
diff --git a/src/registrar/assets/sass/_theme/_header.scss b/src/registrar/assets/sass/_theme/_header.scss
new file mode 100644
index 000000000..a8c642804
--- /dev/null
+++ b/src/registrar/assets/sass/_theme/_header.scss
@@ -0,0 +1,115 @@
+@use "uswds-core" as *;
+@use "cisa_colors" as *;
+
+// Define some styles for the .gov header/logo
+.usa-logo button {
+    color: #{$dhs-dark-gray-85};
+    font-weight: 700;
+    font-family: family('sans');
+    font-size: 1.6rem;
+    line-height: 1.1;
+}
+
+.usa-logo button.usa-button--unstyled.disabled-button:hover{
+    color: #{$dhs-dark-gray-85};
+}
+
+.usa-header {
+    .usa-logo {
+        @include at-media(desktop) {
+            margin-top: units(2);
+        }
+    }
+    .usa-logo__text {
+        @include typeset('sans', 'xl', 2);
+    }
+    .usa-nav__username {
+        max-width: 208px;
+        min-height: units(2);
+        @include at-media(desktop) {
+            max-width: 500px;
+        }
+    }
+    .padding-y-0 {
+        padding-top: 0 !important;
+        padding-bottom: 0 !important;
+    }
+}
+
+.usa-header--basic {
+    .usa-logo__text {
+        color: color('primary-darker');
+    }
+    .usa-nav__username {
+        padding: units(1) units(2);
+        @include at-media(desktop) {
+            padding: units(2);
+        }
+    }
+    .usa-nav__primary {
+        margin-top:units(1);
+    }
+    @include at-media(desktop) {
+        .usa-nav__primary-item:not(:first-child) {
+            position: relative;
+        }
+        .usa-nav__primary-item:not(:first-child)::before {
+            content: '';
+            position: absolute;
+            top: 50%;
+            left: 0;
+            width: 0; /* No width since it's a border */
+            height: 40%;
+            border-left: solid 1px color('base-light');
+            transform: translateY(-50%);
+        }
+    }
+}
+
+.usa-header--extended {
+    .usa-nav__primary {
+        .usa-nav-link,
+        .usa-nav-link:hover,
+        .usa-nav-link:active  {
+            color: color('primary');
+            font-weight: font-weight('normal');
+            font-size: 16px;
+        }
+        .usa-current,
+        .usa-current:hover,
+        .usa-current:active  {
+            font-weight: font-weight('bold');
+        }
+    }
+    @include at-media(desktop) {
+        background-color: color('primary-darker');
+        border-top: solid 1px color('base');
+        border-bottom: solid 1px color('base-lighter');
+
+        .usa-logo__text a {
+            color: color('white');
+        }
+        .usa-nav {
+            background-color: color('primary-lightest');
+        }
+        .usa-nav__primary-item:last-child {
+            margin-left: auto;
+            .usa-nav-link {
+                padding-right: 0;
+            }
+        }
+        .usa-nav__secondary {
+            // I don't know why USWDS has this at 2 rem, which puts it out of alignment
+            right: 3rem;
+            color: color('white');
+            bottom: 4.3rem;
+            .usa-nav-link,
+            .usa-nav-link:hover,
+            .usa-nav-link:active {
+                font-weight: font-weight('bold');
+                color: color('primary-lighter');
+                font-size: 16px;
+            }
+        }
+    }
+}
diff --git a/src/registrar/assets/sass/_theme/styles.scss b/src/registrar/assets/sass/_theme/styles.scss
index 622448d1c..142664423 100644
--- a/src/registrar/assets/sass/_theme/styles.scss
+++ b/src/registrar/assets/sass/_theme/styles.scss
@@ -21,6 +21,7 @@
 @forward "alerts";
 @forward "tables";
 @forward "sidenav";
+@forward "header";
 @forward "register-form";
 
 /*--------------------------------------------------
diff --git a/src/registrar/config/settings.py b/src/registrar/config/settings.py
index 688a3e8ca..af6de6e39 100644
--- a/src/registrar/config/settings.py
+++ b/src/registrar/config/settings.py
@@ -240,6 +240,10 @@
                 "registrar.context_processors.canonical_path",
                 "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",
             ],
         },
     },
diff --git a/src/registrar/context_processors.py b/src/registrar/context_processors.py
index abab72dac..8072e85d4 100644
--- a/src/registrar/context_processors.py
+++ b/src/registrar/context_processors.py
@@ -1,4 +1,5 @@
 from django.conf import settings
+from waffle.decorators import flag_is_active
 
 
 def language_code(request):
@@ -12,7 +13,6 @@ def language_code(request):
     """
     return {"LANGUAGE_CODE": settings.LANGUAGE_CODE}
 
-
 def canonical_path(request):
     """Add a canonical URL to the template context.
 
@@ -22,7 +22,6 @@ def canonical_path(request):
     """
     return {"CANONICAL_PATH": request.build_absolute_uri(request.path)}
 
-
 def is_demo_site(request):
     """Add a boolean if this is a demo site.
 
@@ -32,7 +31,31 @@ def is_demo_site(request):
     """
     return {"IS_DEMO_SITE": settings.IS_DEMO_SITE}
 
-
 def is_production(request):
     """Add a boolean if this is our production site."""
     return {"IS_PRODUCTION": settings.IS_PRODUCTION}
+
+def org_user_status(request):
+    if request.user.is_authenticated:
+        is_org_user = request.user.is_org_user(request)
+    else:
+        is_org_user = False
+
+    return {
+        'is_org_user': is_org_user,
+    }
+
+def add_portfolio_to_context(request):
+    return {
+        'portfolio': getattr(request, 'portfolio', None)
+    }
+
+def add_path_to_context(request):
+    return {
+        'path': getattr(request, 'path', None)
+    }
+
+def add_has_profile_feature_flag_to_context(request):
+    return {
+        'has_profile_feature_flag': flag_is_active(request, "profile_feature")
+    }
diff --git a/src/registrar/models/user.py b/src/registrar/models/user.py
index bb0276607..019e0dbf9 100644
--- a/src/registrar/models/user.py
+++ b/src/registrar/models/user.py
@@ -4,6 +4,7 @@
 from django.db import models
 from django.db.models import Q
 
+from registrar.models.portfolio import Portfolio
 from registrar.models.user_domain_role import UserDomainRole
 
 from .domain_invitation import DomainInvitation
@@ -11,6 +12,7 @@
 from .verified_by_staff import VerifiedByStaff
 from .domain import Domain
 from .domain_request import DomainRequest
+from waffle.decorators import flag_is_active
 
 from phonenumber_field.modelfields import PhoneNumberField  # type: ignore
 
@@ -290,3 +292,11 @@ def on_each_login(self):
         """
 
         self.check_domain_invitations_on_login()
+
+    def is_org_user(self, request):
+        has_organization_feature_flag = flag_is_active(request, "organization_feature")
+        user_portfolios = Portfolio.objects.filter(creator=self)
+
+        user_portfolios_exist = user_portfolios.exists()
+
+        return has_organization_feature_flag and user_portfolios_exist
diff --git a/src/registrar/registrar_middleware.py b/src/registrar/registrar_middleware.py
index 82ee9d0fc..5e534ea7e 100644
--- a/src/registrar/registrar_middleware.py
+++ b/src/registrar/registrar_middleware.py
@@ -141,14 +141,16 @@ def __call__(self, request):
     def process_view(self, request, view_func, view_args, view_kwargs):
         current_path = request.path
 
-        has_organization_feature_flag = flag_is_active(request, "organization_feature")
-
-        if current_path == self.home:
-            if has_organization_feature_flag:
-                if request.user.is_authenticated:
-                    user_portfolios = Portfolio.objects.filter(creator=request.user)
-                    if user_portfolios.exists():
-                        first_portfolio = user_portfolios.first()
-                        home_with_portfolio = reverse("portfolio-domains", kwargs={"portfolio_id": first_portfolio.id})
-                        return HttpResponseRedirect(home_with_portfolio)
+        if request.user.is_authenticated and request.user.is_org_user(request):
+            user_portfolios = Portfolio.objects.filter(creator=request.user)
+            first_portfolio = user_portfolios.first()
+            
+            if first_portfolio:
+                # Add the portfolio to the request object
+                request.portfolio = first_portfolio
+
+                if current_path == self.home:
+                    home_with_portfolio = reverse("portfolio-domains", kwargs={"portfolio_id": first_portfolio.id})
+                    return HttpResponseRedirect(home_with_portfolio)
+
         return None
diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html
index fc49c19ec..a7b2bb783 100644
--- a/src/registrar/templates/base.html
+++ b/src/registrar/templates/base.html
@@ -133,48 +133,14 @@
   </section>
 
 
-  {% block usa_overlay %}<div class="usa-overlay"></div>{% endblock %}
-  {% block banner %}
-  <header class="usa-header usa-header--basic">
-    <div class="usa-nav-container">
-      <div class="usa-navbar">
-          {% block logo %}
-            {% include "includes/gov_extended_logo.html" with logo_clickable=True %}
-          {% endblock %}
-        <button type="button" class="usa-menu-btn">Menu</button>
-      </div>
-      {% block usa_nav %}
-      <nav class="usa-nav" aria-label="Primary navigation">
-        <button type="button" class="usa-nav__close">
-          <img src="/public/img/usa-icons/close.svg" role="img" alt="Close" />
-        </button>
-        <ul class="usa-nav__primary usa-accordion">
-          <li class="usa-nav__primary-item">
-            {% if user.is_authenticated %}
-            <span class="usa-nav__primary-username">{{ user.email }}</span>
-          </li>
-          {% if has_profile_feature_flag %}
-          <li class="usa-nav__primary-item">
-            {% url 'user-profile' as user_profile_url %}
-            {% url 'finish-user-profile-setup' as finish_setup_url %}
-            <a class="usa-nav-link {% if request.path == user_profile_url or request.path == finish_setup_url %}usa-current{% endif %}" href="{{ user_profile_url }}">
-                <span class="text-primary">Your profile</span>
-            </a>
-          </li>
-          {% endif %}
-          <li class="usa-nav__primary-item">
-            <a href="{% url 'logout' %}"><span class="text-primary">Sign out</span></a>
-            {% else %}
-            <a href="{% url 'login' %}"><span>Sign in</span></a>
-            {% endif %}
-          </li>
-        </ul>
-      </nav>
-      {% block usa_nav_secondary %}{% endblock %}
-      {% endblock %}
-    </div>
-  </header>
-  {% endblock banner %}
+  <div class="usa-overlay"></div>
+  {% block header %}
+    {% if not is_org_user %}
+      {% include "includes/header_basic.html" %}
+    {% else %}
+      {% include "includes/header_extended.html" %}
+    {% endif %}
+  {% endblock header %}
 
   {% block wrapper %}
   <div id="wrapper">
diff --git a/src/registrar/templates/dashboard_base.html b/src/registrar/templates/dashboard_base.html
index 6dd2ce8fd..4f24b9280 100644
--- a/src/registrar/templates/dashboard_base.html
+++ b/src/registrar/templates/dashboard_base.html
@@ -9,6 +9,7 @@
       {% block content %}
         {% block messages %}
           {% if messages %}
+          <p>test</p>
           <ul class="messages">
             {% for message in messages %}
               <li {% if message.tags %} class="{{ message.tags }}" {% endif %}>
diff --git a/src/registrar/templates/home.html b/src/registrar/templates/home.html
index a5ed4c86c..4518db271 100644
--- a/src/registrar/templates/home.html
+++ b/src/registrar/templates/home.html
@@ -4,17 +4,21 @@
 
 {% block title %} Home | {% endblock %}
 
+{% comment %}
+  home and portfolio_base test for is_authenticated
+{% endcomment %}
+
 {% block content %}
 <main id="main-content" class="grid-container">
 {% if user.is_authenticated %}
 {# the entire logged in page goes here #}
 
 {% block homepage_content %}
-
   <div class="tablet:grid-col-11 desktop:grid-col-10 tablet:grid-offset-1">
     {% block messages %}
       {% include "includes/form_messages.html" %}
     {% endblock %}
+  
     <h1>Manage your domains</h1>
 
     {% comment %}
@@ -32,26 +36,8 @@ <h1>Manage your domains</h1>
     {% include "includes/domains_table.html" %}
     {% include "includes/domain_requests_table.html" %}
 
-    {# Note: Reimplement this after MVP #}
-    <!--
-    <section class="section--outlined tablet:grid-col-11 desktop:grid-col-10">
-      <h2>Archived domains</h2>
-      <p>You don't have any archived domains</p>
-    </section>
-    -->
-
-    <!-- Note: Uncomment below when this is being implemented post-MVP -->
-    <!-- <section class="tablet:grid-col-11 desktop:grid-col-10">
-      <h2 class="padding-top-1 mobile-lg:padding-top-3"> Export domains</h2>
-      <p>Download a list of your domains and their statuses as a csv file.</p>
-      <a href="{% url 'todo' %}" class="usa-button usa-button--outline">
-        Export domains as csv
-      </a>
-    </section>
-    -->
-
+  </div>
 {% endblock %}
-</div>
 
 {% else %} {# not user.is_authenticated #}
 {# the entire logged out page goes here #}
diff --git a/src/registrar/templates/includes/domain_requests_table.html b/src/registrar/templates/includes/domain_requests_table.html
index 4f091ecf6..ad91699ef 100644
--- a/src/registrar/templates/includes/domain_requests_table.html
+++ b/src/registrar/templates/includes/domain_requests_table.html
@@ -12,6 +12,9 @@ <h2 id="domain-requests-header" class="flex-6">Domain requests</h2>
           <form class="usa-search usa-search--small" method="POST" role="search">
             {% csrf_token %}
             <button class="usa-button usa-button--unstyled margin-right-2 domain-requests__reset-search display-none" type="button">
+              <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24">
+                <use xlink:href="{%static 'img/sprite.svg'%}#close"></use>
+              </svg>
               Reset
             </button>
             <label class="usa-sr-only" for="domain-requests__search-field">Search by domain name</label>
diff --git a/src/registrar/templates/includes/domains_table.html b/src/registrar/templates/includes/domains_table.html
index 8fbfd44e8..a04a6fec5 100644
--- a/src/registrar/templates/includes/domains_table.html
+++ b/src/registrar/templates/includes/domains_table.html
@@ -12,6 +12,9 @@ <h2 id="domains-header" class="flex-6">Domains</h2>
           <form class="usa-search usa-search--small" method="POST" role="search">
             {% csrf_token %}
             <button class="usa-button usa-button--unstyled margin-right-2 domains__reset-search display-none" type="button">
+              <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24">
+                <use xlink:href="{%static 'img/sprite.svg'%}#close"></use>
+              </svg>
               Reset
             </button>
             <label class="usa-sr-only" for="domains__search-field">Search by domain name</label>
@@ -35,7 +38,7 @@ <h2 id="domains-header" class="flex-6">Domains</h2>
     </div>
     {% if portfolio %}
     <div class="display-flex flex-align-center margin-top-1"> 
-      <span class="margin-right-2 margin-top-neg-1 text-base-darker">Filter by</span>
+      <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">
         <div class="usa-accordion__heading">
           <button
@@ -136,6 +139,7 @@ <h2>Status</h2>
             <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>
+            <th data-sortable="suborganization" scope="col" role="columnheader">Suborganization</th>
             <th 
               scope="col" 
               role="columnheader" 
diff --git a/src/registrar/templates/includes/header_basic.html b/src/registrar/templates/includes/header_basic.html
new file mode 100644
index 000000000..0fef664ac
--- /dev/null
+++ b/src/registrar/templates/includes/header_basic.html
@@ -0,0 +1,41 @@
+{% load static %}
+
+<header class="usa-header usa-header--basic">
+    <div class="usa-nav-container">
+      <div class="usa-navbar">
+          {% block logo %}
+            {% include "includes/gov_extended_logo.html" with logo_clickable=True %}
+          {% endblock %}
+        <button type="button" class="usa-menu-btn">Menu</button>
+      </div>
+      {% block usa_nav %}
+      <nav class="usa-nav" aria-label="Primary navigation">
+        <button type="button" class="usa-nav__close">
+          <img src="{%static 'img/usa-icons/close.svg'%}" role="img" alt="Close" />
+        </button>
+        <ul class="usa-nav__primary usa-accordion">
+          <li class="usa-nav__primary-item">
+            {% if user.is_authenticated %}
+            <span class="usa-nav__username">{{ user.email }}</span>
+          </li>
+          {% if has_profile_feature_flag %}
+          <li class="usa-nav__primary-item">
+            {% url 'user-profile' as user_profile_url %}
+            {% url 'finish-user-profile-setup' as finish_setup_url %}
+            <a class="usa-nav-link {% if request.path == user_profile_url or request.path == finish_setup_url %}usa-current{% endif %}" href="{{ user_profile_url }}">
+                <span class="text-primary">Your profile</span>
+            </a>
+          </li>
+          {% endif %}
+          <li class="usa-nav__primary-item">
+            <a href="{% url 'logout' %}"><span class="text-primary">Sign out</span></a>
+            {% else %}
+            <a href="{% url 'login' %}"><span>Sign in</span></a>
+            {% endif %}
+          </li>
+        </ul>
+      </nav>
+      {% block usa_nav_secondary %}{% endblock %}
+      {% endblock %}
+    </div>
+  </header>
\ No newline at end of file
diff --git a/src/registrar/templates/includes/header_extended.html b/src/registrar/templates/includes/header_extended.html
new file mode 100644
index 000000000..96a77afe5
--- /dev/null
+++ b/src/registrar/templates/includes/header_extended.html
@@ -0,0 +1,74 @@
+{% load static %}
+
+<header class="usa-header usa-header--extended">
+    <div class="usa-navbar">
+        {% block logo %}
+        {% include "includes/gov_extended_logo.html" with logo_clickable=True %}
+        {% endblock %}
+    <button type="button" class="usa-menu-btn">Menu</button>
+    </div>
+    {% block usa_nav %}
+    <nav class="usa-nav" aria-label="Primary navigation">
+    <div class="usa-nav__inner">
+        <button type="button" class="usa-nav__close">
+            <img src="{%static 'img/usa-icons/close.svg'%}" role="img" alt="Close" />
+        </button>
+        <ul class="usa-nav__primary usa-accordion">
+            <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 %}"> 
+                Domains
+                </a>
+            </li>
+            <li class="usa-nav__primary-item">
+                <a href="#" class="usa-nav-link">
+                    Domain groups
+                </a>
+            </li>
+            <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 %}"> 
+                Domain requests
+                </a>
+            </li>
+            <li class="usa-nav__primary-item">
+                <a href="#" class="usa-nav-link">
+                    Members
+                </a>
+            </li>
+            <li class="usa-nav__primary-item">
+                <!-- Move the padding from the a to the span so that the descenders do not get cut off -->
+                <a href="#" class="usa-nav-link padding-y-0">
+                    <span class="ellipsis ellipsis--23 ellipsis--desktop-50 padding-y-1 desktop:padding-y-2">
+                        {{ portfolio.organization_name }}
+                    </span>
+                </a>
+            </li>
+        </ul>
+        <div class="usa-nav__secondary">
+            <ul class="usa-nav__secondary-links">
+                <li class="usa-nav__secondary-item">
+                    {% if user.is_authenticated %}
+                    <span class="ellipsis usa-nav__username">{{ user.email }}</span>
+                </li>
+                {% if has_profile_feature_flag %}
+                <li class="usa-nav__secondary-item">
+                    {% url 'user-profile' as user_profile_url %}
+                    {% url 'finish-user-profile-setup' as finish_setup_url %}
+                    <a class="usa-nav-link {% if path == user_profile_url or path == finish_setup_url %}usa-current{% endif %}" href="{{ user_profile_url }}">
+                        Your profile
+                    </a>
+                </li>
+                {% endif %}
+                <li class="usa-nav__secondary-item">
+                    <a class="usa-nav-link" href="{% url 'logout' %}">Sign out</a>
+                    {% else %}
+                    <a class="usa-nav-link" href="{% url 'login' %}">Sign in</a>
+                    {% endif %}
+                </li>
+            </ul>
+        </div>
+    </div>
+    </nav>
+    {% endblock %}
+  </header>
\ No newline at end of file
diff --git a/src/registrar/templates/portfolio.html b/src/registrar/templates/portfolio.html
deleted file mode 100644
index 4f37c0175..000000000
--- a/src/registrar/templates/portfolio.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{% extends 'home.html' %}
-
-{% load static %}
-
-{% block homepage_content %}
-
-  <div class="tablet:grid-col-12">
-    <div class="grid-row grid-gap">
-        <div class="tablet:grid-col-3">
-            {% include "portfolio_sidebar.html" with portfolio=portfolio %}
-        </div>
-        <div class="tablet:grid-col-9">
-            {% block messages %}
-                {% include "includes/form_messages.html" %}
-            {% endblock %}
-            {# Note: Reimplement commented out functionality #}
-            
-            {% block portfolio_content %}
-            {% endblock %}
-
-        </div>
-    </div>
-
-{% endblock %}
diff --git a/src/registrar/templates/portfolio_base.html b/src/registrar/templates/portfolio_base.html
new file mode 100644
index 000000000..4cb8145f8
--- /dev/null
+++ b/src/registrar/templates/portfolio_base.html
@@ -0,0 +1,41 @@
+{% extends "base.html" %}
+
+{% comment %}
+  home and portfolio_base test for is_authenticated
+{% endcomment %}
+
+{% block wrapper %}
+  <div id="wrapper">
+      {% block content %}
+        
+        <main id="main-content" class="grid-container">
+            {% if user.is_authenticated %}
+            {# the entire logged in page goes here #}
+            
+            <div class="tablet:grid-col-12">
+                {% block messages %}
+                    {% include "includes/form_messages.html" %}
+                {% endblock %}
+            
+                {% block portfolio_content %}{% endblock %}
+            
+            </div>            
+            {% else %} {# not user.is_authenticated #}
+            {# the entire logged out page goes here #}
+            
+            <p><a class="usa-button" href="{% url 'login' %}">
+            Sign in
+            </a></p>
+            
+            {% endif %}
+        </main>
+
+      {% endblock %}
+
+    <div role="complementary">{% block complementary %}{% endblock %}</div>
+
+    {% block content_bottom %}{% endblock %}
+  </div>
+
+
+{% endblock wrapper %}
diff --git a/src/registrar/templates/portfolio_domains.html b/src/registrar/templates/portfolio_domains.html
index 4b5e1148b..ede7886e6 100644
--- a/src/registrar/templates/portfolio_domains.html
+++ b/src/registrar/templates/portfolio_domains.html
@@ -1,7 +1,9 @@
-{% extends 'portfolio.html' %}
+{% extends 'portfolio_base.html' %}
 
 {% load static %}
 
+{% block title %} Domains | {% endblock %}
+
 {% block portfolio_content %}
     <h1 id="domains-header">Domains</h1>
     {% include "includes/domains_table.html" with portfolio=portfolio %}
diff --git a/src/registrar/templates/portfolio_requests.html b/src/registrar/templates/portfolio_requests.html
index 8d254a3e2..8c698ec83 100644
--- a/src/registrar/templates/portfolio_requests.html
+++ b/src/registrar/templates/portfolio_requests.html
@@ -1,7 +1,9 @@
-{% extends 'portfolio.html' %}
+{% extends 'portfolio_base.html' %}
 
 {% load static %}
 
+{% block title %} Domain requests | {% endblock %}
+
 {% block portfolio_content %}
     <h1 id="domain-requests-header">Domain requests</h1>
 
@@ -16,6 +18,6 @@ <h1 id="domain-requests-header">Domain requests</h1>
             Start a new domain request
         </a>
     </p>
-       
+    
     {% include "includes/domain_requests_table.html" with portfolio=portfolio %}
 {% endblock %}
diff --git a/src/registrar/templates/portfolio_sidebar.html b/src/registrar/templates/portfolio_sidebar.html
deleted file mode 100644
index d02f5ac0c..000000000
--- a/src/registrar/templates/portfolio_sidebar.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{% load static url_helpers %}
-
-<div class="margin-bottom-4 tablet:margin-bottom-0">
-  <nav aria-label="">
-    <h2 class="margin-top-0 text-semibold">{{ portfolio.organization_name }}</h2>
-    <ul class="usa-sidenav usa-sidenav--portfolio">
-      <li class="usa-sidenav__item">
-        {% url 'portfolio-domains' portfolio.id as url %} 
-        <a href="{{ url }}" {% if request.path == url %}class="usa-current"{% endif %}> 
-           Domains
-        </a>
-
-      </li>
-      <li class="usa-sidenav__item">
-        {% url 'portfolio-domain-requests' portfolio.id as url %} 
-        <a href="{{ url }}" {% if request.path == url %}class="usa-current"{% endif %}> 
-           Domain requests
-        </a>
-      </li>
-      <li class="usa-sidenav__item">
-        <a href="#">
-          Members
-        </a>
-      </li>
-      <li class="usa-sidenav__item">
-        <a href="#">
-          Organization
-        </a>
-      </li>
-      <li class="usa-sidenav__item">
-        <a href="#">
-          Senior official
-        </a>
-      </li>
-    </ul>
-  </nav>
-</div>
diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index 2414eba2c..6d30d9c77 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -102,13 +102,6 @@ def _update_session_with_domain(self):
         domain_pk = "domain:" + str(self.kwargs.get("pk"))
         self.session[domain_pk] = self.object
 
-    def get_context_data(self, **kwargs):
-        """Extend get_context_data to add has_profile_feature_flag to context"""
-        context = super().get_context_data(**kwargs)
-        # This is a django waffle flag which toggles features based off of the "flag" table
-        context["has_profile_feature_flag"] = flag_is_active(self.request, "profile_feature")
-        return context
-
 
 class DomainFormBaseView(DomainBaseView, FormMixin):
     """
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index e8e82500e..40e7d7ed1 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -228,10 +228,8 @@ def get(self, request, *args, **kwargs):
             if request.path_info == self.NEW_URL_NAME:
                 # Clear context so the prop getter won't create a request here.
                 # Creating a request will be handled in the post method for the
-                # intro page. Only TEMPORARY context needed is has_profile_flag
-                has_profile_flag = flag_is_active(self.request, "profile_feature")
-                context_stuff = {"has_profile_feature_flag": has_profile_flag}
-                return render(request, "domain_request_intro.html", context=context_stuff)
+                # intro page.
+                return render(request, "domain_request_intro.html", {})
             else:
                 return self.goto(self.steps.first)
 
@@ -397,8 +395,6 @@ def get_context_data(self):
                 "modal_description": "Once you submit this request, you won’t be able to edit it until we review it.\
                 You’ll only be able to withdraw your request.",
                 "review_form_is_complete": True,
-                # Use the profile waffle feature flag to toggle profile features throughout domain requests
-                "has_profile_feature_flag": has_profile_flag,
                 "user": self.request.user,
             }
         else:  # form is not complete
@@ -414,7 +410,6 @@ def get_context_data(self):
                 "modal_description": 'This request cannot be submitted yet.\
                 Return to the request and visit the steps that are marked as "incomplete."',
                 "review_form_is_complete": False,
-                "has_profile_feature_flag": has_profile_flag,
                 "user": self.request.user,
             }
         return context_stuff
@@ -740,13 +735,6 @@ def get(self, request, *args, **kwargs):
 class DomainRequestStatus(DomainRequestPermissionView):
     template_name = "domain_request_status.html"
 
-    def get_context_data(self, **kwargs):
-        """Extend get_context_data to add has_profile_feature_flag to context"""
-        context = super().get_context_data(**kwargs)
-        # This is a django waffle flag which toggles features based off of the "flag" table
-        context["has_profile_feature_flag"] = flag_is_active(self.request, "profile_feature")
-        return context
-
 
 class DomainRequestWithdrawConfirmation(DomainRequestPermissionWithdrawView):
     """This page will ask user to confirm if they want to withdraw
@@ -757,13 +745,6 @@ class DomainRequestWithdrawConfirmation(DomainRequestPermissionWithdrawView):
 
     template_name = "domain_request_withdraw_confirmation.html"
 
-    def get_context_data(self, **kwargs):
-        """Extend get_context_data to add has_profile_feature_flag to context"""
-        context = super().get_context_data(**kwargs)
-        # This is a django waffle flag which toggles features based off of the "flag" table
-        context["has_profile_feature_flag"] = flag_is_active(self.request, "profile_feature")
-        return context
-
 
 class DomainRequestWithdrawn(DomainRequestPermissionWithdrawView):
     # this view renders no template
diff --git a/src/registrar/views/domains_json.py b/src/registrar/views/domains_json.py
index 8b107ca67..f17185ef2 100644
--- a/src/registrar/views/domains_json.py
+++ b/src/registrar/views/domains_json.py
@@ -11,7 +11,7 @@ def get_domains_json(request):
     """Given the current request,
     get all domains that are associated with the UserDomainRole object"""
 
-    user_domain_roles = UserDomainRole.objects.filter(user=request.user)
+    user_domain_roles = UserDomainRole.objects.filter(user=request.user).select_related('domain_info__sub_organization')
     domain_ids = user_domain_roles.values_list("domain_id", flat=True)
 
     objects = Domain.objects.filter(id__in=domain_ids)
@@ -85,6 +85,7 @@ def get_domains_json(request):
             "action_url": reverse("domain", kwargs={"pk": domain.id}),
             "action_label": ("View" if 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"),
+            "suborganization": domain.domain_info.sub_organization.name if domain.domain_info and domain.domain_info.sub_organization else None,
         }
         for domain in page_obj.object_list
     ]
diff --git a/src/registrar/views/index.py b/src/registrar/views/index.py
index f975b9803..a2752168f 100644
--- a/src/registrar/views/index.py
+++ b/src/registrar/views/index.py
@@ -7,8 +7,6 @@ def index(request):
     context = {}
 
     if request.user.is_authenticated:
-        # This is a django waffle flag which toggles features based off of the "flag" table
-        context["has_profile_feature_flag"] = flag_is_active(request, "profile_feature")
         context["has_organization_feature_flag"] = flag_is_active(request, "organization_feature")
 
         # This controls the creation of a new domain request in the wizard
diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py
index 5ecd5d1d0..1ec40580f 100644
--- a/src/registrar/views/portfolios.py
+++ b/src/registrar/views/portfolios.py
@@ -8,15 +8,6 @@
 def portfolio_domains(request, portfolio_id):
     context = {}
 
-    if request.user.is_authenticated:
-        # This is a django waffle flag which toggles features based off of the "flag" table
-        context["has_profile_feature_flag"] = flag_is_active(request, "profile_feature")
-        context["has_organization_feature_flag"] = flag_is_active(request, "organization_feature")
-
-        # Retrieve the portfolio object based on the provided portfolio_id
-        portfolio = get_object_or_404(Portfolio, id=portfolio_id)
-        context["portfolio"] = portfolio
-
     return render(request, "portfolio_domains.html", context)
 
 
@@ -25,14 +16,6 @@ def portfolio_domain_requests(request, portfolio_id):
     context = {}
 
     if request.user.is_authenticated:
-        # This is a django waffle flag which toggles features based off of the "flag" table
-        context["has_profile_feature_flag"] = flag_is_active(request, "profile_feature")
-        context["has_organization_feature_flag"] = flag_is_active(request, "organization_feature")
-
-        # Retrieve the portfolio object based on the provided portfolio_id
-        portfolio = get_object_or_404(Portfolio, id=portfolio_id)
-        context["portfolio"] = portfolio
-
         # This controls the creation of a new domain request in the wizard
         request.session["new_request"] = True
 
diff --git a/src/registrar/views/user_profile.py b/src/registrar/views/user_profile.py
index 3f9aeb79f..e6909b3e9 100644
--- a/src/registrar/views/user_profile.py
+++ b/src/registrar/views/user_profile.py
@@ -55,10 +55,8 @@ def dispatch(self, request, *args, **kwargs):  # type: ignore
         return super().dispatch(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
-        """Extend get_context_data to include has_profile_feature_flag"""
+        """Extend get_context_data"""
         context = super().get_context_data(**kwargs)
-        # This is a django waffle flag which toggles features based off of the "flag" table
-        context["has_profile_feature_flag"] = flag_is_active(self.request, "profile_feature")
 
         # Set the profile_back_button_text based on the redirect parameter
         if kwargs.get("redirect") == "domain-request:":
@@ -139,7 +137,7 @@ class FinishProfileSetupView(UserProfileView):
     base_view_name = "finish-user-profile-setup"
 
     def get_context_data(self, **kwargs):
-        """Extend get_context_data to include has_profile_feature_flag"""
+        """Extend get_context_data"""
         context = super().get_context_data(**kwargs)
 
         # Show back button conditional on user having finished setup
diff --git a/src/registrar/views/utility/error_views.py b/src/registrar/views/utility/error_views.py
index 2374277d5..3e69d307d 100644
--- a/src/registrar/views/utility/error_views.py
+++ b/src/registrar/views/utility/error_views.py
@@ -14,14 +14,12 @@
 """
 
 from django.shortcuts import render
-from waffle.decorators import flag_is_active
 
 
 def custom_500_error_view(request, context=None):
     """Used to redirect 500 errors to a custom view"""
     if context is None:
         context = {}
-    context["has_profile_feature_flag"] = flag_is_active(request, "profile_feature")
     return render(request, "500.html", context=context, status=500)
 
 
@@ -29,7 +27,6 @@ def custom_401_error_view(request, context=None):
     """Used to redirect 401 errors to a custom view"""
     if context is None:
         context = {}
-    context["has_profile_feature_flag"] = flag_is_active(request, "profile_feature")
     return render(request, "401.html", context=context, status=401)
 
 
@@ -37,5 +34,4 @@ def custom_403_error_view(request, exception=None, context=None):
     """Used to redirect 403 errors to a custom view"""
     if context is None:
         context = {}
-    context["has_profile_feature_flag"] = flag_is_active(request, "profile_feature")
     return render(request, "403.html", context=context, status=403)

From 619a71fdb601f1b4767977ac017b18fcf746580d Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Fri, 5 Jul 2024 18:08:34 -0400
Subject: [PATCH 02/12] extended header for org users

---
 src/registrar/assets/sass/_theme/_base.scss   | 34 -------------------
 .../assets/sass/_theme/_buttons.scss          | 28 +++++++++++++++
 src/registrar/assets/sass/_theme/_header.scss | 32 ++++++++---------
 .../assets/sass/_theme/_identifier.scss       | 10 ++++++
 src/registrar/assets/sass/_theme/styles.scss  |  1 +
 src/registrar/context_processors.py           | 21 ++++++------
 src/registrar/registrar_middleware.py         |  2 +-
 .../templates/includes/header_basic.html      |  2 +-
 src/registrar/views/domain.py                 |  2 +-
 src/registrar/views/domain_request.py         |  1 -
 src/registrar/views/domains_json.py           |  8 +++--
 src/registrar/views/portfolios.py             |  4 +--
 src/registrar/views/user_profile.py           |  2 +-
 13 files changed, 77 insertions(+), 70 deletions(-)
 create mode 100644 src/registrar/assets/sass/_theme/_identifier.scss

diff --git a/src/registrar/assets/sass/_theme/_base.scss b/src/registrar/assets/sass/_theme/_base.scss
index 2aa3da565..12d32d0fe 100644
--- a/src/registrar/assets/sass/_theme/_base.scss
+++ b/src/registrar/assets/sass/_theme/_base.scss
@@ -92,10 +92,6 @@ footer {
   color: color('primary');
 }
 
-.usa-identifier__logo {
-  height: units(7);
-}
-
 abbr[title] {
   // workaround for underlining abbr element
   border-bottom: none;
@@ -135,36 +131,6 @@ abbr[title] {
   cursor: pointer;
 }
 
-.input-with-edit-button {
-  svg.usa-icon {
-    width: 1.5em !important;
-    height: 1.5em !important;
-    color: #{$dhs-green};
-    position: absolute;
-  }
-  &.input-with-edit-button__error {
-    svg.usa-icon {
-      color: #{$dhs-red};
-    }
-    div.readonly-field {
-      color: #{$dhs-red};
-    }
-  }
-}
-
-// We need to deviate from some default USWDS styles here
-// in this particular case, so we have to override this.
-.usa-form .usa-button.readonly-edit-button {
-  margin-top: 0px !important;
-  padding-top: 0px !important;
-  svg {
-    width: 1.25em !important;
-    height: 1.25em !important;
-  }
-}
-
-
-
 .padding--8-8-9 {
   padding: 8px 8px 9px !important;
 }
diff --git a/src/registrar/assets/sass/_theme/_buttons.scss b/src/registrar/assets/sass/_theme/_buttons.scss
index 92556556b..8ec43705f 100644
--- a/src/registrar/assets/sass/_theme/_buttons.scss
+++ b/src/registrar/assets/sass/_theme/_buttons.scss
@@ -162,6 +162,34 @@ a.usa-button--unstyled:visited {
   }
 }
 
+.input-with-edit-button {
+  svg.usa-icon {
+    width: 1.5em !important;
+    height: 1.5em !important;
+    color: #{$dhs-green};
+    position: absolute;
+  }
+  &.input-with-edit-button__error {
+    svg.usa-icon {
+      color: #{$dhs-red};
+    }
+    div.readonly-field {
+      color: #{$dhs-red};
+    }
+  }
+}
+
+// We need to deviate from some default USWDS styles here
+// in this particular case, so we have to override this.
+.usa-form .usa-button.readonly-edit-button {
+  margin-top: 0px !important;
+  padding-top: 0px !important;
+  svg {
+    width: 1.25em !important;
+    height: 1.25em !important;
+  }
+}
+
 .usa-button--filter {
   width: auto;
   // For mobile stacking
diff --git a/src/registrar/assets/sass/_theme/_header.scss b/src/registrar/assets/sass/_theme/_header.scss
index a8c642804..6e12bff9e 100644
--- a/src/registrar/assets/sass/_theme/_header.scss
+++ b/src/registrar/assets/sass/_theme/_header.scss
@@ -67,30 +67,16 @@
 }
 
 .usa-header--extended {
-    .usa-nav__primary {
-        .usa-nav-link,
-        .usa-nav-link:hover,
-        .usa-nav-link:active  {
-            color: color('primary');
-            font-weight: font-weight('normal');
-            font-size: 16px;
-        }
-        .usa-current,
-        .usa-current:hover,
-        .usa-current:active  {
-            font-weight: font-weight('bold');
-        }
-    }
     @include at-media(desktop) {
         background-color: color('primary-darker');
         border-top: solid 1px color('base');
-        border-bottom: solid 1px color('base-lighter');
+        border-bottom: solid 1px color('base-light');
 
         .usa-logo__text a {
             color: color('white');
         }
         .usa-nav {
-            background-color: color('primary-lightest');
+            background-color: color('primary-lighter');
         }
         .usa-nav__primary-item:last-child {
             margin-left: auto;
@@ -98,6 +84,20 @@
                 padding-right: 0;
             }
         }
+        .usa-nav__primary {
+            .usa-nav-link,
+            .usa-nav-link:hover,
+            .usa-nav-link:active  {
+                color: color('primary');
+                font-weight: font-weight('normal');
+                font-size: 16px;
+            }
+            .usa-current,
+            .usa-current:hover,
+            .usa-current:active  {
+                font-weight: font-weight('bold');
+            }
+        }
         .usa-nav__secondary {
             // I don't know why USWDS has this at 2 rem, which puts it out of alignment
             right: 3rem;
diff --git a/src/registrar/assets/sass/_theme/_identifier.scss b/src/registrar/assets/sass/_theme/_identifier.scss
new file mode 100644
index 000000000..e56d887b9
--- /dev/null
+++ b/src/registrar/assets/sass/_theme/_identifier.scss
@@ -0,0 +1,10 @@
+@use "uswds-core" as *;
+
+.usa-banner {
+    background-color: color('primary-darker');
+}
+
+.usa-identifier__logo {
+    height: units(7);
+  }
+  
\ No newline at end of file
diff --git a/src/registrar/assets/sass/_theme/styles.scss b/src/registrar/assets/sass/_theme/styles.scss
index 142664423..4775b60c9 100644
--- a/src/registrar/assets/sass/_theme/styles.scss
+++ b/src/registrar/assets/sass/_theme/styles.scss
@@ -21,6 +21,7 @@
 @forward "alerts";
 @forward "tables";
 @forward "sidenav";
+@forward "identifier";
 @forward "header";
 @forward "register-form";
 
diff --git a/src/registrar/context_processors.py b/src/registrar/context_processors.py
index 8072e85d4..acea72c4e 100644
--- a/src/registrar/context_processors.py
+++ b/src/registrar/context_processors.py
@@ -13,6 +13,7 @@ def language_code(request):
     """
     return {"LANGUAGE_CODE": settings.LANGUAGE_CODE}
 
+
 def canonical_path(request):
     """Add a canonical URL to the template context.
 
@@ -22,6 +23,7 @@ def canonical_path(request):
     """
     return {"CANONICAL_PATH": request.build_absolute_uri(request.path)}
 
+
 def is_demo_site(request):
     """Add a boolean if this is a demo site.
 
@@ -31,10 +33,12 @@ def is_demo_site(request):
     """
     return {"IS_DEMO_SITE": settings.IS_DEMO_SITE}
 
+
 def is_production(request):
     """Add a boolean if this is our production site."""
     return {"IS_PRODUCTION": settings.IS_PRODUCTION}
 
+
 def org_user_status(request):
     if request.user.is_authenticated:
         is_org_user = request.user.is_org_user(request)
@@ -42,20 +46,17 @@ def org_user_status(request):
         is_org_user = False
 
     return {
-        'is_org_user': is_org_user,
+        "is_org_user": is_org_user,
     }
 
+
 def add_portfolio_to_context(request):
-    return {
-        'portfolio': getattr(request, 'portfolio', None)
-    }
+    return {"portfolio": getattr(request, "portfolio", None)}
+
 
 def add_path_to_context(request):
-    return {
-        'path': getattr(request, 'path', None)
-    }
+    return {"path": getattr(request, "path", None)}
+
 
 def add_has_profile_feature_flag_to_context(request):
-    return {
-        'has_profile_feature_flag': flag_is_active(request, "profile_feature")
-    }
+    return {"has_profile_feature_flag": flag_is_active(request, "profile_feature")}
diff --git a/src/registrar/registrar_middleware.py b/src/registrar/registrar_middleware.py
index 5e534ea7e..80d1fe7a9 100644
--- a/src/registrar/registrar_middleware.py
+++ b/src/registrar/registrar_middleware.py
@@ -144,7 +144,7 @@ def process_view(self, request, view_func, view_args, view_kwargs):
         if request.user.is_authenticated and request.user.is_org_user(request):
             user_portfolios = Portfolio.objects.filter(creator=request.user)
             first_portfolio = user_portfolios.first()
-            
+
             if first_portfolio:
                 # Add the portfolio to the request object
                 request.portfolio = first_portfolio
diff --git a/src/registrar/templates/includes/header_basic.html b/src/registrar/templates/includes/header_basic.html
index 0fef664ac..692b2cb03 100644
--- a/src/registrar/templates/includes/header_basic.html
+++ b/src/registrar/templates/includes/header_basic.html
@@ -16,7 +16,7 @@
         <ul class="usa-nav__primary usa-accordion">
           <li class="usa-nav__primary-item">
             {% if user.is_authenticated %}
-            <span class="usa-nav__username">{{ user.email }}</span>
+            <span class="usa-nav__username ellipsis">{{ user.email }}</span>
           </li>
           {% if has_profile_feature_flag %}
           <li class="usa-nav__primary-item">
diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index 6d30d9c77..1cfb259b0 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -59,7 +59,7 @@
 
 from ..utility.email import send_templated_email, EmailSendingError
 from .utility import DomainPermissionView, DomainInvitationPermissionDeleteView
-from waffle.decorators import flag_is_active, waffle_flag
+from waffle.decorators import waffle_flag
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 40e7d7ed1..34e2bfc37 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -378,7 +378,6 @@ def db_check_for_unlocking_steps(self):
 
     def get_context_data(self):
         """Define context for access on all wizard pages."""
-        has_profile_flag = flag_is_active(self.request, "profile_feature")
 
         context_stuff = {}
         if DomainRequest._form_complete(self.domain_request, self.request):
diff --git a/src/registrar/views/domains_json.py b/src/registrar/views/domains_json.py
index f17185ef2..f700f4396 100644
--- a/src/registrar/views/domains_json.py
+++ b/src/registrar/views/domains_json.py
@@ -11,7 +11,7 @@ def get_domains_json(request):
     """Given the current request,
     get all domains that are associated with the UserDomainRole object"""
 
-    user_domain_roles = UserDomainRole.objects.filter(user=request.user).select_related('domain_info__sub_organization')
+    user_domain_roles = UserDomainRole.objects.filter(user=request.user).select_related("domain_info__sub_organization")
     domain_ids = user_domain_roles.values_list("domain_id", flat=True)
 
     objects = Domain.objects.filter(id__in=domain_ids)
@@ -85,7 +85,11 @@ def get_domains_json(request):
             "action_url": reverse("domain", kwargs={"pk": domain.id}),
             "action_label": ("View" if 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"),
-            "suborganization": domain.domain_info.sub_organization.name if domain.domain_info and domain.domain_info.sub_organization else None,
+            "suborganization": (
+                domain.domain_info.sub_organization.name
+                if domain.domain_info and domain.domain_info.sub_organization
+                else None
+            ),
         }
         for domain in page_obj.object_list
     ]
diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py
index 1ec40580f..d5b6cbba5 100644
--- a/src/registrar/views/portfolios.py
+++ b/src/registrar/views/portfolios.py
@@ -1,6 +1,4 @@
-from django.shortcuts import get_object_or_404, render
-from registrar.models.portfolio import Portfolio
-from waffle.decorators import flag_is_active
+from django.shortcuts import render
 from django.contrib.auth.decorators import login_required
 
 
diff --git a/src/registrar/views/user_profile.py b/src/registrar/views/user_profile.py
index e6909b3e9..0529e137b 100644
--- a/src/registrar/views/user_profile.py
+++ b/src/registrar/views/user_profile.py
@@ -15,7 +15,7 @@
 from registrar.models.user import User
 from registrar.models.utility.generic_helper import replace_url_queryparams
 from registrar.views.utility.permission_views import UserProfilePermissionView
-from waffle.decorators import flag_is_active, waffle_flag
+from waffle.decorators import waffle_flag
 
 logger = logging.getLogger(__name__)
 

From a7c29f4d219ac6e57156e5d747236feef9c598ac Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Fri, 5 Jul 2024 18:13:46 -0400
Subject: [PATCH 03/12] clenup

---
 src/registrar/templates/includes/header_basic.html    | 3 ++-
 src/registrar/templates/includes/header_extended.html | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/registrar/templates/includes/header_basic.html b/src/registrar/templates/includes/header_basic.html
index 692b2cb03..7076fcb89 100644
--- a/src/registrar/templates/includes/header_basic.html
+++ b/src/registrar/templates/includes/header_basic.html
@@ -38,4 +38,5 @@
       {% block usa_nav_secondary %}{% endblock %}
       {% endblock %}
     </div>
-  </header>
\ No newline at end of file
+  </header>
+  
\ No newline at end of file
diff --git a/src/registrar/templates/includes/header_extended.html b/src/registrar/templates/includes/header_extended.html
index 96a77afe5..ccba93ea3 100644
--- a/src/registrar/templates/includes/header_extended.html
+++ b/src/registrar/templates/includes/header_extended.html
@@ -71,4 +71,5 @@
     </div>
     </nav>
     {% endblock %}
-  </header>
\ No newline at end of file
+  </header>
+  
\ No newline at end of file

From dcb63d194733b94e0fa0e15840beb04c06e6a6e6 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Mon, 8 Jul 2024 18:57:46 -0400
Subject: [PATCH 04/12] Fix issues with org_user_status global context and
 logo_clickable profile context

---
 src/djangooidc/tests/test_views.py            |   4 +
 .../assets/sass/_theme/_identifier.scss       |   3 +-
 src/registrar/templates/base.html             |   6 +-
 src/registrar/templates/dashboard_base.html   |   1 -
 .../templates/finish_profile_setup.html       |   4 +-
 .../templates/includes/header_basic.html      |  73 +++++------
 .../templates/includes/header_extended.html   |   6 +-
 .../templates/includes/header_selector.html   |   5 +
 src/registrar/templates/portfolio_base.html   |   2 -
 src/registrar/templates/profile.html          |   4 +-
 src/registrar/views/domains_json.py           | 121 ++++++++++--------
 11 files changed, 117 insertions(+), 112 deletions(-)
 create mode 100644 src/registrar/templates/includes/header_selector.html

diff --git a/src/djangooidc/tests/test_views.py b/src/djangooidc/tests/test_views.py
index bdd61b346..6ebe25d45 100644
--- a/src/djangooidc/tests/test_views.py
+++ b/src/djangooidc/tests/test_views.py
@@ -429,6 +429,10 @@ def test_login_callback_does_not_requires_step_up_auth(self, mock_client):
             # Create a mock request
             request = self.factory.get("/some-url")
             request.session = {"acr_value": ""}
+            # Mock user and its attributes
+            mock_user = MagicMock()
+            mock_user.is_authenticated = True
+            request.user = mock_user
             # Ensure that the CLIENT instance used in login_callback is the mock
             # patch _requires_step_up_auth to return False
             with patch("djangooidc.views._requires_step_up_auth", return_value=False), patch(
diff --git a/src/registrar/assets/sass/_theme/_identifier.scss b/src/registrar/assets/sass/_theme/_identifier.scss
index e56d887b9..58ccd659c 100644
--- a/src/registrar/assets/sass/_theme/_identifier.scss
+++ b/src/registrar/assets/sass/_theme/_identifier.scss
@@ -6,5 +6,4 @@
 
 .usa-identifier__logo {
     height: units(7);
-  }
-  
\ No newline at end of file
+}
diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html
index a7b2bb783..e5bd1b0b9 100644
--- a/src/registrar/templates/base.html
+++ b/src/registrar/templates/base.html
@@ -135,11 +135,7 @@
 
   <div class="usa-overlay"></div>
   {% block header %}
-    {% if not is_org_user %}
-      {% include "includes/header_basic.html" %}
-    {% else %}
-      {% include "includes/header_extended.html" %}
-    {% endif %}
+    {% include "includes/header_selector.html" with logo_clickable=True %}
   {% endblock header %}
 
   {% block wrapper %}
diff --git a/src/registrar/templates/dashboard_base.html b/src/registrar/templates/dashboard_base.html
index 4f24b9280..6dd2ce8fd 100644
--- a/src/registrar/templates/dashboard_base.html
+++ b/src/registrar/templates/dashboard_base.html
@@ -9,7 +9,6 @@
       {% block content %}
         {% block messages %}
           {% if messages %}
-          <p>test</p>
           <ul class="messages">
             {% for message in messages %}
               <li {% if message.tags %} class="{{ message.tags }}" {% endif %}>
diff --git a/src/registrar/templates/finish_profile_setup.html b/src/registrar/templates/finish_profile_setup.html
index 6e35ad5da..61cc192bf 100644
--- a/src/registrar/templates/finish_profile_setup.html
+++ b/src/registrar/templates/finish_profile_setup.html
@@ -4,8 +4,8 @@
 {% block title %} Finish setting up your profile | {% endblock %}
 
 {# Disable the redirect  #}
-{% block logo %}
-    {% include "includes/gov_extended_logo.html" with logo_clickable=user_finished_setup %}
+{% block header %}
+    {% include "includes/header_selector.html" with logo_clickable=user_finished_setup %}
 {% endblock %}
 
 {# Add the new form #}
diff --git a/src/registrar/templates/includes/header_basic.html b/src/registrar/templates/includes/header_basic.html
index 7076fcb89..fd3b71000 100644
--- a/src/registrar/templates/includes/header_basic.html
+++ b/src/registrar/templates/includes/header_basic.html
@@ -1,42 +1,39 @@
 {% load static %}
 
 <header class="usa-header usa-header--basic">
-    <div class="usa-nav-container">
-      <div class="usa-navbar">
-          {% block logo %}
-            {% include "includes/gov_extended_logo.html" with logo_clickable=True %}
-          {% endblock %}
-        <button type="button" class="usa-menu-btn">Menu</button>
-      </div>
-      {% block usa_nav %}
-      <nav class="usa-nav" aria-label="Primary navigation">
-        <button type="button" class="usa-nav__close">
-          <img src="{%static 'img/usa-icons/close.svg'%}" role="img" alt="Close" />
-        </button>
-        <ul class="usa-nav__primary usa-accordion">
-          <li class="usa-nav__primary-item">
-            {% if user.is_authenticated %}
-            <span class="usa-nav__username ellipsis">{{ user.email }}</span>
-          </li>
-          {% if has_profile_feature_flag %}
-          <li class="usa-nav__primary-item">
-            {% url 'user-profile' as user_profile_url %}
-            {% url 'finish-user-profile-setup' as finish_setup_url %}
-            <a class="usa-nav-link {% if request.path == user_profile_url or request.path == finish_setup_url %}usa-current{% endif %}" href="{{ user_profile_url }}">
-                <span class="text-primary">Your profile</span>
-            </a>
-          </li>
-          {% endif %}
-          <li class="usa-nav__primary-item">
-            <a href="{% url 'logout' %}"><span class="text-primary">Sign out</span></a>
-            {% else %}
-            <a href="{% url 'login' %}"><span>Sign in</span></a>
-            {% endif %}
-          </li>
-        </ul>
-      </nav>
-      {% block usa_nav_secondary %}{% endblock %}
-      {% endblock %}
+  <div class="usa-nav-container">
+    <div class="usa-navbar">
+        {% include "includes/gov_extended_logo.html" with logo_clickable=logo_clickable %}
+      <button type="button" class="usa-menu-btn">Menu</button>
     </div>
-  </header>
-  
\ No newline at end of file
+    {% block usa_nav %}
+    <nav class="usa-nav" aria-label="Primary navigation">
+      <button type="button" class="usa-nav__close">
+        <img src="{%static 'img/usa-icons/close.svg'%}" role="img" alt="Close" />
+      </button>
+      <ul class="usa-nav__primary usa-accordion">
+        <li class="usa-nav__primary-item">
+          {% if user.is_authenticated %}
+          <span class="usa-nav__username ellipsis">{{ user.email }}</span>
+        </li>
+        {% if has_profile_feature_flag %}
+        <li class="usa-nav__primary-item">
+          {% url 'user-profile' as user_profile_url %}
+          {% url 'finish-user-profile-setup' as finish_setup_url %}
+          <a class="usa-nav-link {% if request.path == user_profile_url or request.path == finish_setup_url %}usa-current{% endif %}" href="{{ user_profile_url }}">
+              <span class="text-primary">Your profile</span>
+          </a>
+        </li>
+        {% endif %}
+        <li class="usa-nav__primary-item">
+          <a href="{% url 'logout' %}"><span class="text-primary">Sign out</span></a>
+          {% else %}
+          <a href="{% url 'login' %}"><span>Sign in</span></a>
+          {% endif %}
+        </li>
+      </ul>
+    </nav>
+    {% block usa_nav_secondary %}{% endblock %}
+    {% endblock %}
+  </div>
+</header>
diff --git a/src/registrar/templates/includes/header_extended.html b/src/registrar/templates/includes/header_extended.html
index ccba93ea3..f388a71bc 100644
--- a/src/registrar/templates/includes/header_extended.html
+++ b/src/registrar/templates/includes/header_extended.html
@@ -2,9 +2,7 @@
 
 <header class="usa-header usa-header--extended">
     <div class="usa-navbar">
-        {% block logo %}
-        {% include "includes/gov_extended_logo.html" with logo_clickable=True %}
-        {% endblock %}
+        {% include "includes/gov_extended_logo.html" with logo_clickable=logo_clickable %}
     <button type="button" class="usa-menu-btn">Menu</button>
     </div>
     {% block usa_nav %}
@@ -71,5 +69,5 @@
     </div>
     </nav>
     {% endblock %}
-  </header>
+</header>
   
\ No newline at end of file
diff --git a/src/registrar/templates/includes/header_selector.html b/src/registrar/templates/includes/header_selector.html
new file mode 100644
index 000000000..3cb2bd51b
--- /dev/null
+++ b/src/registrar/templates/includes/header_selector.html
@@ -0,0 +1,5 @@
+{% if not is_org_user %}
+    {% include "includes/header_basic.html" with logo_clickable=logo_clickable %}
+{% else %}
+    {% include "includes/header_extended.html" with logo_clickable=logo_clickable %}
+{% endif %}
diff --git a/src/registrar/templates/portfolio_base.html b/src/registrar/templates/portfolio_base.html
index 4cb8145f8..d4ba4dab2 100644
--- a/src/registrar/templates/portfolio_base.html
+++ b/src/registrar/templates/portfolio_base.html
@@ -36,6 +36,4 @@
 
     {% block content_bottom %}{% endblock %}
   </div>
-
-
 {% endblock wrapper %}
diff --git a/src/registrar/templates/profile.html b/src/registrar/templates/profile.html
index 41471fe88..6e1e7781f 100644
--- a/src/registrar/templates/profile.html
+++ b/src/registrar/templates/profile.html
@@ -6,8 +6,8 @@
 {% load static url_helpers %}
 
 {# Disable the redirect  #}
-{% block logo %}
-    {% include "includes/gov_extended_logo.html" with logo_clickable=user_finished_setup %}
+{% block header %}
+    {% include "includes/header_selector.html" with logo_clickable=user_finished_setup %}
 {% endblock %}
 
 {% block content %}
diff --git a/src/registrar/views/domains_json.py b/src/registrar/views/domains_json.py
index f700f4396..59bc3e778 100644
--- a/src/registrar/views/domains_json.py
+++ b/src/registrar/views/domains_json.py
@@ -17,91 +17,100 @@ def get_domains_json(request):
     objects = Domain.objects.filter(id__in=domain_ids)
     unfiltered_total = objects.count()
 
-    # Handle sorting
-    sort_by = request.GET.get("sort_by", "id")  # Default to 'id'
-    order = request.GET.get("order", "asc")  # Default to 'asc'
+    objects = apply_search(objects, request)
+    objects = apply_state_filter(objects, request)
+    objects = apply_sorting(objects, request)
 
-    # Handle search term
+    paginator = Paginator(objects, 10)
+    page_number = request.GET.get("page")
+    page_obj = paginator.get_page(page_number)
+
+    domains = [serialize_domain(domain) for domain in page_obj.object_list]
+
+    return JsonResponse(
+        {
+            "domains": domains,
+            "page": page_obj.number,
+            "num_pages": paginator.num_pages,
+            "has_previous": page_obj.has_previous(),
+            "has_next": page_obj.has_next(),
+            "total": paginator.count,
+            "unfiltered_total": unfiltered_total,
+        }
+    )
+
+
+def apply_search(queryset, request):
     search_term = request.GET.get("search_term")
     if search_term:
-        objects = objects.filter(Q(name__icontains=search_term))
+        queryset = queryset.filter(Q(name__icontains=search_term))
+    return queryset
 
-    # Handle state
+
+def apply_state_filter(queryset, request):
     status_param = request.GET.get("status")
     if status_param:
         status_list = status_param.split(",")
-
         # if unknown is in status_list, append 'dns needed' since both
         # unknown and dns needed display as DNS Needed, and both are
         # searchable via state parameter of 'unknown'
         if "unknown" in status_list:
             status_list.append("dns needed")
-
         # Split the status list into normal states and custom states
         normal_states = [state for state in status_list if state in Domain.State.values]
         custom_states = [state for state in status_list if state == "expired"]
-
         # Construct Q objects for normal states that can be queried through ORM
         state_query = Q()
         if normal_states:
             state_query |= Q(state__in=normal_states)
-
         # Handle custom states in Python, as expired can not be queried through ORM
         if "expired" in custom_states:
-            expired_domain_ids = [domain.id for domain in objects if domain.state_display() == "Expired"]
+            expired_domain_ids = [domain.id for domain in queryset if domain.state_display() == "Expired"]
             state_query |= Q(id__in=expired_domain_ids)
-
         # Apply the combined query
-        objects = objects.filter(state_query)
-
+        queryset = queryset.filter(state_query)
         # If there are filtered states, and expired is not one of them, domains with
         # state_display of 'Expired' must be removed
         if "expired" not in custom_states:
-            expired_domain_ids = [domain.id for domain in objects if domain.state_display() == "Expired"]
-            objects = objects.exclude(id__in=expired_domain_ids)
+            expired_domain_ids = [domain.id for domain in queryset if domain.state_display() == "Expired"]
+            queryset = queryset.exclude(id__in=expired_domain_ids)
+
+    return queryset
 
+
+def apply_sorting(queryset, request):
+    sort_by = request.GET.get("sort_by", "id")
+    order = request.GET.get("order", "asc")
     if sort_by == "state_display":
-        # Fetch the objects and sort them in Python
-        objects = list(objects)  # Evaluate queryset to a list
+        objects = list(queryset)
         objects.sort(key=lambda domain: domain.state_display(), reverse=(order == "desc"))
+        return objects
     else:
         if order == "desc":
             sort_by = f"-{sort_by}"
-        objects = objects.order_by(sort_by)
-
-    paginator = Paginator(objects, 10)
-    page_number = request.GET.get("page")
-    page_obj = paginator.get_page(page_number)
-
-    # Convert objects to JSON-serializable format
-    domains = [
-        {
-            "id": domain.id,
-            "name": domain.name,
-            "expiration_date": domain.expiration_date,
-            "state": domain.state,
-            "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 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"),
-            "suborganization": (
-                domain.domain_info.sub_organization.name
-                if domain.domain_info and domain.domain_info.sub_organization
-                else None
-            ),
-        }
-        for domain in page_obj.object_list
-    ]
-
-    return JsonResponse(
-        {
-            "domains": domains,
-            "page": page_obj.number,
-            "num_pages": paginator.num_pages,
-            "has_previous": page_obj.has_previous(),
-            "has_next": page_obj.has_next(),
-            "total": paginator.count,
-            "unfiltered_total": unfiltered_total,
-        }
-    )
+        return queryset.order_by(sort_by)
+
+
+def serialize_domain(domain):
+    suborganization_name = None
+    try:
+        domain_info = domain.domain_info
+        if domain_info:
+            suborganization = domain_info.sub_organization
+            if suborganization:
+                suborganization_name = suborganization.name
+    except Domain.domain_info.RelatedObjectDoesNotExist:
+        domain_info = None
+
+    return {
+        "id": domain.id,
+        "name": domain.name,
+        "expiration_date": domain.expiration_date,
+        "state": domain.state,
+        "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 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"),
+        "suborganization": suborganization_name,
+    }

From 59ed58f72c5697a8663efd0e03686b77d7db66b0 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 9 Jul 2024 12:45:34 -0400
Subject: [PATCH 05/12] Add suborg aria label and title

---
 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 fe2946867..1c0f08d10 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -1197,7 +1197,7 @@ document.addEventListener('DOMContentLoaded', function() {
                 </svg>
               </td>
               <td>
-                  <span class="${suborganization ? 'ellipsis ellipsis--30 vertical-align-middle' : ''}">${suborganization}</span>
+                  <span class="${suborganization ? 'ellipsis ellipsis--30 vertical-align-middle' : ''}" aria-label="${suborganization}" title="${suborganization}">${suborganization}</span>
               </td>
               <td>
                 <a href="${actionUrl}">

From ee95a1aac1bcf35596235ce8885b2778b80dd624 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 9 Jul 2024 14:14:57 -0400
Subject: [PATCH 06/12] cleanup

---
 src/registrar/templates/includes/header_extended.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/registrar/templates/includes/header_extended.html b/src/registrar/templates/includes/header_extended.html
index f388a71bc..dcf950234 100644
--- a/src/registrar/templates/includes/header_extended.html
+++ b/src/registrar/templates/includes/header_extended.html
@@ -70,4 +70,3 @@
     </nav>
     {% endblock %}
 </header>
-  
\ No newline at end of file

From bdeb0064cc16d338e5769a8d017497a9ce293a44 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 16 Jul 2024 17:28:54 -0400
Subject: [PATCH 07/12] Fix logo tooltip when profile and org user

---
 src/registrar/assets/sass/_theme/_header.scss | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/registrar/assets/sass/_theme/_header.scss b/src/registrar/assets/sass/_theme/_header.scss
index 6e12bff9e..583d17147 100644
--- a/src/registrar/assets/sass/_theme/_header.scss
+++ b/src/registrar/assets/sass/_theme/_header.scss
@@ -10,7 +10,7 @@
     line-height: 1.1;
 }
 
-.usa-logo button.usa-button--unstyled.disabled-button:hover{
+.usa-logo button:hover{
     color: #{$dhs-dark-gray-85};
 }
 
@@ -72,7 +72,9 @@
         border-top: solid 1px color('base');
         border-bottom: solid 1px color('base-light');
 
-        .usa-logo__text a {
+        .usa-logo__text a,
+        .usa-logo__text button,
+        .usa-logo__text button:hover {
             color: color('white');
         }
         .usa-nav {
@@ -111,5 +113,9 @@
                 font-size: 16px;
             }
         }
+        > .usa-navbar {
+            // This is a dangerous override to USWDS, necessary because we have a tooltip on the logo
+            overflow: visible;
+        }
     }
 }

From 2ec3fa774dbc6901540357f22059d7b3e23758ed Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 16 Jul 2024 18:03:15 -0400
Subject: [PATCH 08/12] color change

---
 src/registrar/assets/sass/_theme/_header.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/assets/sass/_theme/_header.scss b/src/registrar/assets/sass/_theme/_header.scss
index 583d17147..c0a5be8c4 100644
--- a/src/registrar/assets/sass/_theme/_header.scss
+++ b/src/registrar/assets/sass/_theme/_header.scss
@@ -70,7 +70,7 @@
     @include at-media(desktop) {
         background-color: color('primary-darker');
         border-top: solid 1px color('base');
-        border-bottom: solid 1px color('base-light');
+        border-bottom: solid 1px color('base-lighter');
 
         .usa-logo__text a,
         .usa-logo__text button,
@@ -78,7 +78,7 @@
             color: color('white');
         }
         .usa-nav {
-            background-color: color('primary-lighter');
+            background-color: color('primary-lightest');
         }
         .usa-nav__primary-item:last-child {
             margin-left: auto;

From 58957e1250fc94c42ff7ef93c6018cd16aada632 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 16 Jul 2024 19:16:57 -0400
Subject: [PATCH 09/12] cleanup

---
 src/registrar/models/user.py                | 4 +---
 src/registrar/templates/home.html           | 4 ----
 src/registrar/templates/portfolio_base.html | 4 ----
 src/registrar/views/domains_json.py         | 4 ++++
 src/registrar/views/index.py                | 2 --
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/registrar/models/user.py b/src/registrar/models/user.py
index 5360bde77..00bdf7868 100644
--- a/src/registrar/models/user.py
+++ b/src/registrar/models/user.py
@@ -292,8 +292,6 @@ def on_each_login(self):
 
     def is_org_user(self, request):
         has_organization_feature_flag = flag_is_active(request, "organization_feature")
-        user_portfolios = Portfolio.objects.filter(creator=self)
-
-        user_portfolios_exist = user_portfolios.exists()
+        user_portfolios_exist = Portfolio.objects.filter(creator=self).exists()
 
         return has_organization_feature_flag and user_portfolios_exist
diff --git a/src/registrar/templates/home.html b/src/registrar/templates/home.html
index 4518db271..b79b69ebc 100644
--- a/src/registrar/templates/home.html
+++ b/src/registrar/templates/home.html
@@ -4,10 +4,6 @@
 
 {% block title %} Home | {% endblock %}
 
-{% comment %}
-  home and portfolio_base test for is_authenticated
-{% endcomment %}
-
 {% block content %}
 <main id="main-content" class="grid-container">
 {% if user.is_authenticated %}
diff --git a/src/registrar/templates/portfolio_base.html b/src/registrar/templates/portfolio_base.html
index d4ba4dab2..64653c74e 100644
--- a/src/registrar/templates/portfolio_base.html
+++ b/src/registrar/templates/portfolio_base.html
@@ -1,9 +1,5 @@
 {% extends "base.html" %}
 
-{% comment %}
-  home and portfolio_base test for is_authenticated
-{% endcomment %}
-
 {% block wrapper %}
   <div id="wrapper">
       {% block content %}
diff --git a/src/registrar/views/domains_json.py b/src/registrar/views/domains_json.py
index 59bc3e778..5fd947155 100644
--- a/src/registrar/views/domains_json.py
+++ b/src/registrar/views/domains_json.py
@@ -1,3 +1,4 @@
+import logging
 from django.http import JsonResponse
 from django.core.paginator import Paginator
 from registrar.models import UserDomainRole, Domain
@@ -5,6 +6,8 @@
 from django.urls import reverse
 from django.db.models import Q
 
+logger = logging.getLogger(__name__)
+
 
 @login_required
 def get_domains_json(request):
@@ -101,6 +104,7 @@ def serialize_domain(domain):
                 suborganization_name = suborganization.name
     except Domain.domain_info.RelatedObjectDoesNotExist:
         domain_info = None
+        logger.debug(f'Issue in domains_json: We could not find domain_info for {domain}')
 
     return {
         "id": domain.id,
diff --git a/src/registrar/views/index.py b/src/registrar/views/index.py
index a2752168f..007bcdd47 100644
--- a/src/registrar/views/index.py
+++ b/src/registrar/views/index.py
@@ -7,8 +7,6 @@ def index(request):
     context = {}
 
     if request.user.is_authenticated:
-        context["has_organization_feature_flag"] = flag_is_active(request, "organization_feature")
-
         # This controls the creation of a new domain request in the wizard
         request.session["new_request"] = True
 

From 716f91e3b777c2b3367d773f134a9b72f839aa04 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Thu, 18 Jul 2024 16:24:18 -0400
Subject: [PATCH 10/12] Hide suborgs on domains for regular users

---
 src/registrar/assets/js/get-gov.js            | 16 ++++-
 src/registrar/assets/sass/_theme/_base.scss   |  8 ++-
 src/registrar/assets/sass/_theme/_header.scss |  4 +-
 src/registrar/assets/sass/_theme/_tables.scss | 59 -------------------
 .../includes/domain_requests_table.html       |  1 +
 .../templates/includes/domains_table.html     | 10 +++-
 src/registrar/templates/portfolio_base.html   |  2 +-
 7 files changed, 32 insertions(+), 68 deletions(-)

diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index 1c0f08d10..10fb3ed4f 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -1140,6 +1140,7 @@ document.addEventListener('DOMContentLoaded', function() {
     const statusCheckboxes = document.querySelectorAll('input[name="filter-status"]');
     const statusIndicator = document.querySelector('.domain__filter-indicator');
     const statusToggle = document.querySelector('.usa-button--filter');
+    const noPortfolioFlag = document.getElementById('no-portfolio-js-flag');
 
     /**
      * Loads rows in the domains list, as well as updates pagination around the domains list
@@ -1176,6 +1177,17 @@ document.addEventListener('DOMContentLoaded', function() {
             const suborganization = domain.suborganization ? domain.suborganization : '';
 
             const row = document.createElement('tr');
+
+            let markupForSuborganizationRow = '';
+
+            if (!noPortfolioFlag) {
+              markupForSuborganizationRow = `
+                <td>
+                    <span class="${suborganization ? 'ellipsis ellipsis--30 vertical-align-middle' : ''}" aria-label="${suborganization}" title="${suborganization}">${suborganization}</span>
+                </td>
+              `
+            }
+
             row.innerHTML = `
               <th scope="row" role="rowheader" data-label="Domain name">
                 ${domain.name}
@@ -1196,9 +1208,7 @@ document.addEventListener('DOMContentLoaded', function() {
                   <use aria-hidden="true" xlink:href="/public/img/sprite.svg#info_outline"></use>
                 </svg>
               </td>
-              <td>
-                  <span class="${suborganization ? 'ellipsis ellipsis--30 vertical-align-middle' : ''}" aria-label="${suborganization}" title="${suborganization}">${suborganization}</span>
-              </td>
+              ${markupForSuborganizationRow}
               <td>
                 <a href="${actionUrl}">
                   <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24">
diff --git a/src/registrar/assets/sass/_theme/_base.scss b/src/registrar/assets/sass/_theme/_base.scss
index 12d32d0fe..7a50c3da0 100644
--- a/src/registrar/assets/sass/_theme/_base.scss
+++ b/src/registrar/assets/sass/_theme/_base.scss
@@ -29,9 +29,15 @@ body {
 
 #wrapper.dashboard {
   background-color: color('primary-lightest');
-  padding-top: units(5);
+  padding-top: units(5)!important;
 }
 
+#wrapper.dashboard--portfolio {
+  background-color: color('gray-1');
+  padding-top: units(4)!important;
+}
+
+
 .section--outlined {
   background-color: color('white');
   border: 1px solid color('base-lighter');
diff --git a/src/registrar/assets/sass/_theme/_header.scss b/src/registrar/assets/sass/_theme/_header.scss
index c0a5be8c4..3d72a09cf 100644
--- a/src/registrar/assets/sass/_theme/_header.scss
+++ b/src/registrar/assets/sass/_theme/_header.scss
@@ -69,7 +69,7 @@
 .usa-header--extended {
     @include at-media(desktop) {
         background-color: color('primary-darker');
-        border-top: solid 1px color('base');
+        border-top: solid 1px color('base-light');
         border-bottom: solid 1px color('base-lighter');
 
         .usa-logo__text a,
@@ -83,7 +83,7 @@
         .usa-nav__primary-item:last-child {
             margin-left: auto;
             .usa-nav-link {
-                padding-right: 0;
+                margin-right: units(-2);
             }
         }
         .usa-nav__primary {
diff --git a/src/registrar/assets/sass/_theme/_tables.scss b/src/registrar/assets/sass/_theme/_tables.scss
index cf41dcd1f..e78715da8 100644
--- a/src/registrar/assets/sass/_theme/_tables.scss
+++ b/src/registrar/assets/sass/_theme/_tables.scss
@@ -34,22 +34,6 @@
       pointer-events: none;
     }
   }
-
-  // Ticket #1510
-  // @include at-media('desktop') {
-  //   th:first-child {
-  //     width: 220px;
-  //   }
-  //   th:nth-child(2) {
-  //     width: 175px;
-  //   }
-  //   th:nth-child(3) {
-  //     width: 130px;
-  //   }
-  //   th:nth-child(5) {
-  //     width: 130px;
-  //   }
-  // }
 }
 
 .dotgov-table {
@@ -96,46 +80,3 @@
     }
   }
 }
-@media (min-width: 1040px){
-  .domain-requests__table {
-    th:nth-of-type(1) {
-      width: 200px;
-    }
-
-    th:nth-of-type(2) {
-      width: 158px;
-    }
-
-    th:nth-of-type(3) {
-      width: 120px;
-    }
-
-    th:nth-of-type(4) {
-      width: 95px;
-    }
-
-    th:nth-of-type(5) {
-      width: 85px;
-    }
-  }
-}
-
-@media (min-width: 1040px){
-  .domains__table {
-    th:nth-of-type(1) {
-      width: 200px;
-    }
-
-    th:nth-of-type(2) {
-      width: 158px;
-    }
-
-    th:nth-of-type(3) {
-      width: 215px;
-    }
-
-    th:nth-of-type(4) {
-      width: 95px;
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/registrar/templates/includes/domain_requests_table.html b/src/registrar/templates/includes/domain_requests_table.html
index ad91699ef..b902da783 100644
--- a/src/registrar/templates/includes/domain_requests_table.html
+++ b/src/registrar/templates/includes/domain_requests_table.html
@@ -2,6 +2,7 @@
 
 <section class="section--outlined domain-requests" id="domain-requests">
     <div class="grid-row">
+      <!-- Use portfolio_base_permission when merging into 2366 then delete this comment -->
       {% if portfolio is None %}
         <div class="mobile:grid-col-12 desktop:grid-col-6">
           <h2 id="domain-requests-header" class="flex-6">Domain requests</h2>
diff --git a/src/registrar/templates/includes/domains_table.html b/src/registrar/templates/includes/domains_table.html
index a04a6fec5..66b602970 100644
--- a/src/registrar/templates/includes/domains_table.html
+++ b/src/registrar/templates/includes/domains_table.html
@@ -2,16 +2,18 @@
 
 <section class="section--outlined domains{% if portfolio is not None %} margin-top-0{% endif %}" id="domains">
     <div class="grid-row">
+      <!-- Use portfolio_base_permission when merging into 2366 then delete this comment -->
       {% if portfolio is None %}
         <div class="mobile:grid-col-12 desktop:grid-col-6">
           <h2 id="domains-header" class="flex-6">Domains</h2>
         </div>
+        <span class="display-none" id="no-portfolio-js-flag"></span>
       {% endif %}
       <div class="mobile:grid-col-12 desktop:grid-col-6">
         <section aria-label="Domains search component" class="flex-6 margin-y-2">
           <form class="usa-search usa-search--small" method="POST" role="search">
             {% csrf_token %}
-            <button class="usa-button usa-button--unstyled margin-right-2 domains__reset-search display-none" type="button">
+            <button class="usa-button usa-button--unstyled margin-right-3 domains__reset-search display-none" type="button">
               <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24">
                 <use xlink:href="{%static 'img/sprite.svg'%}#close"></use>
               </svg>
@@ -36,6 +38,7 @@ <h2 id="domains-header" class="flex-6">Domains</h2>
         </section>
       </div>
     </div>
+    <!-- Use portfolio_base_permission when merging into 2366 then delete this comment -->
     {% if portfolio %}
     <div class="display-flex flex-align-center margin-top-1"> 
       <span class="margin-right-2 margin-top-neg-1 usa-prose text-base-darker">Filter by</span>
@@ -139,7 +142,10 @@ <h2>Status</h2>
             <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>
-            <th data-sortable="suborganization" scope="col" role="columnheader">Suborganization</th>
+            <!-- Use portfolio_base_permission when merging into 2366 then delete this comment -->
+            {% if portfolio %}
+              <th data-sortable="suborganization" scope="col" role="columnheader">Suborganization</th>
+            {% endif %}
             <th 
               scope="col" 
               role="columnheader" 
diff --git a/src/registrar/templates/portfolio_base.html b/src/registrar/templates/portfolio_base.html
index 64653c74e..2da33884c 100644
--- a/src/registrar/templates/portfolio_base.html
+++ b/src/registrar/templates/portfolio_base.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block wrapper %}
-  <div id="wrapper">
+  <div id="wrapper" class="dashboard--portfolio">
       {% block content %}
         
         <main id="main-content" class="grid-container">

From e3415a3de9f1880fe61725f223476caf0d440eec Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Thu, 18 Jul 2024 16:33:18 -0400
Subject: [PATCH 11/12] lint

---
 src/registrar/views/domains_json.py | 2 +-
 src/registrar/views/index.py        | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/registrar/views/domains_json.py b/src/registrar/views/domains_json.py
index 5fd947155..3b3cae2c7 100644
--- a/src/registrar/views/domains_json.py
+++ b/src/registrar/views/domains_json.py
@@ -104,7 +104,7 @@ def serialize_domain(domain):
                 suborganization_name = suborganization.name
     except Domain.domain_info.RelatedObjectDoesNotExist:
         domain_info = None
-        logger.debug(f'Issue in domains_json: We could not find domain_info for {domain}')
+        logger.debug(f"Issue in domains_json: We could not find domain_info for {domain}")
 
     return {
         "id": domain.id,
diff --git a/src/registrar/views/index.py b/src/registrar/views/index.py
index 007bcdd47..498434dca 100644
--- a/src/registrar/views/index.py
+++ b/src/registrar/views/index.py
@@ -1,5 +1,4 @@
 from django.shortcuts import render
-from waffle.decorators import flag_is_active
 
 
 def index(request):

From acf89e79c17d69a88c908a6c6c5fe929486668a7 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Thu, 18 Jul 2024 23:48:20 -0400
Subject: [PATCH 12/12] trigger pr

---
 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 b902da783..efebd1e28 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">
-      <!-- Use portfolio_base_permission when merging into 2366 then delete this comment -->
+      <!-- Use portfolio_base_permission when merging into 2366 and then delete this comment -->
       {% if portfolio is None %}
         <div class="mobile:grid-col-12 desktop:grid-col-6">
           <h2 id="domain-requests-header" class="flex-6">Domain requests</h2>