rails_modal_manager 1.0.44 → 1.0.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0752ed8f79cdbe227d9a4010cab4ac2f73cf59e75dade5572bc98cda6374e2d
-  data.tar.gz: 5d9d4f28f9f9a4535d5646e707540e21e641f49e5b757a4d50d9cc7afbf1ef54
+  metadata.gz: 35bbae9104923aaa6bc1fa87eacd8616c2ef0aaf538ed1210fb369c3f25e89e2
+  data.tar.gz: 34ba022c5adac89ff47c3f505215acef624056da6f48afaec02bc42e611e587e
 SHA512:
-  metadata.gz: fc8042fd0499d9f7076c8ad822ef9849a324f12a733d23a5449b1b07677f9bb73b8b9e9d88324baec9b448ffcdf983d83a1a9d3f6f2e346b87da23fdfd39e9fb
-  data.tar.gz: eb4dc333dd595d3bac849153b8e5f7cde6ecefecf3e5d9fa056309e3a479e8e96d70e9734aabd219170a920e79f3e009099128d3a0b5220fb5c5d394d5925545
+  metadata.gz: f94273a89dcd52dba439b464196f7c3db208a28405c01f582227e81bb3c709f236074d6a5bca7c6dcdbf53dcf822357d47da9ae643aa23463f25a5d000b55d35
+  data.tar.gz: 2c8f6ffd4bfced2dcf0ae66a5f8b0f39b63d58fa490f5bbdc7e114f3cbd88810d6c73c054a435e5a3a041d5e3adc7ff67f4e323305f45ed3bb367b2e9748a278

data/app/javascript/rails_modal_manager/controllers/rmm_sidebar_controller.js

@@ -297,6 +297,15 @@ export default class extends Controller {
     const modal = this.element.closest('.rmm-modal')
     if (!modal) return
 
+    // Abort all pending AJAX requests from all submenu controllers
+    modal.querySelectorAll('[data-controller*="rmm-submenu"]').forEach(el => {
+      const ctrl = this.application.getControllerForElementAndIdentifier(el, 'rmm-submenu')
+      if (ctrl && ctrl.currentAbortController) {
+        ctrl.currentAbortController.abort()
+        ctrl.currentAbortController = null
+      }
+    })
+
     // Hide all submenu groups
     modal.querySelectorAll('.rmm-submenu-group').forEach(group => {
       group.classList.remove('rmm-submenu-group-active')

data/app/javascript/rails_modal_manager/controllers/rmm_submenu_controller.js

@@ -45,7 +45,6 @@ export default class extends Controller {
     this.ajaxCache = new Map()
     this.currentItemId = null
     this.currentAbortController = null
-    this.currentRequestId = 0
 
     // Find initial active item
     const activeItem = this.element.querySelector('.rmm-submenu-item.rmm-active')
@@ -165,14 +164,18 @@ export default class extends Controller {
       return
     }
 
-    // Abort previous pending request
+    // Abort previous pending request from this controller
     if (this.currentAbortController) {
       this.currentAbortController.abort()
     }
 
     const abortController = new AbortController()
     this.currentAbortController = abortController
-    const requestId = ++this.currentRequestId
+
+    // Global request counter on the shared content container
+    // This ensures cross-controller coordination (e.g., when switching sidebar groups)
+    const requestId = (parseInt(contentContainer.dataset.rmmRequestId || '0', 10) + 1)
+    contentContainer.dataset.rmmRequestId = requestId
 
     // Show loading state
     contentContainer.classList.add('rmm-tab-loading')
@@ -194,7 +197,8 @@ export default class extends Controller {
       const html = await response.text()
 
       // Validate: only update if this is still the latest request
-      if (this.currentRequestId !== requestId) {
+      // Uses the shared counter on the DOM element, not instance-level counter
+      if (parseInt(contentContainer.dataset.rmmRequestId, 10) !== requestId) {
         return
       }
 

data/lib/rails_modal_manager/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsModalManager
-  VERSION = "1.0.44"
+  VERSION = "1.0.45"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_modal_manager
 version: !ruby/object:Gem::Version
-  version: 1.0.44
+  version: 1.0.45
 platform: ruby
 authors:
 - reshacs