From 5d84b16b366875fa5192994d2645a271fcfd03ea Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Mon, 12 May 2025 15:28:19 -0400
Subject: [PATCH 1/7] Ensure dates are re-formatted on turbo frame load

ref: https://37s.fizzy.37signals.com/collections/693169850/cards/999009063
---
 app/views/layouts/application.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index ba86f92e4..f7cdcd0af 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -25,7 +25,7 @@
     <link rel="apple-touch-icon" href="/apple-touch-icon.png">
   </head>
 
-  <body data-controller="lightbox local-time timezone-cookie" data-action="turbo:morph@window->local-time#refreshAll">
+  <body data-controller="lightbox local-time timezone-cookie" data-action="turbo:morph@window->local-time#refreshAll turbo:frame-load->local-time#refreshAll">
     <header id="header">
       <a href="#main-content" class="skip-navigation btn">Skip to main content</a>
       <%= yield :header %>

From 5d26feaa75c88ad6c4e29a8d9675c4ec31b2f804 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Mon, 12 May 2025 17:14:35 -0400
Subject: [PATCH 2/7] Handle collections that do not auto close

---
 app/models/card/closeable.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/card/closeable.rb b/app/models/card/closeable.rb
index 0f7b88dd6..121a0e2d4 100644
--- a/app/models/card/closeable.rb
+++ b/app/models/card/closeable.rb
@@ -34,7 +34,7 @@ module Card::Closeable
   end
 
   def closing_soon?
-    considering? && Time.current >= auto_close_at - AUTO_CLOSE_REMINDER_BEFORE
+    considering? && auto_closing? && Time.current >= auto_close_at - AUTO_CLOSE_REMINDER_BEFORE
   end
 
   def closed?

From 64e366efd2570aee123dc0754027a09663951729 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Mon, 12 May 2025 17:07:05 -0500
Subject: [PATCH 3/7] Do or die

---
 app/views/collections/edit/_auto_close.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/collections/edit/_auto_close.html.erb b/app/views/collections/edit/_auto_close.html.erb
index 84be06644..e0a05df2b 100644
--- a/app/views/collections/edit/_auto_close.html.erb
+++ b/app/views/collections/edit/_auto_close.html.erb
@@ -1,4 +1,4 @@
-<strong class="txt-large">Auto-Close Cards</strong>
+<strong class="txt-large">Do or Die</strong>
 <label for="closure" class="margin-block-end">Cards automatically close when there is no activity for…</label>
 
 <%= form_with model: collection, data: { controller: "form" } do |form| %>

From 9c4a35986513d88ba16571ee3b12e5bf0a4e128f Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Mon, 12 May 2025 21:50:32 -0500
Subject: [PATCH 4/7] Ensure checkboxes in menus have full size click targets

---
 .../cards/index/_collections_filter.html.erb  | 10 ++++----
 .../filter/_all_collections_option.html.erb   | 23 ++++++++-----------
 .../events/filter/_collection_option.html.erb |  4 ++--
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/app/views/cards/index/_collections_filter.html.erb b/app/views/cards/index/_collections_filter.html.erb
index 86c4592ee..b735a29c8 100644
--- a/app/views/cards/index/_collections_filter.html.erb
+++ b/app/views/cards/index/_collections_filter.html.erb
@@ -5,7 +5,7 @@
   <% end %>
 
   <% if Current.user.collections.one? %>
-    <%= link_to cards_path(filter.as_params.except(:collection_ids)), class: "popup__group flex align-center", style: "--hover-size: 0" do %>
+    <%= link_to cards_path(filter.as_params.except(:collection_ids)), class: "popup__group flex align-center" do %>
       <%= tag.div class: "btn popup__item min-width flex-item-grow" do %>
         <span class="overflow-ellipsis"><%= Current.user.collections.first.name %></span>
         <span class="txt-ink translucent flex-item-no-shrink flex-item-justify-end"><span class="txt-x-small txt-uppercase">GO TO</span> ›</span>
@@ -13,14 +13,14 @@
     <% end %>
   <% elsif Current.user.collections.many? %>
     <%= link_to cards_path(filter.as_params.except(:collection_ids)), class: "popup__group flex align-center", style: "--hover-size: 0" do %>
