From 9f59dd7bdbf1abfafd03ef9ae80ea23367b9b4bd Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Wed, 29 Oct 2025 15:35:33 -0500 Subject: [PATCH 1/5] Reset bar after clicking a result Fixes that search input was still filled even though the dialog was gone: https://box-car.com/5986089/cards/2513 --- app/views/searches/_result.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/searches/_result.html.erb b/app/views/searches/_result.html.erb index c4caad8f9..6a5dbcae5 100644 --- a/app/views/searches/_result.html.erb +++ b/app/views/searches/_result.html.erb @@ -1,5 +1,5 @@
  • - <%= link_to result.source, class: "search__result", data: { turbo_frame: "_top" } do %> + <%= link_to result.source, class: "search__result", data: { turbo_frame: "_top", action: "bar#reset" } do %>

    # <%= result.card_id %> <%= result.card_title %> From 18f0782b375b3512c8db7bf91279caaccb33caf8 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Wed, 29 Oct 2025 15:45:22 -0500 Subject: [PATCH 2/5] Make this a little more understandable --- app/views/filters/settings/_indexed_by.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/filters/settings/_indexed_by.html.erb b/app/views/filters/settings/_indexed_by.html.erb index 8baa35557..2a990e66b 100644 --- a/app/views/filters/settings/_indexed_by.html.erb +++ b/app/views/filters/settings/_indexed_by.html.erb @@ -5,7 +5,7 @@ action: "keydown.esc->dialog#close click@document->dialog#closeOnClickOutside", filter_show: user_filtering.show_indexed_by?, combobox_default_value_value: "all", - combobox_default_label_value: "Status", + combobox_default_label_value: "Status…", combobox_with_default_class: "quick-filter--with-default" } do %> <% end %> From 2ab737b032a8bd2d6e1dd39574f06274e3fe23de Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Wed, 29 Oct 2025 16:07:29 -0500 Subject: [PATCH 3/5] Open should mean everything except closed and not now --- app/models/filter.rb | 5 +++++ app/views/filters/settings/_indexed_by.html.erb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/models/filter.rb b/app/models/filter.rb index 6218dbbaa..ca14629a9 100644 --- a/app/models/filter.rb +++ b/app/models/filter.rb @@ -22,6 +22,7 @@ class Filter < ApplicationRecord result = result.indexed_by(indexed_by) result = result.sorted_by(sorted_by) result = result.where(id: card_ids) if card_ids.present? + result = result.where.missing(:not_now) unless include_not_now_cards? result = result.open unless include_closed_cards? result = result.unassigned if assignment_status.unassigned? result = result.assigned_to(assignees.ids) if assignees.present? @@ -67,4 +68,8 @@ class Filter < ApplicationRecord def include_closed_cards? only_closed? || card_ids.present? || creator_ids.present? end + + def include_not_now_cards? + indexed_by.not_now? || card_ids.present? + end end diff --git a/app/views/filters/settings/_indexed_by.html.erb b/app/views/filters/settings/_indexed_by.html.erb index 2a990e66b..f75419058 100644 --- a/app/views/filters/settings/_indexed_by.html.erb +++ b/app/views/filters/settings/_indexed_by.html.erb @@ -23,7 +23,7 @@ <% Filter::INDEXES.each do |index| %> <%= tag.li class: "popup__item", data: { navigable_list_target: "item", combobox_target: "item", combobox_value: index, combobox_label: index.humanize }, role: "checkbox", aria: { checked: filter.indexed_by == index } do %> <% end %> From 8618d277c39ad69a9c1d9f95012c5d2cf0d043ef Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Wed, 29 Oct 2025 16:31:48 -0500 Subject: [PATCH 4/5] Typo --- test/models/filter_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/models/filter_test.rb b/test/models/filter_test.rb index a47e4ccba..fab856b87 100644 --- a/test/models/filter_test.rb +++ b/test/models/filter_test.rb @@ -26,7 +26,7 @@ class FilterTest < ActiveSupport::TestCase assert_equal [ cards(:shipping) ], filter.cards cards(:shipping).postpone - filter = users(:david).filters.new indexed_by: "now_now" + filter = users(:david).filters.new indexed_by: "not_now" assert_includes filter.cards, cards(:shipping) filter = users(:david).filters.new card_ids: [ cards(:logo, :layout).collect(&:id) ] From 5c3f664e7e912d6383d1fe2bc4b3307192fe7b80 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Wed, 29 Oct 2025 16:32:11 -0500 Subject: [PATCH 5/5] Allow changing columns even when cards are done --- app/views/cards/_container.html.erb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb index 85116888e..add4b0049 100644 --- a/app/views/cards/_container.html.erb +++ b/app/views/cards/_container.html.erb @@ -20,9 +20,7 @@ <%= render "cards/container/title", card: card %> <%= render "cards/display/perma/steps", card: card %>

    - <% if card.published? %> - <%= render "cards/triage/columns", card: card if card.open? %> - <% end %> + <%= render "cards/triage/columns", card: card %>