From 1d8742237d2dddcc3e42ab87144c754bf6cf7f47 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Thu, 27 Feb 2025 08:07:22 -0700
Subject: [PATCH 1/9] fixes

---
 src/registrar/assets/src/js/getgov/formset-forms.js    |  5 +++++
 .../templates/domain_request_dotgov_domain.html        | 10 +++++++---
 .../templates/includes/domain_requests_table.html      |  4 ++--
 src/registrar/templates/includes/domains_table.html    |  2 +-
 src/registrar/templates/includes/members_table.html    |  2 +-
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/registrar/assets/src/js/getgov/formset-forms.js b/src/registrar/assets/src/js/getgov/formset-forms.js
index 27b85212e..f68650104 100644
--- a/src/registrar/assets/src/js/getgov/formset-forms.js
+++ b/src/registrar/assets/src/js/getgov/formset-forms.js
@@ -372,6 +372,11 @@ export function initFormsetsForms() {
           });
         });
       }
+
+      if (newForm) {
+        // announce("new form added")
+        newForm.focus();
+      }
   }
 }
 
diff --git a/src/registrar/templates/domain_request_dotgov_domain.html b/src/registrar/templates/domain_request_dotgov_domain.html
index 91373609d..9a037ab3b 100644
--- a/src/registrar/templates/domain_request_dotgov_domain.html
+++ b/src/registrar/templates/domain_request_dotgov_domain.html
@@ -61,7 +61,7 @@
 
   <fieldset class="usa-fieldset margin-top-1 dotgov-domain-form" id="form-container">
     <legend>
-      <h2>Alternative domains (optional)</h2>
+      <h2 id="alternative-domains">Alternative domains (optional)</h2>
     </legend>
 
     <p id="alt_domain_instructions" class="margin-top-05">Are there other domains you’d like if we can’t give
@@ -79,19 +79,23 @@
         {% endfor %}
       {% endwith %}
     {% endwith %}
-
-    <button type="button" value="save" class="usa-button usa-button--unstyled usa-button--with-icon" id="add-form">
+    
+    <div class="usa-sr-only" id="alternative-domains__add-another-alternative">Add another alternative domain</div> 
+    <button aria-labelledby="alternative-domains" aria-describedby="alternative-domains__add-another-alternative" type="button" value="save" class="usa-button usa-button--unstyled usa-button--with-icon" id="add-form">
       <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24" height="24">
         <use xlink:href="{%static 'img/sprite.svg'%}#add_circle"></use>
       </svg><span class="margin-left-05">Add another alternative</span>
     </button>
 
     <div class="margin-bottom-3">
+      <div class="usa-sr-only" id="alternative-domains__check-availability">Check domain availability</div> 
       <button
       id="validate-alt-domains-availability"
       type="button"
       class="usa-button usa-button--outline"
       validate-for="{{ forms.1.requested_domain.auto_id }}"
+      aria-labelledby="alternative-domains"
+      aria-describedby="alternative-domains__check-availability"
       >Check availability</button>
     </div>
     
diff --git a/src/registrar/templates/includes/domain_requests_table.html b/src/registrar/templates/includes/domain_requests_table.html
index 8adc0929a..f02f9f91c 100644
--- a/src/registrar/templates/includes/domain_requests_table.html
+++ b/src/registrar/templates/includes/domain_requests_table.html
@@ -25,9 +25,9 @@
                     </button>
                     <label id="domain-requests__search-label" class="usa-sr-only" for="domain-requests__search-field">
                         {% if portfolio %}
-                            Search by domain name or creator
+                        Domain requests table: Search by domain name or creator
                         {% else %}
-                            Search by domain name
+                        Domain requests table: Search by domain name
                         {% endif %}
                     </label>                    
                     <input
diff --git a/src/registrar/templates/includes/domains_table.html b/src/registrar/templates/includes/domains_table.html
index 3cf04a830..392943d03 100644
--- a/src/registrar/templates/includes/domains_table.html
+++ b/src/registrar/templates/includes/domains_table.html
@@ -43,7 +43,7 @@
             </svg>
             Reset
           </button>
-          <label id="domains__search-label" class="usa-sr-only" for="domains__search-field">Search by domain name</label>
+          <label id="domains__search-label" class="usa-sr-only" for="domains__search-field">Domains table: Search by domain name</label>
           <input
             class="usa-input"
             id="domains__search-field"
