From 0819e87ae26478e0a1aa3e963653f6c656a299c8 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 21 Aug 2025 15:10:55 +0200
Subject: [PATCH] Make filters work in the cards path directly re-add strong
 markup for collections in custom filter names

---
 app/helpers/filters_helper.rb                  |  4 ++++
 app/models/user/filtering.rb                   | 12 +++++++-----
 app/views/cards/index.html.erb                 |  4 ++--
 app/views/events/index.html.erb                |  2 +-
 app/views/filters/_menu.html.erb               |  1 +
 app/views/filters/menu/_collections.html.erb   |  1 -
 app/views/filters/menu/_custom.html.erb        | 15 ++++++++++-----
 app/views/filters/menu/custom/_create.html.erb |  2 +-
 app/views/filters/menu/custom/_filter.html.erb |  4 ++--
 9 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb
index 0b37484be..f281c1007 100644
--- a/app/helpers/filters_helper.rb
+++ b/app/helpers/filters_helper.rb
@@ -10,4 +10,8 @@ module FiltersHelper
     name = params[key].is_a?(Array) ? "#{key}[]" : key
     hidden_field_tag name, value, id: nil
   end
+
+  def filter_selected_collections_title(user_filtering)
+    user_filtering.selected_collection_titles.collect { tag.strong it }.to_sentence.html_safe
+  end
 end
diff --git a/app/models/user/filtering.rb b/app/models/user/filtering.rb
index fdc5fa415..74c436801 100644
--- a/app/models/user/filtering.rb
+++ b/app/models/user/filtering.rb
@@ -13,16 +13,18 @@ class User::Filtering
     @collections ||= user.collections.ordered_by_recently_accessed
   end
 
-  def collections_title
+  def selected_collection_titles
     if filter.collections.none?
-      collections.one? ? collections.first.name : "All collections"
-    elsif filter.collections.one?
-      filter.collections.first.name
+      [ collections.one? ? collections.first.name : "All collections" ]
     else
-      filter.collections.map(&:name).to_sentence
+      filter.collections.map(&:name)
     end
   end
 
+  def selected_collections_label
+    selected_collection_titles.to_sentence
+  end
+
   def tags
     @tags ||= Tag.all.alphabetically
   end
diff --git a/app/views/cards/index.html.erb b/app/views/cards/index.html.erb
index 946370aef..7a3cf9d29 100644
--- a/app/views/cards/index.html.erb
+++ b/app/views/cards/index.html.erb
@@ -1,4 +1,4 @@
-<% @page_title = @user_filtering.collections_title %>
+<% @page_title = @user_filtering.selected_collections_label %>
 
 <%= render "filters/broadcasts", filter: @filter %>
 
@@ -16,7 +16,7 @@
   <%= render "filters/menu/add_card_button", user_filtering: @user_filtering %>
 
   <h1 class="header__title overflow-ellipsis" style="view-transistion-name: card-collection-title">
-    <%= @user_filtering.collections_title %>
+    <%= @user_filtering.selected_collections_label %>
   </h1>
 
   <div class="header__actions header__actions--end">
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 2445fc41f..68e01041b 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -10,7 +10,7 @@
 
   <h1 class="header__title overflow-ellipsis">
     <div class="overflow-ellipsis">
-      Activity in <%= @user_filtering.collections_title %>
+      Activity in <%= @user_filtering.selected_collections_label %>
     </div>
   </h1>
 
diff --git a/app/views/filters/_menu.html.erb b/app/views/filters/_menu.html.erb
index 2dc22223b..fe930c456 100644
--- a/app/views/filters/_menu.html.erb
+++ b/app/views/filters/_menu.html.erb
@@ -15,6 +15,7 @@
               type: "search", autocorrect: "off", autocomplete: "off", data: { "1p-ignore": "true", filter_target: "input", action: "input->filter#filter" } %>
 
         <%= render "filters/menu/header" %>
