From 7bd6e7f5939308324d07278c7c6552a73efea009 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Thu, 5 Oct 2023 16:11:56 -0400
Subject: [PATCH 01/18] logic in domain_sidebar which determines display of DS
 Data and Key Data

---
 src/registrar/templates/domain_sidebar.html | 2 +-
 src/registrar/templatetags/url_helpers.py   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/registrar/templates/domain_sidebar.html b/src/registrar/templates/domain_sidebar.html
index d31ce613a..aff9f5dab 100644
--- a/src/registrar/templates/domain_sidebar.html
+++ b/src/registrar/templates/domain_sidebar.html
@@ -34,7 +34,7 @@
             >
                 DNSSEC
             </a>
-            {% if domain.dnssec_enabled %}
+            {% if domain.dnssecdata is not None or request.path|startswith:url and request.path|endswith:'data' %}
             <ul class="usa-sidenav__sublist">
               <li class="usa-sidenav__item">
                 {% url 'domain-dns-dnssec-dsdata' pk=domain.id as url %}
diff --git a/src/registrar/templatetags/url_helpers.py b/src/registrar/templatetags/url_helpers.py
index 5b76c116f..2b983930f 100644
--- a/src/registrar/templatetags/url_helpers.py
+++ b/src/registrar/templatetags/url_helpers.py
@@ -18,6 +18,11 @@ def startswith(text, starts):
         return text.startswith(starts)
     return False
 
+@register.filter("endswith")
+def endswith(text, ends):
+    if isinstance(text, str):
+        return text.endswith(ends)
+    return False
 
 @register.simple_tag
 def public_site_url(url_path):

From 170708ecf3bdd8144b61a637dd3ece29e6c9dee3 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Thu, 5 Oct 2023 16:29:19 -0400
Subject: [PATCH 02/18] modal and js toggler wip

---
 src/registrar/assets/js/get-gov.js          |  23 +++-
 src/registrar/templates/domain_dnssec.html  | 139 ++++++++++++++++----
 src/registrar/templates/includes/modal.html |  42 ++++++
 src/registrar/views/domain.py               |  39 ++++--
 4 files changed, 202 insertions(+), 41 deletions(-)
 create mode 100644 src/registrar/templates/includes/modal.html

diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index 17d4c4d6a..cfe6066e8 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -469,4 +469,25 @@ function prepareDeleteButtons() {
 //       }
 //     });
 //   }
-// })();
\ No newline at end of file
+// })();
+
+
+/**
+ * 
+ *
+ */
+(function toggleDNSSECWarning() {
+  document.getElementById("toggler1").addEventListener("click", function () {
+    var element = document.getElementById("step-1");
+    var element2 = document.getElementById("step-2");
+    element.classList.toggle("display-none");
+    element2.classList.toggle("display-none");
+  });
+
+  document.getElementById("toggler2").addEventListener("click", function () {
+    var element = document.getElementById("step-1");
+    var element2 = document.getElementById("step-2");
+    element.classList.toggle("display-none");
+    element2.classList.toggle("display-none");
+  });
+})();
\ No newline at end of file
diff --git a/src/registrar/templates/domain_dnssec.html b/src/registrar/templates/domain_dnssec.html
index e21bb9458..80bcd7b50 100644
--- a/src/registrar/templates/domain_dnssec.html
+++ b/src/registrar/templates/domain_dnssec.html
@@ -11,40 +11,121 @@
 
   <form class="usa-form usa-form--large" method="post">
     {% csrf_token %}
-    {% if not domain.dnssec_enabled %}
-    <div class="usa-alert usa-alert--info usa-alert--slim margin-bottom-3">
-      <div class="usa-alert__body">
-      It is strongly recommended that you do not enable this unless you fully understand DNSSEC and know how to set it up properly. If you make a mistake, it could cause your domain name to stop working.
-      </div>
-    </div>
-    <button
-        type="submit"
-        class="usa-button"
-        name="enable_dnssec"
-    >Enable DNSSEC</button>
-    {% elif domain.dnssecdata is None %}
-    <h2> Add DS Records </h2>
-    <p>In order to enable DNSSEC and add Delegation Signer (DS) records, you must first configure it with your DNS hosting service. Your configuration will determine whether you need to add DS Data or Key Data. Contact your DNS hosting provider if you are unsure which record type to add.</p>
-    <p>
-      <a href="{% url 'domain-dns-dnssec-dsdata' pk=domain.id %}" class="usa-button usa-button--outline">Add DS Data</a>
-      <a href="{% url 'domain-dns-dnssec-keydata' pk=domain.id %}" class="usa-button usa-button--outline">Add Key Data</a>
-      <button
-        type="submit"
-        class="usa-button usa-button--unstyled"
-        name="cancel"
-    >Cancel</button>
-    </p>
-    {% else %}
+    {% if domain.has_dnssec_records %}
     <div class="usa-alert usa-alert--info usa-alert--slim margin-bottom-3">
       <div class="usa-alert__body">
       In order to fully disable DNSSEC on your domain, you will need to work with your DNS provider to remove your DNSSEC-related records from your zone.
       </div>
     </div>
-    <button
-        type="submit"
-        class="usa-button"
-        name="disable_dnssec"
-    >Disable DNSSEC</button>
+    <a
+      href="#example-modal-1"
+      class="usa-button"
+      aria-controls="example-modal-1"
+      data-open-modal
+      >Disable DNSSEC</a
+    >
+    {% else %}
+    <div id="step-1">
+      <div class="usa-alert usa-alert--info usa-alert--slim margin-bottom-3">
+        <div class="usa-alert__body">
+        It is strongly recommended that you do not enable this unless you fully understand DNSSEC and know how to set it up properly. If you make a mistake, it could cause your domain name to stop working.
+        </div>
+      </div>
+      <button
+          type="button"
+          class="usa-button"
+          name="enable_dnssec"
+          id="toggler1"
+      >Enable DNSSEC</button>
+    </div>
+
+    <div id="step-2" class="display-none">
+      <h2> Add DS Records </h2>
+      <p>In order to enable DNSSEC and add Delegation Signer (DS) records, you must first configure it with your DNS hosting service. Your configuration will determine whether you need to add DS Data or Key Data. Contact your DNS hosting provider if you are unsure which record type to add.</p>
+      <p>
+        <a href="{% url 'domain-dns-dnssec-dsdata' pk=domain.id %}" class="usa-button usa-button--outline">Add DS Data</a>
+        <a href="{% url 'domain-dns-dnssec-keydata' pk=domain.id %}" class="usa-button usa-button--outline">Add Key Data</a>
+        <button
+          type="button"
+          class="usa-button usa-button--unstyled"
+          name="cancel"
+          id="toggler2"
+      >Cancel</button>
+      </p>
+    </div>
+    
+    
+
+    
+
+    
     {% endif %}
   </form>
+
+  <div
+    class="usa-modal"
+    id="example-modal-1"
+    aria-labelledby="modal-1-heading"
+    aria-describedby="modal-1-description"
+  >
+      {% include 'includes/modal.html' with modal_heading="Are you sure you want to continue?" modal_description="Your DNSSEC records will be deleted from the registry." modal_button=modal_button|safe %}
+  </div>
+
+
+  {% comment %} <div
+      class="usa-modal"
+      id="example-modal-1"
+      aria-labelledby="modal-1-heading"
+      aria-describedby="modal-1-description"
+    >
+      <div class="usa-modal__content">
+        <div class="usa-modal__main">
+          <h2 class="usa-modal__heading" id="modal-1-heading">
+            Are you sure you want to continue?
+          </h2>
+          <div class="usa-prose">
+            <p id="modal-1-description">
+              Your DNSSEC records will be deleted from the registry.
+            </p>
+          </div>
+
+          
+          <div class="usa-modal__footer">
+            <ul class="usa-button-group">
+              <li class="usa-button-group__item">
+                <form method="post">
+                  {% csrf_token %}
+                  <button
+                      type="submit"
+                      class="usa-button"
+                      name="disable_dnssec"
+                  >Disable DNSSEC</button>
+                </form>
+              </li>
+              <li class="usa-button-group__item">
+                <button
+                  type="button"
+                  class="usa-button usa-button--unstyled padding-105 text-center"
+                  data-close-modal
+                >
+                  Cancel
+                </button>
+              </li>
+            </ul>
+          </div>
+        </div>
+        <button
+          type="button"
+          class="usa-button usa-modal__close"
+          aria-label="Close this window"
+          data-close-modal
+        >
+          <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
+            <use xlink:href="/assets/img/sprite.svg#close"></use>
+          </svg>
+        </button>
+      </div>
+    </div> {% endcomment %}
+  
+
 {% endblock %}  {# domain_content #}
diff --git a/src/registrar/templates/includes/modal.html b/src/registrar/templates/includes/modal.html
new file mode 100644
index 000000000..b456a59e1
--- /dev/null
+++ b/src/registrar/templates/includes/modal.html
@@ -0,0 +1,42 @@
+<div class="usa-modal__content">
+    <div class="usa-modal__main">
+        <h2 class="usa-modal__heading" id="modal-1-heading">
+            {{ modal_heading }}
+        </h2>
+        <div class="usa-prose">
+            <p id="modal-1-description">
+                {{ modal_description }}
+            </p>
+        </div>
+
+        <div class="usa-modal__footer">
+            <ul class="usa-button-group">
+                <li class="usa-button-group__item">
+                    <form method="post">
+                        {% csrf_token %}
+                        {{ modal_button }}
+                    </form>
+                </li>
+                <li class="usa-button-group__item">
+                    <button
+                        type="button"
+                        class="usa-button usa-button--unstyled padding-105 text-center"
+                        data-close-modal
+                    >
+                        Cancel
+                    </button>
+                </li>
+            </ul>
+        </div>
+    </div>
+    <button
+        type="button"
+        class="usa-button usa-modal__close"
+        aria-label="Close this window"
+        data-close-modal
+    >
+        <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
+            <use xlink:href="/assets/img/sprite.svg#close"></use>
+        </svg>
+    </button>
+</div>
\ No newline at end of file
diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index f7483c6e0..6358bf39a 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -233,6 +233,32 @@ class DomainDNSSECView(DomainPermissionView, FormMixin):
 
     template_name = "domain_dnssec.html"
     form_class = DomainDnssecForm
+    clicked_enable_dns = False
+        
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        """The initial value for the form (which is a formset here)."""
+        self.domain = self.get_object()
+        
+        has_dnssec_records = self.domain.dnssecdata is not None
+        
+        logger.debug(f"clicked_enable_dns {self.clicked_enable_dns}")
+        
+        # if does_not_have_dnssec_records and self.clicked_enable_dns == False:
+        #     logger.debug(f"clicked_enable_dns {self.clicked_enable_dns}")
+        #     self.domain.dnssec_enabled = False
+        #     self.domain.dnssec_ds_confirmed = False
+        #     self.domain.dnssec_key_confirmed = False
+        #     self.domain.save()
+            
+        # Create HTML for the buttons
+        modal_button = '<button type="submit" class="usa-button" name="disable_dnssec">Disable DNSSEC</button>'
+
+        context['modal_button'] = modal_button
+        context['has_dnssec_records'] = has_dnssec_records   
+        context['domain'] = self.domain
+        
+        return context
 
     def get_success_url(self):
         """Redirect to the DNSSEC page for the domain."""
@@ -243,16 +269,8 @@ class DomainDNSSECView(DomainPermissionView, FormMixin):
         """
         self.domain = self.get_object()
         form = self.get_form()
-        if form.is_valid():
-            if 'enable_dnssec' in request.POST:
-                self.domain.dnssec_enabled = True
-                self.domain.save()
-            elif 'cancel' in request.POST:
-                self.domain.dnssec_enabled = False
-                self.domain.dnssec_ds_confirmed = False
-                self.domain.dnssec_key_confirmed = False
-                self.domain.save()                
-            elif 'disable_dnssec' in request.POST:
+        if form.is_valid():             
+            if 'disable_dnssec' in request.POST:
                 try:
                     self.domain.dnssecdata = {}
                 except RegistryError as err:
@@ -261,7 +279,6 @@ class DomainDNSSECView(DomainPermissionView, FormMixin):
                     messages.error(
                         self.request, errmsg
                     )
-                self.domain.dnssec_enabled = False
                 self.domain.dnssec_ds_confirmed = False
                 self.domain.dnssec_key_confirmed = False
                 self.domain.save()

From 13e294d0d2d5bb1eb7b648e0f1798db8c4564f71 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Thu, 5 Oct 2023 16:54:01 -0400
Subject: [PATCH 03/18] clean up JS and dnssec template

---
 src/registrar/assets/js/get-gov.js         | 22 +++---
 src/registrar/templates/domain_dnssec.html | 81 +++-------------------
 src/registrar/views/domain.py              |  6 +-
 3 files changed, 20 insertions(+), 89 deletions(-)

diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index cfe6066e8..36d5f257a 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -472,22 +472,18 @@ function prepareDeleteButtons() {
 // })();
 
 
+function toggleElements() {
+  let element1 = document.getElementById("enable-dnssec");
+  let element2 = document.getElementById("add-records");
+  element1.classList.toggle("display-none");
+  element2.classList.toggle("display-none");
+}
+
 /**
  * 
  *
  */
 (function toggleDNSSECWarning() {
-  document.getElementById("toggler1").addEventListener("click", function () {
-    var element = document.getElementById("step-1");
-    var element2 = document.getElementById("step-2");
-    element.classList.toggle("display-none");
-    element2.classList.toggle("display-none");
-  });
-
-  document.getElementById("toggler2").addEventListener("click", function () {
-    var element = document.getElementById("step-1");
-    var element2 = document.getElementById("step-2");
-    element.classList.toggle("display-none");
-    element2.classList.toggle("display-none");
-  });
+  document.getElementById("enable_dnssec").addEventListener("click", toggleElements);
+  document.getElementById("cancel_dnssec").addEventListener("click", toggleElements);
 })();
\ No newline at end of file
diff --git a/src/registrar/templates/domain_dnssec.html b/src/registrar/templates/domain_dnssec.html
index 80bcd7b50..903020c93 100644
--- a/src/registrar/templates/domain_dnssec.html
+++ b/src/registrar/templates/domain_dnssec.html
@@ -11,7 +11,7 @@
 
   <form class="usa-form usa-form--large" method="post">
     {% csrf_token %}
-    {% if domain.has_dnssec_records %}
+    {% if has_dnssec_records %}
     <div class="usa-alert usa-alert--info usa-alert--slim margin-bottom-3">
       <div class="usa-alert__body">
       In order to fully disable DNSSEC on your domain, you will need to work with your DNS provider to remove your DNSSEC-related records from your zone.
@@ -25,7 +25,7 @@
       >Disable DNSSEC</a
     >
     {% else %}
-    <div id="step-1">
+    <div id="enable-dnssec">
       <div class="usa-alert usa-alert--info usa-alert--slim margin-bottom-3">
         <div class="usa-alert__body">
         It is strongly recommended that you do not enable this unless you fully understand DNSSEC and know how to set it up properly. If you make a mistake, it could cause your domain name to stop working.
@@ -35,11 +35,11 @@
           type="button"
           class="usa-button"
           name="enable_dnssec"
-          id="toggler1"
+          id="enable_dnssec"
       >Enable DNSSEC</button>
     </div>
 
-    <div id="step-2" class="display-none">
+    <div id="add-records" class="display-none">
       <h2> Add DS Records </h2>
       <p>In order to enable DNSSEC and add Delegation Signer (DS) records, you must first configure it with your DNS hosting service. Your configuration will determine whether you need to add DS Data or Key Data. Contact your DNS hosting provider if you are unsure which record type to add.</p>
       <p>
@@ -48,84 +48,21 @@
         <button
           type="button"
           class="usa-button usa-button--unstyled"
-          name="cancel"
-          id="toggler2"
+          name="cancel_dnssec"
+          id="cancel_dnssec"
       >Cancel</button>
       </p>
     </div>
-    
-    
-
-    
-
-    
     {% endif %}
   </form>
 
   <div
     class="usa-modal"
-    id="example-modal-1"
-    aria-labelledby="modal-1-heading"
-    aria-describedby="modal-1-description"
+    id="toggle-dnssec-alert"
+    aria-labelledby="Are you sure you want to continue?"
+    aria-describedby="Your DNSSEC records will be deleted from the registry."
   >
       {% include 'includes/modal.html' with modal_heading="Are you sure you want to continue?" modal_description="Your DNSSEC records will be deleted from the registry." modal_button=modal_button|safe %}
   </div>
 
-
-  {% comment %} <div
-      class="usa-modal"
-      id="example-modal-1"
-      aria-labelledby="modal-1-heading"
-      aria-describedby="modal-1-description"
-    >
-      <div class="usa-modal__content">
-        <div class="usa-modal__main">
-          <h2 class="usa-modal__heading" id="modal-1-heading">
-            Are you sure you want to continue?
-          </h2>
-          <div class="usa-prose">
-            <p id="modal-1-description">
-              Your DNSSEC records will be deleted from the registry.
-            </p>
-          </div>
-
-          
-          <div class="usa-modal__footer">
-            <ul class="usa-button-group">
-              <li class="usa-button-group__item">
-                <form method="post">
-                  {% csrf_token %}
-                  <button
-                      type="submit"
-                      class="usa-button"
-                      name="disable_dnssec"
-                  >Disable DNSSEC</button>
-                </form>
-              </li>
-              <li class="usa-button-group__item">
-                <button
-                  type="button"
-                  class="usa-button usa-button--unstyled padding-105 text-center"
-                  data-close-modal
-                >
-                  Cancel
-                </button>
-              </li>
-            </ul>
-          </div>
-        </div>
-        <button
-          type="button"
-          class="usa-button usa-modal__close"
-          aria-label="Close this window"
-          data-close-modal
-        >
-          <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-            <use xlink:href="/assets/img/sprite.svg#close"></use>
-          </svg>
-        </button>
-      </div>
-    </div> {% endcomment %}
-  
-
 {% endblock %}  {# domain_content #}
diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index 6358bf39a..12ce50606 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -241,9 +241,7 @@ class DomainDNSSECView(DomainPermissionView, FormMixin):
         self.domain = self.get_object()
         
         has_dnssec_records = self.domain.dnssecdata is not None
-        
-        logger.debug(f"clicked_enable_dns {self.clicked_enable_dns}")
-        
+                
         # if does_not_have_dnssec_records and self.clicked_enable_dns == False:
         #     logger.debug(f"clicked_enable_dns {self.clicked_enable_dns}")
         #     self.domain.dnssec_enabled = False
@@ -256,7 +254,7 @@ class DomainDNSSECView(DomainPermissionView, FormMixin):
 
         context['modal_button'] = modal_button
         context['has_dnssec_records'] = has_dnssec_records   
-        context['domain'] = self.domain
+        # context['domain'] = self.domain
         
         return context
 

From 3e8dc743197dcf290c251c634b8416d3de2ed58c Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Thu, 5 Oct 2023 17:36:43 -0400
Subject: [PATCH 04/18] cleanup

---
 src/registrar/assets/js/get-gov.js          | 96 +--------------------
 src/registrar/templates/domain_keydata.html |  5 +-
 2 files changed, 2 insertions(+), 99 deletions(-)

diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index 36d5f257a..99c689ddf 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -279,17 +279,6 @@ function prepareDeleteButtons() {
     let formNum2 = forms.length;
     totalForms.setAttribute('value', `${formNum2}`);
 
-    // We need to fix the indicies of every existing form otherwise 
-    // the frontend and backend will not match and will error on submit
-    // let formNumberRegex = RegExp(`form-(\\d){1}-`,'g');
-    // let formLabelRegex = RegExp(`DS Data record (\\d){1}`, 'g');
-    // forms.forEach((form, index) => {
-    //   form.innerHTML = form.innerHTML.replace(formNumberRegex, `form-${index}-`);
-    //   form.innerHTML = form.innerHTML.replace(formLabelRegex, `DS Data Record ${index+1}`);
-    // });
-
-
-
     let formNumberRegex = RegExp(`form-(\\d){1}-`, 'g');
     let formLabelRegex = RegExp(`DS Data record (\\d){1}`, 'g');
 
@@ -311,10 +300,6 @@ function prepareDeleteButtons() {
       });
     
     });
-
-
-
-
   }
 }
 
@@ -389,89 +374,10 @@ function prepareDeleteButtons() {
 
       // Attach click event listener on the delete buttons of the new form
       prepareDeleteButtons();
-
-      // We need to fix the indicies of every existing form otherwise 
-      // the frontend and backend will not match and will error on submit
-      // forms.forEach((form, index) => {
-      //   form.innerHTML = form.innerHTML.replace(formNumberRegex, `form-${index}-`);
-      //   form.innerHTML = form.innerHTML.replace(formLabelRegex, `DS Data Record ${index+1}`);
-      // });
   }
 
 })();
 
-
-// (function prepareCancelButtons() {
-//   const cancelButton = document.querySelector('.btn-cancel');
-
-//   if (cancelButton) {
-//       cancelButton.addEventListener('click', () => {
-
-//           // Option 2: Redirect to another page (e.g., the homepage)
-
-//           localStorage.clear(); // Clear all localStorage data
-//           sessionStorage.clear(); // Clear all sessionStorage data
-
-//           location.reload();
-//       });
-//   }
-// })();
-
-
-// /**
-//  * An IIFE that attaches a click handler on form cancel buttons
-//  *
-//  */
-// (function prepareCancelButtons() {
-//   const cancelButton = document.querySelector('.btn-cancel');
-
-//   const formsetContainer = document.querySelector('#form-container');
-//   const originalFormHTML = document.querySelector('.ds-record').innerHTML;
-//   const numberOfFormsToReset = document.querySelectorAll('.ds-record').length;
-//   const addNewRecordButton = document.querySelector('#add-ds-form');
-//   const submitButton = document.querySelector('button[type="submit"]');
-
-//   if (cancelButton) {
-//     cancelButton.addEventListener('click', () => {
-//       // Reset the form to its initial values
-//       const form = document.querySelector('form');
-//       resetForm(form);
-//     });
-//   }
-
-//   function resetForm(form) {
-
-//     // Remove all existing forms within the container
-//     formsetContainer.innerHTML = '';
-//     for (let i = 0; i < numberOfFormsToReset; i++) {
-//       formsetContainer.innerHTML += originalFormHTML;
-//     }
-//     formsetContainer.innerHTML += addNewRecordButton
-//     formsetContainer.innerHTML += submitButton
-
-//     const dsRecords = form.querySelectorAll('.ds-record');
-
-//     dsRecords.forEach((record) => {
-//       const initialValuesField = record.querySelector('.initial-values');
-//       const formFields = record.querySelectorAll('input, textarea, select');
-
-//       if (initialValuesField) {
-//         const initialValues = JSON.parse(initialValuesField.value);
-
-//         formFields.forEach((field) => {
-//           const fieldName = field.name;
-//           if (fieldName in initialValues) {
-//             field.value = initialValues[fieldName];
-//           } else {
-//             field.value = ''; // Set to empty if no initial value
-//           }
-//         });
-//       }
-//     });
-//   }
-// })();
-
-
 function toggleElements() {
   let element1 = document.getElementById("enable-dnssec");
   let element2 = document.getElementById("add-records");
@@ -480,7 +386,7 @@ function toggleElements() {
 }
 
 /**
- * 
+ * An IIFE that attaches a click handler to toggle the DNSSEC warning on the DNSSEC landing page
  *
  */
 (function toggleDNSSECWarning() {
diff --git a/src/registrar/templates/domain_keydata.html b/src/registrar/templates/domain_keydata.html
index 1602c5d87..34ce14a4e 100644
--- a/src/registrar/templates/domain_keydata.html
+++ b/src/registrar/templates/domain_keydata.html
@@ -38,7 +38,7 @@
     {% for form in formset %}
     <fieldset class="ds-record">
 
-      <legend class="sr-only">Key Data record {{forloop.counter}}</legend>
+      <legend class="sr-only">DS Data record {{forloop.counter}}</legend>
 
       <h2 class="margin-top-0">DS Data record {{forloop.counter}}</h2>
 
@@ -70,9 +70,6 @@
 
       <div class="grid-row margin-top-2">
         <div class="grid-col">
-          {% comment %} {% with add_group_class="float-right-tablet" %}
-            {% input_with_errors form.delete %}
-          {% endwith %} {% endcomment %}
           <button type="button" class="usa-button usa-button--unstyled display-block float-right-tablet delete-record">
             <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24" height="24">
               <use xlink:href="{%static 'img/sprite.svg'%}#delete"></use>

From ad7b4f3adbc8db31797b502af69dadbcf19ec50c Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Thu, 5 Oct 2023 17:50:41 -0400
Subject: [PATCH 05/18] added cancel button click to domain view

---
 src/registrar/views/domain.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index 12ce50606..105691c37 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -437,7 +437,10 @@ class DomainKeydataView(DomainPermissionView, FormMixin):
             self.object.dnssec_ds_confirmed = False
             self.object.save()
             return super().form_valid(formset)
-
+        
+        if 'btn-cancel-click' in request.POST:
+            return redirect('/', {'formset': formset},RequestContext(request))
+        
         if formset.is_valid():
             return self.form_valid(formset)
         else:

From e6d2ad32635de5c77f448b77ed422eca9bc0095f Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Thu, 5 Oct 2023 18:08:39 -0400
Subject: [PATCH 06/18] JS cleanup, form error alert on form pages

---
 src/registrar/assets/js/get-gov.js         | 11 +++++---
 src/registrar/forms/domain.py              | 29 +++++++++++++++++++---
 src/registrar/templates/domain_dnssec.html |  1 +
 src/registrar/templates/domain_dsdata.html |  9 +++----
 4 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index 99c689ddf..3a7d81ba5 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -316,9 +316,8 @@ function prepareDeleteButtons() {
   // Attach click event listener on the delete buttons of the existing forms
   prepareDeleteButtons();
 
-  if (addButton) {
+  if (addButton)
     addButton.addEventListener('click', addForm);
-  }
 
   function addForm(e){
       let forms = document.querySelectorAll(".ds-record");
@@ -390,6 +389,10 @@ function toggleElements() {
  *
  */
 (function toggleDNSSECWarning() {
-  document.getElementById("enable_dnssec").addEventListener("click", toggleElements);
-  document.getElementById("cancel_dnssec").addEventListener("click", toggleElements);
+  let toggle1 = document.getElementById("enable_dnssec");
+  if (toggle1)
+    toggle1.addEventListener("click", toggleElements);
+  let toggle2 = document.getElementById("cancel_dnssec");
+  if (toggle2)
+    toggle2.addEventListener("click", toggleElements);
 })();
\ No newline at end of file
diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index 6ebaa3be9..a9c736175 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -154,27 +154,38 @@ class DomainDsdataForm(forms.Form):
         required=True,
         label="Key tag",
         validators=[
-            MinValueValidator(0, "Value must be between 0 and 65535"),
-            MaxValueValidator(65535, "Value must be between 0 and 65535"),
+            MinValueValidator(0, message="Value must be between 0 and 65535"),
+            MaxValueValidator(65535, message="Value must be between 0 and 65535"),
         ],
+        error_messages={
+            "required": ("Key tag is required.")
+        },
     )
     
     algorithm = forms.TypedChoiceField(
         required=True,
         label="Algorithm",
         choices=[(None, "--Select--")] + ALGORITHM_CHOICES,
+        error_messages={
+            "required": ("Algorithm is required.")
+        },
     )
 
     digest_type = forms.TypedChoiceField(
         required=True,
         label="Digest Type",
         choices=[(None, "--Select--")] + DIGEST_TYPE_CHOICES,
+        error_messages={
+            "required": ("Digest Type is required.")
+        },
     )
 
     digest = forms.CharField(
         required=True,
         label="Digest",
-        # TODO: Validation of digests in registrar?
+        error_messages={
+            "required": ("Digest is required.")
+        },
     )
 
 
@@ -193,23 +204,35 @@ class DomainKeydataForm(forms.Form):
         required=True,
         label="Flag",
         choices=FLAG_CHOICES,
+        error_messages={
+            "required": ("Flag is required.")
+        },
     )
 
     protocol = forms.TypedChoiceField(
         required=True,
         label="Protocol",
         choices=PROTOCOL_CHOICES,
+        error_messages={
+            "required": ("Protocol is required.")
+        },
     )
 
     algorithm = forms.TypedChoiceField(
         required=True,
         label="Algorithm",
         choices=[(None, "--Select--")] + ALGORITHM_CHOICES,
+        error_messages={
+            "required": ("Algorithm is required.")
+        },
     )
     
     pub_key = forms.CharField(
         required=True,
         label="Pub key",
+        error_messages={
+            "required": ("Pub key is required.")
+        },
     )
 
 
diff --git a/src/registrar/templates/domain_dnssec.html b/src/registrar/templates/domain_dnssec.html
index 903020c93..c87fc9152 100644
--- a/src/registrar/templates/domain_dnssec.html
+++ b/src/registrar/templates/domain_dnssec.html
@@ -39,6 +39,7 @@
       >Enable DNSSEC</button>
     </div>
 
+    {% comment %} display: none is sufficient on hidden elements for accessibility (removes accessibility tree) {% endcomment %}
     <div id="add-records" class="display-none">
       <h2> Add DS Records </h2>
       <p>In order to enable DNSSEC and add Delegation Signer (DS) records, you must first configure it with your DNS hosting service. Your configuration will determine whether you need to add DS Data or Key Data. Contact your DNS hosting provider if you are unsure which record type to add.</p>
diff --git a/src/registrar/templates/domain_dsdata.html b/src/registrar/templates/domain_dsdata.html
index 0de7f4730..585b4a981 100644
--- a/src/registrar/templates/domain_dsdata.html
+++ b/src/registrar/templates/domain_dsdata.html
@@ -4,6 +4,9 @@
 {% block title %}DS Data | {{ domain.name }} | {% endblock %}
 
 {% block domain_content %}
+  {% for form in formset %}
+    {% include "includes/form_errors.html" with form=form %}
+  {% endfor %}
 
   <h1>DS Data</h1>
 
@@ -70,9 +73,6 @@
 
       <div class="grid-row margin-top-1">
         <div class="grid-col">
-          {% comment %} {% with add_group_class="float-right-tablet" %}
-            {% input_with_errors form.delete %}
-          {% endwith %} {% endcomment %}
           <button type="button" class="usa-button usa-button--unstyled display-block float-right-tablet delete-record">
             <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24" height="24">
               <use xlink:href="{%static 'img/sprite.svg'%}#delete"></use>
@@ -81,9 +81,6 @@
         </div>
       </div>
 
-      <!-- Hidden field to store initial values -->
-      {% comment %} <input type="hidden" class="initial-values" value="{{ form.initial|escapejs }}"> {% endcomment %}
-
     </fieldset>
     {% endfor %}
 

From b899b35285796b113aa581001b884d65909f33fa Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Thu, 5 Oct 2023 18:09:37 -0400
Subject: [PATCH 07/18] form error msgs on keydata form

---
 src/registrar/templates/domain_keydata.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/registrar/templates/domain_keydata.html b/src/registrar/templates/domain_keydata.html
index 34ce14a4e..cea62e71a 100644
--- a/src/registrar/templates/domain_keydata.html
+++ b/src/registrar/templates/domain_keydata.html
@@ -4,6 +4,9 @@
 {% block title %}Key Data | {{ domain.name }} | {% endblock %}
 
 {% block domain_content %}
+  {% for form in formset %}
+    {% include "includes/form_errors.html" with form=form %}
+  {% endfor %}
 
   <h1>Key Data</h1>
 

From a6cfd343e8ea805cabba49eff5ee571940d64788 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 6 Oct 2023 07:05:45 -0400
Subject: [PATCH 08/18] removed js for hide and show on dnssec main page;
 handling flags in app with session variables rather than model attributes

---
 src/registrar/assets/js/get-gov.js          | 20 --------
 src/registrar/templates/domain_dnssec.html  | 37 +++++++--------
 src/registrar/templates/domain_dsdata.html  |  2 +-
 src/registrar/templates/domain_keydata.html |  2 +-
 src/registrar/views/domain.py               | 52 ++++++++++++++-------
 5 files changed, 54 insertions(+), 59 deletions(-)

diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index 3a7d81ba5..4b5ff5e31 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -376,23 +376,3 @@ function prepareDeleteButtons() {
   }
 
 })();
-
-function toggleElements() {
-  let element1 = document.getElementById("enable-dnssec");
-  let element2 = document.getElementById("add-records");
-  element1.classList.toggle("display-none");
-  element2.classList.toggle("display-none");
-}
-
-/**
- * An IIFE that attaches a click handler to toggle the DNSSEC warning on the DNSSEC landing page
- *
- */
-(function toggleDNSSECWarning() {
-  let toggle1 = document.getElementById("enable_dnssec");
-  if (toggle1)
-    toggle1.addEventListener("click", toggleElements);
-  let toggle2 = document.getElementById("cancel_dnssec");
-  if (toggle2)
-    toggle2.addEventListener("click", toggleElements);
-})();
\ No newline at end of file
diff --git a/src/registrar/templates/domain_dnssec.html b/src/registrar/templates/domain_dnssec.html
index c87fc9152..4763ff3c1 100644
--- a/src/registrar/templates/domain_dnssec.html
+++ b/src/registrar/templates/domain_dnssec.html
@@ -5,9 +5,9 @@
 
 {% block domain_content %}
 
-  <h1>DNSSEC</h1>
+  <h1>{% if dnssec_enabled %}Set up {% endif %}DNSSEC</h1>
 
-  <p>DNSSEC, or DNS Security Extensions, is additional security layer to protect your website. Enabling DNSSEC ensures that when someone visits your website, they can be certain that it's connecting to the correct server, preventing potential hijacking or tampering with your domain's records. <a href="https://www.icann.org/resources/pages/dnssec-what-is-it-why-important-2019-03-05-en">Read more about DNSSEC and why it is important.</a></p>
+  <p>DNSSEC, or DNS Security Extensions, is additional security layer to protect your website. Enabling DNSSEC ensures that when someone visits your website, they can be certain that it's connecting to the correct server, preventing potential hijacking or tampering with your domain's records.</p>
 
   <form class="usa-form usa-form--large" method="post">
     {% csrf_token %}
@@ -24,6 +24,21 @@
       data-open-modal
       >Disable DNSSEC</a
     >
+    {% elif dnssec_enabled %}
+    <div id="add-records">
+      <h2> Add DS Records </h2>
+      <p>In order to enable DNSSEC and add Delegation Signer (DS) records, you must first configure it with your DNS hosting service. Your configuration will determine whether you need to add DS Data or Key Data. Contact your DNS hosting provider if you are unsure which record type to add.</p>
+      <p>
+        <a href="{% url 'domain-dns-dnssec-dsdata' pk=domain.id %}" class="usa-button usa-button--outline">Add DS Data</a>
+        <a href="{% url 'domain-dns-dnssec-keydata' pk=domain.id %}" class="usa-button usa-button--outline">Add Key Data</a>
+        <button
+          type="submit"
+          class="usa-button usa-button--unstyled"
+          name="cancel_dnssec"
+          id="cancel_dnssec"
+      >Cancel</button>
+      </p>
+    </div>
     {% else %}
     <div id="enable-dnssec">
       <div class="usa-alert usa-alert--info usa-alert--slim margin-bottom-3">
@@ -32,28 +47,12 @@
         </div>
       </div>
       <button
-          type="button"
+          type="submit"
           class="usa-button"
           name="enable_dnssec"
           id="enable_dnssec"
       >Enable DNSSEC</button>
     </div>
-
-    {% comment %} display: none is sufficient on hidden elements for accessibility (removes accessibility tree) {% endcomment %}
-    <div id="add-records" class="display-none">
-      <h2> Add DS Records </h2>
-      <p>In order to enable DNSSEC and add Delegation Signer (DS) records, you must first configure it with your DNS hosting service. Your configuration will determine whether you need to add DS Data or Key Data. Contact your DNS hosting provider if you are unsure which record type to add.</p>
-      <p>
-        <a href="{% url 'domain-dns-dnssec-dsdata' pk=domain.id %}" class="usa-button usa-button--outline">Add DS Data</a>
-        <a href="{% url 'domain-dns-dnssec-keydata' pk=domain.id %}" class="usa-button usa-button--outline">Add Key Data</a>
-        <button
-          type="button"
-          class="usa-button usa-button--unstyled"
-          name="cancel_dnssec"
-          id="cancel_dnssec"
-      >Cancel</button>
-      </p>
-    </div>
     {% endif %}
   </form>
 
diff --git a/src/registrar/templates/domain_dsdata.html b/src/registrar/templates/domain_dsdata.html
index 585b4a981..2ad162360 100644
--- a/src/registrar/templates/domain_dsdata.html
+++ b/src/registrar/templates/domain_dsdata.html
@@ -19,7 +19,7 @@
       </p>
     </div>
   </div>
-  {% elif not domain.dnssec_ds_confirmed %}
+  {% elif not dnssec_ds_confirmed %}
     <p>In order to enable DNSSEC and add DS records, you must first configure it with your DNS hosting service. Your configuration will determine whether you need to add DS Data or Key Data. Contact your DNS hosting provider if you are unsure which record type to add.</p>
     <form class="usa-form usa-form--large" method="post" novalidate id="form-container">
       {% csrf_token %}
diff --git a/src/registrar/templates/domain_keydata.html b/src/registrar/templates/domain_keydata.html
index cea62e71a..a5d2f610c 100644
--- a/src/registrar/templates/domain_keydata.html
+++ b/src/registrar/templates/domain_keydata.html
@@ -19,7 +19,7 @@
       </p>
     </div>
   </div>
-  {% elif not domain.dnssec_key_confirmed %}
+  {% elif not dnssec_key_confirmed %}
     <p>In order to enable DNSSEC and add DS records, you must first configure it with your DNS hosting service. Your configuration will determine whether you need to add DS Data or Key Data. Contact your DNS hosting provider if you are unsure which record type to add.</p>
     <form class="usa-form usa-form--large" method="post" novalidate id="form-container">
       {% csrf_token %}
diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index 105691c37..fd5d22651 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -233,7 +233,6 @@ class DomainDNSSECView(DomainPermissionView, FormMixin):
 
     template_name = "domain_dnssec.html"
     form_class = DomainDnssecForm
-    clicked_enable_dns = False
         
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -242,20 +241,13 @@ class DomainDNSSECView(DomainPermissionView, FormMixin):
         
         has_dnssec_records = self.domain.dnssecdata is not None
                 
-        # if does_not_have_dnssec_records and self.clicked_enable_dns == False:
-        #     logger.debug(f"clicked_enable_dns {self.clicked_enable_dns}")
-        #     self.domain.dnssec_enabled = False
-        #     self.domain.dnssec_ds_confirmed = False
-        #     self.domain.dnssec_key_confirmed = False
-        #     self.domain.save()
-            
         # Create HTML for the buttons
         modal_button = '<button type="submit" class="usa-button" name="disable_dnssec">Disable DNSSEC</button>'
 
         context['modal_button'] = modal_button
         context['has_dnssec_records'] = has_dnssec_records   
-        # context['domain'] = self.domain
-        
+        context['dnssec_enabled'] = self.request.session.pop('dnssec_enabled', False)
+
         return context
 
     def get_success_url(self):
@@ -277,9 +269,12 @@ class DomainDNSSECView(DomainPermissionView, FormMixin):
                     messages.error(
                         self.request, errmsg
                     )
-                self.domain.dnssec_ds_confirmed = False
-                self.domain.dnssec_key_confirmed = False
-                self.domain.save()
+                request.session['dnssec_ds_confirmed'] = False
+                request.session['dnssec_key_confirmed'] = False
+            elif 'enable_dnssec' in request.POST:
+                request.session['dnssec_enabled'] = True
+                request.session['dnssec_ds_confirmed'] = False
+                request.session['dnssec_key_confirmed'] = False
         
         return self.form_valid(form)
 
@@ -323,6 +318,17 @@ class DomainDsdataView(DomainPermissionView, FormMixin):
         context = super().get_context_data(**kwargs)
         # use "formset" instead of "form" for the key
         context["formset"] = context.pop("form")
+
+        # set the dnssec_ds_confirmed flag in the context for this view 
+        # based either on the existence of DS Data in the domain,
+        # or on the flag stored in the session
+        domain = self.get_object()
+        dnssecdata: extensions.DNSSECExtension = domain.dnssecdata
+
+        if dnssecdata is not None and dnssecdata.dsData is not None:
+            self.request.session['dnssec_ds_confirmed'] = True
+
+        context['dnssec_ds_confirmed'] = self.request.session.get('dnssec_ds_confirmed', False)
         return context
 
     def post(self, request, *args, **kwargs):
@@ -331,9 +337,8 @@ class DomainDsdataView(DomainPermissionView, FormMixin):
         formset = self.get_form()
 
         if 'confirm-ds' in request.POST:
-            self.object.dnssec_ds_confirmed = True
-            self.object.dnssec_key_confirmed = False
-            self.object.save()
+            request.session['dnssec_ds_confirmed'] = True
+            request.session['dnssec_key_confirmed'] = False
             return super().form_valid(formset)
         
         if 'btn-cancel-click' in request.POST:
@@ -425,6 +430,17 @@ class DomainKeydataView(DomainPermissionView, FormMixin):
         context = super().get_context_data(**kwargs)
         # use "formset" instead of "form" for the key
         context["formset"] = context.pop("form")
+
+        # set the dnssec_key_confirmed flag in the context for this view 
+        # based either on the existence of Key Data in the domain,
+        # or on the flag stored in the session
+        domain = self.get_object()
+        dnssecdata: extensions.DNSSECExtension = domain.dnssecdata
+
+        if dnssecdata is not None and dnssecdata.keyData is not None:
+            self.request.session['dnssec_key_confirmed'] = True
+
+        context['dnssec_key_confirmed'] = self.request.session.get('dnssec_key_confirmed', False)
         return context
 
     def post(self, request, *args, **kwargs):
@@ -433,8 +449,8 @@ class DomainKeydataView(DomainPermissionView, FormMixin):
         formset = self.get_form()
         
         if 'confirm-key' in request.POST:
-            self.object.dnssec_key_confirmed = True
-            self.object.dnssec_ds_confirmed = False
+            request.session['dnssec_key_confirmed'] = True
+            request.session['dnssec_ds_confirmed'] = False
             self.object.save()
             return super().form_valid(formset)
         

From ba8901bf272822427aa622f9d9d56542da4c552c Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 6 Oct 2023 07:56:44 -0400
Subject: [PATCH 09/18] removing unnecessary domain attributes

---
 ...ove_domain_dnssec_ds_confirmed_and_more.py | 24 +++++++++++++++++++
 src/registrar/models/domain.py                | 15 ------------
 2 files changed, 24 insertions(+), 15 deletions(-)
 create mode 100644 src/registrar/migrations/0035_remove_domain_dnssec_ds_confirmed_and_more.py

diff --git a/src/registrar/migrations/0035_remove_domain_dnssec_ds_confirmed_and_more.py b/src/registrar/migrations/0035_remove_domain_dnssec_ds_confirmed_and_more.py
new file mode 100644
index 000000000..8b7b7566e
--- /dev/null
+++ b/src/registrar/migrations/0035_remove_domain_dnssec_ds_confirmed_and_more.py
@@ -0,0 +1,24 @@
+# Generated by Django 4.2.1 on 2023-10-06 11:50
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("registrar", "0034_domain_dnssec_ds_confirmed_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="domain",
+            name="dnssec_ds_confirmed",
+        ),
+        migrations.RemoveField(
+            model_name="domain",
+            name="dnssec_enabled",
+        ),
+        migrations.RemoveField(
+            model_name="domain",
+            name="dnssec_key_confirmed",
+        ),
+    ]
diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py
index 56a1a53cb..7a890632c 100644
--- a/src/registrar/models/domain.py
+++ b/src/registrar/models/domain.py
@@ -702,21 +702,6 @@ class Domain(TimeStampedModel, DomainHelper):
         help_text="Very basic info about the lifecycle of this domain object",
     )
 
-    dnssec_enabled = models.BooleanField(
-        default=False,
-        help_text="Boolean indicating if dnssec is enabled",
-    )
-    
-    dnssec_ds_confirmed = models.BooleanField(
-        default=False,
-        help_text="Boolean indicating if DS record adding is confirmed",
-    )
-    
-    dnssec_key_confirmed = models.BooleanField(
-        default=False,
-        help_text="Boolean indicating if Key record adding is confirmed",
-    )
-
     # ForeignKey on UserDomainRole creates a "permissions" member for
     # all of the user-roles that are in place for this domain
 

From 88bcb1eedcccae3b8f997324890923111da90a92 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Fri, 6 Oct 2023 10:12:10 -0400
Subject: [PATCH 10/18] fix modal ui

---
 src/registrar/assets/sass/_theme/_buttons.scss | 8 ++++++++
 src/registrar/templates/domain_dnssec.html     | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/registrar/assets/sass/_theme/_buttons.scss b/src/registrar/assets/sass/_theme/_buttons.scss
index 45ea6620c..f4c72f4fa 100644
--- a/src/registrar/assets/sass/_theme/_buttons.scss
+++ b/src/registrar/assets/sass/_theme/_buttons.scss
@@ -24,6 +24,14 @@ a.breadcrumb__back {
 
 a.usa-button {
   text-decoration: none;
+  color: color('white');
+}
+
+a.usa-button:visited,
+a.usa-button:hover,
+a.usa-button:focus,
+a.usa-button:active {
+  color: color('white');
 }
   
 a.usa-button--outline,
diff --git a/src/registrar/templates/domain_dnssec.html b/src/registrar/templates/domain_dnssec.html
index 4763ff3c1..6a0a15389 100644
--- a/src/registrar/templates/domain_dnssec.html
+++ b/src/registrar/templates/domain_dnssec.html
@@ -18,9 +18,9 @@
       </div>
     </div>
     <a
-      href="#example-modal-1"
+      href="#toggle-dnssec-alert"
       class="usa-button"
-      aria-controls="example-modal-1"
+      aria-controls="toggle-dnssec-alert"
       data-open-modal
       >Disable DNSSEC</a
     >

From a0f7cd5e1dda8d8320d99af921a6bff16c82b88f Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 6 Oct 2023 12:04:56 -0400
Subject: [PATCH 11/18] shared mock data for dnssec unit tests

---
 src/registrar/tests/common.py             |  63 +++++++-
 src/registrar/tests/test_models_domain.py | 168 +++++-----------------
 2 files changed, 94 insertions(+), 137 deletions(-)

diff --git a/src/registrar/tests/common.py b/src/registrar/tests/common.py
index 10c387099..9291aa271 100644
--- a/src/registrar/tests/common.py
+++ b/src/registrar/tests/common.py
@@ -7,7 +7,7 @@ import random
 from string import ascii_uppercase
 from django.test import TestCase
 from unittest.mock import MagicMock, Mock, patch
-from typing import List, Dict
+from typing import List, Dict, Mapping, Any
 
 from django.conf import settings
 from django.contrib.auth import get_user_model, login
@@ -26,6 +26,7 @@ from registrar.models import (
 from epplibwrapper import (
     commands,
     common,
+    extensions,
     RegistryError,
     ErrorCode,
 )
@@ -584,6 +585,37 @@ class MockEppLib(TestCase):
     mockDataInfoHosts = fakedEppObject(
         "lastPw", cr_date=datetime.datetime(2023, 8, 25, 19, 45, 35)
     )
+    addDsData1 = {
+        "keyTag": 1234,
+        "alg": 3,
+        "digestType": 1,
+        "digest": "ec0bdd990b39feead889f0ba613db4adec0bdd99",
+    }
+    addDsData2 = {
+        "keyTag": 2345,
+        "alg": 3,
+        "digestType": 1,
+        "digest": "ec0bdd990b39feead889f0ba613db4adecb4adec",
+    }
+    keyDataDict = {
+        "flags": 257,
+        "protocol": 3,
+        "alg": 1,
+        "pubKey": "AQPJ////4Q==",
+    }
+    dnssecExtensionWithDsData: Mapping[str, Any] = {
+        "dsData": [common.DSData(**addDsData1)]
+    }
+    dnssecExtensionWithMultDsData: Mapping[str, Any] = {
+        "dsData": [
+            common.DSData(**addDsData1),
+            common.DSData(**addDsData2),
+        ],
+    }
+    dnssecExtensionWithKeyData: Mapping[str, Any] = {
+        "maxSigLife": 3215,
+        "keyData": [common.DNSSECKeyData(**keyDataDict)],
+    }
 
     def mockSend(self, _request, cleaned):
         """Mocks the registry.send function used inside of domain.py
@@ -593,6 +625,30 @@ class MockEppLib(TestCase):
         if isinstance(_request, commands.InfoDomain):
             if getattr(_request, "name", None) == "security.gov":
                 return MagicMock(res_data=[self.infoDomainNoContact])
+            elif getattr(_request, "name", None) == "dnssec-dsdata.gov":
+                return MagicMock(
+                    res_data=[self.mockDataInfoDomain],
+                    extensions=[
+                        extensions.DNSSECExtension(**self.dnssecExtensionWithDsData)
+                    ],
+                )
+            elif getattr(_request, "name", None) == "dnssec-multdsdata.gov":
+                return MagicMock(
+                    res_data=[self.mockDataInfoDomain],
+                    extensions=[
+                        extensions.DNSSECExtension(**self.dnssecExtensionWithMultDsData)
+                    ],
+                )
+            elif getattr(_request, "name", None) == "dnssec-keydata.gov":
+                return MagicMock(
+                    res_data=[self.mockDataInfoDomain],
+                    extensions=[
+                        extensions.DNSSECExtension(**self.dnssecExtensionWithKeyData)
+                    ],
+                )
+            elif getattr(_request, "name", None) == "dnssec-none.gov":
+                # this case is not necessary, but helps improve readability
+                return MagicMock(res_data=[self.mockDataInfoDomain])
             return MagicMock(res_data=[self.mockDataInfoDomain])
         elif isinstance(_request, commands.InfoContact):
             return MagicMock(res_data=[self.mockDataInfoContact])
@@ -614,6 +670,11 @@ class MockEppLib(TestCase):
                 raise RegistryError(
                     code=ErrorCode.OBJECT_ASSOCIATION_PROHIBITS_OPERATION
                 )
+        elif (
+            isinstance(_request, commands.UpdateDomain)
+            and getattr(_request, "name", None) == "dnssec-invalid.gov"
+        ):
+            raise RegistryError(code=ErrorCode.PARAMETER_VALUE_RANGE_ERROR)
         return MagicMock(res_data=[self.mockDataInfoHosts])
 
     def setUp(self):
diff --git a/src/registrar/tests/test_models_domain.py b/src/registrar/tests/test_models_domain.py
index 16dd30017..6f164d1f4 100644
--- a/src/registrar/tests/test_models_domain.py
+++ b/src/registrar/tests/test_models_domain.py
@@ -3,7 +3,6 @@ Feature being tested: Registry Integration
 
 This file tests the various ways in which the registrar interacts with the registry.
 """
-from typing import Mapping, Any
 from django.test import TestCase
 from django.db.utils import IntegrityError
 from unittest.mock import MagicMock, patch, call
@@ -803,37 +802,7 @@ class TestRegistrantDNSSEC(MockEppLib):
         super().setUp()
         # for the tests, need a domain in the unknown state
         self.domain, _ = Domain.objects.get_or_create(name="fake.gov")
-        self.addDsData1 = {
-            "keyTag": 1234,
-            "alg": 3,
-            "digestType": 1,
-            "digest": "ec0bdd990b39feead889f0ba613db4adec0bdd99",
-        }
-        self.addDsData2 = {
-            "keyTag": 2345,
-            "alg": 3,
-            "digestType": 1,
-            "digest": "ec0bdd990b39feead889f0ba613db4adecb4adec",
-        }
-        self.keyDataDict = {
-            "flags": 257,
-            "protocol": 3,
-            "alg": 1,
-            "pubKey": "AQPJ////4Q==",
-        }
-        self.dnssecExtensionWithDsData: Mapping[str, Any] = {
-            "dsData": [common.DSData(**self.addDsData1)]
-        }
-        self.dnssecExtensionWithMultDsData: Mapping[str, Any] = {
-            "dsData": [
-                common.DSData(**self.addDsData1),
-                common.DSData(**self.addDsData2),
-            ],
-        }
-        self.dnssecExtensionWithKeyData: Mapping[str, Any] = {
-            "maxSigLife": 3215,
-            "keyData": [common.DNSSECKeyData(**self.keyDataDict)],
-        }
+        
 
     def tearDown(self):
         Domain.objects.all().delete()
@@ -852,26 +821,13 @@ class TestRegistrantDNSSEC(MockEppLib):
 
         """
 
-        # make sure to stop any other patcher so there are no conflicts
-        self.mockSendPatch.stop()
+        domain, _ = Domain.objects.get_or_create(name="dnssec-dsdata.gov")
 
-        def side_effect(_request, cleaned):
-            return MagicMock(
-                res_data=[self.mockDataInfoDomain],
-                extensions=[
-                    extensions.DNSSECExtension(**self.dnssecExtensionWithDsData)
-                ],
-            )
-
-        patcher = patch("registrar.models.domain.registry.send")
-        mocked_send = patcher.start()
-        mocked_send.side_effect = side_effect
-
-        self.domain.dnssecdata = self.dnssecExtensionWithDsData
+        domain.dnssecdata = self.dnssecExtensionWithDsData
         # get the DNS SEC extension added to the UpdateDomain command and
         # verify that it is properly sent
         # args[0] is the _request sent to registry
-        args, _ = mocked_send.call_args
+        args, _ = self.mockedSendFunction.call_args
         # assert that the extension matches
         self.assertEquals(
             args[0].extensions[0],
@@ -880,12 +836,12 @@ class TestRegistrantDNSSEC(MockEppLib):
             ),
         )
         # test that the dnssecdata getter is functioning properly
-        dnssecdata_get = self.domain.dnssecdata
-        mocked_send.assert_has_calls(
+        dnssecdata_get = domain.dnssecdata
+        self.mockedSendFunction.assert_has_calls(
             [
                 call(
                     commands.UpdateDomain(
-                        name="fake.gov",
+                        name="dnssec-dsdata.gov",
                         nsset=None,
                         keyset=None,
                         registrant=None,
@@ -895,7 +851,7 @@ class TestRegistrantDNSSEC(MockEppLib):
                 ),
                 call(
                     commands.InfoDomain(
-                        name="fake.gov",
+                        name="dnssec-dsdata.gov",
                     ),
                     cleaned=True,
                 ),
@@ -906,8 +862,6 @@ class TestRegistrantDNSSEC(MockEppLib):
             dnssecdata_get.dsData, self.dnssecExtensionWithDsData["dsData"]
         )
 
-        patcher.stop()
-
     def test_dnssec_is_idempotent(self):
         """
         Scenario: Registrant adds DNS data twice, due to a UI glitch
@@ -923,32 +877,19 @@ class TestRegistrantDNSSEC(MockEppLib):
 
         """
 
-        # make sure to stop any other patcher so there are no conflicts
-        self.mockSendPatch.stop()
-
-        def side_effect(_request, cleaned):
-            return MagicMock(
-                res_data=[self.mockDataInfoDomain],
-                extensions=[
-                    extensions.DNSSECExtension(**self.dnssecExtensionWithDsData)
-                ],
-            )
-
-        patcher = patch("registrar.models.domain.registry.send")
-        mocked_send = patcher.start()
-        mocked_send.side_effect = side_effect
+        domain, _ = Domain.objects.get_or_create(name="dnssec-dsdata.gov")
 
         # set the dnssecdata once
-        self.domain.dnssecdata = self.dnssecExtensionWithDsData
+        domain.dnssecdata = self.dnssecExtensionWithDsData
         # set the dnssecdata again
-        self.domain.dnssecdata = self.dnssecExtensionWithDsData
+        domain.dnssecdata = self.dnssecExtensionWithDsData
         # test that the dnssecdata getter is functioning properly
-        dnssecdata_get = self.domain.dnssecdata
-        mocked_send.assert_has_calls(
+        dnssecdata_get = domain.dnssecdata
+        self.mockedSendFunction.assert_has_calls(
             [
                 call(
                     commands.UpdateDomain(
-                        name="fake.gov",
+                        name="dnssec-dsdata.gov",
                         nsset=None,
                         keyset=None,
                         registrant=None,
@@ -958,7 +899,7 @@ class TestRegistrantDNSSEC(MockEppLib):
                 ),
                 call(
                     commands.UpdateDomain(
-                        name="fake.gov",
+                        name="dnssec-dsdata.gov",
                         nsset=None,
                         keyset=None,
                         registrant=None,
@@ -968,7 +909,7 @@ class TestRegistrantDNSSEC(MockEppLib):
                 ),
                 call(
                     commands.InfoDomain(
-                        name="fake.gov",
+                        name="dnssec-dsdata.gov",
                     ),
                     cleaned=True,
                 ),
@@ -979,8 +920,6 @@ class TestRegistrantDNSSEC(MockEppLib):
             dnssecdata_get.dsData, self.dnssecExtensionWithDsData["dsData"]
         )
 
-        patcher.stop()
-
     def test_user_adds_dnssec_data_multiple_dsdata(self):
         """
         Scenario: Registrant adds DNSSEC data with multiple DSData.
@@ -994,26 +933,13 @@ class TestRegistrantDNSSEC(MockEppLib):
 
         """
 
-        # make sure to stop any other patcher so there are no conflicts
-        self.mockSendPatch.stop()
+        domain, _ = Domain.objects.get_or_create(name="dnssec-multdsdata.gov")
 
-        def side_effect(_request, cleaned):
-            return MagicMock(
-                res_data=[self.mockDataInfoDomain],
-                extensions=[
-                    extensions.DNSSECExtension(**self.dnssecExtensionWithMultDsData)
-                ],
-            )
-
-        patcher = patch("registrar.models.domain.registry.send")
-        mocked_send = patcher.start()
-        mocked_send.side_effect = side_effect
-
-        self.domain.dnssecdata = self.dnssecExtensionWithMultDsData
+        domain.dnssecdata = self.dnssecExtensionWithMultDsData
         # get the DNS SEC extension added to the UpdateDomain command
         # and verify that it is properly sent
         # args[0] is the _request sent to registry
-        args, _ = mocked_send.call_args
+        args, _ = self.mockedSendFunction.call_args
         # assert that the extension matches
         self.assertEquals(
             args[0].extensions[0],
@@ -1022,12 +948,12 @@ class TestRegistrantDNSSEC(MockEppLib):
             ),
         )
         # test that the dnssecdata getter is functioning properly
-        dnssecdata_get = self.domain.dnssecdata
-        mocked_send.assert_has_calls(
+        dnssecdata_get = domain.dnssecdata
+        self.mockedSendFunction.assert_has_calls(
             [
                 call(
                     commands.UpdateDomain(
-                        name="fake.gov",
+                        name="dnssec-multdsdata.gov",
                         nsset=None,
                         keyset=None,
                         registrant=None,
@@ -1037,7 +963,7 @@ class TestRegistrantDNSSEC(MockEppLib):
                 ),
                 call(
                     commands.InfoDomain(
-                        name="fake.gov",
+                        name="dnssec-multdsdata.gov",
                     ),
                     cleaned=True,
                 ),
@@ -1048,8 +974,6 @@ class TestRegistrantDNSSEC(MockEppLib):
             dnssecdata_get.dsData, self.dnssecExtensionWithMultDsData["dsData"]
         )
 
-        patcher.stop()
-
     def test_user_adds_dnssec_keydata(self):
         """
         Scenario: Registrant adds DNSSEC data.
@@ -1063,26 +987,13 @@ class TestRegistrantDNSSEC(MockEppLib):
 
         """
 
-        # make sure to stop any other patcher so there are no conflicts
-        self.mockSendPatch.stop()
+        domain, _ = Domain.objects.get_or_create(name="dnssec-keydata.gov")
 
-        def side_effect(_request, cleaned):
-            return MagicMock(
-                res_data=[self.mockDataInfoDomain],
-                extensions=[
-                    extensions.DNSSECExtension(**self.dnssecExtensionWithKeyData)
-                ],
-            )
-
-        patcher = patch("registrar.models.domain.registry.send")
-        mocked_send = patcher.start()
-        mocked_send.side_effect = side_effect
-
-        self.domain.dnssecdata = self.dnssecExtensionWithKeyData
+        domain.dnssecdata = self.dnssecExtensionWithKeyData
         # get the DNS SEC extension added to the UpdateDomain command
         # and verify that it is properly sent
         # args[0] is the _request sent to registry
-        args, _ = mocked_send.call_args
+        args, _ = self.mockedSendFunction.call_args
         # assert that the extension matches
         self.assertEquals(
             args[0].extensions[0],
@@ -1091,12 +1002,12 @@ class TestRegistrantDNSSEC(MockEppLib):
             ),
         )
         # test that the dnssecdata getter is functioning properly
-        dnssecdata_get = self.domain.dnssecdata
-        mocked_send.assert_has_calls(
+        dnssecdata_get = domain.dnssecdata
+        self.mockedSendFunction.assert_has_calls(
             [
                 call(
                     commands.UpdateDomain(
-                        name="fake.gov",
+                        name="dnssec-keydata.gov",
                         nsset=None,
                         keyset=None,
                         registrant=None,
@@ -1106,7 +1017,7 @@ class TestRegistrantDNSSEC(MockEppLib):
                 ),
                 call(
                     commands.InfoDomain(
-                        name="fake.gov",
+                        name="dnssec-keydata.gov",
                     ),
                     cleaned=True,
                 ),
@@ -1117,8 +1028,6 @@ class TestRegistrantDNSSEC(MockEppLib):
             dnssecdata_get.keyData, self.dnssecExtensionWithKeyData["keyData"]
         )
 
-        patcher.stop()
-
     def test_update_is_unsuccessful(self):
         """
         Scenario: An update to the dns data is unsuccessful
@@ -1126,27 +1035,14 @@ class TestRegistrantDNSSEC(MockEppLib):
             Then a user-friendly error message is returned for displaying on the web
         """
 
-        # make sure to stop any other patcher so there are no conflicts
-        self.mockSendPatch.stop()
+        domain, _ = Domain.objects.get_or_create(name="dnssec-invalid.gov")
 
-        def side_effect(_request, cleaned):
-            raise RegistryError(code=ErrorCode.PARAMETER_VALUE_RANGE_ERROR)
-
-        patcher = patch("registrar.models.domain.registry.send")
-        mocked_send = patcher.start()
-        mocked_send.side_effect = side_effect
-
-        # if RegistryError is raised, view formats user-friendly
-        # error message if error is_client_error, is_session_error, or
-        # is_server_error; so test for those conditions
         with self.assertRaises(RegistryError) as err:
-            self.domain.dnssecdata = self.dnssecExtensionWithDsData
+            domain.dnssecdata = self.dnssecExtensionWithDsData
             self.assertTrue(
                 err.is_client_error() or err.is_session_error() or err.is_server_error()
             )
 
-        patcher.stop()
-
 
 class TestAnalystClientHold(MockEppLib):
     """Rule: Analysts may suspend or restore a domain by using client hold"""

From 136db5bab2022c34482f35fb9b8f5f31fa5bd948 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 6 Oct 2023 12:12:43 -0400
Subject: [PATCH 12/18] initial breakdown of test_views

---
 src/registrar/tests/test_views.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index c49ec8f3f..83e9a8749 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -1133,7 +1133,7 @@ class TestDomainPermissions(TestWithDomainPermissions):
                 self.assertEqual(response.status_code, 403)
 
 
-class TestDomainDetail(TestWithDomainPermissions, WebTest):
+class TestDomainOverview(TestWithDomainPermissions, WebTest):
     def setUp(self):
         super().setUp()
         self.app.set_user(self.user.username)
@@ -1147,6 +1147,13 @@ class TestDomainDetail(TestWithDomainPermissions, WebTest):
         self.assertContains(detail_page, "igorville.gov")
         self.assertContains(detail_page, "Status")
 
+
+class TestDomainUserManagement(TestWithDomainPermissions, WebTest):
+    def setUp(self):
+        super().setUp()
+        self.app.set_user(self.user.username)
+        self.client.force_login(self.user)
+
     def test_domain_user_management(self):
         response = self.client.get(
             reverse("domain-users", kwargs={"pk": self.domain.id})

From bb61ce9f642eb853a8bb0d0b599f9494bff2b09d Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Fri, 6 Oct 2023 13:26:07 -0400
Subject: [PATCH 13/18] 50% coverage on DNSSEC code (testing for statuses and
 flows)

---
 src/registrar/tests/test_views.py | 181 ++++++++++++++++++++++++++----
 1 file changed, 160 insertions(+), 21 deletions(-)

diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index 83e9a8749..8e984be85 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -1071,21 +1071,51 @@ class TestWithDomainPermissions(TestWithUser):
     def setUp(self):
         super().setUp()
         self.domain, _ = Domain.objects.get_or_create(name="igorville.gov")
+        self.domain_dsdata, _ = Domain.objects.get_or_create(name="dnssec-dsdata.gov")
+        self.domain_multdsdata, _ = Domain.objects.get_or_create(name="dnssec-multdsdata.gov")
+        self.domain_keydata, _ = Domain.objects.get_or_create(name="dnssec-keydata.gov")
+        # We could simply use domain (igoreville) but this will be more readable in tests 
+        # that inherit this setUp
+        self.domain_dnssec_none, _ = Domain.objects.get_or_create(name="dnssec-none.gov")
         self.domain_information, _ = DomainInformation.objects.get_or_create(
             creator=self.user, domain=self.domain
         )
+        DomainInformation.objects.get_or_create(
+            creator=self.user, domain=self.domain_dsdata
+        )
+        DomainInformation.objects.get_or_create(
+            creator=self.user, domain=self.domain_multdsdata
+        )
+        DomainInformation.objects.get_or_create(
+            creator=self.user, domain=self.domain_keydata
+        )
+        DomainInformation.objects.get_or_create(
+            creator=self.user, domain=self.domain_dnssec_none
+        )
         self.role, _ = UserDomainRole.objects.get_or_create(
             user=self.user, domain=self.domain, role=UserDomainRole.Roles.ADMIN
         )
+        UserDomainRole.objects.get_or_create(
+            user=self.user, domain=self.domain_dsdata, role=UserDomainRole.Roles.ADMIN
+        )
+        UserDomainRole.objects.get_or_create(
+            user=self.user, domain=self.domain_multdsdata, role=UserDomainRole.Roles.ADMIN
+        )
+        UserDomainRole.objects.get_or_create(
+            user=self.user, domain=self.domain_keydata, role=UserDomainRole.Roles.ADMIN
+        )
+        UserDomainRole.objects.get_or_create(
+            user=self.user, domain=self.domain_dnssec_none, role=UserDomainRole.Roles.ADMIN
+        )
 
     def tearDown(self):
         try:
-            self.domain_information.delete()
+            UserDomainRole.objects.all().delete()
             if hasattr(self.domain, "contacts"):
                 self.domain.contacts.all().delete()
             DomainApplication.objects.all().delete()
-            self.domain.delete()
-            self.role.delete()
+            Domain.objects.all().delete()
+            UserDomainRole.objects.all().delete()
         except ValueError:  # pass if already deleted
             pass
         super().tearDown()
@@ -1143,17 +1173,25 @@ class TestDomainOverview(TestWithDomainPermissions, WebTest):
         home_page = self.app.get("/")
         self.assertContains(home_page, "igorville.gov")
         # click the "Edit" link
-        detail_page = home_page.click("Manage")
+        detail_page = home_page.click("Manage", index=0)
         self.assertContains(detail_page, "igorville.gov")
         self.assertContains(detail_page, "Status")
+        
+    def test_domain_overview_blocked_for_ineligible_user(self):
+        """We could easily duplicate this test for all domain management
+        views, but a single url test should be solid enough since all domain
+        management pages share the same permissions class"""
+        self.user.status = User.RESTRICTED
+        self.user.save()
+        home_page = self.app.get("/")
+        self.assertContains(home_page, "igorville.gov")
+        with less_console_noise():
+            response = self.client.get(reverse("domain", kwargs={"pk": self.domain.id}))
+            self.assertEqual(response.status_code, 403)
 
 
-class TestDomainUserManagement(TestWithDomainPermissions, WebTest):
-    def setUp(self):
-        super().setUp()
-        self.app.set_user(self.user.username)
-        self.client.force_login(self.user)
-
+class TestDomainUserManagement(TestDomainOverview):
+    
     def test_domain_user_management(self):
         response = self.client.get(
             reverse("domain-users", kwargs={"pk": self.domain.id})
@@ -1311,6 +1349,8 @@ class TestDomainUserManagement(TestWithDomainPermissions, WebTest):
         # Now load the home page and make sure our domain appears there
         home_page = self.app.get(reverse("home"))
         self.assertContains(home_page, self.domain.name)
+        
+class TestDomainNameservers(TestDomainOverview):
 
     def test_domain_nameservers(self):
         """Can load domain's nameservers page."""
@@ -1362,6 +1402,8 @@ class TestDomainUserManagement(TestWithDomainPermissions, WebTest):
         # error text appears twice, once at the top of the page, once around
         # the field.
         self.assertContains(result, "This field is required", count=2, status_code=200)
+        
+class TestDomainAuthorizingOfficial(TestDomainOverview):
 
     def test_domain_authorizing_official(self):
         """Can load domain's authorizing official page."""
@@ -1380,6 +1422,8 @@ class TestDomainUserManagement(TestWithDomainPermissions, WebTest):
             reverse("domain-authorizing-official", kwargs={"pk": self.domain.id})
         )
         self.assertContains(page, "Testy")
+        
+class TestDomainOrganization(TestDomainOverview):
 
     def test_domain_org_name_address(self):
         """Can load domain's org name and mailing address page."""
@@ -1416,6 +1460,8 @@ class TestDomainUserManagement(TestWithDomainPermissions, WebTest):
 
         self.assertContains(success_result_page, "Not igorville")
         self.assertContains(success_result_page, "Faketown")
+        
+class TestDomainContactInformation(TestDomainOverview):
 
     def test_domain_your_contact_information(self):
         """Can load domain's your contact information page."""
@@ -1432,6 +1478,8 @@ class TestDomainUserManagement(TestWithDomainPermissions, WebTest):
             reverse("domain-your-contact-information", kwargs={"pk": self.domain.id})
         )
         self.assertContains(page, "Testy")
+        
+class TestDomainSecurityEmail(TestDomainOverview):
 
     def test_domain_security_email(self):
         """Can load domain's security email page."""
@@ -1465,18 +1513,109 @@ class TestDomainUserManagement(TestWithDomainPermissions, WebTest):
         self.assertContains(
             success_page, "The security email for this domain have been updated"
         )
+       
+        
+class TestDomainDNSSEC(TestDomainOverview):
+    
+    """MockEPPLib is already inherited."""
+        
+    def test_dnssec_page_refreshes_enable_button(self):
+        """DNSSEC overview page loads when domain has no DNSSEC data
+        and shows a 'Enable DNSSEC' button. When button is clicked the template
+        updates. When user navigates away then comes back to the page, the
+        'Enable DNSSEC' button is shown again."""
+        # home_page = self.app.get("/")
+        
+        page = self.client.get(
+            reverse("domain-dns-dnssec", kwargs={"pk": self.domain.id})
+        )
+        self.assertContains(page, "Enable DNSSEC")
+        
+        # Prepare the data for the POST request
+        post_data = {
+            'enable_dnssec': 'Enable DNSSEC',  # Replace with the actual form field and value
+            # Add other form fields as needed
+        }
+        updated_page = self.client.post(reverse("domain-dns-dnssec", kwargs={"pk": self.domain.id}), post_data, follow=True)
+        
+        self.assertEqual(updated_page.status_code, 200)
+        
+        self.assertContains(updated_page, "Add DS Data")
+        self.assertContains(updated_page, "Add Key Data")
+        
+        self.app.get("/")
+        
+        back_to_page = self.client.get(
+            reverse("domain-dns-dnssec", kwargs={"pk": self.domain.id})
+        )
+        self.assertContains(back_to_page, "Enable DNSSEC")
+        
+        
+    def test_dnssec_page_loads_with_data_in_domain(self):
+        """DNSSEC overview page loads when domain has DNSSEC data
+        and the template contains a button to disable DNSSEC."""
+        
+        page = self.client.get(
+            reverse("domain-dns-dnssec", kwargs={"pk": self.domain_multdsdata.id})
+        )
+        self.assertContains(page, "Disable DNSSEC")
+        
+    def test_ds_form_loads_with_no_domain_data(self):
+        """DNSSEC Add DS Data page loads when there is no
+        domain DNSSEC data and shows a button to Add DS Data record"""
+        
+        page = self.client.get(
+            reverse("domain-dns-dnssec-dsdata", kwargs={"pk": self.domain_dnssec_none.id})
+        )
+        self.assertContains(page, "Add DS Data record")
+        
+    def test_ds_form_loads_with_ds_data(self):
+        """DNSSEC Add DS Data page loads when there is
+        domain DNSSEC DS data and shows the data"""
+        
+        page = self.client.get(
+            reverse("domain-dns-dnssec-dsdata", kwargs={"pk": self.domain_dsdata.id})
+        )
+        self.assertContains(page, "DS Data record 1")
+        
+    def test_ds_form_loads_with_key_data(self):
+        """DNSSEC Add DS Data page loads when there is
+        domain DNSSEC KEY data and shows an alert"""
+        
+        page = self.client.get(
+            reverse("domain-dns-dnssec-dsdata", kwargs={"pk": self.domain_keydata.id})
+        )
+        self.assertContains(page, "Warning, you cannot add DS Data")
+        
+    def test_key_form_loads_with_no_domain_data(self):
+        """DNSSEC Add Key Data page loads when there is no
+        domain DNSSEC data and shows a button to Add DS Key record"""
+        
+        page = self.client.get(
+            reverse("domain-dns-dnssec-keydata", kwargs={"pk": self.domain_dnssec_none.id})
+        )
+        self.assertContains(page, "Add DS Key record")
+        
+    def test_key_form_loads_with_key_data(self):
+        """DNSSEC Add Key Data page loads when there is
+        domain DNSSEC Key data and shows the data"""
+        
+        page = self.client.get(
+            reverse("domain-dns-dnssec-keydata", kwargs={"pk": self.domain_keydata.id})
+        )
+        self.assertContains(page, "DS Data record 1")
+        
+    def test_key_form_loads_with_ds_data(self):
+        """DNSSEC Add Key Data page loads when there is
+        domain DNSSEC DS data and shows an alert"""
+        
+        page = self.client.get(
+            reverse("domain-dns-dnssec-keydata", kwargs={"pk": self.domain_dsdata.id})
+        )
+        self.assertContains(page, "Warning, you cannot add Key Data")
 
-    def test_domain_overview_blocked_for_ineligible_user(self):
-        """We could easily duplicate this test for all domain management
-        views, but a single url test should be solid enough since all domain
-        management pages share the same permissions class"""
-        self.user.status = User.RESTRICTED
-        self.user.save()
-        home_page = self.app.get("/")
-        self.assertContains(home_page, "igorville.gov")
-        with less_console_noise():
-            response = self.client.get(reverse("domain", kwargs={"pk": self.domain.id}))
-            self.assertEqual(response.status_code, 403)
+
+    
 
 
 class TestApplicationStatus(TestWithUser, WebTest):

From a6f4c2f000c18ba6b04fc2cb6c018c2f160976d4 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 6 Oct 2023 13:59:20 -0400
Subject: [PATCH 14/18] unit tests on ds data form and disable dnssec

---
 src/registrar/tests/test_views.py | 52 ++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index 8e984be85..5c24b33f4 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -1550,7 +1550,6 @@ class TestDomainDNSSEC(TestDomainOverview):
         )
         self.assertContains(back_to_page, "Enable DNSSEC")
         
-        
     def test_dnssec_page_loads_with_data_in_domain(self):
         """DNSSEC overview page loads when domain has DNSSEC data
         and the template contains a button to disable DNSSEC."""
@@ -1559,6 +1558,16 @@ class TestDomainDNSSEC(TestDomainOverview):
             reverse("domain-dns-dnssec", kwargs={"pk": self.domain_multdsdata.id})
         )
         self.assertContains(page, "Disable DNSSEC")
+
+        # Prepare the data for the POST request
+        post_data = {
+            'disable_dnssec': 'Disable DNSSEC',  # Replace with the actual form field and value
+        }
+        updated_page = self.client.post(reverse("domain-dns-dnssec", kwargs={"pk": self.domain.id}), post_data, follow=True)
+        
+        self.assertEqual(updated_page.status_code, 200)
+        
+        self.assertContains(updated_page, "Enable DNSSEC")
         
     def test_ds_form_loads_with_no_domain_data(self):
         """DNSSEC Add DS Data page loads when there is no
@@ -1614,6 +1623,47 @@ class TestDomainDNSSEC(TestDomainOverview):
         )
         self.assertContains(page, "Warning, you cannot add Key Data")
 
+    def test_ds_data_form_submits(self):
+        """DS Data form submits successfully
+
+        Uses self.app WebTest because we need to interact with forms.
+        """
+        add_data_page = self.app.get(
+            reverse("domain-dns-dnssec-dsdata", kwargs={"pk": self.domain_dsdata.id})
+        )
+        session_id = self.app.cookies[settings.SESSION_COOKIE_NAME]
+        self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+        with less_console_noise():  # swallow log warning message
+            result = add_data_page.forms[0].submit()
+        # form submission was a post, response should be a redirect
+        self.assertEqual(result.status_code, 302)
+        self.assertEqual(
+            result["Location"],
+            reverse("domain-dns-dnssec-dsdata", kwargs={"pk": self.domain_dsdata.id}),
+        )
+        self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+        page = result.follow()
+        self.assertContains(page, "The DS Data records for this domain have been updated.")
+
+    def test_domain_nameservers_form_invalid(self):
+        """DS Data form errors with invalid data
+
+        Uses self.app WebTest because we need to interact with forms.
+        """
+        add_data_page = self.app.get(
+            reverse("domain-dns-dnssec-dsdata", kwargs={"pk": self.domain_dsdata.id})
+        )
+        session_id = self.app.cookies[settings.SESSION_COOKIE_NAME]
+        self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+        # first two nameservers are required, so if we empty one out we should
+        # get a form error
+        add_data_page.forms[0]["form-0-key_tag"] = ""
+        with less_console_noise():  # swallow logged warning message
+            result = add_data_page.forms[0].submit()
+        # form submission was a post with an error, response should be a 200
+        # error text appears twice, once at the top of the page, once around
+        # the field.
+        self.assertContains(result, "Key tag is required", count=2, status_code=200)
 
     
 

From c39384df8c8842076d818659fd977e1b2945d111 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 6 Oct 2023 14:04:37 -0400
Subject: [PATCH 15/18] unit tests completed

---
 src/registrar/tests/test_views.py | 46 +++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index 5c24b33f4..cff7d1614 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -1645,7 +1645,7 @@ class TestDomainDNSSEC(TestDomainOverview):
         page = result.follow()
         self.assertContains(page, "The DS Data records for this domain have been updated.")
 
-    def test_domain_nameservers_form_invalid(self):
+    def test_ds_data_form_invalid(self):
         """DS Data form errors with invalid data
 
         Uses self.app WebTest because we need to interact with forms.
@@ -1665,9 +1665,49 @@ class TestDomainDNSSEC(TestDomainOverview):
         # the field.
         self.assertContains(result, "Key tag is required", count=2, status_code=200)
 
+    def test_key_data_form_submits(self):
+        """Key Data form submits successfully
+
+        Uses self.app WebTest because we need to interact with forms.
+        """
+        add_data_page = self.app.get(
+            reverse("domain-dns-dnssec-keydata", kwargs={"pk": self.domain_keydata.id})
+        )
+        session_id = self.app.cookies[settings.SESSION_COOKIE_NAME]
+        self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+        with less_console_noise():  # swallow log warning message
+            result = add_data_page.forms[0].submit()
+        # form submission was a post, response should be a redirect
+        self.assertEqual(result.status_code, 302)
+        self.assertEqual(
+            result["Location"],
+            reverse("domain-dns-dnssec-keydata", kwargs={"pk": self.domain_keydata.id}),
+        )
+        self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+        page = result.follow()
+        self.assertContains(page, "The Key Data records for this domain have been updated.")
+
+    def test_key_data_form_invalid(self):
+        """Key Data form errors with invalid data
+
+        Uses self.app WebTest because we need to interact with forms.
+        """
+        add_data_page = self.app.get(
+            reverse("domain-dns-dnssec-keydata", kwargs={"pk": self.domain_keydata.id})
+        )
+        session_id = self.app.cookies[settings.SESSION_COOKIE_NAME]
+        self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+        # first two nameservers are required, so if we empty one out we should
+        # get a form error
+        add_data_page.forms[0]["form-0-pub_key"] = ""
+        with less_console_noise():  # swallow logged warning message
+            result = add_data_page.forms[0].submit()
+        # form submission was a post with an error, response should be a 200
+        # error text appears twice, once at the top of the page, once around
+        # the field.
+        self.assertContains(result, "Pub key is required", count=2, status_code=200)
+    
     
-
-
 class TestApplicationStatus(TestWithUser, WebTest):
     def setUp(self):
         super().setUp()

From 6ece85796c6ae4ccf834ae24799546cc820b7ea9 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 6 Oct 2023 15:22:03 -0400
Subject: [PATCH 16/18] removing old migrations

---
 .../migrations/0033_domain_dnssec_enabled.py  | 19 -------------
 ...034_domain_dnssec_ds_confirmed_and_more.py | 28 -------------------
 ...ove_domain_dnssec_ds_confirmed_and_more.py | 24 ----------------
 3 files changed, 71 deletions(-)
 delete mode 100644 src/registrar/migrations/0033_domain_dnssec_enabled.py
 delete mode 100644 src/registrar/migrations/0034_domain_dnssec_ds_confirmed_and_more.py
 delete mode 100644 src/registrar/migrations/0035_remove_domain_dnssec_ds_confirmed_and_more.py

diff --git a/src/registrar/migrations/0033_domain_dnssec_enabled.py b/src/registrar/migrations/0033_domain_dnssec_enabled.py
deleted file mode 100644
index a4695a02b..000000000
--- a/src/registrar/migrations/0033_domain_dnssec_enabled.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 4.2.1 on 2023-10-03 06:36
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("registrar", "0032_alter_transitiondomain_status"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="domain",
-            name="dnssec_enabled",
-            field=models.BooleanField(
-                default=False, help_text="Boolean indicating if dnssec is enabled"
-            ),
-        ),
-    ]
diff --git a/src/registrar/migrations/0034_domain_dnssec_ds_confirmed_and_more.py b/src/registrar/migrations/0034_domain_dnssec_ds_confirmed_and_more.py
deleted file mode 100644
index 72513a401..000000000
--- a/src/registrar/migrations/0034_domain_dnssec_ds_confirmed_and_more.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Generated by Django 4.2.1 on 2023-10-03 17:34
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("registrar", "0033_domain_dnssec_enabled"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="domain",
-            name="dnssec_ds_confirmed",
-            field=models.BooleanField(
-                default=False,
-                help_text="Boolean indicating if DS record adding is confirmed",
-            ),
-        ),
-        migrations.AddField(
-            model_name="domain",
-            name="dnssec_key_confirmed",
-            field=models.BooleanField(
-                default=False,
-                help_text="Boolean indicating if Key record adding is confirmed",
-            ),
-        ),
-    ]
diff --git a/src/registrar/migrations/0035_remove_domain_dnssec_ds_confirmed_and_more.py b/src/registrar/migrations/0035_remove_domain_dnssec_ds_confirmed_and_more.py
deleted file mode 100644
index 8b7b7566e..000000000
--- a/src/registrar/migrations/0035_remove_domain_dnssec_ds_confirmed_and_more.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Generated by Django 4.2.1 on 2023-10-06 11:50
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("registrar", "0034_domain_dnssec_ds_confirmed_and_more"),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name="domain",
-            name="dnssec_ds_confirmed",
-        ),
-        migrations.RemoveField(
-            model_name="domain",
-            name="dnssec_enabled",
-        ),
-        migrations.RemoveField(
-            model_name="domain",
-            name="dnssec_key_confirmed",
-        ),
-    ]

From a9d57cda079bf91a532f202ed4b5bad131a16334 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 6 Oct 2023 15:38:50 -0400
Subject: [PATCH 17/18] fixed unit tests

---
 src/registrar/tests/test_views.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index 3f583ea77..da4d2dce8 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -18,6 +18,7 @@ from registrar.models import (
     DraftDomain,
     DomainInvitation,
     Contact,
+    PublicContact,
     Website,
     UserDomainRole,
     User,
@@ -1113,6 +1114,7 @@ class TestWithDomainPermissions(TestWithUser):
             if hasattr(self.domain, "contacts"):
                 self.domain.contacts.all().delete()
             DomainApplication.objects.all().delete()
+            PublicContact.objects.all().delete()
             Domain.objects.all().delete()
             UserDomainRole.objects.all().delete()
         except ValueError:  # pass if already deleted

From 93d8b8227e046f4dbdd2eb043f03bb59b973c86d Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 6 Oct 2023 16:18:59 -0400
Subject: [PATCH 18/18] refactored complicated test code in common, satisfied
 the linter

---
 src/registrar/forms/common.py             |   5 +-
 src/registrar/forms/domain.py             |  52 ++++----
 src/registrar/templatetags/url_helpers.py |   2 +
 src/registrar/tests/common.py             | 110 ++++++++--------
 src/registrar/tests/test_models_domain.py |   1 -
 src/registrar/tests/test_views.py         | 130 +++++++++++--------
 src/registrar/views/domain.py             | 146 ++++++++++++----------
 7 files changed, 241 insertions(+), 205 deletions(-)

diff --git a/src/registrar/forms/common.py b/src/registrar/forms/common.py
index 377f59797..159113488 100644
--- a/src/registrar/forms/common.py
+++ b/src/registrar/forms/common.py
@@ -1,7 +1,8 @@
 # common.py
-# 
+#
 # ALGORITHM_CHOICES are options for alg attribute in DS Data and Key Data
-# reference: https://www.iana.org/assignments/dns-sec-alg-numbers/dns-sec-alg-numbers.xhtml
+# reference:
+# https://www.iana.org/assignments/dns-sec-alg-numbers/dns-sec-alg-numbers.xhtml
 ALGORITHM_CHOICES = [
     (1, "(1) ERSA/MD5 [RSAMD5]"),
     (2, "(2) Diffie-Hellman [DH]"),
diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index a9c736175..4ee17a72d 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -7,7 +7,13 @@ from django.forms import formset_factory
 from phonenumber_field.widgets import RegionalPhoneNumberWidget
 
 from ..models import Contact, DomainInformation
-from .common import ALGORITHM_CHOICES, DIGEST_TYPE_CHOICES, FLAG_CHOICES, PROTOCOL_CHOICES
+from .common import (
+    ALGORITHM_CHOICES,
+    DIGEST_TYPE_CHOICES,
+    FLAG_CHOICES,
+    PROTOCOL_CHOICES,
+)
+
 
 class DomainAddUserForm(forms.Form):
 
@@ -157,35 +163,27 @@ class DomainDsdataForm(forms.Form):
             MinValueValidator(0, message="Value must be between 0 and 65535"),
             MaxValueValidator(65535, message="Value must be between 0 and 65535"),
         ],
-        error_messages={
-            "required": ("Key tag is required.")
-        },
+        error_messages={"required": ("Key tag is required.")},
     )
-    
+
     algorithm = forms.TypedChoiceField(
         required=True,
         label="Algorithm",
-        choices=[(None, "--Select--")] + ALGORITHM_CHOICES,
-        error_messages={
-            "required": ("Algorithm is required.")
-        },
+        choices=[(None, "--Select--")] + ALGORITHM_CHOICES,  # type: ignore
+        error_messages={"required": ("Algorithm is required.")},
     )
 
     digest_type = forms.TypedChoiceField(
         required=True,
         label="Digest Type",
-        choices=[(None, "--Select--")] + DIGEST_TYPE_CHOICES,
-        error_messages={
-            "required": ("Digest Type is required.")
-        },
+        choices=[(None, "--Select--")] + DIGEST_TYPE_CHOICES,  # type: ignore
+        error_messages={"required": ("Digest Type is required.")},
     )
 
     digest = forms.CharField(
         required=True,
         label="Digest",
-        error_messages={
-            "required": ("Digest is required.")
-        },
+        error_messages={"required": ("Digest is required.")},
     )
 
 
@@ -204,35 +202,27 @@ class DomainKeydataForm(forms.Form):
         required=True,
         label="Flag",
         choices=FLAG_CHOICES,
-        error_messages={
-            "required": ("Flag is required.")
-        },
+        error_messages={"required": ("Flag is required.")},
     )
 
     protocol = forms.TypedChoiceField(
         required=True,
         label="Protocol",
         choices=PROTOCOL_CHOICES,
-        error_messages={
-            "required": ("Protocol is required.")
-        },
+        error_messages={"required": ("Protocol is required.")},
     )
 
     algorithm = forms.TypedChoiceField(
         required=True,
         label="Algorithm",
-        choices=[(None, "--Select--")] + ALGORITHM_CHOICES,
-        error_messages={
-            "required": ("Algorithm is required.")
-        },
+        choices=[(None, "--Select--")] + ALGORITHM_CHOICES,  # type: ignore
+        error_messages={"required": ("Algorithm is required.")},
     )
-    
+
     pub_key = forms.CharField(
         required=True,
         label="Pub key",
-        error_messages={
-            "required": ("Pub key is required.")
-        },
+        error_messages={"required": ("Pub key is required.")},
     )
 
 
@@ -240,4 +230,4 @@ DomainKeydataFormset = formset_factory(
     DomainKeydataForm,
     extra=0,
     can_delete=True,
-)
\ No newline at end of file
+)
diff --git a/src/registrar/templatetags/url_helpers.py b/src/registrar/templatetags/url_helpers.py
index 2b983930f..931eedc92 100644
--- a/src/registrar/templatetags/url_helpers.py
+++ b/src/registrar/templatetags/url_helpers.py
@@ -18,12 +18,14 @@ def startswith(text, starts):
         return text.startswith(starts)
     return False
 
+
 @register.filter("endswith")
 def endswith(text, ends):
     if isinstance(text, str):
         return text.endswith(ends)
     return False
 
+
 @register.simple_tag
 def public_site_url(url_path):
     """Make a full URL for this path at our public site.
diff --git a/src/registrar/tests/common.py b/src/registrar/tests/common.py
index b44e21d01..70d0cd1c9 100644
--- a/src/registrar/tests/common.py
+++ b/src/registrar/tests/common.py
@@ -689,18 +689,18 @@ class MockEppLib(TestCase):
         "alg": 1,
         "pubKey": "AQPJ////4Q==",
     }
-    dnssecExtensionWithDsData: Mapping[str, Any] = {
-        "dsData": [common.DSData(**addDsData1)]
+    dnssecExtensionWithDsData: Mapping[Any, Any] = {
+        "dsData": [common.DSData(**addDsData1)]  # type: ignore
     }
     dnssecExtensionWithMultDsData: Mapping[str, Any] = {
         "dsData": [
-            common.DSData(**addDsData1),
-            common.DSData(**addDsData2),
+            common.DSData(**addDsData1),  # type: ignore
+            common.DSData(**addDsData2),  # type: ignore
         ],
     }
     dnssecExtensionWithKeyData: Mapping[str, Any] = {
         "maxSigLife": 3215,
-        "keyData": [common.DNSSECKeyData(**keyDataDict)],
+        "keyData": [common.DNSSECKeyData(**keyDataDict)],  # type: ignore
     }
 
     def mockSend(self, _request, cleaned):
@@ -709,54 +709,9 @@ class MockEppLib(TestCase):
         returns objects that simulate what would be in a epp response
         but only relevant pieces for tests"""
         if isinstance(_request, commands.InfoDomain):
-            if getattr(_request, "name", None) == "security.gov":
-                return MagicMock(res_data=[self.infoDomainNoContact])
-            elif getattr(_request, "name", None) == "dnssec-dsdata.gov":
-                return MagicMock(
-                    res_data=[self.mockDataInfoDomain],
-                    extensions=[
-                        extensions.DNSSECExtension(**self.dnssecExtensionWithDsData)
-                    ],
-                )
-            elif getattr(_request, "name", None) == "dnssec-multdsdata.gov":
-                return MagicMock(
-                    res_data=[self.mockDataInfoDomain],
-                    extensions=[
-                        extensions.DNSSECExtension(**self.dnssecExtensionWithMultDsData)
-                    ],
-                )
-            elif getattr(_request, "name", None) == "dnssec-keydata.gov":
-                return MagicMock(
-                    res_data=[self.mockDataInfoDomain],
-                    extensions=[
-                        extensions.DNSSECExtension(**self.dnssecExtensionWithKeyData)
-                    ],
-                )
-            elif getattr(_request, "name", None) == "dnssec-none.gov":
-                # this case is not necessary, but helps improve readability
-                return MagicMock(res_data=[self.mockDataInfoDomain])
-            elif getattr(_request, "name", None) == "freeman.gov":
-                return MagicMock(res_data=[self.InfoDomainWithContacts])
-            else:
-                return MagicMock(res_data=[self.mockDataInfoDomain])
+            return self.mockInfoDomainCommands(_request, cleaned)
         elif isinstance(_request, commands.InfoContact):
-            mocked_result: info.InfoContactResultData
-
-            # For testing contact types
-            match getattr(_request, "id", None):
-                case "securityContact":
-                    mocked_result = self.mockSecurityContact
-                case "technicalContact":
-                    mocked_result = self.mockTechnicalContact
-                case "adminContact":
-                    mocked_result = self.mockAdministrativeContact
-                case "regContact":
-                    mocked_result = self.mockRegistrantContact
-                case _:
-                    # Default contact return
-                    mocked_result = self.mockDataInfoContact
-
-            return MagicMock(res_data=[mocked_result])
+            return self.mockInfoContactCommands(_request, cleaned)
         elif (
             isinstance(_request, commands.CreateContact)
             and getattr(_request, "id", None) == "fail"
@@ -782,6 +737,57 @@ class MockEppLib(TestCase):
             raise RegistryError(code=ErrorCode.PARAMETER_VALUE_RANGE_ERROR)
         return MagicMock(res_data=[self.mockDataInfoHosts])
 
+    def mockInfoDomainCommands(self, _request, cleaned):
+        if getattr(_request, "name", None) == "security.gov":
+            return MagicMock(res_data=[self.infoDomainNoContact])
+        elif getattr(_request, "name", None) == "dnssec-dsdata.gov":
+            return MagicMock(
+                res_data=[self.mockDataInfoDomain],
+                extensions=[
+                    extensions.DNSSECExtension(**self.dnssecExtensionWithDsData)
+                ],
+            )
+        elif getattr(_request, "name", None) == "dnssec-multdsdata.gov":
+            return MagicMock(
+                res_data=[self.mockDataInfoDomain],
+                extensions=[
+                    extensions.DNSSECExtension(**self.dnssecExtensionWithMultDsData)
+                ],
+            )
+        elif getattr(_request, "name", None) == "dnssec-keydata.gov":
+            return MagicMock(
+                res_data=[self.mockDataInfoDomain],
+                extensions=[
+                    extensions.DNSSECExtension(**self.dnssecExtensionWithKeyData)
+                ],
+            )
+        elif getattr(_request, "name", None) == "dnssec-none.gov":
+            # this case is not necessary, but helps improve readability
+            return MagicMock(res_data=[self.mockDataInfoDomain])
+        elif getattr(_request, "name", None) == "freeman.gov":
+            return MagicMock(res_data=[self.InfoDomainWithContacts])
+        else:
+            return MagicMock(res_data=[self.mockDataInfoDomain])
+
+    def mockInfoContactCommands(self, _request, cleaned):
+        mocked_result: info.InfoContactResultData
+
+        # For testing contact types
+        match getattr(_request, "id", None):
+            case "securityContact":
+                mocked_result = self.mockSecurityContact
+            case "technicalContact":
+                mocked_result = self.mockTechnicalContact
+            case "adminContact":
+                mocked_result = self.mockAdministrativeContact
+            case "regContact":
+                mocked_result = self.mockRegistrantContact
+            case _:
+                # Default contact return
+                mocked_result = self.mockDataInfoContact
+
+        return MagicMock(res_data=[mocked_result])
+
     def setUp(self):
         """mock epp send function as this will fail locally"""
         self.mockSendPatch = patch("registrar.models.domain.registry.send")
diff --git a/src/registrar/tests/test_models_domain.py b/src/registrar/tests/test_models_domain.py
index 5b299c112..d0718b4ba 100644
--- a/src/registrar/tests/test_models_domain.py
+++ b/src/registrar/tests/test_models_domain.py
@@ -1003,7 +1003,6 @@ class TestRegistrantDNSSEC(MockEppLib):
         super().setUp()
         # for the tests, need a domain in the unknown state
         self.domain, _ = Domain.objects.get_or_create(name="fake.gov")
-        
 
     def tearDown(self):
         Domain.objects.all().delete()
diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index da4d2dce8..553b45135 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -1072,11 +1072,15 @@ class TestWithDomainPermissions(TestWithUser):
         super().setUp()
         self.domain, _ = Domain.objects.get_or_create(name="igorville.gov")
         self.domain_dsdata, _ = Domain.objects.get_or_create(name="dnssec-dsdata.gov")
-        self.domain_multdsdata, _ = Domain.objects.get_or_create(name="dnssec-multdsdata.gov")
+        self.domain_multdsdata, _ = Domain.objects.get_or_create(
+            name="dnssec-multdsdata.gov"
+        )
         self.domain_keydata, _ = Domain.objects.get_or_create(name="dnssec-keydata.gov")
-        # We could simply use domain (igoreville) but this will be more readable in tests 
+        # We could simply use domain (igorville) but this will be more readable in tests
         # that inherit this setUp
-        self.domain_dnssec_none, _ = Domain.objects.get_or_create(name="dnssec-none.gov")
+        self.domain_dnssec_none, _ = Domain.objects.get_or_create(
+            name="dnssec-none.gov"
+        )
         self.domain_information, _ = DomainInformation.objects.get_or_create(
             creator=self.user, domain=self.domain
         )
@@ -1099,13 +1103,17 @@ class TestWithDomainPermissions(TestWithUser):
             user=self.user, domain=self.domain_dsdata, role=UserDomainRole.Roles.ADMIN
         )
         UserDomainRole.objects.get_or_create(
-            user=self.user, domain=self.domain_multdsdata, role=UserDomainRole.Roles.ADMIN
+            user=self.user,
+            domain=self.domain_multdsdata,
+            role=UserDomainRole.Roles.ADMIN,
         )
         UserDomainRole.objects.get_or_create(
             user=self.user, domain=self.domain_keydata, role=UserDomainRole.Roles.ADMIN
         )
         UserDomainRole.objects.get_or_create(
-            user=self.user, domain=self.domain_dnssec_none, role=UserDomainRole.Roles.ADMIN
+            user=self.user,
+            domain=self.domain_dnssec_none,
+            role=UserDomainRole.Roles.ADMIN,
         )
 
     def tearDown(self):
@@ -1177,7 +1185,7 @@ class TestDomainOverview(TestWithDomainPermissions, WebTest):
         detail_page = home_page.click("Manage", index=0)
         self.assertContains(detail_page, "igorville.gov")
         self.assertContains(detail_page, "Status")
-        
+
     def test_domain_overview_blocked_for_ineligible_user(self):
         """We could easily duplicate this test for all domain management
         views, but a single url test should be solid enough since all domain
@@ -1192,7 +1200,6 @@ class TestDomainOverview(TestWithDomainPermissions, WebTest):
 
 
 class TestDomainUserManagement(TestDomainOverview):
-    
     def test_domain_user_management(self):
         response = self.client.get(
             reverse("domain-users", kwargs={"pk": self.domain.id})
@@ -1350,9 +1357,9 @@ class TestDomainUserManagement(TestDomainOverview):
         # Now load the home page and make sure our domain appears there
         home_page = self.app.get(reverse("home"))
         self.assertContains(home_page, self.domain.name)
-        
-class TestDomainNameservers(TestDomainOverview):
 
+
+class TestDomainNameservers(TestDomainOverview):
     def test_domain_nameservers(self):
         """Can load domain's nameservers page."""
         page = self.client.get(
@@ -1403,9 +1410,9 @@ class TestDomainNameservers(TestDomainOverview):
         # error text appears twice, once at the top of the page, once around
         # the field.
         self.assertContains(result, "This field is required", count=2, status_code=200)
-        
-class TestDomainAuthorizingOfficial(TestDomainOverview):
 
+
+class TestDomainAuthorizingOfficial(TestDomainOverview):
     def test_domain_authorizing_official(self):
         """Can load domain's authorizing official page."""
         page = self.client.get(
@@ -1423,9 +1430,9 @@ class TestDomainAuthorizingOfficial(TestDomainOverview):
             reverse("domain-authorizing-official", kwargs={"pk": self.domain.id})
         )
         self.assertContains(page, "Testy")
-        
-class TestDomainOrganization(TestDomainOverview):
 
+
+class TestDomainOrganization(TestDomainOverview):
     def test_domain_org_name_address(self):
         """Can load domain's org name and mailing address page."""
         page = self.client.get(
@@ -1461,9 +1468,9 @@ class TestDomainOrganization(TestDomainOverview):
 
         self.assertContains(success_result_page, "Not igorville")
         self.assertContains(success_result_page, "Faketown")
-        
-class TestDomainContactInformation(TestDomainOverview):
 
+
+class TestDomainContactInformation(TestDomainOverview):
     def test_domain_your_contact_information(self):
         """Can load domain's your contact information page."""
         page = self.client.get(
@@ -1479,9 +1486,9 @@ class TestDomainContactInformation(TestDomainOverview):
             reverse("domain-your-contact-information", kwargs={"pk": self.domain.id})
         )
         self.assertContains(page, "Testy")
-        
-class TestDomainSecurityEmail(TestDomainOverview):
 
+
+class TestDomainSecurityEmail(TestDomainOverview):
     def test_domain_security_email_existing_security_contact(self):
         """Can load domain's security email page."""
         self.mockSendPatch = patch("registrar.models.domain.registry.send")
@@ -1546,47 +1553,50 @@ class TestDomainSecurityEmail(TestDomainOverview):
         self.assertContains(
             success_page, "The security email for this domain has been updated"
         )
-       
-        
+
+
 class TestDomainDNSSEC(TestDomainOverview):
-    
+
     """MockEPPLib is already inherited."""
-        
+
     def test_dnssec_page_refreshes_enable_button(self):
         """DNSSEC overview page loads when domain has no DNSSEC data
         and shows a 'Enable DNSSEC' button. When button is clicked the template
         updates. When user navigates away then comes back to the page, the
         'Enable DNSSEC' button is shown again."""
         # home_page = self.app.get("/")
-        
+
         page = self.client.get(
             reverse("domain-dns-dnssec", kwargs={"pk": self.domain.id})
         )
         self.assertContains(page, "Enable DNSSEC")
-        
+
         # Prepare the data for the POST request
         post_data = {
-            'enable_dnssec': 'Enable DNSSEC',  # Replace with the actual form field and value
-            # Add other form fields as needed
+            "enable_dnssec": "Enable DNSSEC",
         }
-        updated_page = self.client.post(reverse("domain-dns-dnssec", kwargs={"pk": self.domain.id}), post_data, follow=True)
-        
+        updated_page = self.client.post(
+            reverse("domain-dns-dnssec", kwargs={"pk": self.domain.id}),
+            post_data,
+            follow=True,
+        )
+
         self.assertEqual(updated_page.status_code, 200)
-        
+
         self.assertContains(updated_page, "Add DS Data")
         self.assertContains(updated_page, "Add Key Data")
-        
+
         self.app.get("/")
-        
+
         back_to_page = self.client.get(
             reverse("domain-dns-dnssec", kwargs={"pk": self.domain.id})
         )
         self.assertContains(back_to_page, "Enable DNSSEC")
-        
+
     def test_dnssec_page_loads_with_data_in_domain(self):
         """DNSSEC overview page loads when domain has DNSSEC data
         and the template contains a button to disable DNSSEC."""
-        
+
         page = self.client.get(
             reverse("domain-dns-dnssec", kwargs={"pk": self.domain_multdsdata.id})
         )
@@ -1594,63 +1604,71 @@ class TestDomainDNSSEC(TestDomainOverview):
 
         # Prepare the data for the POST request
         post_data = {
-            'disable_dnssec': 'Disable DNSSEC',  # Replace with the actual form field and value
+            "disable_dnssec": "Disable DNSSEC",
         }
-        updated_page = self.client.post(reverse("domain-dns-dnssec", kwargs={"pk": self.domain.id}), post_data, follow=True)
-        
+        updated_page = self.client.post(
+            reverse("domain-dns-dnssec", kwargs={"pk": self.domain.id}),
+            post_data,
+            follow=True,
+        )
+
         self.assertEqual(updated_page.status_code, 200)
-        
+
         self.assertContains(updated_page, "Enable DNSSEC")
-        
+
     def test_ds_form_loads_with_no_domain_data(self):
         """DNSSEC Add DS Data page loads when there is no
         domain DNSSEC data and shows a button to Add DS Data record"""
-        
+
         page = self.client.get(
-            reverse("domain-dns-dnssec-dsdata", kwargs={"pk": self.domain_dnssec_none.id})
+            reverse(
+                "domain-dns-dnssec-dsdata", kwargs={"pk": self.domain_dnssec_none.id}
+            )
         )
         self.assertContains(page, "Add DS Data record")
-        
+
     def test_ds_form_loads_with_ds_data(self):
         """DNSSEC Add DS Data page loads when there is
         domain DNSSEC DS data and shows the data"""
-        
+
         page = self.client.get(
             reverse("domain-dns-dnssec-dsdata", kwargs={"pk": self.domain_dsdata.id})
         )
         self.assertContains(page, "DS Data record 1")
-        
+
     def test_ds_form_loads_with_key_data(self):
         """DNSSEC Add DS Data page loads when there is
         domain DNSSEC KEY data and shows an alert"""
-        
+
         page = self.client.get(
             reverse("domain-dns-dnssec-dsdata", kwargs={"pk": self.domain_keydata.id})
         )
         self.assertContains(page, "Warning, you cannot add DS Data")
-        
+
     def test_key_form_loads_with_no_domain_data(self):
         """DNSSEC Add Key Data page loads when there is no
         domain DNSSEC data and shows a button to Add DS Key record"""
-        
+
         page = self.client.get(
-            reverse("domain-dns-dnssec-keydata", kwargs={"pk": self.domain_dnssec_none.id})
+            reverse(
+                "domain-dns-dnssec-keydata", kwargs={"pk": self.domain_dnssec_none.id}
+            )
         )
         self.assertContains(page, "Add DS Key record")
-        
+
     def test_key_form_loads_with_key_data(self):
         """DNSSEC Add Key Data page loads when there is
         domain DNSSEC Key data and shows the data"""
-        
+
         page = self.client.get(
             reverse("domain-dns-dnssec-keydata", kwargs={"pk": self.domain_keydata.id})
         )
         self.assertContains(page, "DS Data record 1")
-        
+
     def test_key_form_loads_with_ds_data(self):
         """DNSSEC Add Key Data page loads when there is
         domain DNSSEC DS data and shows an alert"""
-        
+
         page = self.client.get(
             reverse("domain-dns-dnssec-keydata", kwargs={"pk": self.domain_dsdata.id})
         )
@@ -1676,7 +1694,9 @@ class TestDomainDNSSEC(TestDomainOverview):
         )
         self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
         page = result.follow()
-        self.assertContains(page, "The DS Data records for this domain have been updated.")
+        self.assertContains(
+            page, "The DS Data records for this domain have been updated."
+        )
 
     def test_ds_data_form_invalid(self):
         """DS Data form errors with invalid data
@@ -1718,7 +1738,9 @@ class TestDomainDNSSEC(TestDomainOverview):
         )
         self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
         page = result.follow()
-        self.assertContains(page, "The Key Data records for this domain have been updated.")
+        self.assertContains(
+            page, "The Key Data records for this domain have been updated."
+        )
 
     def test_key_data_form_invalid(self):
         """Key Data form errors with invalid data
@@ -1739,8 +1761,8 @@ class TestDomainDNSSEC(TestDomainOverview):
         # error text appears twice, once at the top of the page, once around
         # the field.
         self.assertContains(result, "Pub key is required", count=2, status_code=200)
-    
-    
+
+
 class TestApplicationStatus(TestWithUser, WebTest):
     def setUp(self):
         super().setUp()
diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index 9334700ef..e51395ba3 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -233,20 +233,24 @@ class DomainDNSSECView(DomainPermissionView, FormMixin):
 
     template_name = "domain_dnssec.html"
     form_class = DomainDnssecForm
-        
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         """The initial value for the form (which is a formset here)."""
         self.domain = self.get_object()
-        
-        has_dnssec_records = self.domain.dnssecdata is not None
-                
-        # Create HTML for the buttons
-        modal_button = '<button type="submit" class="usa-button" name="disable_dnssec">Disable DNSSEC</button>'
 
-        context['modal_button'] = modal_button
-        context['has_dnssec_records'] = has_dnssec_records   
-        context['dnssec_enabled'] = self.request.session.pop('dnssec_enabled', False)
+        has_dnssec_records = self.domain.dnssecdata is not None
+
+        # Create HTML for the buttons
+        modal_button = (
+            '<button type="submit" '
+            'class="usa-button" '
+            'name="disable_dnssec">Disable DNSSEC</button>'
+        )
+
+        context["modal_button"] = modal_button
+        context["has_dnssec_records"] = has_dnssec_records
+        context["dnssec_enabled"] = self.request.session.pop("dnssec_enabled", False)
 
         return context
 
@@ -255,27 +259,24 @@ class DomainDNSSECView(DomainPermissionView, FormMixin):
         return reverse("domain-dns-dnssec", kwargs={"pk": self.domain.pk})
 
     def post(self, request, *args, **kwargs):
-        """Form submission posts to this view.
-        """
+        """Form submission posts to this view."""
         self.domain = self.get_object()
         form = self.get_form()
-        if form.is_valid():             
-            if 'disable_dnssec' in request.POST:
+        if form.is_valid():
+            if "disable_dnssec" in request.POST:
                 try:
                     self.domain.dnssecdata = {}
                 except RegistryError as err:
                     errmsg = "Error removing existing DNSSEC record(s)."
                     logger.error(errmsg + ": " + err)
-                    messages.error(
-                        self.request, errmsg
-                    )
-                request.session['dnssec_ds_confirmed'] = False
-                request.session['dnssec_key_confirmed'] = False
-            elif 'enable_dnssec' in request.POST:
-                request.session['dnssec_enabled'] = True
-                request.session['dnssec_ds_confirmed'] = False
-                request.session['dnssec_key_confirmed'] = False
-        
+                    messages.error(self.request, errmsg)
+                request.session["dnssec_ds_confirmed"] = False
+                request.session["dnssec_key_confirmed"] = False
+            elif "enable_dnssec" in request.POST:
+                request.session["dnssec_enabled"] = True
+                request.session["dnssec_ds_confirmed"] = False
+                request.session["dnssec_key_confirmed"] = False
+
         return self.form_valid(form)
 
 
@@ -292,21 +293,28 @@ class DomainDsdataView(DomainPermissionView, FormMixin):
         domain = self.get_object()
         dnssecdata: extensions.DNSSECExtension = domain.dnssecdata
         initial_data = []
-        
-        if dnssecdata is not None:
 
+        if dnssecdata is not None:
             if dnssecdata.keyData is not None:
                 # TODO: Throw an error
                 pass
 
             if dnssecdata.dsData is not None:
                 # Add existing nameservers as initial data
-                initial_data.extend({"key_tag": record.keyTag, "algorithm": record.alg, "digest_type": record.digestType, "digest": record.digest} for record in dnssecdata.dsData)
-        
+                initial_data.extend(
+                    {
+                        "key_tag": record.keyTag,
+                        "algorithm": record.alg,
+                        "digest_type": record.digestType,
+                        "digest": record.digest,
+                    }
+                    for record in dnssecdata.dsData
+                )
+
         # Ensure at least 3 fields, filled or empty
         while len(initial_data) == 0:
             initial_data.append({})
-        
+
         return initial_data
 
     def get_success_url(self):
@@ -319,16 +327,18 @@ class DomainDsdataView(DomainPermissionView, FormMixin):
         # use "formset" instead of "form" for the key
         context["formset"] = context.pop("form")
 
-        # set the dnssec_ds_confirmed flag in the context for this view 
+        # set the dnssec_ds_confirmed flag in the context for this view
         # based either on the existence of DS Data in the domain,
         # or on the flag stored in the session
         domain = self.get_object()
         dnssecdata: extensions.DNSSECExtension = domain.dnssecdata
 
         if dnssecdata is not None and dnssecdata.dsData is not None:
-            self.request.session['dnssec_ds_confirmed'] = True
+            self.request.session["dnssec_ds_confirmed"] = True
 
-        context['dnssec_ds_confirmed'] = self.request.session.get('dnssec_ds_confirmed', False)
+        context["dnssec_ds_confirmed"] = self.request.session.get(
+            "dnssec_ds_confirmed", False
+        )
         return context
 
     def post(self, request, *args, **kwargs):
@@ -336,14 +346,14 @@ class DomainDsdataView(DomainPermissionView, FormMixin):
         self.object = self.get_object()
         formset = self.get_form()
 
-        if 'confirm-ds' in request.POST:
-            request.session['dnssec_ds_confirmed'] = True
-            request.session['dnssec_key_confirmed'] = False
+        if "confirm-ds" in request.POST:
+            request.session["dnssec_ds_confirmed"] = True
+            request.session["dnssec_key_confirmed"] = False
             return super().form_valid(formset)
-        
-        if 'btn-cancel-click' in request.POST:
-            return redirect('/', {'formset': formset},RequestContext(request))
-                
+
+        if "btn-cancel-click" in request.POST:
+            return redirect("/", {"formset": formset}, RequestContext(request))
+
         if formset.is_valid():
             return self.form_valid(formset)
         else:
@@ -353,11 +363,12 @@ class DomainDsdataView(DomainPermissionView, FormMixin):
         """The formset is valid, perform something with it."""
 
         # Set the nameservers from the formset
-        dnssecdata = {"dsData":[]}
+        dnssecdata = {"dsData": []}
 
         for form in formset:
             try:
-                # if 'delete' not in form.cleaned_data or form.cleaned_data['delete'] == False:
+                # if 'delete' not in form.cleaned_data
+                # or form.cleaned_data['delete'] == False:
                 dsrecord = {
                     "keyTag": form.cleaned_data["key_tag"],
                     "alg": form.cleaned_data["algorithm"],
@@ -378,9 +389,7 @@ class DomainDsdataView(DomainPermissionView, FormMixin):
             errmsg = "Error updating DNSSEC data in the registry."
             logger.error(errmsg)
             logger.error(err)
-            messages.error(
-                self.request, errmsg
-            )
+            messages.error(self.request, errmsg)
             return self.form_invalid(formset)
         else:
             messages.success(
@@ -388,7 +397,6 @@ class DomainDsdataView(DomainPermissionView, FormMixin):
             )
             # superclass has the redirect
             return super().form_valid(formset)
-        
 
 
 class DomainKeydataView(DomainPermissionView, FormMixin):
@@ -404,21 +412,28 @@ class DomainKeydataView(DomainPermissionView, FormMixin):
         domain = self.get_object()
         dnssecdata: extensions.DNSSECExtension = domain.dnssecdata
         initial_data = []
-        
-        if dnssecdata is not None:
 
+        if dnssecdata is not None:
             if dnssecdata.dsData is not None:
                 # TODO: Throw an error
                 pass
 
             if dnssecdata.keyData is not None:
                 # Add existing keydata as initial data
-                initial_data.extend({"flag": record.flags, "protocol": record.protocol, "algorithm": record.alg, "pub_key": record.pubKey} for record in dnssecdata.keyData)
-        
+                initial_data.extend(
+                    {
+                        "flag": record.flags,
+                        "protocol": record.protocol,
+                        "algorithm": record.alg,
+                        "pub_key": record.pubKey,
+                    }
+                    for record in dnssecdata.keyData
+                )
+
         # Ensure at least 3 fields, filled or empty
         while len(initial_data) == 0:
             initial_data.append({})
-        
+
         return initial_data
 
     def get_success_url(self):
@@ -431,32 +446,34 @@ class DomainKeydataView(DomainPermissionView, FormMixin):
         # use "formset" instead of "form" for the key
         context["formset"] = context.pop("form")
 
-        # set the dnssec_key_confirmed flag in the context for this view 
+        # set the dnssec_key_confirmed flag in the context for this view
         # based either on the existence of Key Data in the domain,
         # or on the flag stored in the session
         domain = self.get_object()
         dnssecdata: extensions.DNSSECExtension = domain.dnssecdata
 
         if dnssecdata is not None and dnssecdata.keyData is not None:
-            self.request.session['dnssec_key_confirmed'] = True
+            self.request.session["dnssec_key_confirmed"] = True
 
-        context['dnssec_key_confirmed'] = self.request.session.get('dnssec_key_confirmed', False)
+        context["dnssec_key_confirmed"] = self.request.session.get(
+            "dnssec_key_confirmed", False
+        )
         return context
 
     def post(self, request, *args, **kwargs):
         """Formset submission posts to this view."""
         self.object = self.get_object()
         formset = self.get_form()
-        
-        if 'confirm-key' in request.POST:
-            request.session['dnssec_key_confirmed'] = True
-            request.session['dnssec_ds_confirmed'] = False
+
+        if "confirm-key" in request.POST:
+            request.session["dnssec_key_confirmed"] = True
+            request.session["dnssec_ds_confirmed"] = False
             self.object.save()
             return super().form_valid(formset)
-        
-        if 'btn-cancel-click' in request.POST:
-            return redirect('/', {'formset': formset},RequestContext(request))
-        
+
+        if "btn-cancel-click" in request.POST:
+            return redirect("/", {"formset": formset}, RequestContext(request))
+
         if formset.is_valid():
             return self.form_valid(formset)
         else:
@@ -466,11 +483,12 @@ class DomainKeydataView(DomainPermissionView, FormMixin):
         """The formset is valid, perform something with it."""
 
         # Set the nameservers from the formset
-        dnssecdata = {"keyData":[]}
+        dnssecdata = {"keyData": []}
 
         for form in formset:
             try:
-                # if 'delete' not in form.cleaned_data or form.cleaned_data['delete'] == False:
+                # if 'delete' not in form.cleaned_data
+                # or form.cleaned_data['delete'] == False:
                 keyrecord = {
                     "flags": form.cleaned_data["flag"],
                     "protocol": form.cleaned_data["protocol"],
@@ -490,9 +508,7 @@ class DomainKeydataView(DomainPermissionView, FormMixin):
             errmsg = "Error updating DNSSEC data in the registry."
             logger.error(errmsg)
             logger.error(err)
-            messages.error(
-                self.request, errmsg
-            )
+            messages.error(self.request, errmsg)
             return self.form_invalid(formset)
         else:
             messages.success(