Cleanup

src/registrar/config/urls.py

@@ -22,7 +22,7 @@ from registrar.views.report_views import (
     ExportDataTypeUser,
 )
 
-from registrar.views.domain_request import DomainRequestStep
+from registrar.views.domain_request import Step
 from registrar.views.domain_requests_json import get_domain_requests_json
 from registrar.views.transfer_user import TransferUserView
 from registrar.views.utility.api_views import (
@@ -43,20 +43,20 @@ domain_request_urls = [
 # dynamically generate the other domain_request_urls
 for step, view in [
     # add/remove steps here
-    (DomainRequestStep.ORGANIZATION_TYPE, views.OrganizationType),
-    (DomainRequestStep.TRIBAL_GOVERNMENT, views.TribalGovernment),
-    (DomainRequestStep.ORGANIZATION_FEDERAL, views.OrganizationFederal),
-    (DomainRequestStep.ORGANIZATION_ELECTION, views.OrganizationElection),
-    (DomainRequestStep.ORGANIZATION_CONTACT, views.OrganizationContact),
-    (DomainRequestStep.ABOUT_YOUR_ORGANIZATION, views.AboutYourOrganization),
-    (DomainRequestStep.SENIOR_OFFICIAL, views.SeniorOfficial),
-    (DomainRequestStep.CURRENT_SITES, views.CurrentSites),
-    (DomainRequestStep.DOTGOV_DOMAIN, views.DotgovDomain),
-    (DomainRequestStep.PURPOSE, views.Purpose),
-    (DomainRequestStep.OTHER_CONTACTS, views.OtherContacts),
-    (DomainRequestStep.ADDITIONAL_DETAILS, views.AdditionalDetails),
-    (DomainRequestStep.REQUIREMENTS, views.Requirements),
-    (DomainRequestStep.REVIEW, views.Review),
+    (Step.ORGANIZATION_TYPE, views.OrganizationType),
+    (Step.TRIBAL_GOVERNMENT, views.TribalGovernment),
+    (Step.ORGANIZATION_FEDERAL, views.OrganizationFederal),
+    (Step.ORGANIZATION_ELECTION, views.OrganizationElection),
+    (Step.ORGANIZATION_CONTACT, views.OrganizationContact),
+    (Step.ABOUT_YOUR_ORGANIZATION, views.AboutYourOrganization),
+    (Step.SENIOR_OFFICIAL, views.SeniorOfficial),
+    (Step.CURRENT_SITES, views.CurrentSites),
+    (Step.DOTGOV_DOMAIN, views.DotgovDomain),
+    (Step.PURPOSE, views.Purpose),
+    (Step.OTHER_CONTACTS, views.OtherContacts),
+    (Step.ADDITIONAL_DETAILS, views.AdditionalDetails),
+    (Step.REQUIREMENTS, views.Requirements),
+    (Step.REVIEW, views.Review),
 ]:
     domain_request_urls.append(path(f"{step}/", view.as_view(), name=step))
 

src/registrar/forms/utility/wizard_form_helper.py

@@ -4,7 +4,7 @@ from itertools import zip_longest
 from typing import Callable
 from django.db.models.fields.related import ForeignObjectRel
 from django import forms
-from registrar.utility.enums import DomainRequestStep
+from registrar.utility.enums import Step
 from registrar.models import DomainRequest, Contact
 
 

src/registrar/templates/includes/summary_item.html

@@ -43,12 +43,12 @@
                 {% endfor %}
                 </dl>
             {% elif custom_text_for_value_none %}
-              <p class="red-incomplete-text">
+              <p>
                 {{ custom_text_for_value_none }}
               </p>
             {% else %}
               <p>
-                None
+                  None
               </p>
             {% endif %}
           {% endif %}
@@ -96,17 +96,15 @@
           </ul>
         {% endif %}
       {% else %}
+      <p class="margin-top-0 margin-bottom-0">
         {% if value %}
-          <p class="margin-top-0 margin-bottom-0">
-            {{ value }}
-          </p>
+          {{ value }}
         {% elif custom_text_for_value_none %}
-          <p class="margin-top-0 margin-bottom-0 red-incomplete-text">
-            {{ custom_text_for_value_none }}
-          </p>
+          {{ custom_text_for_value_none }}
         {% else %}
           None
         {% endif %}
+      </p>
       {% endif %}
     </div>
 

src/registrar/tests/test_views_request.py

@@ -22,7 +22,7 @@ from registrar.models import (
     Portfolio,
     UserPortfolioPermission,
 )
-from registrar.views.domain_request import DomainRequestWizard, DomainRequestStep
+from registrar.views.domain_request import DomainRequestWizard, Step
 
 from .common import less_console_noise
 from .test_views import TestWithUser
@@ -1098,7 +1098,7 @@ class DomainRequestTests(TestWithUser, WebTest):
         self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
         contact_page = type_result.follow()
 
-        self.assertContains(contact_page, self.TITLES[DomainRequestStep.ABOUT_YOUR_ORGANIZATION])
+        self.assertContains(contact_page, self.TITLES[Step.ABOUT_YOUR_ORGANIZATION])
 
     @less_console_noise_decorator
     def test_federal_agency_dropdown_excludes_expected_values(self):
@@ -2327,7 +2327,7 @@ class DomainRequestTests(TestWithUser, WebTest):
         self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
         contact_page = type_result.follow()
 
-        self.assertContains(contact_page, self.TITLES[DomainRequestStep.ABOUT_YOUR_ORGANIZATION])
+        self.assertContains(contact_page, self.TITLES[Step.ABOUT_YOUR_ORGANIZATION])
 
     @less_console_noise_decorator
     def test_domain_request_tribal_government(self):
@@ -2359,7 +2359,7 @@ class DomainRequestTests(TestWithUser, WebTest):
         tribal_government_page = type_result.follow()
 
         # and the step is on the sidebar list.
-        self.assertContains(tribal_government_page, self.TITLES[DomainRequestStep.TRIBAL_GOVERNMENT])
+        self.assertContains(tribal_government_page, self.TITLES[Step.TRIBAL_GOVERNMENT])
 
     @less_console_noise_decorator
     def test_domain_request_so_dynamic_text(self):

src/registrar/utility/enums.py

@@ -40,7 +40,7 @@ class DefaultEmail(Enum):
     LEGACY_DEFAULT = "registrar@dotgov.gov"
 
 
-class DomainRequestStep(StrEnum):
+class Step(StrEnum):
     """
     Names for each page of the domain request wizard.
 

src/registrar/views/domain_request.py

@@ -14,7 +14,7 @@ from registrar.models.contact import Contact
 from registrar.models.user import User
 from registrar.views.utility import StepsHelper
 from registrar.views.utility.permission_views import DomainRequestPermissionDeleteView
-from registrar.utility.enums import DomainRequestStep, PortfolioDomainRequestStep
+from registrar.utility.enums import Step, PortfolioDomainRequestStep
 
 from .utility import (
     DomainRequestPermissionView,
@@ -43,7 +43,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
     Any method not marked as internal can be overridden in a subclass,
     although not without consulting the base implementation, first.
     """
-    StepEnum = DomainRequestStep
+    StepEnum = Step
     template_name = ""
 
     # uniquely namespace the wizard in urls.py
@@ -698,7 +698,7 @@ class Review(DomainRequestWizard):
         if DomainRequest._form_complete(self.domain_request, self.request) is False:
             logger.warning("User arrived at review page with an incomplete form.")
         context = super().get_context_data()
-        context["Step"] = DomainRequestStep.__members__
+        context["Step"] = Step.__members__
         context["domain_request"] = self.domain_request
         return context