rails_modal_manager 1.0.44 → 1.0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0752ed8f79cdbe227d9a4010cab4ac2f73cf59e75dade5572bc98cda6374e2d
-  data.tar.gz: 5d9d4f28f9f9a4535d5646e707540e21e641f49e5b757a4d50d9cc7afbf1ef54
+  metadata.gz: 7dec9a40ef3da3620d41315569b51f9b0a3ac6a291bdd81edf77ca6271858464
+  data.tar.gz: 719e56407709affe6b21f781ad92cc5496f3ed1c13de711b6f4cbc3769915910
 SHA512:
-  metadata.gz: fc8042fd0499d9f7076c8ad822ef9849a324f12a733d23a5449b1b07677f9bb73b8b9e9d88324baec9b448ffcdf983d83a1a9d3f6f2e346b87da23fdfd39e9fb
-  data.tar.gz: eb4dc333dd595d3bac849153b8e5f7cde6ecefecf3e5d9fa056309e3a479e8e96d70e9734aabd219170a920e79f3e009099128d3a0b5220fb5c5d394d5925545
+  metadata.gz: 41af209ea06bad87c813444fe5a4e7ba074d685709d9f1dbf916e5dfbd983120d2445de1436bec01ee7b9d3b675084887824010e7ffce4704df4b0c4d74b3757
+  data.tar.gz: 14ed339f8138e4e4586f4b13d4fd078e570752bd92f2e7367d2d8c3b128dde332c12f755e7343be703e8810bf5f5f73abe623fbb25ccc740452befa6fc3bca65

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

@@ -297,6 +297,20 @@ export default class extends Controller {
     const modal = this.element.closest('.rmm-modal')
     if (!modal) return
 
+    // 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) {
+        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')
@@ -54,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
@@ -75,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)
@@ -99,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)
@@ -142,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
@@ -159,20 +175,23 @@ 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
+    // Abort previous pending request from this controller instance
     if (this.currentAbortController) {
       this.currentAbortController.abort()
     }
 
     const abortController = new AbortController()
     this.currentAbortController = abortController
-    const requestId = ++this.currentRequestId
+
+    // 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')
@@ -193,8 +212,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) {
+      // Validate: discard if a newer request has been initiated
+      if (parseInt(contentContainer.dataset.rmmRequestId, 10) !== requestId) {
         return
       }
 
@@ -216,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">
@@ -259,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.44"
+  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.44
+  version: 1.0.46
 platform: ruby
 authors:
 - reshacs