+        <%= render "filters/menu/custom", user_filtering: user_filtering %>
         <%= render "filters/menu/collections", user_filtering: user_filtering %>
         <%= render "filters/menu/tags", user_filtering: user_filtering %>
         <%= render "filters/menu/users", user_filtering: user_filtering %>
diff --git a/app/views/filters/menu/_collections.html.erb b/app/views/filters/menu/_collections.html.erb
index 58dc6fff4..0375ff705 100644
--- a/app/views/filters/menu/_collections.html.erb
+++ b/app/views/filters/menu/_collections.html.erb
@@ -1,7 +1,6 @@
 <%= form_with url: user_filtering.self_filter_path, method: :get, class: "display-contents",
       data: { controller: "form" } do |form| %>
   <% if user_filtering.collections.any? %>
-    <%= render "filters/menu/custom", user_filtering: user_filtering %>
 
     <ul class="popup__list">
       <li class="popup__group-title">Collections</li>
diff --git a/app/views/filters/menu/_custom.html.erb b/app/views/filters/menu/_custom.html.erb
index ebc5ce1e9..6fb583668 100644
--- a/app/views/filters/menu/_custom.html.erb
+++ b/app/views/filters/menu/_custom.html.erb
@@ -1,6 +1,11 @@
-<ul class="popup__list">
-  <li class="popup__group-title">Saved filters</li>
+<%= form_with url: cards_path, method: :get, class: "display-contents",
+      data: { controller: "form" } do |form| %>
 
-  <%= render "filters/menu/custom/create" %>
-  <%= render partial: "filters/menu/custom/filter", collection: user_filtering.filters, as: :filter, locals: { user_filtering: user_filtering } %>
-</ul>
+  <ul class="popup__list">
+    <li class="popup__group-title">Saved filters</li>
+
+    <%= render "filters/menu/custom/create" %>
+    <%= render partial: "filters/menu/custom/filter", collection: user_filtering.filters, as: :filter, locals: { user_filtering: user_filtering } %>
+  </ul>
+
+<% end %>
diff --git a/app/views/filters/menu/custom/_create.html.erb b/app/views/filters/menu/custom/_create.html.erb
index e99ad2785..0e1923b4f 100644
--- a/app/views/filters/menu/custom/_create.html.erb
+++ b/app/views/filters/menu/custom/_create.html.erb
@@ -1,5 +1,5 @@
 <li class="popup__group gap-half overflow-ellipsis" data-navigable-list-target="item" data-filter-target="item">
-  <%= link_to url_for(expand_all: true), class: "btn popup__new popup__item" do %>
+  <%= link_to cards_path(expand_all: true), class: "btn popup__new popup__item" do %>
     <%= icon_tag "bookmark" %>
     <div class="flex flex-column txt-tight-lines min-width txt-small">
       <strong class="overflow-ellipsis">Create a new filter</strong>
diff --git a/app/views/filters/menu/custom/_filter.html.erb b/app/views/filters/menu/custom/_filter.html.erb
index c1d96d2a3..69c01d2e7 100644
--- a/app/views/filters/menu/custom/_filter.html.erb
+++ b/app/views/filters/menu/custom/_filter.html.erb
@@ -1,8 +1,8 @@
 <li class="popup__group gap-half overflow-ellipsis" data-filter-target="item" data-navigable-list-target="item">
-  <%= link_to url_for(filter_id: filter.id), class: "btn popup__new popup__item" do %>
+  <%= link_to cards_path(filter_id: filter.id), class: "btn popup__new popup__item" do %>
     <%= icon_tag "bookmark" %>
     <div class="flex flex-column txt-tight-lines min-width txt-small">
-      <span class="overflow-ellipsis"><%= user_filtering.collections_title %></span>
+      <span class="overflow-ellipsis"><%= filter_selected_collections_title(user_filtering) %></span>
       <span class="overflow-ellipsis"><%= filter.summary %></span>
     </div>
     <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>