refactor(dossiers): use dossiers_list partial instead of transferes_dossiers_list

Co-authored-by: Lisa Durand <lisa.c.durand@gmail.com>

app/controllers/users/dossiers_controller.rb

@@ -28,9 +28,9 @@ module Users
       @dossiers_invites = current_user.dossiers_invites.merge(dossiers_visibles)
       @dossiers_supprimes_recemment = current_user.dossiers.hidden_by_user.merge(dossiers)
       @dossiers_supprimes_definitivement = current_user.deleted_dossiers.includes(:procedure).order_by_updated_at
-      @dossier_transfers = DossierTransfer.for_email(current_user.email)
+      @dossiers_transferes = dossiers_visibles.where(dossier_transfer_id: DossierTransfer.for_email(current_user.email).ids)
       @dossiers_close_to_expiration = current_user.dossiers.close_to_expiration.merge(dossiers_visibles)
-      @statut = statut(@user_dossiers, @dossiers_traites, @dossiers_invites, @dossiers_supprimes_recemment, @dossiers_supprimes_definitivement, @dossier_transfers, @dossiers_close_to_expiration, params[:statut])
+      @statut = statut(@user_dossiers, @dossiers_traites, @dossiers_invites, @dossiers_supprimes_recemment, @dossiers_supprimes_definitivement, @dossiers_transferes, @dossiers_close_to_expiration, params[:statut])
 
       @dossiers = case @statut
       when 'en-cours'
@@ -44,7 +44,7 @@ module Users
       when 'dossiers-supprimes-definitivement'
         @dossiers_supprimes_definitivement
       when 'dossiers-transferes'
-        @dossier_transfers
+        @dossiers_transferes
       when 'dossiers-expirant'
         @dossiers_close_to_expiration
       end.page(page)
@@ -388,14 +388,14 @@ module Users
     # if the status tab is filled, then this tab
     # else first filled tab
     # else en-cours
-    def statut(mes_dossiers, dossiers_traites, dossiers_invites, dossiers_supprimes_recemment, dossiers_supprimes_definitivement, dossier_transfers, dossiers_close_to_expiration, params_statut)
+    def statut(mes_dossiers, dossiers_traites, dossiers_invites, dossiers_supprimes_recemment, dossiers_supprimes_definitivement, dossiers_transferes, dossiers_close_to_expiration, params_statut)
       tabs = {
         'en-cours' => mes_dossiers.present?,
         'traites' => dossiers_traites.present?,
         'dossiers-invites' => dossiers_invites.present?,
         'dossiers-supprimes-recemment' => dossiers_supprimes_recemment.present?,
         'dossiers-supprimes-definitivement' => dossiers_supprimes_definitivement.present?,
-        'dossiers-transferes' => dossier_transfers.present?,
+        'dossiers-transferes' => dossiers_transferes.present?,
         'dossiers-expirant' => dossiers_close_to_expiration.present?
       }
       if tabs[params_statut]

app/views/users/dossiers/_transfered_dossiers_list.html.haml

@@ -1,35 +0,0 @@
-- if dossier_transfers.present?
-  .fr-table.fr-table--bordered
-    %table.table.dossiers-table.display-table
-      %thead
-        %tr
-          %th.number-col= t('views.users.dossiers.dossiers_list.n_dossier')
-          %th= t('views.users.dossiers.dossiers_list.procedure')
-          %th= t('views.users.dossiers.dossiers_list.status')
-          %th.action-col.follow-col Date de dépot
-      %tbody
-        - dossier_transfers.each do |transfer|
-          - transfer.dossiers.each do |dossier|
-            %tr.fr-background-alt--blue-france.no-border
-              %td.fr-py-2w{ colspan: 100 }
-                .flex.align-center
-                  %p.fr-mb-0
-                    %small
-                      = t('views.users.dossiers.transfers.receiver_demande_en_cours', id: dossier.id, email: transfer.dossiers.first.user.email)
-                  .ml-auto
-                    = link_to t('views.users.dossiers.transfers.accept'), transfer_path(transfer), class: "fr-btn fr-btn--sm fr-btn--tertiary", method: :put
-
-                    = link_to t('views.users.dossiers.transfers.reject'), transfer_path(transfer), class: "fr-btn fr-btn--sm fr-btn--tertiary-no-outline", method: :delete
-            %tr{ data: { 'transfer-id': transfer.id } }
-              %th.number-col{ scope: :row }
-                %span.icon.folder
-                = dossier.id
-              %td= dossier.procedure.libelle
-              %td= status_badge(dossier.state)
-              %td.action-col.follow-col{ style: 'padding: 18px;' }= (dossier.depose_at || dossier.created_at).strftime('%d/%m/%Y')
-
-    = paginate dossier_transfers, views_prefix: 'shared'
-
-- else
-  .blank-tab
-    %h2.empty-text Aucune demande de transfert de dossiers ne vous a été adressée.

app/views/users/dossiers/index.html.haml

@@ -56,11 +56,11 @@
             active: @statut == 'dossiers-supprimes-definitivement',
             badge: number_with_html_delimiter(@dossiers_supprimes_definitivement.count))
 
-          - if @dossier_transfers.present?
+          - if @dossiers_transferes.present?
-            = tab_item(t('pluralize.dossiers_transferes', count: @dossier_transfers.count),
+            = tab_item(t('pluralize.dossiers_transferes', count: @dossiers_transferes.count),
               dossiers_path(statut: 'dossiers-transferes'),
               active: @statut == 'dossiers-transferes',
-              badge: number_with_html_delimiter(@dossier_transfers.count))
+              badge: number_with_html_delimiter(@dossiers_transferes.count))
 
 .fr-container
   - if @statut == "en-cours"
@@ -94,8 +94,7 @@
       = render partial: "deleted_dossiers_list", locals: { deleted_dossiers: @dossiers }
 
     - if @statut == "dossiers-transferes"
-      -# /!\ in this context, @dossiers is a collection of DossierTransfer not Dossier
+      = render partial: "dossiers_list", locals: { dossiers: @dossiers, filter: @filter, statut: @statut }
-      = render partial: "transfered_dossiers_list", locals: { dossier_transfers: @dossiers }
 
     - if @statut == "dossiers-expirant"
       = render partial: "dossiers_list", locals: { dossiers: @dossiers, filter: @filter, statut: @statut }

spec/views/users/dossiers/index.html.haml_spec.rb

@@ -16,7 +16,7 @@ describe 'users/dossiers/index', type: :view do
     assign(:dossiers_supprimes_recemment, Kaminari.paginate_array(user_dossiers).page(1))
     assign(:dossiers_supprimes_definitivement, Kaminari.paginate_array(user_dossiers).page(1))
     assign(:dossiers_traites, Kaminari.paginate_array(user_dossiers).page(1))
-    assign(:dossier_transfers, Kaminari.paginate_array([]).page(1))
+    assign(:dossiers_transferes, Kaminari.paginate_array([]).page(1))
     assign(:dossiers_close_to_expiration, Kaminari.paginate_array([]).page(1))
     assign(:dossiers, Kaminari.paginate_array(user_dossiers).page(1))
     assign(:statut, statut)