diff --git a/src/registrar/templates/includes/members_table.html b/src/registrar/templates/includes/members_table.html
index be1715f30..2c285419e 100644
--- a/src/registrar/templates/includes/members_table.html
+++ b/src/registrar/templates/includes/members_table.html
@@ -18,7 +18,7 @@
               </svg>
               Reset
             </button>
-            <label class="usa-sr-only" for="members__search-field">Search by member name</label>
+            <label class="usa-sr-only" for="members__search-field">Members table: Search by member name</label>
             <input
               class="usa-input"
               id="members__search-field"

From 09289769b8365bcf03f96e231d1c66ec1046e733 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Thu, 27 Feb 2025 10:58:44 -0700
Subject: [PATCH 2/9] add focus on error

---
 src/registrar/assets/src/js/getgov/formset-forms.js | 5 -----
 src/registrar/templates/includes/form_errors.html   | 8 +++++---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/registrar/assets/src/js/getgov/formset-forms.js b/src/registrar/assets/src/js/getgov/formset-forms.js
index f68650104..27b85212e 100644
--- a/src/registrar/assets/src/js/getgov/formset-forms.js
+++ b/src/registrar/assets/src/js/getgov/formset-forms.js
@@ -372,11 +372,6 @@ export function initFormsetsForms() {
           });
         });
       }
-
-      if (newForm) {
-        // announce("new form added")
-        newForm.focus();
-      }
   }
 }
 
diff --git a/src/registrar/templates/includes/form_errors.html b/src/registrar/templates/includes/form_errors.html
index 52c82aaf0..816704ed5 100644
--- a/src/registrar/templates/includes/form_errors.html
+++ b/src/registrar/templates/includes/form_errors.html
@@ -1,16 +1,18 @@
 {% if form.errors %}
   <div id="form-errors">
   {% for error in form.non_field_errors %}
-    <div class="usa-alert usa-alert--error usa-alert--slim margin-bottom-2" role="alert">
+    <div class="usa-alert usa-alert--error usa-alert--slim margin-bottom-2" role="alert" tabindex="0">
     <div class="usa-alert__body">
-    {{ error|escape }}
+      <span class="usa-sr-only">Error:</span>
+      {{ error|escape }}
     </div>
     </div>
   {% endfor %}
   {% for field in form %}
   {% for error in field.errors %}
-    <div class="usa-alert usa-alert--error usa-alert--slim margin-bottom-2">
+    <div class="usa-alert usa-alert--error usa-alert--slim margin-bottom-2" tabindex="0">
       <div class="usa-alert__body">
+        <span class="usa-sr-only">Error:</span>
         {{ error|escape }}
       </div>
     </div>

From a7170dde54c985ec79c38669a7ab4cba984da313 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Thu, 27 Feb 2025 13:42:16 -0700
Subject: [PATCH 3/9] Button uniqueness, fix search buttons

---
 .../assets/src/js/getgov/formset-forms.js       | 13 ++++++++++++-
 src/registrar/models/domain.py                  |  1 +
 .../domain_request_other_contacts.html          | 10 +++++++---
 .../includes/domain_requests_table.html         | 17 ++++++-----------
 .../templates/includes/domains_table.html       |  9 +++++----
 5 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/registrar/assets/src/js/getgov/formset-forms.js b/src/registrar/assets/src/js/getgov/formset-forms.js
