Merge pull request #2160 from betagouv/enable-new-dossiers-list

Active la nouvelle liste des dossiers

app/assets/stylesheets/new_design/utils.scss

@@ -35,6 +35,16 @@
   margin: 60px 0;
 }
 
+.empty-text-details {
+  margin-bottom: 60px;
+  text-align: center;
+
+  .empty-text + & {
+    margin-top: -50px;
+  }
+}
+
+
 .highlighted {
   background: $orange-bg;
   color: $black;

app/controllers/new_user/dossiers_controller.rb

@@ -88,8 +88,8 @@ module NewUser
     end
 
     def index
-      @user_dossiers = current_user.dossiers.includes(:procedure).page(page)
-      @dossiers_invites = current_user.dossiers_invites.includes(:procedure).page(page)
+      @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)
 
       @current_tab = current_tab(@user_dossiers.count, @dossiers_invites.count)
 
@@ -107,7 +107,7 @@ module NewUser
       if !dossier.instruction_commencee?
         dossier.delete_and_keep_track
         flash.notice = 'Votre dossier a bien été supprimé.'
-        redirect_to users_dossiers_path
+        redirect_to dossiers_path
       else
         flash.notice = "L'instruction de votre dossier a commencé, il n'est plus possible de supprimer votre dossier. Si vous souhaitez annuler l'instruction contactez votre administration par la messagerie de votre dossier."
         redirect_to users_dossier_path(dossier)
@@ -123,7 +123,7 @@ module NewUser
     def ensure_dossier_can_be_updated
       if !dossier.can_be_updated_by_the_user?
         flash.alert = 'Votre dossier ne peut plus être modifié'
-        redirect_to users_dossiers_path
+        redirect_to dossiers_path
       end
     end
 

app/controllers/root_controller.rb

@@ -7,7 +7,7 @@ class RootController < ApplicationController
     elsif gestionnaire_signed_in?
       return redirect_to gestionnaire_procedures_path
     elsif user_signed_in?
-      return redirect_to users_dossiers_path
+      return redirect_to dossiers_path
     elsif administration_signed_in?
       return redirect_to manager_root_path
     end

app/controllers/users/dossiers/add_siret_controller.rb

@@ -8,6 +8,6 @@ class Users::Dossiers::AddSiretController < ApplicationController
 
   rescue ActiveRecord::RecordNotFound
     flash.alert = t('errors.messages.dossier_not_found')
-    redirect_to url_for users_dossiers_path
+    redirect_to url_for dossiers_path
   end
 end

app/controllers/users/dossiers/invites_controller.rb

@@ -12,6 +12,6 @@ class Users::Dossiers::InvitesController < UsersController
     render 'users/recapitulatif/show'
   rescue ActiveRecord::RecordNotFound
     flash.alert = t('errors.messages.dossier_not_found')
-    redirect_to url_for users_dossiers_path
+    redirect_to url_for dossiers_path
   end
 end

app/controllers/users/dossiers_controller.rb

@@ -104,7 +104,7 @@ class Users::DossiersController < UsersController
 
   rescue ActiveRecord::RecordNotFound
     flash.alert = t('errors.messages.dossier_not_found')
-    redirect_to url_for users_dossiers_path
+    redirect_to url_for dossiers_path
   end
 
   def siret_informations
@@ -133,7 +133,7 @@ class Users::DossiersController < UsersController
     end
   rescue ActiveRecord::RecordNotFound
     flash.alert = t('errors.messages.dossier_not_found')
-    redirect_to url_for users_dossiers_path
+    redirect_to url_for dossiers_path
   end
 
   def change_siret
@@ -181,7 +181,7 @@ class Users::DossiersController < UsersController
       dossier.destroy
       flash.notice = 'Brouillon supprimé'
     end
-    redirect_to url_for users_dossiers_path(liste: 'brouillon')
+    redirect_to url_for dossiers_path
   end
 
   def text_summary
@@ -229,7 +229,7 @@ class Users::DossiersController < UsersController
   def error_procedure
     flash.alert = t('errors.messages.procedure_not_found')
 
