wip

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">

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

@@ -32,50 +32,6 @@ body {
   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');
   border: 1px solid color('base-lighter');
@@ -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;
+  }
+}

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;
+            }
+        }
+    }
+}

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

@@ -21,6 +21,7 @@
 @forward "alerts";
 @forward "tables";
 @forward "sidenav";
+@forward "header";
 @forward "register-form";
 
 /*--------------------------------------------------

src/registrar/config/settings.py

@@ -240,6 +240,10 @@ TEMPLATES = [
                 "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",
             ],
         },
     },

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")
+    }

src/registrar/models/user.py

@@ -4,6 +4,7 @@ from django.contrib.auth.models import AbstractUser
 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 .transition_domain import TransitionDomain
 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 @@ class User(AbstractUser):
         """
 
         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

src/registrar/registrar_middleware.py

@@ -141,14 +141,16 @@ class CheckPortfolioMiddleware:
     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 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)
 
-        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)
         return None

src/registrar/templates/base.html

@@ -133,48 +133,14 @@
   </section>
 
 
-  {% block usa_overlay %}<div class="usa-overlay"></div>{% endblock %}
+  <div class="usa-overlay"></div>
-  {% block banner %}
+  {% block header %}
-  <header class="usa-header usa-header--basic">
+    {% if not is_org_user %}
-    <div class="usa-nav-container">
+      {% include "includes/header_basic.html" %}
-      <div class="usa-navbar">
+    {% else %}
-          {% block logo %}
+      {% include "includes/header_extended.html" %}
-            {% include "includes/gov_extended_logo.html" with logo_clickable=True %}
+    {% endif %}
-          {% endblock %}
+  {% endblock header %}
-        <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 %}
 
   {% block wrapper %}
   <div id="wrapper">

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 %}>

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 @@
     {% include "includes/domains_table.html" %}
     {% include "includes/domain_requests_table.html" %}
 
-    {# Note: Reimplement this after MVP #}
+  </div>
-    <!--
-    <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>
-    -->
-
 {% endblock %}
-</div>
 
 {% else %} {# not user.is_authenticated #}
 {# the entire logged out page goes here #}

src/registrar/templates/includes/domain_requests_table.html

@@ -12,6 +12,9 @@
           <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>

src/registrar/templates/includes/domains_table.html

@@ -12,6 +12,9 @@
           <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 @@
     </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 @@
             <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" 

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>

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>

src/registrar/templates/portfolio.html

@@ -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 %}

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 %}

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 %}

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>
 

src/registrar/templates/portfolio_sidebar.html

@@ -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>

src/registrar/views/domain.py

@@ -102,13 +102,6 @@ class DomainBaseView(DomainPermissionView):
         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):
     """

src/registrar/views/domain_request.py

@@ -228,10 +228,8 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
             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
+                # intro page.
-                has_profile_flag = flag_is_active(self.request, "profile_feature")
+                return render(request, "domain_request_intro.html", {})
-                context_stuff = {"has_profile_feature_flag": has_profile_flag}
-                return render(request, "domain_request_intro.html", context=context_stuff)
             else:
                 return self.goto(self.steps.first)
 
@@ -397,8 +395,6 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
                 "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 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
                 "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 @@ class Finished(DomainRequestWizard):
 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

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
     ]

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

src/registrar/views/portfolios.py

@@ -8,15 +8,6 @@ from django.contrib.auth.decorators import login_required
 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
 

src/registrar/views/user_profile.py

@@ -55,10 +55,8 @@ class UserProfileView(UserProfilePermissionView, FormMixin):
         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

src/registrar/views/utility/error_views.py

@@ -14,14 +14,12 @@ Rather than dealing with that, we keep everything centralized in one location.
 """
 
 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)