From d0c2212734aff5729a813fcc4f8c8d06e351929e Mon Sep 17 00:00:00 2001
From: Andy Smith <andy@37signals.com>
Date: Tue, 6 May 2025 13:36:40 -0500
Subject: [PATCH 01/10] Use black for completed card color

---
 app/assets/stylesheets/_global.css | 1 +
 app/assets/stylesheets/cards.css   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/_global.css b/app/assets/stylesheets/_global.css
index 48ab4782c..d6d7712fc 100644
--- a/app/assets/stylesheets/_global.css
+++ b/app/assets/stylesheets/_global.css
@@ -159,6 +159,7 @@
 
   /* Colors: Cards */
   --color-card-default: oklch(var(--lch-blue-dark));
+  --color-card-complete: var(--color-ink);
   --color-card-1: oklch(var(--lch-ink-medium));
   --color-card-2: oklch(var(--lch-uncolor-medium));
   --color-card-3: oklch(var(--lch-yellow-medium));
diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css
index 4529a3c05..0e3e4a1ff 100644
--- a/app/assets/stylesheets/cards.css
+++ b/app/assets/stylesheets/cards.css
@@ -266,7 +266,7 @@
 
     .card:has(&),
     .card-perma:has(&) {
-      --card-color: var(--card-color-1) !important;
+      --card-color: var(--color-card-complete) !important;
     }
   }
 

From 018f22a037268b971a078013c20dd2d8cd64c706 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 6 May 2025 13:58:28 -0500
Subject: [PATCH 02/10] Display obvious chip when filtering by stage

---
 app/views/filters/_settings.html.erb | 1 +
 app/views/filters/_stages.html.erb   | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/views/filters/_settings.html.erb b/app/views/filters/_settings.html.erb
index 76dd3f1f8..850cd786e 100644
--- a/app/views/filters/_settings.html.erb
+++ b/app/views/filters/_settings.html.erb
@@ -3,6 +3,7 @@
     <%= render "filters/tags", filter: filter %>
     <%= render "filters/assignees", filter: filter %>
     <%= render "filters/creators", filter: filter %>
+    <%= render "filters/stages", filter: filter %>
 
     <% filter.terms.each do |term| %>
       <%= filter_chip_tag %Q("#{term}"), filter.as_params_without(:terms, term) %>
diff --git a/app/views/filters/_stages.html.erb b/app/views/filters/_stages.html.erb
index 0172b0130..d20e8fc86 100644
--- a/app/views/filters/_stages.html.erb
+++ b/app/views/filters/_stages.html.erb
@@ -1,6 +1,6 @@
-<% if Workflow.any? %>
+<% if filter.stages.any? %>
   <div class="quick-filter position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
-    <button class="btn input input--select flex-inline txt-small" data-action="click->dialog#open:stop">
+    <button class="btn input input--select flex-inline txt-x-small" data-action="click->dialog#open:stop">
       <span class="overflow-ellipsis">
         <% if filter.stages.any? %>
           <%= filter.stages.map(&:name).to_sentence %>
@@ -13,14 +13,14 @@
     <dialog class="events__popup popup panel flex-column align-start gap-half fill-white shadow"
         aria-label="In stage…" aria-description="In stage…"
         data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
-      <strong class="popup__title margin-block-start-half pad-inline-half">In stage…</strong>
+      <strong class="popup__title margin-block-start-half pad-inline-half overflow-ellipsis">In stage…</strong>
       <%= form_with url: cards_path, method: :get, class: "flex flex-column full-width popup__list",
             data: { controller: "form" } do |form| %>
         <% filter.as_params.except(:stage_ids).each do |key, value| %>
           <%= filter_hidden_field_tag key, value %>
         <% end %>
 
