Merge pull request #3426 from projectblacklight/refactor-contact-dele…

…te-error-handler Refactor the exhibit contact delete 404 handler
projectblacklight · Jan 31, 2025 · c7e6517 · c7e6517
2 parents 2e3da52 + f6dfe56
commit c7e6517
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 71 deletions.
diff --git a/app/assets/javascripts/spotlight/spotlight.esm.js b/app/assets/javascripts/spotlight/spotlight.esm.js
diff --git a/app/assets/javascripts/spotlight/spotlight.esm.js.map b/app/assets/javascripts/spotlight/spotlight.esm.js.map
diff --git a/app/assets/javascripts/spotlight/spotlight.js b/app/assets/javascripts/spotlight/spotlight.js
diff --git a/app/assets/javascripts/spotlight/spotlight.js.map b/app/assets/javascripts/spotlight/spotlight.js.map
diff --git a/app/javascript/spotlight/admin/exhibits.js b/app/javascript/spotlight/admin/exhibits.js
@@ -41,29 +41,9 @@ export default class {
       $(inputContainer).insertAfter(contacts.last());
     });
 
-    $('.contact-email-delete').on('ajax:success', function() {
-      $(this).closest('.contact').fadeOut(250, function() { $(this).remove(); });
-    });
-
-    $('.contact-email-delete').on('ajax:error', function(event, _xhr, _status, error) {
-      var errSpan = $(this).closest('.contact').find('.contact-email-delete-error');
-      errSpan.show();
-      errSpan.find('.error-msg').first().text(error || event.detail[1]);
-    });
-
-    document.addEventListener('turbo:submit-end', (event) => {
-      const response = event.detail.fetchResponse;
-      if (!response.succeeded && response.response.status === 404) {
-        const path = new URL(event.target.action).pathname;
-        const deleteButton = document.querySelector(`.contact-email-delete[href="${path}"]`);
-        if (deleteButton) {
-          const errSpan = deleteButton.closest('.contact').querySelector('.contact-email-delete-error');
-          const errorMsg = errSpan.querySelector('.error-msg');
-          errSpan.style.display = 'block';
-          errorMsg.textContent = 'Not Found';
-        }
-      }
-    });
+    if (document.getElementById('another-email')) {
+      document.addEventListener('turbo:submit-end', this.contactToDeleteNotFoundHandler);
+    }
 
     if ($.fn.tooltip) {
       $('.btn-with-tooltip').tooltip();
@@ -74,4 +54,13 @@ export default class {
         $('#search_title').focus();
     });
   }
+
+  contactToDeleteNotFoundHandler(e) {
+    const contact = e.detail.formSubmission?.delegate?.element?.querySelector('.contact')
+    if (contact && e.detail?.fetchResponse?.response?.status === 404) {
+      const error = contact.querySelector('.contact-email-delete-error');
+      error.style.display = 'block';
+      error.querySelector('.error-msg').textContent = 'Not Found';
+    }
+  }
 }