-    redirect_to url_for users_dossiers_path
+    redirect_to url_for dossiers_path
   end
 
   def update_current_user_siret!(siret)

app/helpers/application_helper.rb

@@ -25,7 +25,7 @@ module ApplicationHelper
     when :gestionnaire
       gestionnaire_procedures_path
     when :user
-      users_dossiers_path
+      dossiers_path
     else
       root_path
     end

app/helpers/dossier_helper.rb

@@ -15,6 +15,16 @@ module DossierHelper
     end
   end
 
+  def url_for_dossier(dossier)
+    if dossier.kind_of? Invite
+      users_dossiers_invite_path(id: dossier.id)
+    elsif dossier.brouillon?
+      modifier_dossier_path(dossier)
+    else
+      users_dossier_recapitulatif_path(dossier)
+    end
+  end
+
   def dossier_submission_is_closed?(dossier)
     dossier.brouillon? && dossier.procedure.archivee?
   end

app/views/layouts/_new_header.haml

@@ -36,7 +36,7 @@
       - if nav_bar_profile == :user
         %ul.header-tabs
           %li
-            = active_link_to "Dossiers", users_dossiers_path, active: :inclusive, class: 'tab-link'
+            = active_link_to "Dossiers", dossiers_path, active: :inclusive, class: 'tab-link'
 
     %ul.header-right-content
       - if nav_bar_profile == :gestionnaire && gestionnaire_signed_in?
@@ -63,7 +63,7 @@
               - if SwitchDeviseProfileService.new(warden).multiple_devise_profile_connect?
                 - if user_signed_in? && nav_bar_profile != :user
                   %li
-                    = link_to users_dossiers_path, class: "menu-item menu-link" do
+                    = link_to dossiers_path, class: "menu-item menu-link" do
                       = image_tag "icons/switch-profile.svg"
                       Passer en usager
                 - if gestionnaire_signed_in? && nav_bar_profile != :gestionnaire

app/views/layouts/_switch_devise_profile_module.html.haml

@@ -6,7 +6,7 @@
     %ul.dropdown-menu.dropdown-menu-left
       - if user_signed_in?
         %li
-          = link_to(users_dossiers_path, id: :menu_item_procedure) do
+          = link_to(dossiers_path, id: :menu_item_procedure) do
             %i.fa.fa-user
              
             Usager

app/views/layouts/left_panels/_left_panel_users_recapitulatifcontroller_show.html.haml

@@ -1,5 +1,5 @@
 .link-to-dossiers
-  = link_to 'retour aux dossiers', users_dossiers_path
+  = link_to 'retour aux dossiers', dossiers_path
 
 #first-block
   .en-cours

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

@@ -37,23 +37,24 @@
           - @dossiers.each do |dossier|
             %tr
               %td.folder-col
-                = link_to(users_dossier_recapitulatif_path(dossier), class: 'cell-link') do
+                = link_to(url_for_dossier(dossier), class: 'cell-link') do
                   %span.icon.folder
               %td.number-col
-                = link_to(users_dossier_recapitulatif_path(dossier), class: 'cell-link') do
+                = link_to(url_for_dossier(dossier), class: 'cell-link') do
                   = dossier.id
               %td
-                = link_to(users_dossier_recapitulatif_path(dossier), class: 'cell-link') do
+                = link_to(url_for_dossier(dossier), class: 'cell-link') do
                   = dossier.procedure.libelle
               %td.status-col
-                = link_to(users_dossier_recapitulatif_path(dossier), class: 'cell-link') do
+                = link_to(url_for_dossier(dossier), class: 'cell-link') do
                   = render partial: 'shared/dossiers/status', locals: { dossier: dossier }
               %td.updated-at-col
-                = link_to(users_dossier_recapitulatif_path(dossier), class: 'cell-link') do
+                = link_to(url_for_dossier(dossier), class: 'cell-link') do
                   = dossier.updated_at.localtime.strftime("%d/%m/%Y")
     = paginate(@dossiers)
 
   - else
     .dossiers-table-empty
       %h2.empty-text Aucun dossier.
