From 326b925690163a8366dd2fb91c474827d5d41360 Mon Sep 17 00:00:00 2001
From: dataCenter430 <161712630+dataCenter430@users.noreply.github.com>
Date: Sun, 15 Feb 2026 01:34:34 -0700
Subject: [PATCH] fix: prevent New rule modal from closing when removing
 conditions or actions (#991)

---
 app/javascript/controllers/rule/actions_controller.js    | 3 +++
 app/javascript/controllers/rule/conditions_controller.js | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/app/javascript/controllers/rule/actions_controller.js b/app/javascript/controllers/rule/actions_controller.js
index 0ca8a2520..343424c6c 100644
--- a/app/javascript/controllers/rule/actions_controller.js
+++ b/app/javascript/controllers/rule/actions_controller.js
@@ -11,6 +11,9 @@ export default class extends Controller {
   ];
 
   remove(e) {
+    e.preventDefault();
+    e.stopPropagation();
+    
     if (e.params.destroy) {
       this.destroyFieldTarget.value = true;
       this.element.classList.add("hidden");
diff --git a/app/javascript/controllers/rule/conditions_controller.js b/app/javascript/controllers/rule/conditions_controller.js
index 2999ca0d9..fccabd527 100644
--- a/app/javascript/controllers/rule/conditions_controller.js
+++ b/app/javascript/controllers/rule/conditions_controller.js
@@ -26,6 +26,9 @@ export default class extends Controller {
   }
 
   remove(e) {
+    e.preventDefault();
+    e.stopPropagation();
+    
     // Find the parent rules controller before removing the condition
     const rulesEl = this.element.closest('[data-controller~="rules"]');