[Fix #3477] Individually remove values from multi-value filter

app/controllers/new_gestionnaire/procedures_controller.rb

@@ -159,8 +159,8 @@ module NewGestionnaire
     def remove_filter
       filters = procedure_presentation.filters
 
-      to_remove = params.values_at(:table, :column)
+      to_remove = params.values_at(:table, :column, :value)
-      filters[statut].reject! { |filter| filter.values_at('table', 'column') == to_remove }
+      filters[statut].reject! { |filter| filter.values_at('table', 'column', 'value') == to_remove }
 
       procedure_presentation.update(filters: filters)
 

app/views/new_gestionnaire/procedures/show.html.haml

@@ -59,7 +59,7 @@
 
       - @current_filters.each do |filter|
         %span.filter
-          = link_to remove_filter_gestionnaire_procedure_path(@procedure, statut: @statut, table: filter['table'], column: filter['column']) do
+          = link_to remove_filter_gestionnaire_procedure_path(@procedure, statut: @statut, table: filter['table'], column: filter['column'], value: filter['value']) do
             %img.close-icon{ src: image_url("close.svg") }
           = "#{filter['label'].truncate(50)} : #{filter['value']}"
       %table.table.dossiers-table.hoverable

config/routes.rb

@@ -312,7 +312,7 @@ Rails.application.routes.draw do
         patch 'update_displayed_fields'
         get 'update_sort/:table/:column' => 'procedures#update_sort', as: 'update_sort'
         post 'add_filter'
-        get 'remove_filter/:statut/:table/:column' => 'procedures#remove_filter', as: 'remove_filter'
+        get 'remove_filter/:statut/:table/:column/:value' => 'procedures#remove_filter', as: 'remove_filter'
         get 'download_dossiers'
 
         resources :dossiers, only: [:show], param: :dossier_id do

spec/features/new_gestionnaire/procedure_filters_spec.rb

@@ -7,9 +7,11 @@ feature "procedure filters" do
   let!(:new_unfollow_dossier) { create(:dossier, procedure: procedure, state: Dossier.states.fetch(:en_instruction)) }
   let!(:champ) { Champ.find_by(type_de_champ_id: type_de_champ.id, dossier_id: new_unfollow_dossier.id) }
   let!(:new_unfollow_dossier_2) { create(:dossier, procedure: procedure, state: Dossier.states.fetch(:en_instruction)) }
+  let!(:champ_2) { Champ.find_by(type_de_champ_id: type_de_champ.id, dossier_id: new_unfollow_dossier_2.id) }
 
   before do
     champ.update(value: "Mon champ rempli")
+    champ_2.update(value: "Mon autre champ rempli différemment")
     login_as gestionnaire, scope: :gestionnaire
     visit gestionnaire_procedure_path(procedure)
   end
@@ -66,7 +68,7 @@ feature "procedure filters" do
       expect(page).not_to have_link(new_unfollow_dossier_2.user.email)
     end
 
-    remove_filter
+    remove_filter(champ.value)
 
     within ".dossiers-table" do
       expect(page).to have_link(new_unfollow_dossier.id)
@@ -77,8 +79,43 @@ feature "procedure filters" do
     end
   end
 
-  def remove_filter
+  scenario "should be able to add and remove two filters for the same field", js: true do
-    find(:xpath, "//span[contains(@class, 'filter')]/a").click
+    add_filter(type_de_champ.libelle, champ.value)
+    add_filter(type_de_champ.libelle, champ_2.value)
+
+    expect(page).to have_content("#{type_de_champ.libelle} : #{champ.value}")
+
+    within ".dossiers-table" do
+      expect(page).to have_link(new_unfollow_dossier.id, exact: true)
+      expect(page).to have_link(new_unfollow_dossier.user.email)
+
+      expect(page).to have_link(new_unfollow_dossier_2.id, exact: true)
+      expect(page).to have_link(new_unfollow_dossier_2.user.email)
+    end
+
+    remove_filter(champ.value)
+
+    within ".dossiers-table" do
+      expect(page).not_to have_link(new_unfollow_dossier.id)
+      expect(page).not_to have_link(new_unfollow_dossier.user.email)
+
+      expect(page).to have_link(new_unfollow_dossier_2.id)
+      expect(page).to have_link(new_unfollow_dossier_2.user.email)
+    end
+
+    remove_filter(champ_2.value)
+
+    within ".dossiers-table" do
+      expect(page).to have_link(new_unfollow_dossier.id)
+      expect(page).to have_link(new_unfollow_dossier.user.email)
+
+      expect(page).to have_link(new_unfollow_dossier_2.id)
+      expect(page).to have_link(new_unfollow_dossier_2.user.email)
+    end
+  end
+
+  def remove_filter(filter_value)
+    find(:xpath, "(//span[contains(@class, 'filter')]/a[contains(@href, '#{URI.encode(filter_value)}')])[1]").click
   end
 
   def add_filter(column_name, filter_value)