index 27b85212e..96d250574 100644
--- a/src/registrar/assets/src/js/getgov/formset-forms.js
+++ b/src/registrar/assets/src/js/getgov/formset-forms.js
@@ -292,7 +292,18 @@ export function initFormsetsForms() {
         // For the other contacts form, we need to update the fieldset headers based on what's visible vs hidden,
         // since the form on the backend employs Django's DELETE widget.
         let totalShownForms = document.querySelectorAll(`.repeatable-form:not([style*="display: none"])`).length;
-        newForm.innerHTML = newForm.innerHTML.replace(formLabelRegex, `${formLabel} ${totalShownForms + 1}`);
+        let newFormCount = totalShownForms + 1;
+        // update the header
+        let header = newForm.querySelector('legend h3');
+        header.textContent = `${formLabel} ${newFormCount}`;
+        header.id = `org-contact-${newFormCount}`;
+        // update accessibility elements on the delete buttons
+        let deleteDescription = newForm.querySelector('.delete-button-description');
+        deleteDescription.textContent = 'Delete new contact';
+        deleteDescription.id = `org-contact-${newFormCount}__name`;
+        let deleteButton = newForm.querySelector('button');
+        deleteButton.setAttribute("aria-labelledby", header.id);
+        deleteButton.setAttribute("aria-describedby", deleteDescription.id);
       } else {
         // Nameservers form is cloned from index 2 which has the word optional on init, does not have the word optional
         // if indices 0 or 1 have been deleted
diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py
index d3c0ed347..040ad8a8f 100644
--- a/src/registrar/models/domain.py
+++ b/src/registrar/models/domain.py
@@ -245,6 +245,7 @@ class Domain(TimeStampedModel, DomainHelper):
         is called in the validate function on the request/domain page
 
         throws- RegistryError or InvalidDomainError"""
+        return True
         if not cls.string_could_be_domain(domain):
             logger.warning("Not a valid domain: %s" % str(domain))
             # throw invalid domain error so that it can be caught in
diff --git a/src/registrar/templates/domain_request_other_contacts.html b/src/registrar/templates/domain_request_other_contacts.html
index 65641bf4c..811a28ecf 100644
--- a/src/registrar/templates/domain_request_other_contacts.html
+++ b/src/registrar/templates/domain_request_other_contacts.html
@@ -31,10 +31,14 @@
             <fieldset class="usa-fieldset repeatable-form padding-y-1">
             
               <legend class="float-left-tablet">
-                  <h3 class="margin-top-05">Organization contact {{ forloop.counter }}</h2>
+                  <h3 class="margin-top-05" id="org-contact-{{ forloop.counter }}">Organization contact {{ forloop.counter }}</h2>
               </legend>
-
-              <button type="button" class="usa-button usa-button--unstyled display-block float-right-tablet delete-record margin-top-1 text-secondary line-height-sans-5 usa-button--with-icon">
+              {% if form.first_name or form.last_name %}
+                <span class="usa-sr-only delete-button-description" id="org-contact-{{ forloop.counter }}__name">Delete {{form.first_name.value }} {{ form.last_name.value }}</span>
+              {% else %}
+                <span class="usa-sr-only" id="org-contact-{{ forloop.counter }}__name">Delete new contact</span>
+              {% endif %}
+              <button aria-labelledby="org-contact-{{ forloop.counter }}" aria-describedby="org-contact-{{ forloop.counter }}__name" type="button" class="usa-button usa-button--unstyled display-block float-right-tablet delete-record margin-top-1 text-secondary line-height-sans-5 usa-button--with-icon">
                   <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24" height="24">
                   <use xlink:href="{%static 'img/sprite.svg'%}#delete"></use>
                   </svg>Delete
diff --git a/src/registrar/templates/includes/domain_requests_table.html b/src/registrar/templates/includes/domain_requests_table.html
index f02f9f91c..3557ff9e0 100644
--- a/src/registrar/templates/includes/domain_requests_table.html
+++ b/src/registrar/templates/includes/domain_requests_table.html
@@ -14,22 +14,15 @@
         {% endif %}
 
         <div class="section-outlined__search section-outlined__search--widescreen {% if portfolio %}mobile:grid-col-12 desktop:grid-col-6{% endif %}">
-            <section aria-label="Domain requests search component" class="margin-top-2">
+            <section aria-label="Domain requests search component" class="margin-top-2" id="domain-requests-search-component">
                 <form class="usa-search usa-search--small" method="POST" role="search">
                     {% csrf_token %}
-                    <button class="usa-button usa-button--unstyled margin-right-3 display-none" id="domain-requests__reset-search" type="button">
+                    <button class="usa-button usa-button--unstyled margin-right-3 display-none" id="domain-requests__reset-search" type="button" aria-labelledby="domain-requests-search-component">
                         <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 id="domain-requests__search-label" class="usa-sr-only" for="domain-requests__search-field">
-                        {% if portfolio %}
-                        Domain requests table: Search by domain name or creator
-                        {% else %}
-                        Domain requests table: Search by domain name
-                        {% endif %}
-                    </label>                    
+                    </button>                
                     <input
                         class="usa-input"
                         id="domain-requests__search-field"
@@ -40,8 +33,10 @@
                         {% else %}
                         placeholder="Search by domain name"
                         {% endif %}
+                        aria-labelledby="domain-requests-search-component"
                     />
-                    <button class="usa-button" type="submit" id="domain-requests__search-field-submit" aria-labelledby="domain-requests__search-label">
+                    <div class="usa-sr-only" id="domain-requests-search-button__description">Click to search</div>
+                    <button class="usa-button" type="submit" id="domain-requests__search-field-submit" aria-labelledby="domain-requests-search-component" aria-describedby="domain-requests-search-button__description">
                         <img
                             src="{% static 'img/usa-icons-bg/search--white.svg' %}"
                             class="usa-search__submit-icon"
diff --git a/src/registrar/templates/includes/domains_table.html b/src/registrar/templates/includes/domains_table.html
index 392943d03..c46c5fed2 100644
--- a/src/registrar/templates/includes/domains_table.html
+++ b/src/registrar/templates/includes/domains_table.html
@@ -34,24 +34,25 @@
       <span id="portfolio-js-value" data-portfolio="{{ portfolio.id }}"></span>
     {% endif %}
     <div class="section-outlined__search section-outlined__search--widescreen {% if portfolio %}mobile:grid-col-12 desktop:grid-col-6{% endif %}">
-      <section aria-label="Domains search component" class="margin-top-2">
+      <section aria-label="Domains search component" class="margin-top-2" id="domains-search-component">
         <form class="usa-search usa-search--small" method="POST" role="search">
           {% csrf_token %}
-          <button class="usa-button usa-button--unstyled margin-right-3 display-none" id="domains__reset-search" type="button">
+          <button class="usa-button usa-button--unstyled margin-right-3 display-none" id="domains__reset-search" type="button" aria-labelledby="domains-search-component">
             <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 id="domains__search-label" class="usa-sr-only" for="domains__search-field">Domains table: Search by domain name</label>
           <input
             class="usa-input"
             id="domains__search-field"
             type="search"
             name="domains-search"
             placeholder="Search by domain name"
+            aria-labelledby="domains-search-component"
           />
-          <button class="usa-button" type="submit" id="domains__search-field-submit" aria-labelledby="domains__search-label">
+          <div class="usa-sr-only" id="domains-search-button__description">Click to search</div>
+          <button class="usa-button" type="submit" id="domains__search-field-submit" aria-labelledby="domains-search-component" aria-describedby="domains-search-button__description">
             <img
               src="{% static 'img/usa-icons-bg/search--white.svg' %}"
               class="usa-search__submit-icon"

From d37cdd54f7584d626057f7cbbd19f56eb8515bba Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Thu, 27 Feb 2025 13:54:51 -0700
Subject: [PATCH 4/9] Cleanup member search + fix links that should be buttons

---
 src/registrar/templates/home.html                |  5 ++---
 .../includes/domain_requests_table.html          |  2 +-
 .../templates/includes/domains_table.html        |  7 ++++---
 .../templates/includes/members_table.html        | 16 +++++++++-------
 src/registrar/templates/portfolio_requests.html  |  5 ++---
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/registrar/templates/home.html b/src/registrar/templates/home.html
index de4d9e712..c4370a6ba 100644
--- a/src/registrar/templates/home.html
+++ b/src/registrar/templates/home.html
@@ -18,10 +18,9 @@
     <h1>Manage your domains</h1>
 
     <p class="margin-top-4">
-      <a href="{% url 'domain-request:start' %}" class="usa-button"
-      >
+      <button data-href="{% url 'domain-request:start' %}" class="usa-button use-button-as-link">
         Start a new domain request
-      </a>
+      </button>
     </p>
 
     {% include "includes/domains_table.html" with user_domain_count=user_domain_count %}
diff --git a/src/registrar/templates/includes/domain_requests_table.html b/src/registrar/templates/includes/domain_requests_table.html
index 3557ff9e0..1489a4715 100644
--- a/src/registrar/templates/includes/domain_requests_table.html
+++ b/src/registrar/templates/includes/domain_requests_table.html
@@ -14,7 +14,7 @@
         {% endif %}
 
         <div class="section-outlined__search section-outlined__search--widescreen {% if portfolio %}mobile:grid-col-12 desktop:grid-col-6{% endif %}">
-            <section aria-label="Domain requests search component" class="margin-top-2" id="domain-requests-search-component">
+            <section aria-label="Domain requests search component" id="domain-requests-search-component" class="margin-top-2">
                 <form class="usa-search usa-search--small" method="POST" role="search">
                     {% csrf_token %}
                     <button class="usa-button usa-button--unstyled margin-right-3 display-none" id="domain-requests__reset-search" type="button" aria-labelledby="domain-requests-search-component">
diff --git a/src/registrar/templates/includes/domains_table.html b/src/registrar/templates/includes/domains_table.html
index c46c5fed2..7d9fd77a6 100644
--- a/src/registrar/templates/includes/domains_table.html
+++ b/src/registrar/templates/includes/domains_table.html
@@ -64,12 +64,13 @@
     </div>
     {% if user_domain_count and user_domain_count > 0 %}
     <div class="section-outlined__utility-button mobile-lg:padding-right-105 {% if portfolio %} mobile:grid-col-12 desktop:grid-col-6 desktop:padding-left-3{% endif %}">
-      <section aria-label="Domains report component" class="margin-top-205">
-        <a href="{% url 'export_data_type_user' %}" class="usa-button usa-button--unstyled usa-button--with-icon usa-button--justify-right">
+      <section aria-label="Domains report component" class="margin-top-205" id="domains-report-component">
+        <div class="usa-sr-only" id="domains-export-button__description">Click to export as csv</div>
+        <button data-href="{% url 'export_data_type_user' %}" class="use-button-as-link usa-button usa-button--unstyled usa-button--with-icon usa-button--justify-right" aria-labelledby="domains-report-component" aria-describedby="domains-export-button__description">
           <svg class="usa-icon usa-icon--large" aria-hidden="true" focusable="false" role="img" width="24" height="24">
             <use xlink:href="{%static 'img/sprite.svg'%}#file_download"></use>
           </svg>Export as CSV
-        </a>
+        </button>
       </section>
     </div>
     {% endif %}
diff --git a/src/registrar/templates/includes/members_table.html b/src/registrar/templates/includes/members_table.html
index 2c285419e..528f9a5dc 100644
--- a/src/registrar/templates/includes/members_table.html
+++ b/src/registrar/templates/includes/members_table.html
@@ -9,24 +9,25 @@
   <div class="section-outlined__header margin-bottom-3 grid-row">
       <!-- ---------- SEARCH ---------- -->
       <div class="section-outlined__search mobile:grid-col-12 desktop:grid-col-6 section-outlined__search--widescreen">
-        <section aria-label="Members search component" class="margin-top-2">
+        <section aria-label="Members search component" class="margin-top-2" id="members-search-component">
           <form class="usa-search usa-search--small" method="POST" role="search">
             {% csrf_token %}
-            <button class="usa-button usa-button--unstyled margin-right-3 display-none" id="members__reset-search" type="button">
+            <button class="usa-button usa-button--unstyled margin-right-3 display-none" id="members__reset-search" type="button" aria-labelledby="members-search-component">
               <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="members__search-field">Members table: Search by member name</label>
             <input
               class="usa-input"
               id="members__search-field"
               type="search"
               name="members-search"
               placeholder="Search by member name"
+              aria-labelledby="members-search-component"
             />
-            <button class="usa-button" type="submit" id="members__search-field-submit">
+            <div class="usa-sr-only" id="members-search-button__description">Click to search</div>
+            <button class="usa-button" type="submit" id="members__search-field-submit" aria-labelledby="members-search-component" aria-describedby="members-search-button__description">
               <img
                 src="{% static 'img/usa-icons-bg/search--white.svg' %}"
                 class="usa-search__submit-icon"
@@ -37,12 +38,13 @@
         </section>
       </div>
       <div class="section-outlined__utility-button mobile-lg:padding-right-105 {% if portfolio %} mobile:grid-col-12 desktop:grid-col-6 desktop:padding-left-3{% endif %}">
-        <section aria-label="Domains report component" class="margin-top-205">
-          <a href="{% url 'export_members_portfolio' %}" class="usa-button usa-button--unstyled usa-button--with-icon usa-button--justify-right">
+        <section aria-label="Members report component" class="margin-top-205" id="members-report-component">
+          <div class="usa-sr-only" id="members-export-button__description">Click to export as csv</div>
+          <button href="{% url 'export_members_portfolio' %}" class="use-button-as-link usa-button usa-button--unstyled usa-button--with-icon usa-button--justify-right" aria-labelledby="members-report-component" aria-describedby="members-export-button__description">
             <svg class="usa-icon usa-icon--large" aria-hidden="true" focusable="false" role="img" width="24" height="24">
               <use xlink:href="{%static 'img/sprite.svg'%}#file_download"></use>
             </svg>Export as CSV
-          </a>
+          </button>
         </section>
       </div>
     </div>
diff --git a/src/registrar/templates/portfolio_requests.html b/src/registrar/templates/portfolio_requests.html
index 58fbde10c..c7030199a 100644
--- a/src/registrar/templates/portfolio_requests.html
+++ b/src/registrar/templates/portfolio_requests.html
@@ -26,10 +26,9 @@
             <div class="mobile:grid-col-12 tablet:grid-col-6">
  
                 <p class="float-right-tablet tablet:margin-y-0">
-                    <a href="{% url 'domain-request:start' %}" class="usa-button"
-                    >
+                    <button data-href="{% url 'domain-request:start' %}" class="usa-button use-button-as-link">
                         Start a new domain request
-                    </a>
+                    </button>
                 </p>
             </div>
         {% else %}

From 53b0c2da7c3d5f40675aafe82f3c32c24973b5cf Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Thu, 27 Feb 2025 15:10:31 -0700
Subject: [PATCH 5/9] fix buttons

---
 src/registrar/assets/src/js/getgov/main.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/registrar/assets/src/js/getgov/main.js b/src/registrar/assets/src/js/getgov/main.js
index a077da929..c95bf2144 100644
--- a/src/registrar/assets/src/js/getgov/main.js
+++ b/src/registrar/assets/src/js/getgov/main.js
@@ -15,6 +15,7 @@ import { initDomainManagersPage } from './domain-managers.js';
 import { initDomainDSData } from './domain-dsdata.js';
 import { initDomainDNSSEC } from './domain-dnssec.js';
 import { initFormErrorHandling } from './form-errors.js';
+import { initButtonLinks } from '../getgov-admin/button-utils.js';
 
 initDomainValidators();
 
@@ -49,3 +50,5 @@ initFormErrorHandling();
 initPortfolioMemberPageRadio();
 initPortfolioNewMemberPageToggle();
 initAddNewMemberPageListeners();
+
+initButtonLinks();

From b22059cf0bb071d28b63f650b6106f2cef2d5777 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 27 Feb 2025 16:25:07 -0800
Subject: [PATCH 6/9] Update create domain requests fixtures

---
 src/registrar/fixtures/fixtures_requests.py | 41 ++++++++++++---------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/registrar/fixtures/fixtures_requests.py b/src/registrar/fixtures/fixtures_requests.py
index 6eee6438f..77d7595ae 100644
--- a/src/registrar/fixtures/fixtures_requests.py
+++ b/src/registrar/fixtures/fixtures_requests.py
@@ -315,7 +315,7 @@ class DomainRequestFixture:
         cls._create_domain_requests(users)
 
     @classmethod
-    def _create_domain_requests(cls, users):  # noqa: C901
+    def _create_domain_requests(cls, users, total_requests=None):  # noqa: C901
         """Creates DomainRequests given a list of users."""
         total_domain_requests_to_make = len(users)  # 100000
 
@@ -323,26 +323,33 @@ class DomainRequestFixture:
         # number of entries.
         # (Prevents re-adding more entries to an already populated database,
         # which happens when restarting Docker src)
-        domain_requests_already_made = DomainRequest.objects.count()
+        total_existing_requests = DomainRequest.objects.count()
 
         domain_requests_to_create = []
-        if domain_requests_already_made < total_domain_requests_to_make:
-            for user in users:
-                for request_data in cls.DOMAINREQUESTS:
-                    # Prepare DomainRequest objects
-                    try:
-                        domain_request = DomainRequest(
-                            creator=user,
-                            organization_name=request_data["organization_name"],
-                        )
-                        cls._set_non_foreign_key_fields(domain_request, request_data)
-                        cls._set_foreign_key_fields(domain_request, request_data, user)
-                        domain_requests_to_create.append(domain_request)
-                    except Exception as e:
-                        logger.warning(e)
+        if total_requests and total_requests <= total_existing_requests:
+            total_domain_requests_to_make = total_requests - total_existing_requests
+            if total_domain_requests_to_make >= 0: 
+                total_domains_to_delete = total_domain_requests_to_make
+                DomainRequest.objects.filter(id__in=list(DomainRequest.objects.values_list('pk', flat=True)[:total_domains_to_delete])).delete()
+            if total_domain_requests_to_make == 0:
+                return
+
+        for user in users:
+            for request_data in cls.DOMAINREQUESTS:
+                # Prepare DomainRequest objects
+                try:
+                    domain_request = DomainRequest(
+                        creator=user,
+                        organization_name=request_data["organization_name"],
+                    )
+                    cls._set_non_foreign_key_fields(domain_request, request_data)
+                    cls._set_foreign_key_fields(domain_request, request_data, user)
+                    domain_requests_to_create.append(domain_request)
+                except Exception as e:
+                    logger.warning(e)
 
             num_additional_requests_to_make = (
-                total_domain_requests_to_make - domain_requests_already_made - len(domain_requests_to_create)
+                total_domain_requests_to_make - len(domain_requests_to_create)
             )
             if num_additional_requests_to_make > 0:
                 for _ in range(num_additional_requests_to_make):

From 099e7257ed9c1be4b2ed426f91276882213a601e Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 27 Feb 2025 16:25:36 -0800
Subject: [PATCH 7/9] Fix linting

---
 src/registrar/fixtures/fixtures_requests.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/registrar/fixtures/fixtures_requests.py b/src/registrar/fixtures/fixtures_requests.py
index 77d7595ae..45989f989 100644
--- a/src/registrar/fixtures/fixtures_requests.py
+++ b/src/registrar/fixtures/fixtures_requests.py
@@ -328,9 +328,11 @@ class DomainRequestFixture:
         domain_requests_to_create = []
         if total_requests and total_requests <= total_existing_requests:
             total_domain_requests_to_make = total_requests - total_existing_requests
-            if total_domain_requests_to_make >= 0: 
+            if total_domain_requests_to_make >= 0:
                 total_domains_to_delete = total_domain_requests_to_make
-                DomainRequest.objects.filter(id__in=list(DomainRequest.objects.values_list('pk', flat=True)[:total_domains_to_delete])).delete()
+                DomainRequest.objects.filter(
+                    id__in=list(DomainRequest.objects.values_list("pk", flat=True)[:total_domains_to_delete])
+                ).delete()
             if total_domain_requests_to_make == 0:
                 return
 
@@ -348,9 +350,7 @@ class DomainRequestFixture:
                 except Exception as e:
                     logger.warning(e)
 
-            num_additional_requests_to_make = (
-                total_domain_requests_to_make - len(domain_requests_to_create)
-            )
+            num_additional_requests_to_make = total_domain_requests_to_make - len(domain_requests_to_create)
             if num_additional_requests_to_make > 0:
                 for _ in range(num_additional_requests_to_make):
                     random_user = random.choice(users)  # nosec

From 07fd477b3bd4c9cbed5d01105b1b0af5ee62c2e8 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Mon, 3 Mar 2025 10:18:49 -0700
Subject: [PATCH 8/9] remove old code

---
 src/registrar/models/domain.py                            | 1 -
 src/registrar/templates/domain_request_dotgov_domain.html | 6 +++---
 src/registrar/templates/home.html                         | 5 +++--
 src/registrar/templates/portfolio_requests.html           | 5 +++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py
index 040ad8a8f..d3c0ed347 100644
--- a/src/registrar/models/domain.py
+++ b/src/registrar/models/domain.py
@@ -245,7 +245,6 @@ class Domain(TimeStampedModel, DomainHelper):
         is called in the validate function on the request/domain page
 
         throws- RegistryError or InvalidDomainError"""
-        return True
         if not cls.string_could_be_domain(domain):
             logger.warning("Not a valid domain: %s" % str(domain))
             # throw invalid domain error so that it can be caught in
diff --git a/src/registrar/templates/domain_request_dotgov_domain.html b/src/registrar/templates/domain_request_dotgov_domain.html
index 9a037ab3b..9edba1612 100644
--- a/src/registrar/templates/domain_request_dotgov_domain.html
+++ b/src/registrar/templates/domain_request_dotgov_domain.html
@@ -61,7 +61,7 @@
 
   <fieldset class="usa-fieldset margin-top-1 dotgov-domain-form" id="form-container">
     <legend>
-      <h2 id="alternative-domains">Alternative domains (optional)</h2>
+      <h2 id="alternative-domains-title">Alternative domains (optional)</h2>
     </legend>
 
     <p id="alt_domain_instructions" class="margin-top-05">Are there other domains you’d like if we can’t give
@@ -81,7 +81,7 @@
     {% endwith %}
     
     <div class="usa-sr-only" id="alternative-domains__add-another-alternative">Add another alternative domain</div> 
-    <button aria-labelledby="alternative-domains" aria-describedby="alternative-domains__add-another-alternative" type="button" value="save" class="usa-button usa-button--unstyled usa-button--with-icon" id="add-form">
+    <button aria-labelledby="alternative-domains-title" aria-describedby="alternative-domains__add-another-alternative" type="button" value="save" class="usa-button usa-button--unstyled usa-button--with-icon" id="add-form">
       <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24" height="24">
         <use xlink:href="{%static 'img/sprite.svg'%}#add_circle"></use>
       </svg><span class="margin-left-05">Add another alternative</span>
@@ -94,7 +94,7 @@
       type="button"
       class="usa-button usa-button--outline"
       validate-for="{{ forms.1.requested_domain.auto_id }}"
-      aria-labelledby="alternative-domains"
+      aria-labelledby="alternative-domains-title"
       aria-describedby="alternative-domains__check-availability"
       >Check availability</button>
     </div>
diff --git a/src/registrar/templates/home.html b/src/registrar/templates/home.html
index c4370a6ba..de4d9e712 100644
--- a/src/registrar/templates/home.html
+++ b/src/registrar/templates/home.html
@@ -18,9 +18,10 @@
     <h1>Manage your domains</h1>
 
     <p class="margin-top-4">
-      <button data-href="{% url 'domain-request:start' %}" class="usa-button use-button-as-link">
+      <a href="{% url 'domain-request:start' %}" class="usa-button"
+      >
         Start a new domain request
-      </button>
+      </a>
     </p>
 
     {% include "includes/domains_table.html" with user_domain_count=user_domain_count %}
diff --git a/src/registrar/templates/portfolio_requests.html b/src/registrar/templates/portfolio_requests.html
index c7030199a..58fbde10c 100644
--- a/src/registrar/templates/portfolio_requests.html
+++ b/src/registrar/templates/portfolio_requests.html
@@ -26,9 +26,10 @@
             <div class="mobile:grid-col-12 tablet:grid-col-6">
  
                 <p class="float-right-tablet tablet:margin-y-0">
-                    <button data-href="{% url 'domain-request:start' %}" class="usa-button use-button-as-link">
+                    <a href="{% url 'domain-request:start' %}" class="usa-button"
+                    >
                         Start a new domain request
-                    </button>
+                    </a>
                 </p>
             </div>
         {% else %}

From 73e80da06e20dee8faa8ec0cdcebdacd7ac0ad3d Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Tue, 4 Mar 2025 14:06:47 -0800
Subject: [PATCH 9/9] Remove extraneous variable

---
 src/registrar/fixtures/fixtures_requests.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/registrar/fixtures/fixtures_requests.py b/src/registrar/fixtures/fixtures_requests.py
index 45989f989..038c2db37 100644
--- a/src/registrar/fixtures/fixtures_requests.py
+++ b/src/registrar/fixtures/fixtures_requests.py
@@ -329,9 +329,8 @@ class DomainRequestFixture:
         if total_requests and total_requests <= total_existing_requests:
             total_domain_requests_to_make = total_requests - total_existing_requests
             if total_domain_requests_to_make >= 0:
-                total_domains_to_delete = total_domain_requests_to_make
                 DomainRequest.objects.filter(
-                    id__in=list(DomainRequest.objects.values_list("pk", flat=True)[:total_domains_to_delete])
+                    id__in=list(DomainRequest.objects.values_list("pk", flat=True)[:total_domain_requests_to_make])
                 ).delete()
             if total_domain_requests_to_make == 0:
                 return