From abe48f0efa970d79ba46a6c1ed5dbe5a802007ec Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Mon, 8 Dec 2025 14:21:56 -0500
Subject: [PATCH] Ensure user toggles on board edit page are cached properly

Not including the disabled flag as part of the cache resulted in
issues like the one described in #1992
---
 app/helpers/accesses_helper.rb             |  2 +-
 test/controllers/boards_controller_test.rb | 24 ++++++++++++++++++++++
 test/test_helper.rb                        |  2 +-
 test/test_helpers/caching_test_helper.rb   | 14 +++++++++++++
 4 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 test/test_helpers/caching_test_helper.rb

diff --git a/app/helpers/accesses_helper.rb b/app/helpers/accesses_helper.rb
index 68caf6995..69ef2efec 100644
--- a/app/helpers/accesses_helper.rb
+++ b/app/helpers/accesses_helper.rb
@@ -12,7 +12,7 @@ module AccessesHelper
     render partial: "boards/access_toggle",
       collection: users, as: :user,
       locals: { selected: selected, disabled: disabled },
-      cached: ->(user) { [ user, selected ] }
+      cached: ->(user) { [ user, selected, disabled ] }
   end
 
   def access_involvement_advance_button(board, user, show_watchers: true, icon_only: false)
diff --git a/test/controllers/boards_controller_test.rb b/test/controllers/boards_controller_test.rb
index d9314775b..a7e3580de 100644
--- a/test/controllers/boards_controller_test.rb
+++ b/test/controllers/boards_controller_test.rb
@@ -166,4 +166,28 @@ class BoardsControllerTest < ActionDispatch::IntegrationTest
     assert_select "button:not([disabled])", text: "Select all"
     assert_select "button:not([disabled])", text: "Select none"
   end
+
+  test "access toggle disabled state is cached correctly" do
+    board = boards(:writebook)
+    david = users(:david)
+
+    with_actionview_partial_caching do
+      # privileged user
+      assert users(:kevin).can_administer_board?(board)
+
+      get edit_board_path(board)
+
+      assert_response :success
+      assert_select "input.switch__input[name='user_ids[]'][value='#{david.id}']:not([disabled])"
+
+      # unprivileged user
+      logout_and_sign_in_as :jz
+      assert_not users(:jz).can_administer_board?(board)
+
+      get edit_board_path(board)
+
+      assert_response :success
+      assert_select "input.switch__input[name='user_ids[]'][value='#{david.id}'][disabled]"
+    end
+  end
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 4cec836fd..bc856d815 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -44,7 +44,7 @@ module ActiveSupport
     fixtures :all
 
     include ActiveJob::TestHelper
-    include ActionTextTestHelper, CardTestHelper, ChangeTestHelper, SessionTestHelper
+    include ActionTextTestHelper, CachingTestHelper, CardTestHelper, ChangeTestHelper, SessionTestHelper
     include Turbo::Broadcastable::TestHelper
 
     setup do
diff --git a/test/test_helpers/caching_test_helper.rb b/test/test_helpers/caching_test_helper.rb
new file mode 100644
index 000000000..90dab64d5
--- /dev/null
+++ b/test/test_helpers/caching_test_helper.rb
@@ -0,0 +1,14 @@
+module CachingTestHelper
+  def with_actionview_partial_caching
+    was_cache = ActionView::PartialRenderer.collection_cache
+    was_perform_caching = ApplicationController.perform_caching
+    begin
+      ActionView::PartialRenderer.collection_cache = ActiveSupport::Cache.lookup_store(:memory_store)
+      ApplicationController.perform_caching = true
+      yield
+    ensure
+      ActionView::PartialRenderer.collection_cache = was_cache
+      ApplicationController.perform_caching = was_perform_caching
+    end
+  end
+end