From d79f2f903f10dee53ca84611fad28e8424696377 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 21 May 2025 21:57:58 -0500
Subject: [PATCH] Allow filtering activity by user via user profile

---
 app/models/user/day_timeline.rb | 6 +++++-
 app/views/events/index.html.erb | 7 ++++++-
 app/views/users/show.html.erb   | 5 +++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/models/user/day_timeline.rb b/app/models/user/day_timeline.rb
index 32aad0814..2a91706d2 100644
--- a/app/models/user/day_timeline.rb
+++ b/app/models/user/day_timeline.rb
@@ -27,7 +27,11 @@ class User::DayTimeline
 
   private
     def filtered_events
-      @filtered_events ||= Event.where(collection: collections)
+      @filtered_events ||= begin
+        events = Event.where(collection: collections)
+        events = events.where(creator_id: filter.creators.ids) if filter.creators.present?
+        events
+      end
     end
 
     def collections
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 254c9d33f..821c00c9a 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -5,7 +5,12 @@
     <div class="btn btn--circle btn--placeholder flex-item-justify-start"></div>
 
     <div class="flex-inline flex-column center gap-half margin-block-end-double txt-align-center min-width">
-      <h2 class="font-black txt-large center overflow-ellipsis max-width"><%= Account.sole.name %> / Latest activity</h2>
+      <h2 class="font-black txt-large center overflow-ellipsis max-width">
+        <%= Account.sole.name %> / Latest activity
+        <% if @filter.creators.any? %>
+          by <%= @filter.creators.each_with_object([]) { |creator, names| names << creator.familiar_name }.to_sentence %>
+        <% end %>
+      </h2>
       <%= render "events/filter", filter: @filter %>
     </div>
 
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index d061814d2..758c3eeec 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -32,8 +32,9 @@
       </div>
 
       <div class="flex-inline center justify-center flex-wrap gap">
-        <%= link_to "See cards assigned to #{ Current.user == @user ? "you" : @user.first_name }", cards_path(assignee_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>
-        <%= link_to "See cards added by #{ Current.user == @user ? "you" : @user.first_name }", cards_path(creator_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>
+        <%= link_to "What #{ Current.user == @user ? "have you" : "#{ @user.first_name } has" } been up to?", events_path(creator_ids: [@user.id]), class: "btn", data: { turbo_frame: "_top" } %>
+        <%= link_to "Which cards are assigned to #{ Current.user == @user ? "you" : @user.first_name }?", cards_path(assignee_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>
+        <%= link_to "Which cards were added by #{ Current.user == @user ? "you" : @user.first_name }?", cards_path(creator_ids: [@user.id], indexed_by: "newest"), class: "btn", data: { turbo_frame: "_top" } %>
       </div>
     </div>
   </div>