From 0453e13d4de93458246f00a6d664ae37a8c6b31b Mon Sep 17 00:00:00 2001
From: Kenta Ishizaki <kentaishizaki@55728.jp>
Date: Wed, 1 Apr 2026 22:06:40 +0900
Subject: [PATCH] Fix destroy button click navigating to show page on index

Clicking the Destroy button on the index collection table was triggering row navigation to the show page. The visitDataUrl Stimulus action only checked event.target.href to skip navigation, but button_to generates a <button> element without href.

Replace the href check with event.target.closest() to properly detect interactive elements (links, buttons, submit inputs) that should not trigger row navigation.

Fixes #2978
---
 .../administrate/controllers/table_controller.js      |  2 +-
 spec/features/orders_index_spec.rb                    | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/administrate/controllers/table_controller.js b/app/assets/javascripts/administrate/controllers/table_controller.js
index ad0279d6a0..e2a84bce31 100644
--- a/app/assets/javascripts/administrate/controllers/table_controller.js
+++ b/app/assets/javascripts/administrate/controllers/table_controller.js
@@ -9,7 +9,7 @@ export default class extends Controller {
         event.keyCode == keycodes.space ||
         event.keyCode == keycodes.enter) {
 
-      if (event.target.href) {
+      if (event.target.closest("a[href], button, input[type='submit']")) {
         return;
       }
 
diff --git a/spec/features/orders_index_spec.rb b/spec/features/orders_index_spec.rb
index 47923a060f..320427f99f 100644
--- a/spec/features/orders_index_spec.rb
+++ b/spec/features/orders_index_spec.rb
@@ -57,6 +57,17 @@
     )
   end
 
+  scenario "clicking destroy does not navigate to show page", js: true do
+    create(:order)
+
+    visit admin_orders_path
+    dismiss_confirm do
+      click_on t("administrate.actions.destroy")
+    end
+
+    expect(page).to have_current_path(admin_orders_path)
+  end
+
   scenario "cannot delete because associated payment", js: true do
     create(:payment, order: create(:order))