From f7afd6c939190f372e1d67c52367b59f76368121 Mon Sep 17 00:00:00 2001
From: Andy Smith <andy@37signals.com>
Date: Wed, 15 Oct 2025 15:28:46 -0500
Subject: [PATCH] Make collection-specific keys for collapsed column state

---
 app/javascript/controllers/collapsible_columns_controller.js | 5 ++++-
 app/views/collections/show/_columns.html.erb                 | 2 +-
 app/views/public/collections/show/_columns.html.erb          | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/javascript/controllers/collapsible_columns_controller.js b/app/javascript/controllers/collapsible_columns_controller.js
index 5002c46e2..136848b84 100644
--- a/app/javascript/controllers/collapsible_columns_controller.js
+++ b/app/javascript/controllers/collapsible_columns_controller.js
@@ -3,6 +3,9 @@ import { Controller } from "@hotwired/stimulus"
 export default class extends Controller {
   static classes = [ "collapsed" ]
   static targets = [ "column", "button" ]
+  static values = {
+    collection: String
+  }
 
   connect() {
     this.#restoreColumns()
@@ -71,6 +74,6 @@ export default class extends Controller {
   }
 
   #localStorageKeyFor(column) {
-    return `expand-${column.getAttribute("id")}`
+    return `expand-${this.collectionValue}-${column.getAttribute("id")}`
   }
 }
diff --git a/app/views/collections/show/_columns.html.erb b/app/views/collections/show/_columns.html.erb
index 06862a158..d1b099a2a 100644
--- a/app/views/collections/show/_columns.html.erb
+++ b/app/views/collections/show/_columns.html.erb
@@ -8,7 +8,7 @@
         dragenter->drag-and-strum#dragEnter
         drop->drag-and-drop#drop
         dragend->drag-and-drop#dragEnd" } do %>
-  <div class="card-columns" data-controller="collapsible-columns" data-collapsible-columns-collapsed-class="is-collapsed">
+  <div class="card-columns" data-controller="collapsible-columns" data-collapsible-columns-collection-value="<%= collection.id %>" data-collapsible-columns-collapsed-class="is-collapsed">
     <div class="card-columns__left">
       <%= render "collections/show/not_now", collection: collection %>
     </div>
diff --git a/app/views/public/collections/show/_columns.html.erb b/app/views/public/collections/show/_columns.html.erb
index 1ac361b6b..533c3f463 100644
--- a/app/views/public/collections/show/_columns.html.erb
+++ b/app/views/public/collections/show/_columns.html.erb
@@ -1,5 +1,5 @@
 <%= turbo_frame_tag :cards_container do %>
-  <div class="card-columns" data-controller="collapsible-columns" data-collapsible-columns-collapsed-class="is-collapsed">
+  <div class="card-columns" data-controller="collapsible-columns" data-collapsible-columns-collection-value="<%= collection.id %>" data-collapsible-columns-collapsed-class="is-collapsed">
 
     <div class="card-columns__left">
       <%= render "public/collections/show/not_now", collection: collection %>
@@ -12,4 +12,4 @@
       <%= render "public/collections/show/closed", collection: collection %>
     </div>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>