-        <% Workflow.first.stages.each do |stage| %>
+        <% filter.stages.first.workflow.stages.each do |stage| %>
           <div class="btn popup__item">
             <%= form.check_box :stage_ids, {
               multiple: true,

From b80969151e25cf82a6870693d71fb197176bc949 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 6 May 2025 15:33:17 -0500
Subject: [PATCH 03/10] Adjust for svg icons

---
 app/assets/stylesheets/events.css |  2 +-
 app/assets/stylesheets/popup.css  | 20 +++++---------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/app/assets/stylesheets/events.css b/app/assets/stylesheets/events.css
index 849540e5b..f4f280412 100644
--- a/app/assets/stylesheets/events.css
+++ b/app/assets/stylesheets/events.css
@@ -144,7 +144,7 @@
     place-content: center;
     margin-inline-end: -0.75em;
 
-    img {
+    .icon {
       block-size: 1.1em;
       inline-size: 1.1em;
       grid-area: 1 / 1;
diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css
index 45db824ae..6f7794b5b 100644
--- a/app/assets/stylesheets/popup.css
+++ b/app/assets/stylesheets/popup.css
@@ -78,20 +78,15 @@
     }
 
     &:has(input:checked)  {
-      --btn-background: var(--color-selected);
+      --btn-background: var(--color-ink-lightest);
       --btn-color: var(--color-ink);
 
-      img {
-        filter: invert(0);
-
+      .icon {
         &.checked {
+          block-size: 1em;
           display: block;
-        }
-      }
-
-      @media (prefers-color-scheme: dark) {
-        img {
-          filter: invert(1);
+          inline-size: 1em;
+          margin-inline-end: var(--inline-space);
         }
       }
 
@@ -101,11 +96,6 @@
         }
       }
     }
-
-    img.checked {
-      block-size: 1em;
-      inline-size: 1em;
-    }
   }
 
   .popup__list {

From 7e8c45a0a522dcbf0e1edbeb96c6f3c9006f6f6d Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 6 May 2025 15:39:55 -0500
Subject: [PATCH 04/10] Need to name the assignee(s)

---
 app/helpers/notifications_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 13125cdad..3baaf7aab 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -2,7 +2,7 @@ module NotificationsHelper
   def event_notification_title(event)
     case event_notification_action(event)
     when "comment_created" then "RE: " + event.eventable.card.title
-    when "card_assigned" then "Assigned to you: " + event.eventable.title
+    when "card_assigned" then "Assigned to #{event.assignees.pluck(:name).to_sentence}: " + event.eventable.title
     else event.eventable.title
     end
   end

From 36fb154ee12d6977d1feca1b217efaec94a020c7 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 6 May 2025 13:58:28 -0500
Subject: [PATCH 05/10] Display obvious chip when filtering by stage

---
 app/views/filters/_settings.html.erb | 1 +
 app/views/filters/_stages.html.erb   | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/views/filters/_settings.html.erb b/app/views/filters/_settings.html.erb
index 76dd3f1f8..850cd786e 100644
--- a/app/views/filters/_settings.html.erb
+++ b/app/views/filters/_settings.html.erb
@@ -3,6 +3,7 @@
     <%= render "filters/tags", filter: filter %>
     <%= render "filters/assignees", filter: filter %>
     <%= render "filters/creators", filter: filter %>
+    <%= render "filters/stages", filter: filter %>
 
     <% filter.terms.each do |term| %>
       <%= filter_chip_tag %Q("#{term}"), filter.as_params_without(:terms, term) %>
diff --git a/app/views/filters/_stages.html.erb b/app/views/filters/_stages.html.erb
index 0172b0130..d20e8fc86 100644
--- a/app/views/filters/_stages.html.erb
+++ b/app/views/filters/_stages.html.erb
@@ -1,6 +1,6 @@
-<% if Workflow.any? %>
+<% if filter.stages.any? %>
   <div class="quick-filter position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
-    <button class="btn input input--select flex-inline txt-small" data-action="click->dialog#open:stop">
+    <button class="btn input input--select flex-inline txt-x-small" data-action="click->dialog#open:stop">
       <span class="overflow-ellipsis">
         <% if filter.stages.any? %>
           <%= filter.stages.map(&:name).to_sentence %>
@@ -13,14 +13,14 @@
     <dialog class="events__popup popup panel flex-column align-start gap-half fill-white shadow"
         aria-label="In stage…" aria-description="In stage…"
         data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
-      <strong class="popup__title margin-block-start-half pad-inline-half">In stage…</strong>
+      <strong class="popup__title margin-block-start-half pad-inline-half overflow-ellipsis">In stage…</strong>
       <%= form_with url: cards_path, method: :get, class: "flex flex-column full-width popup__list",
             data: { controller: "form" } do |form| %>
         <% filter.as_params.except(:stage_ids).each do |key, value| %>
           <%= filter_hidden_field_tag key, value %>
         <% end %>
 
-        <% Workflow.first.stages.each do |stage| %>
+        <% filter.stages.first.workflow.stages.each do |stage| %>
           <div class="btn popup__item">
             <%= form.check_box :stage_ids, {
               multiple: true,

From d8c25912962dac19e6d589ab1812003e697c6679 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 6 May 2025 15:33:17 -0500
Subject: [PATCH 06/10] Adjust for svg icons

---
 app/assets/stylesheets/events.css |  2 +-
 app/assets/stylesheets/popup.css  | 20 +++++---------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/app/assets/stylesheets/events.css b/app/assets/stylesheets/events.css
index 849540e5b..f4f280412 100644
--- a/app/assets/stylesheets/events.css
+++ b/app/assets/stylesheets/events.css
@@ -144,7 +144,7 @@
     place-content: center;
     margin-inline-end: -0.75em;
 
-    img {
+    .icon {
       block-size: 1.1em;
       inline-size: 1.1em;
       grid-area: 1 / 1;
diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css
index 45db824ae..6f7794b5b 100644
--- a/app/assets/stylesheets/popup.css
+++ b/app/assets/stylesheets/popup.css
@@ -78,20 +78,15 @@
     }
 
     &:has(input:checked)  {
-      --btn-background: var(--color-selected);
+      --btn-background: var(--color-ink-lightest);
       --btn-color: var(--color-ink);
 
-      img {
-        filter: invert(0);
-
+      .icon {
         &.checked {
+          block-size: 1em;
           display: block;
-        }
-      }
-
-      @media (prefers-color-scheme: dark) {
-        img {
-          filter: invert(1);
+          inline-size: 1em;
+          margin-inline-end: var(--inline-space);
         }
       }
 
@@ -101,11 +96,6 @@
         }
       }
     }
-
-    img.checked {
-      block-size: 1em;
-      inline-size: 1em;
-    }
   }
 
   .popup__list {

From c2a563c699c130f7a91c67a4323baddf4ac7caaf Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 6 May 2025 15:39:55 -0500
Subject: [PATCH 07/10] Need to name the assignee(s)

---
 app/helpers/notifications_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 13125cdad..3baaf7aab 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -2,7 +2,7 @@ module NotificationsHelper
   def event_notification_title(event)
     case event_notification_action(event)
     when "comment_created" then "RE: " + event.eventable.card.title
-    when "card_assigned" then "Assigned to you: " + event.eventable.title
+    when "card_assigned" then "Assigned to #{event.assignees.pluck(:name).to_sentence}: " + event.eventable.title
     else event.eventable.title
     end
   end

From 16a174d87fadfc59154da1e9636e391cb4cfe216 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Fri, 2 May 2025 17:35:24 +0200
Subject: [PATCH 08/10] Accounts always start with a "Cards" collection

- Deleting the last collection, immediately creates a new "Cards" collection
---
 app/models/collection.rb | 9 +++++++++
 app/models/first_run.rb  | 5 ++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/models/collection.rb b/app/models/collection.rb
index 29e07a98b..9b74d8524 100644
--- a/app/models/collection.rb
+++ b/app/models/collection.rb
@@ -8,4 +8,13 @@ class Collection < ApplicationRecord
   has_many :events
 
   scope :alphabetically, -> { order("lower(name)") }
+
+  after_destroy_commit :ensure_default_collection
+
+  private
+    def ensure_default_collection
+      if Collection.count.zero?
+        Collection.create!(name: "Cards")
+      end
+    end
 end
diff --git a/app/models/first_run.rb b/app/models/first_run.rb
index cc48de7ad..88fc321f2 100644
--- a/app/models/first_run.rb
+++ b/app/models/first_run.rb
@@ -1,7 +1,10 @@
 class FirstRun
   def self.create!(user_attributes)
+    user = User.member.create!(user_attributes)
+
     Account.create!(name: "Fizzy")
     Closure::Reason.create_defaults
-    User.member.create!(user_attributes)
+    Collection.create!(name: "Cards", creator: user, all_access: true)
+    user
   end
 end

From 40dbd51ab15969b257b5ea55085962efe513fe35 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 6 May 2025 12:27:02 -0500
Subject: [PATCH 09/10] We can't rely on count now so test that the specific
 collection no longer exists

---
 test/controllers/collections_controller_test.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/controllers/collections_controller_test.rb b/test/controllers/collections_controller_test.rb
index f816332b8..9d3275078 100644
--- a/test/controllers/collections_controller_test.rb
+++ b/test/controllers/collections_controller_test.rb
@@ -55,9 +55,9 @@ class CollectionsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "destroy" do
-    assert_difference -> { Collection.count }, -1 do
-      delete collection_path(collections(:writebook))
-      assert_redirected_to root_path
-    end
+    collection = collections(:writebook)
+    delete collection_path(collection)
+    assert_redirected_to root_path
+    assert_raises(ActiveRecord::RecordNotFound) { collection.reload }
   end
 end

From 5b929619b4582cb246a314d6a32260544a4856ad Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 6 May 2025 12:28:33 -0500
Subject: [PATCH 10/10] Need a user for this

---
 test/models/filter_test.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/models/filter_test.rb b/test/models/filter_test.rb
index 3605c28a1..586fc6b0e 100644
--- a/test/models/filter_test.rb
+++ b/test/models/filter_test.rb
@@ -93,8 +93,10 @@ class FilterTest < ActiveSupport::TestCase
     end
     assert_nil filter.reload.as_params[:tag_ids]
 
-    assert_changes "Filter.exists?(filter.id)" do
-      collections(:writebook).destroy!
+    Current.set session: sessions(:david) do
+      assert_changes "Filter.exists?(filter.id)" do
+        collections(:writebook).destroy!
+      end
     end
   end