Prioritize filters with predicates in active filter labels (#7702)

ray-curran · ray-curran · commit ee720aa2de59 · 2022-11-09T15:08:15.000-05:00
When there are filters for a single field and a multi-field ransack
search with predicate, the multi-field label on the active filter
should use the custom label from the filter input box.

Reproduction steps:

./app/admin/posts.rb
```
ActiveAdmin.register Post do
  filter :title_or_body_contains, as: :string, label: 'Title or Body'
  filter :title, as: :string

  ...
end
```

Navigate to the posts path for a user like
`localhost:3000/admin/users/4/posts`

Complete search in both fields, note that both active filters use the
label "Title contains". The `title_or_body_contains` should use the
label from the filter "Title or Body contains".
diff --git a/lib/active_admin/filters/active_filter.rb b/lib/active_admin/filters/active_filter.rb
@@ -98,7 +98,7 @@ def find_class
       end
 
       def filter
-        resource.filters[name.to_sym] || resource.filters[condition.key.to_sym]
+        resource.filters[condition.key.to_sym] || resource.filters[name.to_sym]
       end
 
       def related_primary_key
diff --git a/spec/unit/filters/active_filter_spec.rb b/spec/unit/filters/active_filter_spec.rb
@@ -190,6 +190,15 @@
         resource.add_filter(:title_or_body_cont, label: label)
         expect(subject.label).to eq("#{label} contains")
       end
+
+      context "when an additional filter exists for one of the fields" do
+        it "should use the filter label as the label prefix" do
+          label = "#{user.first_name}'s Post"
+          resource.add_filter(:title_or_body_cont, label: label)
+          resource.add_filter(:title)
+          expect(subject.label).to eq("#{label} contains")
+        end
+      end
     end
   end
 