-      <div class="btn txt-xx-small flex-item-no-shrink">
+      <label class="btn txt-xx-small flex-item-no-shrink" style="--hover-size: 0.15rem">
         <input type="checkbox" <%= "checked" if filter.collection_ids.empty? %>>
 
         <span class="for-screen-reader">
           See everything in all collections
         </span>
         <%= icon_tag "check", size: 18, class: "checked" %>
-      </div>
+      </label>
       <%= tag.div class: "btn popup__item min-width flex-item-grow" do %>
         <span class="overflow-ellipsis">All collections</span>
         <span class="txt-ink translucent flex-item-no-shrink flex-item-justify-end"><span class="txt-x-small txt-uppercase">GO TO</span> ›</span>
@@ -29,7 +29,7 @@
 
     <% Current.user.collections.order(:name).each do |collection| %>
       <li class="popup__group flex align-center" data-value="<%= collection.name.downcase %>">
-        <div class="btn txt-xx-small flex-item-no-shrink">
+        <label class="btn txt-xx-small flex-item-no-shrink">
           <%= form.check_box "collection_ids[]", {
                 checked: filter.collections.include?(collection),
                 data: { action: "change->form#submit" },
@@ -40,7 +40,7 @@
             Toggle filter for <%= collection.name %>
           </span>
           <%= icon_tag "check", size: 18, class: "checked" %>
-        </div>
+        </label>
 
         <%= link_to cards_path(collection_ids: [ collection ]), class: "btn popup__item min-width flex-item-grow" do %>
           <span class="overflow-ellipsis"><%= collection.name %></span>
diff --git a/app/views/events/filter/_all_collections_option.html.erb b/app/views/events/filter/_all_collections_option.html.erb
index 24ab518df..0f57357c9 100644
--- a/app/views/events/filter/_all_collections_option.html.erb
+++ b/app/views/events/filter/_all_collections_option.html.erb
@@ -6,21 +6,18 @@
     <% end %>
   <% end %>
 <% elsif Current.user.collections.many? %>
-  <div class="popup__group flex align-center" style="--hover-size: 0">
-  <div class="btn txt-xx-small flex-item-no-shrink">
-    <%= link_to events_path(clear_filter: true), style: "--hover-size: 0" do %>
+  <div class="popup__group flex align-center">
+    <%= link_to events_path(clear_filter: true), class: "btn txt-xx-small flex-item-no-shrink" do %>
       <%= check_box_tag "filter_collections", nil, filter.collections.blank?, class: "form-checkbox" %>
+      <span class="for-screen-reader">
+        See everything in all collections
+      </span>
+      <%= icon_tag "check", size: 18, class: "checked" %>
     <% end %>
 
-    <span class="for-screen-reader">
-      See everything in all collections
-    </span>
-    <%= icon_tag "check", size: 18, class: "checked" %>
-  </div>
-
-  <%= link_to cards_path(filter.as_params.except(:collection_ids)), class: "btn popup__item min-width flex-item-grow" do %>
-    <span class="overflow-ellipsis">All collections</span>
-    <span class="txt-ink translucent flex-item-no-shrink flex-item-justify-end"><span class="txt-x-small txt-uppercase">GO TO</span> ›</span>
-  <% end %>
+    <%= link_to cards_path(filter.as_params.except(:collection_ids)), class: "btn popup__item min-width flex-item-grow" do %>
+      <span class="overflow-ellipsis">All collections</span>
+      <span class="txt-ink translucent flex-item-no-shrink flex-item-justify-end"><span class="txt-x-small txt-uppercase">GO TO</span> ›</span>
+    <% end %>
   </div>
 <% end %>
\ No newline at end of file
diff --git a/app/views/events/filter/_collection_option.html.erb b/app/views/events/filter/_collection_option.html.erb
index bdc2877b6..b2c2bc77e 100644
--- a/app/views/events/filter/_collection_option.html.erb
+++ b/app/views/events/filter/_collection_option.html.erb
@@ -1,5 +1,5 @@
 <li class="popup__group flex align-center" data-value="<%= collection.name.downcase %>">
-  <div class="btn txt-xx-small">
+  <label class="btn txt-xx-small">
     <%= form.check_box "collection_ids[]", {
           checked: filter.collections.include?(collection),
           data: { action: "change->form#submit" },
@@ -10,7 +10,7 @@
       Toggle filter for <%= collection.name %>
     </span>
     <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
-  </div>
+  </label>
 
   <%= link_to cards_path(collection_ids: [ collection ]), class: "btn popup__item min-width flex-item-grow" do %>
     <span class="overflow-ellipsis"><%= collection.name %></span>

From 368ae5ce6af037fed38236cd831067e7c9ccf3c9 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Mon, 12 May 2025 22:23:16 -0500
Subject: [PATCH 5/7] Handle case where no params are sent because nothing is
 checked

---
 app/controllers/concerns/day_timelines_scoped.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/controllers/concerns/day_timelines_scoped.rb b/app/controllers/concerns/day_timelines_scoped.rb
index 597e35f7d..f08167179 100644
--- a/app/controllers/concerns/day_timelines_scoped.rb
+++ b/app/controllers/concerns/day_timelines_scoped.rb
@@ -4,12 +4,19 @@ module DayTimelinesScoped
   included do
     include FilterScoped
 
+    before_action :normalize_collection_params
     before_action :restore_collections_filter_from_cookie
     before_action :set_day_timeline
     after_action :save_collections_filter_to_cookie
   end
 
   private
+    def normalize_collection_params
+      if params[:collection_ids].blank? && !params[:clear_filter]
+        params[:collection_ids] = []
+      end
+    end
+
     def restore_collections_filter_from_cookie
       if params[:clear_filter]
         delete_collections_filter_cookie

From 515396263e66d6213a359ed3bc83c95ee13aca79 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Tue, 13 May 2025 05:44:19 +0200
Subject: [PATCH 6/7] Refresh local time target when morphed

Alternative to https://github.com/basecamp/fizzy/pull/486
---
 app/helpers/time_helper.rb                          | 2 +-
 app/javascript/controllers/local_time_controller.js | 6 ++++++
 app/views/layouts/application.html.erb              | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/helpers/time_helper.rb b/app/helpers/time_helper.rb
index c3fd4f066..50295789b 100644
--- a/app/helpers/time_helper.rb
+++ b/app/helpers/time_helper.rb
@@ -1,5 +1,5 @@
 module TimeHelper
   def local_datetime_tag(datetime, style: :time, **attributes)
-    tag.time **attributes, datetime: datetime.iso8601, data: { local_time_target: style }
+    tag.time **attributes, datetime: datetime.iso8601, data: { local_time_target: style, action: "turbo:morph-element->local-time#refreshTarget" }
   end
 end
diff --git a/app/javascript/controllers/local_time_controller.js b/app/javascript/controllers/local_time_controller.js
index e539d9eb5..7e38772c9 100644
--- a/app/javascript/controllers/local_time_controller.js
+++ b/app/javascript/controllers/local_time_controller.js
@@ -37,6 +37,12 @@ export default class extends Controller {
     })
   }
 
