+
<%= render DS::SearchInput.new(
variant: :embedded,
placeholder: t(".filter_category"),
@@ -17,7 +17,13 @@
{
multiple: true,
checked: @q[:categories]&.include?(category.name),
- class: "checkbox checkbox--light"
+ class: "checkbox checkbox--light",
+ data: {
+ category_filter_target: "checkbox",
+ action: "change->category-filter#toggle",
+ category_id: category.id,
+ parent_id: category.parent_id
+ }
},
category.name,
nil %>
diff --git a/test/controllers/transactions/categorizes_controller_test.rb b/test/controllers/transactions/categorizes_controller_test.rb
index a1e96b250..1bd141f77 100644
--- a/test/controllers/transactions/categorizes_controller_test.rb
+++ b/test/controllers/transactions/categorizes_controller_test.rb
@@ -43,6 +43,26 @@ class Transactions::CategorizesControllerTest < ActionDispatch::IntegrationTest
assert_equal parent_index + 1, child_index
end
+ test "show groups subcategories immediately after their parent in the category pills" do
+ create_transaction(account: @account, name: "Starbucks")
+ get transactions_categorize_url
+
+ assert_response :success
+
+ doc = Nokogiri::HTML::Document.parse(response.body)
+ pill_values = doc.css("button[name='category_id']").map { |node| node["value"] }
+
+ parent_index = pill_values.index(categories(:food_and_drink).id)
+ child_index = pill_values.index(categories(:subcategory).id)
+
+ assert_not_nil parent_index
+ assert_not_nil child_index
+ assert_equal parent_index + 1, child_index
+
+ child_pill = doc.css("button[name='category_id'][value='#{categories(:subcategory).id}']").first
+ assert_includes child_pill.text, categories(:subcategory).display_name_with_parent
+ end
+
test "show renders full dates so multi-year lists are unambiguous" do
create_transaction(account: @account, name: "Starbucks", date: Date.new(2024, 7, 8))
diff --git a/test/system/category_filter_cascading_test.rb b/test/system/category_filter_cascading_test.rb
new file mode 100644
index 000000000..1587b49dc
--- /dev/null
+++ b/test/system/category_filter_cascading_test.rb
@@ -0,0 +1,101 @@
+require "application_system_test_case"
+
+class CategoryFilterCascadingTest < ApplicationSystemTestCase
+ setup do
+ sign_in @user = users(:family_admin)
+
+ Entry.delete_all # clean slate
+
+ @parent = categories(:food_and_drink)
+ @child_one = categories(:subcategory) # "Restaurants"
+ @child_two = @user.family.categories.create!(name: "Groceries", parent: @parent, color: "#4da568", lucide_icon: "shopping-bag")
+
+ @child_one_transaction = create_transaction("restaurant purchase", 2.days.ago.to_date, 50, category: @child_one)
+ @child_two_transaction = create_transaction("grocery run", 1.day.ago.to_date, 30, category: @child_two)
+
+ visit transactions_url
+ end
+
+ test "checking a parent category checks all its subcategories" do
+ find("#transaction-filters-button").click
+
+ within "#transaction-filters-menu" do
+ click_button "Category"
+ check(@parent.name)
+
+ assert find_field(@child_one.name).checked?
+ assert find_field(@child_two.name).checked?
+ end
+ end
+
+ test "unchecking one subcategory unchecks the parent and excludes only that subcategory from the filter" do
+ find("#transaction-filters-button").click
+
+ within "#transaction-filters-menu" do
+ click_button "Category"
+ check(@parent.name)
+ uncheck(@child_one.name)
+
+ assert_not find_field(@parent.name).checked?
+ assert find_field(@child_two.name).checked?
+
+ click_button "Apply"
+ end
+
+ # Only the still-checked subcategory's transaction should show — the
+ # deselected child must not sneak back in via the parent match.
+ assert_selector "#" + dom_id(@child_two_transaction)
+ assert_no_selector "#" + dom_id(@child_one_transaction)
+ end
+
+ test "re-checking all subcategories re-checks the parent" do
+ find("#transaction-filters-button").click
+
+ within "#transaction-filters-menu" do
+ click_button "Category"
+ check(@parent.name)
+ uncheck(@child_one.name)
+ check(@child_one.name)
+
+ assert find_field(@parent.name).checked?
+
+ click_button "Apply"
+ end
+
+ assert_selector "#" + dom_id(@child_one_transaction)
+ assert_selector "#" + dom_id(@child_two_transaction)
+ end
+
+ test "reopening a parent-only filter from the URL keeps it checked and active on Apply" do
+ visit transactions_url(q: { categories: [ @parent.name ] })
+
+ assert_selector "#" + dom_id(@child_one_transaction)
+ assert_selector "#" + dom_id(@child_two_transaction)
+
+ find("#transaction-filters-button").click
+
+ within "#transaction-filters-menu" do
+ click_button "Category"
+
+ assert find_field(@parent.name).checked?
+ assert find_field(@child_one.name).checked?
+ assert find_field(@child_two.name).checked?
+
+ click_button "Apply"
+ end
+
+ assert_selector "#" + dom_id(@child_one_transaction)
+ assert_selector "#" + dom_id(@child_two_transaction)
+ end
+
+ private
+
+ def create_transaction(name, date, amount, category:)
+ accounts(:depository).entries.create! \
+ name: name,
+ date: date,
+ amount: amount,
+ currency: "USD",
+ entryable: Transaction.new(category: category)
+ end
+end