add grace period to deleted dossiers

app/controllers/instructeurs/dossiers_controller.rb

@@ -216,7 +216,7 @@ module Instructeurs
 
     def delete_dossier
       if dossier.termine?
-        dossier.deleted_by_instructeur_and_keep_track!(current_instructeur)
+        dossier.discard_and_keep_track!(current_instructeur, :instructeur_request)
         flash.notice = 'Le dossier a bien été supprimé'
         redirect_to instructeur_procedure_path(procedure)
       else

app/controllers/users/dossiers_controller.rb

@@ -14,12 +14,12 @@ module Users
     before_action :forbid_closed_submission!, only: [:update_brouillon]
     before_action :show_demarche_en_test_banner
     before_action :store_user_location!, only: :new
-    before_action :statut, only: :index
 
     def index
       @user_dossiers = current_user.dossiers.includes(:procedure).order_by_updated_at.page(page)
       @dossiers_invites = current_user.dossiers_invites.includes(:procedure).order_by_updated_at.page(page)
       @dossiers_supprimes = DeletedDossier.where(user_id: current_user.id).order_by_updated_at.page(page)
+      @statut = statut(@user_dossiers.count, @dossiers_invites.count, @dossiers_supprimes.count)
     end
 
     def show
@@ -275,8 +275,16 @@ module Users
 
     private
 
-    def statut
-      @statut = params[:statut].presence || 'mes-dossiers'
+    def statut(mes_dossiers_count, dossiers_invites_count, dossiers_supprimes_count)
+      if dossiers_invites_count == 0 && dossiers_supprimes_count == 0
+        'mes-dossiers'
+      elsif mes_dossiers_count == 0 && dossiers_invites_count > 0
+        'dossiers-invites'
+      elsif dossiers_invites_count == 0 && mes_dossiers_count == 0 && dossiers_supprimes_count > 0
+        'dossiers-supprimes'
+      else
+        @statut = params[:statut].presence || 'mes-dossiers'
+      end
     end
 
     def store_user_location!