From 8e5dd3e9f0869bf75d8435414ae3cced5be0a4a0 Mon Sep 17 00:00:00 2001
From: Brad Bodine <bbodine1@gmail.com>
Date: Mon, 13 Jan 2025 21:06:19 -0600
Subject: [PATCH 1/3] fix: improve applicant destruction confirmation handling
 and logging

---
 .../javascripts/financial_assistance.js       |   5 +-
 app/assets/javascripts/inline_replacements.js |   3 +-
 .../applicants/_edit.html.erb                 | 105 +++++++++---------
 3 files changed, 58 insertions(+), 55 deletions(-)

diff --git a/app/assets/javascripts/financial_assistance.js b/app/assets/javascripts/financial_assistance.js
index b1c62f9f5a8..5b5b0701431 100644
--- a/app/assets/javascripts/financial_assistance.js
+++ b/app/assets/javascripts/financial_assistance.js
@@ -22,12 +22,13 @@ $(document).on('ajax:success', '#edit-dependent-person', function (event) {
     $('.btn-confirmation').removeAttr('disabled');
   });
 
-  $(document).on('click', '#destroyApplicant #destroy-confirm', function (e) {
+  $(document).on('click', '#destroy-confirm', function (e) {
     confirmDestoyApplicant(e, $(this).data('url'));
   });
 
   function confirmDestoyApplicant(event, url) {
-    $('.btn-confirmation').prop('disabled', true);
+    console.log('Applicant Destroy Initiated');
+    $('#destroy-confirm').prop('disabled', true);
     event.preventDefault();
     event.stopImmediatePropagation();
     //
diff --git a/app/assets/javascripts/inline_replacements.js b/app/assets/javascripts/inline_replacements.js
index 52c1a773904..0867dc3d7df 100644
--- a/app/assets/javascripts/inline_replacements.js
+++ b/app/assets/javascripts/inline_replacements.js
@@ -279,7 +279,8 @@ $(document).on('click', 'button#delete_applicant_button', function (e) {
 });
 
 function confirmDestoyApplicant(event, url) {
-  $('.btn-confirmation').prop('disabled', true);
+  console.log('Applicant Destroy1 Initiated');
+  $('#destroy-confirm').prop('disabled', true);
   event.preventDefault();
   event.stopImmediatePropagation();
   //
diff --git a/components/financial_assistance/app/views/financial_assistance/applicants/_edit.html.erb b/components/financial_assistance/app/views/financial_assistance/applicants/_edit.html.erb
index ade4bf2cda0..eb5e6bd88e9 100644
--- a/components/financial_assistance/app/views/financial_assistance/applicants/_edit.html.erb
+++ b/components/financial_assistance/app/views/financial_assistance/applicants/_edit.html.erb
@@ -148,20 +148,20 @@
   <%= render 'users/security_question_responses/edit_modal', action: 'replace', method: 'POST', edit_mode: true %>
 
   <div class="modal" id="destroyApplicant" role="dialog">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-body">
-        <%= l10n('faa.edit.delete_applicant') %>
-        <strong><br /><%= l10n('faa.edit.remove_warning') %></strong>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default pull-left" data-dismiss="modal">Cancel</button>
-        <button type="button" class="btn btn-primary btn-confirmation" id="destroy-confirm" data-url="<%=application_applicant_path(@application, @applicant)%>">Confirm</button>
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-body">
+          <%= l10n('faa.edit.delete_applicant') %>
+          <strong><br /><%= l10n('faa.edit.remove_warning') %></strong>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-default pull-left" data-dismiss="modal">Cancel</button>
+          <button type="button" class="" id="destroy-confirm" data-url="<%=application_applicant_path(@application, @applicant)%>">Confirm</button>
 
+        </div>
       </div>
     </div>
   </div>
-</div>
 
 
 <% else %>
@@ -366,54 +366,55 @@
     <button type="button" class="btn btn-default close_member_form hide cancel_<%=@applicant.id%>_edit"> Cancel</button>
     <span tabindex="0" tabindex="0" onkeydown="handleButtonKeyDown(event, 'confirm_member')" id="confirm_member" class='btn btn-primary btn-br save_member applicant-confirm-member' onclick='confirmMember($(this));'> Confirm member</span>
   </div>
-<% end %>
-<br>
-<%= render 'users/security_question_responses/edit_modal', action: 'replace', method: 'POST', edit_mode: true %>
-<script>
-  Freebies.floatlabels();
-  $.inputMasks();
-
-    $('#applicant_same_with_primary').click(function(){
-      if($(this).is(':checked')){
-          $('#applicant-home-address-area').css("display", "none");
-      } else {
-          $('#applicant-home-address-area').css("display", "block");
-      }
-    });
 
-    $(document).on('click', '#delete_applicant_button', function(e) {
-      e.preventDefault();
-      $("#destroyApplicant").modal();
+  <% end %>
+  <br>
+  <%= render 'users/security_question_responses/edit_modal', action: 'replace', method: 'POST', edit_mode: true %>
+  <script>
+    Freebies.floatlabels();
+    $.inputMasks();
+
+      $('#applicant_same_with_primary').click(function(){
+        if($(this).is(':checked')){
+            $('#applicant-home-address-area').css("display", "none");
+        } else {
+            $('#applicant-home-address-area').css("display", "block");
+        }
+      });
 
-    $("#destroyApplicant .modal-cancel-button").click(function(e) {
-      $("#destroyApplicant").modal('hide');
+      $(document).on('click', '#delete_applicant_button', function(e) {
+        e.preventDefault();
+        $("#destroyApplicant").modal();
+
+      $("#destroyApplicant .modal-cancel-button").click(function(e) {
+        $("#destroyApplicant").modal('hide');
+      });
+      $(".btn-confirmation").removeAttr('disabled');
     });
-    $(".btn-confirmation").removeAttr('disabled');
-  });
-
-  function confirmMember(element) {
-    const form = element.closest('form')[0];
-    const maleRadio = document.getElementById('radio_male');
-    const femaleRadio = document.getElementById('radio_female');
-    const confirmButtonText = "<%= l10n('confirm_member') %>";
-    const applicantSSN = document.getElementById('applicant_ssn')
-    const applicantNoSSN = document.getElementById('applicant_no_ssn')
-    element.text("Please Wait...").addClass("disabled");
-
-    PersonValidations.manageRequiredValidations(element);
-
-    if (!form.checkValidity() || !isGenderSelected(maleRadio, femaleRadio) || !isSsnSelected(applicantSSN, applicantNoSSN)) {
-      element.text(confirmButtonText).removeClass("disabled");
+
+    function confirmMember(element) {
+      const form = element.closest('form')[0];
+      const maleRadio = document.getElementById('radio_male');
+      const femaleRadio = document.getElementById('radio_female');
+      const confirmButtonText = "<%= l10n('confirm_member') %>";
+      const applicantSSN = document.getElementById('applicant_ssn')
+      const applicantNoSSN = document.getElementById('applicant_no_ssn')
+      element.text("Please Wait...").addClass("disabled");
+
+      PersonValidations.manageRequiredValidations(element);
+
+      if (!form.checkValidity() || !isGenderSelected(maleRadio, femaleRadio) || !isSsnSelected(applicantSSN, applicantNoSSN)) {
+        element.text(confirmButtonText).removeClass("disabled");
+      }
     }
-  }
 
-  function isGenderSelected(maleRadio, femaleRadio) {
-    return (maleRadio && maleRadio.checked) || (femaleRadio && femaleRadio.checked);
-  }
+    function isGenderSelected(maleRadio, femaleRadio) {
+      return (maleRadio && maleRadio.checked) || (femaleRadio && femaleRadio.checked);
+    }
 
-  function isSsnSelected(applicantSSN, applicantNoSSN) {
-    return (applicantSSN && applicantSSN.value.replace(/-/g, '').length == 9) || (applicantNoSSN && applicantNoSSN.checked);
-  }
+    function isSsnSelected(applicantSSN, applicantNoSSN) {
+      return (applicantSSN && applicantSSN.value.replace(/-/g, '').length == 9) || (applicantNoSSN && applicantNoSSN.checked);
+    }
 
     function confirmDestoyApplicant(event, url){
       $(".btn-confirmation").prop('disabled', true);

From af971e6f3c477788adbf3501b95748a8acf38d43 Mon Sep 17 00:00:00 2001
From: Brad Bodine <bbodine1@gmail.com>
Date: Thu, 16 Jan 2025 08:35:11 -0600
Subject: [PATCH 2/3] Update financial_assistance.js

Comment out console.log

Signed-off-by: Brad Bodine <bbodine1@gmail.com>
---
 app/assets/javascripts/financial_assistance.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/financial_assistance.js b/app/assets/javascripts/financial_assistance.js
index 5b5b0701431..98f1a8b5162 100644
--- a/app/assets/javascripts/financial_assistance.js
+++ b/app/assets/javascripts/financial_assistance.js
@@ -27,7 +27,7 @@ $(document).on('ajax:success', '#edit-dependent-person', function (event) {
   });
 
   function confirmDestoyApplicant(event, url) {
-    console.log('Applicant Destroy Initiated');
+    // console.log('Applicant Destroy Initiated');
     $('#destroy-confirm').prop('disabled', true);
     event.preventDefault();
     event.stopImmediatePropagation();

From dbc71c04a70a8b6f13654f4c53df667680b47702 Mon Sep 17 00:00:00 2001
From: Brad Bodine <bbodine1@gmail.com>
Date: Thu, 16 Jan 2025 08:35:41 -0600
Subject: [PATCH 3/3] Update inline_replacements.js

Signed-off-by: Brad Bodine <bbodine1@gmail.com>
---
 app/assets/javascripts/inline_replacements.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/inline_replacements.js b/app/assets/javascripts/inline_replacements.js
index 0867dc3d7df..8b6d3a5e1ca 100644
--- a/app/assets/javascripts/inline_replacements.js
+++ b/app/assets/javascripts/inline_replacements.js
@@ -279,7 +279,7 @@ $(document).on('click', 'button#delete_applicant_button', function (e) {
 });
 
 function confirmDestoyApplicant(event, url) {
-  console.log('Applicant Destroy1 Initiated');
+  // console.log('Applicant Destroy1 Initiated');
   $('#destroy-confirm').prop('disabled', true);
   event.preventDefault();
   event.stopImmediatePropagation();