+      %p.empty-text-details Pour l’instant vous n’avez commencé aucune démarche.
       = link_to "Commencer une nouvelle démarche", new_demarche_url, class: "button primary"

app/views/root/patron.html.haml

@@ -201,3 +201,4 @@
 
   .container
     %h2.empty-text Aucun dossier
+    %p.empty-text-details Vous n’avez commencé aucune démarche pour l’instant.

spec/controllers/new_user/dossiers_controller_spec.rb

@@ -150,8 +150,8 @@ describe NewUser::DossiersController, type: :controller do
       let(:individual_params) { { gender: 'M', nom: 'Mouse', prenom: 'Mickey' } }
       let(:dossier_params) { { autorisation_donnees: true } }
 
-      it 'redirects to user_dossiers_path' do
-        expect(response).to redirect_to(users_dossiers_path)
+      it 'redirects to the dossiers list' do
+        expect(response).to redirect_to(dossiers_path)
         expect(flash.alert).to eq('Votre dossier ne peut plus être modifié')
       end
     end
@@ -225,10 +225,10 @@ describe NewUser::DossiersController, type: :controller do
     context 'when the dossier cannot be updated by the user' do
       let!(:dossier) { create(:dossier, :en_instruction, user: user) }
 
-      it 'redirects to user_dossiers_path' do
+      it 'redirects to the dossiers list' do
         subject
 
-        expect(response).to redirect_to(users_dossiers_path)
+        expect(response).to redirect_to(dossiers_path)
         expect(flash.alert).to eq('Votre dossier ne peut plus être modifié')
       end
     end
@@ -418,6 +418,23 @@ describe NewUser::DossiersController, type: :controller do
         it { expect(assigns(:current_tab)).to eq('mes-dossiers') }
       end
     end
+
+    describe 'sort order' do
+      before do
+        Timecop.freeze(4.days.ago) { create(:dossier, user: user) }
+        Timecop.freeze(2.days.ago) { create(:dossier, user: user) }
+        Timecop.freeze(4.days.ago) { create(:invite, dossier: create(:dossier), user: user, type: 'InviteUser') }
+        Timecop.freeze(2.days.ago) { create(:invite, dossier: create(:dossier), user: user, type: 'InviteUser') }
+        get(:index)
+      end
+
+      it 'displays the most recently updated dossiers first' do
+        expect(assigns(:user_dossiers).first.updated_at.to_date).to eq(2.days.ago.to_date)
+        expect(assigns(:user_dossiers).second.updated_at.to_date).to eq(4.days.ago.to_date)
+        expect(assigns(:dossiers_invites).first.updated_at.to_date).to eq(2.days.ago.to_date)
+        expect(assigns(:dossiers_invites).second.updated_at.to_date).to eq(4.days.ago.to_date)
+      end
+    end
   end
 
   describe '#ask_deletion' do
@@ -457,7 +474,7 @@ describe NewUser::DossiersController, type: :controller do
         expect(procedure.deleted_dossiers.first.dossier_id).to eq(dossier_id)
       end
 
-      it { is_expected.to redirect_to(users_dossiers_path) }
+      it { is_expected.to redirect_to(dossiers_path) }
 
       context "and the instruction has started" do
         let(:dossier) { create(:dossier, :en_instruction, user: user, autorisation_donnees: true) }

spec/controllers/root_controller_spec.rb

@@ -8,7 +8,7 @@ describe RootController, type: :controller do
       sign_in create(:user)
     end
 
-    it { expect(subject).to redirect_to(users_dossiers_path) }
+    it { expect(subject).to redirect_to(dossiers_path) }
   end
 
   context 'when Gestionnaire is connected' do

spec/controllers/users/dossiers/add_siret_controller_spec.rb

@@ -11,7 +11,7 @@ describe Users::Dossiers::AddSiretController, type: :controller do
     subject { get :show, params: { dossier_id: dossier.id } }
 
     context 'when dossier is not attached at a procedure with individual siret attribut' do
