fix order for user's dossiers page

demarches-simplifiees · Feb 5, 2025 · a3246c6 · a3246c6
1 parent 54b5401
commit a3246c6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/app/controllers/users/dossiers_controller.rb b/app/controllers/users/dossiers_controller.rb
@@ -27,7 +27,7 @@ class DossiersController < UserController
     end
 
     def index
-      ordered_dossiers = Dossier.includes(:procedure).order_by_updated_at
+      ordered_dossiers = Dossier.includes(:procedure).order_by_depose_at
 
       user_revisions = ProcedureRevision.where(dossiers: current_user.dossiers.visible_by_user)
       invite_revisions = ProcedureRevision.where(dossiers: current_user.dossiers_invites.visible_by_user)

diff --git a/app/models/dossier.rb b/app/models/dossier.rb
@@ -235,6 +235,7 @@ def classer_sans_suite(motivation: nil, instructeur: nil, processed_at: Time.zon
   scope :for_editing_fork, -> { where.not(editing_fork_origin_id: nil) }
   scope :for_groupe_instructeur, -> (groupe_instructeurs) { where(groupe_instructeur: groupe_instructeurs) }
   scope :order_by_updated_at,            -> (order = :desc) { order(updated_at: order, id: order) }
+  scope :order_by_depose_at,             -> (order = :desc) { order(depose_at: order, id: order) }
   scope :order_by_created_at,            -> (order = :asc) { order(depose_at: order, id: order) }
   scope :updated_since,                  -> (since) { where(dossiers: { updated_at: since.. }) }
   scope :created_since,                  -> (since) { where(dossiers: { depose_at: since.. }) }

diff --git a/app/views/users/dossiers/_dossiers_list.html.haml b/app/views/users/dossiers/_dossiers_list.html.haml
@@ -3,7 +3,7 @@
     = page_entries_info dossiers
 
   - dossiers.each do |dossier|
-    .card
+    .card{ id: "dossier_#{dossier.id}" }
       .flex.justify-between
         %div
           %h3.card-title

diff --git a/spec/system/users/list_dossiers_spec.rb b/spec/system/users/list_dossiers_spec.rb
@@ -187,7 +187,7 @@
     context 'when user clicks on delete button' do
       scenario 'the dossier is deleted' do
         expect(page).to have_content(dossier_en_construction.procedure.libelle)
-        within(:css, ".card", match: :first) do
+        within(:css, "#dossier_#{dossier_en_construction.id}", match: :first) do
           click_on 'Autres actions'
           accept_alert('Confirmer la suppression ?') do
             click_on 'Mettre à la corbeille'