From 94188b53950ddf616c63029eec9865f6fecc276b Mon Sep 17 00:00:00 2001
From: Andy Newton <andy.newton@dvsa.gov.uk>
Date: Wed, 14 Aug 2024 11:00:07 +0100
Subject: [PATCH] fix: refactor cascadeForm for JQ3

---
 app/cdn/assets/_js/components/cascadeForm.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/cdn/assets/_js/components/cascadeForm.js b/app/cdn/assets/_js/components/cascadeForm.js
index 8a311ed7fa..3eb5ef442a 100644
--- a/app/cdn/assets/_js/components/cascadeForm.js
+++ b/app/cdn/assets/_js/components/cascadeForm.js
@@ -30,7 +30,7 @@ OLCS.cascadeForm = (function(document, $, undefined) {
         $.each(elems, function(i, elem) {
           elem = $(elem);
           if (elem.is(":checked")) {
-            elem.removeAttr("checked");
+            elem.prop("checked", false);
           }
         });
         // ensure the change notification cascades down the line
@@ -100,9 +100,9 @@ OLCS.cascadeForm = (function(document, $, undefined) {
       }
       OLCS.logger.verbose(
         group + " > " + selector +
-          ", should show? (" + show + "), is visible? (" +
-          elem.is(":visible") + "), action: (" +
-          action + ")",
+        ", should show? (" + show + "), is visible? (" +
+        elem.is(":visible") + "), action: (" +
+        action + ")",
         "cascadeForm"
       );
 
@@ -161,9 +161,9 @@ OLCS.cascadeForm = (function(document, $, undefined) {
         // assume a name=value pair specifies a radio button with a given value
         parts = selector.split("=");
         return OLCS.formHelper.findInput(group, parts[0])
-        .filter("[value=" + parts[1] + "]")
-        // radios are always wrapped inside a label
-        .parents("label:last");
+          .filter("[value=" + parts[1] + "]")
+          // radios are always wrapped inside a label
+          .parents("label:last");
       }
 
       // otherwise assume a straight input name which we assume is inside a field container
@@ -199,6 +199,8 @@ OLCS.cascadeForm = (function(document, $, undefined) {
     $(document).on("change", formSelector, checkForm);
 
     OLCS.eventEmitter.on("render", checkForm);
+
+    checkForm();
   };
 
-}(document, window.jQuery));
\ No newline at end of file
+}(document, window.jQuery));