+  refreshTarget(event) {
+    const target = event.target;
+    const targetName = target.dataset.localTimeTarget
+    this.#formatTime(this[`${targetName}Formatter`], target)
+  }
+
   timeTargetConnected(target) {
     this.#formatTime(this.timeFormatter, target)
   }
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index f7cdcd0af..ba86f92e4 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -25,7 +25,7 @@
     <link rel="apple-touch-icon" href="/apple-touch-icon.png">
   </head>
 
-  <body data-controller="lightbox local-time timezone-cookie" data-action="turbo:morph@window->local-time#refreshAll turbo:frame-load->local-time#refreshAll">
+  <body data-controller="lightbox local-time timezone-cookie" data-action="turbo:morph@window->local-time#refreshAll">
     <header id="header">
       <a href="#main-content" class="skip-navigation btn">Skip to main content</a>
       <%= yield :header %>

From 0a500612dab72994f84edb5c54daf1c5dbb0f743 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 13 May 2025 08:24:48 -0500
Subject: [PATCH 7/7] Just set the clear filter so
 `restore_collections_filter_from_cookie` can do the right thing

---
 app/controllers/concerns/day_timelines_scoped.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/concerns/day_timelines_scoped.rb b/app/controllers/concerns/day_timelines_scoped.rb
index f08167179..ecbfe1511 100644
--- a/app/controllers/concerns/day_timelines_scoped.rb
+++ b/app/controllers/concerns/day_timelines_scoped.rb
@@ -13,7 +13,7 @@ module DayTimelinesScoped
   private
     def normalize_collection_params
       if params[:collection_ids].blank? && !params[:clear_filter]
-        params[:collection_ids] = []
+        params[:clear_filter] = true
       end
     end
 