-      it { is_expected.to redirect_to users_dossiers_path }
+      it { is_expected.to redirect_to dossiers_path }
     end
 
     context 'when dossier is  attached at a procedure with individual siret attribut' do

spec/controllers/users/dossiers/invites_controller_spec.rb

@@ -72,7 +72,7 @@ describe Users::Dossiers::InvitesController, type: :controller do
       let(:email) { 'fake@email.com' }
 
       it { expect(subject.status).to eq 302 }
-      it { is_expected.to redirect_to users_dossiers_path }
+      it { is_expected.to redirect_to dossiers_path }
     end
   end
 end

spec/controllers/users/dossiers_controller_spec.rb

@@ -120,7 +120,7 @@ describe Users::DossiersController, type: :controller do
           context 'when procedure is archived' do
             let(:procedure) { create(:procedure, archived_at: Time.now) }
 
-            it { is_expected.to redirect_to users_dossiers_path }
+            it { is_expected.to redirect_to dossiers_path }
           end
         end
         context 'when user is not logged' do
@@ -136,7 +136,7 @@ describe Users::DossiersController, type: :controller do
           sign_in user
         end
 
-        it { is_expected.to redirect_to users_dossiers_path }
+        it { is_expected.to redirect_to dossiers_path }
       end
 
       context 'when procedure is not published' do
@@ -146,7 +146,7 @@ describe Users::DossiersController, type: :controller do
           sign_in user
         end
 
-        it { is_expected.to redirect_to users_dossiers_path }
+        it { is_expected.to redirect_to dossiers_path }
       end
     end
   end

spec/features/users/drawing_a_zone_with_freedraw_spec.rb

@@ -45,7 +45,7 @@ feature 'drawing a zone with freedraw' do
         let(:module_api_carto) { create(:module_api_carto) }
 
         scenario 'he is redirect to user dossiers index' do
-          expect(page).to have_css('#users-index')
+          expect(page).to have_css('.dossiers-table')
         end
 
         scenario 'alert message is present' do

spec/features/users/list_dossiers_spec.rb

@@ -6,8 +6,12 @@ describe 'user access to the list of his dossier' do
   let!(:dossier1) { create(:dossier, :with_entreprise, user: user, state: 'en_construction') }
   let!(:dossier2) { create(:dossier, :with_entreprise) }
   let!(:dossier_archived) { create(:dossier, :with_entreprise, user: user, state: 'en_construction') }
+  let(:dossiers_per_page) { 25 }
 
   before do
+    @default_per_page = Dossier.default_per_page
+    Dossier.paginates_per dossiers_per_page
+
     last_updated_dossier.update_column(:updated_at, "19/07/2052 15:35".to_time)
 
     visit new_user_session_path
@@ -18,29 +22,47 @@ describe 'user access to the list of his dossier' do
     end
   end
 
+  after do
+    Dossier.paginates_per @default_per_page
+  end
+
   it 'the list of dossier is displayed' do
     expect(page).to have_content(dossier1.procedure.libelle)
+    expect(page).to have_content('en construction')
+  end
+
+  it 'dossiers belonging to other users are not displayed' do
     expect(page).not_to have_content(dossier2.procedure.libelle)
   end
 
