rails_modal_manager 1.0.45 → 1.0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35bbae9104923aaa6bc1fa87eacd8616c2ef0aaf538ed1210fb369c3f25e89e2
-  data.tar.gz: 34ba022c5adac89ff47c3f505215acef624056da6f48afaec02bc42e611e587e
+  metadata.gz: 7dec9a40ef3da3620d41315569b51f9b0a3ac6a291bdd81edf77ca6271858464
+  data.tar.gz: 719e56407709affe6b21f781ad92cc5496f3ed1c13de711b6f4cbc3769915910
 SHA512:
-  metadata.gz: f94273a89dcd52dba439b464196f7c3db208a28405c01f582227e81bb3c709f236074d6a5bca7c6dcdbf53dcf822357d47da9ae643aa23463f25a5d000b55d35
-  data.tar.gz: 2c8f6ffd4bfced2dcf0ae66a5f8b0f39b63d58fa490f5bbdc7e114f3cbd88810d6c73c054a435e5a3a041d5e3adc7ff67f4e323305f45ed3bb367b2e9748a278
+  metadata.gz: 41af209ea06bad87c813444fe5a4e7ba074d685709d9f1dbf916e5dfbd983120d2445de1436bec01ee7b9d3b675084887824010e7ffce4704df4b0c4d74b3757
+  data.tar.gz: 14ed339f8138e4e4586f4b13d4fd078e570752bd92f2e7367d2d8c3b128dde332c12f755e7343be703e8810bf5f5f73abe623fbb25ccc740452befa6fc3bca65

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

@@ -297,7 +297,12 @@ export default class extends Controller {
     const modal = this.element.closest('.rmm-modal')
     if (!modal) return
 
-    // Abort all pending AJAX requests from all submenu controllers
+    // Invalidate any pending AJAX responses + abort network requests
+    const contentContainer = modal.querySelector('.rmm-tab-content')
+    if (contentContainer) {
+      // Increment shared counter to invalidate all pending responses
+      contentContainer.dataset.rmmRequestId = (parseInt(contentContainer.dataset.rmmRequestId || '0', 10) + 1)
+    }
     modal.querySelectorAll('[data-controller*="rmm-submenu"]').forEach(el => {
       const ctrl = this.application.getControllerForElementAndIdentifier(el, 'rmm-submenu')
       if (ctrl && ctrl.currentAbortController) {

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

@@ -53,6 +53,19 @@ export default class extends Controller {
     }
   }
 
+  /**
+   * Increment the shared request counter on the content container.
+   * Called synchronously from selectItem/forceReloadActive BEFORE async loadAjaxContent.
+   * This ensures any pending async response is immediately invalidated.
+   */
+  _incrementRequestId() {
+    const modal = this.element.closest('.rmm-modal')
+    if (!modal) return
+    const container = modal.querySelector('.rmm-tab-content')
+    if (!container) return
+    container.dataset.rmmRequestId = (parseInt(container.dataset.rmmRequestId || '0', 10) + 1)
+  }
+
   selectItem(e) {
     const item = e.currentTarget
     const itemId = item.dataset.itemId
@@ -74,6 +87,8 @@ export default class extends Controller {
 
     // Handle content switching based on load mode
     if (this.loadModeValue === 'ajax') {
+      // Synchronously invalidate any pending requests BEFORE starting new one
+      this._incrementRequestId()
       this.loadAjaxContent(item)
     } else {
       this.switchPanel(item)
@@ -98,6 +113,8 @@ export default class extends Controller {
     const activeItem = this.element.querySelector('.rmm-submenu-item.rmm-active')
     if (activeItem) {
       if (this.loadModeValue === 'ajax') {
+        // Synchronously invalidate any pending requests
+        this._incrementRequestId()
         this.loadAjaxContent(activeItem)
       } else {
         this.switchPanel(activeItem)
@@ -141,8 +158,8 @@ export default class extends Controller {
 
   /**
    * AJAX mode: Load content from URL
-   * Uses AbortController to cancel previous pending requests and
-   * validates response against current active item to prevent race conditions.
+   * Uses AbortController to cancel pending network requests and
+   * a shared request counter (on the DOM) to discard stale responses.
    */
   async loadAjaxContent(item) {
     const url = item.dataset.url
@@ -158,13 +175,14 @@ export default class extends Controller {
     // Check cache
     if (this.cacheAjaxValue && this.ajaxCache.has(url)) {
       contentContainer.innerHTML = this.ajaxCache.get(url)
+      contentContainer.classList.remove('rmm-tab-loading')
       this.dispatch('contentLoaded', {
         detail: { modalId: this.modalIdValue, itemId: item.dataset.itemId, fromCache: true }
       })
       return
     }
 
-    // Abort previous pending request from this controller
+    // Abort previous pending request from this controller instance
     if (this.currentAbortController) {
       this.currentAbortController.abort()
     }
@@ -172,10 +190,8 @@ export default class extends Controller {
     const abortController = new AbortController()
     this.currentAbortController = abortController
 
-    // 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
+    // Read the request ID that was set synchronously by selectItem/forceReloadActive
+    const requestId = parseInt(contentContainer.dataset.rmmRequestId || '0', 10)
 
     // Show loading state
     contentContainer.classList.add('rmm-tab-loading')
@@ -196,8 +212,7 @@ export default class extends Controller {
 
       const html = await response.text()
 
-      // Validate: only update if this is still the latest request
-      // Uses the shared counter on the DOM element, not instance-level counter
+      // Validate: discard if a newer request has been initiated
       if (parseInt(contentContainer.dataset.rmmRequestId, 10) !== requestId) {
         return
       }
@@ -220,6 +235,11 @@ export default class extends Controller {
         return
       }
 
+      // Also discard errors from stale requests
+      if (parseInt(contentContainer.dataset.rmmRequestId, 10) !== requestId) {
+        return
+      }
+
       console.error('RMM Submenu: Failed to load content', error)
       contentContainer.innerHTML = `
         <div class="rmm-tab-error">
@@ -263,6 +283,7 @@ export default class extends Controller {
         if (url) {
           this.ajaxCache.delete(url)
         }
+        this._incrementRequestId()
         this.loadAjaxContent(activeItem)
       }
     }

data/lib/rails_modal_manager/version.rb

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

metadata

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