Merge branch...

Merge branch '22457-reset-filters-button-should-be-invisible-when-no-filters-are-active' into 'master'

`Reset filters` link should only be visible when filters are active

## Why was this MR needed?

`Reset filters` link is always visible.

Closes #22457

See merge request !6497

app/helpers/issuables_helper.rb

@@ -124,6 +124,10 @@ module IssuablesHelper
     end
   end
 
+  def issuable_filters_present
+    params[:search] || params[:author_id] || params[:assignee_id] || params[:milestone_title] || params[:label_name]
+  end
+
   def issuables_count_for_state(issuable_type, state)
     issuables_finder = public_send("#{issuable_type}_finder")
     issuables_finder.params[:state] = state

app/views/shared/issuable/_filter.html.haml

@@ -29,6 +29,7 @@
         .filter-item.inline.labels-filter
           = render "shared/issuable/label_dropdown", selected: finder.labels.select(:title).uniq, use_id: false, selected_toggle: params[:label_name], data_options: { field_name: "label_name[]" }
 
+        - if issuable_filters_present
           .filter-item.inline.reset-filters
             %a{href: page_filter_path(without: [:assignee_id, :author_id, :milestone_title, :label_name, :search])} Reset filters
 

spec/features/issues/reset_filters_spec.rb

@@ -75,6 +75,14 @@ feature 'Issues filter reset button', feature: true, js: true do
     end
   end
 
+  context 'when no filters have been applied' do
+    it 'the reset link should not be visible' do
+      visit_issues(project)
+      expect(page).to have_css('.issue', count: 2)
+      expect(page).not_to have_css '.reset_filters'
+    end
+  end
+
   def reset_filters
     find('.reset-filters').click
   end