-  it 'the list must be order by last updated' do
+  it 'the list must be ordered by last updated' do
     expect(page.body).to match(/#{last_updated_dossier.procedure.libelle}.*#{dossier1.procedure.libelle}/m)
   end
 
-  it 'should list archived dossier' do
+  it 'should list archived dossiers' do
     expect(page).to have_content(dossier_archived.procedure.libelle)
   end
 
-  it 'the state of dossier is displayed' do
-    expect(page).to have_css("#dossier_#{dossier1.id}_state")
-  end
-
   context 'when user clicks on a projet in list', js: true do
     before do
-      page.find("#tr_dossier_#{dossier1.id}").click
+      page.click_on(dossier1.procedure.libelle)
     end
     scenario 'user is redirected to dossier page' do
       expect(page).to have_css('#users-recapitulatif-dossier-show')
     end
   end
+
+  context 'when there is more than one page' do
+    let(:dossiers_per_page) { 2 }
+
+    scenario 'the user can navigate through the other pages', js: true do
+      page.click_link("Suivant")
+      expect(page).to have_content(dossier_archived.procedure.libelle)
+    end
+
+    scenario 'the user sees a card asking for feedback' do
+      expect(page).to have_css('.card.feedback')
+      expect(page).to have_content(CONTACT_EMAIL)
+    end
+  end
 end

spec/helpers/dossier_helper_spec.rb

@@ -26,6 +26,25 @@ RSpec.describe DossierHelper, type: :helper do
     end
   end
 
+  describe ".url_for_dossier" do
+    subject { url_for_dossier(dossier) }
+
+    context "when the dossier is an invitation" do
+      let(:dossier) { create(:invite) }
+      it { is_expected.to eq "/users/dossiers/invites/#{dossier.id}" }
+    end
+
+    context "when the dossier is in the brouillon state" do
+      let(:dossier) { create(:dossier, state: 'brouillon') }
+      it { is_expected.to eq "/dossiers/#{dossier.id}/modifier" }
+    end
+
+    context "when the dossier is any other state" do
+      let(:dossier) { create(:dossier, state: 'en_construction') }
+      it { is_expected.to eq "/users/dossiers/#{dossier.id}/recapitulatif" }
+    end
+  end
+
   describe ".dossier_submission_is_closed?" do
     let(:dossier) { create(:dossier, state: state) }
     let(:state) { "brouillon" }

spec/views/layouts/_new_header_spec.rb

@@ -14,8 +14,8 @@ describe 'layouts/_new_header.html.haml', type: :view do
       let(:user) { create(:user) }
       let(:profile) { :user }
 
-      it { is_expected.to have_css("a.header-logo[href=\"#{users_dossiers_path}\"]") }
-      it { is_expected.to have_link("Dossiers", href: users_dossiers_path) }
+      it { is_expected.to have_css("a.header-logo[href=\"#{dossiers_path}\"]") }
+      it { is_expected.to have_link("Dossiers", href: dossiers_path) }
     end
 
     context 'when rendering for gestionnaire' do

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

@@ -2,7 +2,9 @@ require 'spec_helper'
 
 describe 'new_user/dossiers/index.html.haml', type: :view do
   let(:user) { create(:user) }
-  let(:user_dossiers) { create_list(:dossier, 2, state: 'brouillon', user: user) }
+  let(:dossier_brouillon) { create(:dossier, state: 'brouillon', user: user) }
+  let(:dossier_en_construction) { create(:dossier, state: 'en_construction', user: user) }
+  let(:user_dossiers) { [dossier_brouillon, dossier_en_construction] }
   let(:dossiers_invites) { [] }
   let(:current_tab) { 'mes-dossiers' }
 
@@ -21,9 +23,13 @@ describe 'new_user/dossiers/index.html.haml', type: :view do
 
   it 'affiche les informations des dossiers' do
     dossier = user_dossiers.first
-    expect(rendered).to have_text(dossier.id)
-    expect(rendered).to have_text(dossier.procedure.libelle)
-    expect(rendered).to have_link(dossier.id, href: users_dossier_recapitulatif_path(dossier))
+    expect(rendered).to have_text(dossier_brouillon.id)
+    expect(rendered).to have_text(dossier_brouillon.procedure.libelle)
+    expect(rendered).to have_link(dossier_brouillon.id, href: modifier_dossier_path(dossier_brouillon))
+
+    expect(rendered).to have_text(dossier_en_construction.id)
+    expect(rendered).to have_text(dossier_en_construction.procedure.libelle)
+    expect(rendered).to have_link(dossier_en_construction.id, href: users_dossier_recapitulatif_path(dossier_en_construction))
   end
 
   context 'quand il n’y a aucun dossier' do