Refactor to use updated params in finder

2 files changed, 4 insertions, 15 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 183db931f90..74042f0bae8 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -188,21 +188,6 @@ module ApplicationHelper
     "#{request.path}?#{params.to_param}"
   end
 
-  def filter_bar_params
-    {
-      milestone_title: params[:milestone_title],
-      assignee_id: params[:assignee_id],
-      author_id: params[:author_id],
-      search: params[:search],
-      label_name: params[:label_name],
-      my_reaction_emoji: params[:my_reaction_emoji]
-    }
-  end
-
-  def has_filter_bar_param?
-    filter_bar_params.values.any? { |v| v.present? }
-  end
-
   def outdated_browser?
     browser.ie? && browser.version.to_i < 10
   end
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index 6069640b9c8..dfa86f52e40 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -362,6 +362,10 @@ module IssuablesHelper
     end
   end
 
+  def has_filter_bar_param?
+    finder.class.scalar_params.any? { |p| params[p].present? }
+  end
+
   private
 
   def sidebar_gutter_collapsed?