Merge branch 'main' into bug-input-pj-apres-suppression

app/views/attachments/destroy.turbo_stream.haml

@@ -1,7 +1,9 @@
 = turbo_stream.remove dom_id(@attachment, :persisted_row)
 
-- if @champ_id
-  = turbo_stream.show "attachment-multiple-empty-#{@champ_id}"
-  = turbo_stream.focus_all "#attachment-multiple-empty-#{@champ_id} input"
-
 = turbo_stream.show_all ".attachment-input-#{@attachment.id}"
+
+- if @champ
+  = fields_for @champ.input_name, @champ do |form|
+    = turbo_stream.replace @champ.input_group_id do
+      = render EditableChamp::EditableChampComponent.new champ: @champ, form: form
+  = turbo_stream.focus_all "#attachment-multiple-empty-#{@champ.public_id} input"

app/views/commencer/show.html.haml

@@ -13,7 +13,11 @@
                 #{Current.application_name}
           %li= link_to t('views.shared.account.already_user'), commencer_sign_in_path(path: @procedure.path, prefill_token: @prefilled_dossier&.prefill_token), class: 'fr-btn fr-btn--secondary'
 
+    = render ProcedureDraftWarningComponent.new(revision: @revision, current_administrateur:, extra_class_names: "fr-mb-2w")
+
   - else
+    = render ProcedureDraftWarningComponent.new(revision: @revision, current_administrateur:, extra_class_names: "fr-mb-2w")
+
     - if @prefilled_dossier
       = render Dsfr::CalloutComponent.new(title: t(".prefilled_draft"), heading_level: 'h2') do |c|
         - c.with_body do

app/views/experts/avis/show.html.haml

@@ -2,4 +2,9 @@
 
 = render partial: 'header', locals: { avis: @avis, dossier: @dossier }
 
-= render partial: 'shared/dossiers/demande', locals: { dossier: @dossier, demande_seen_at: nil, profile: 'expert' }
+.fr-container
+  .fr-grid-row.fr-grid-row--center
+    - summary = ViewableChamp::HeaderSectionsSummaryComponent.new(dossier: @dossier, is_private: false)
+    = render summary
+    %div{ class: class_names("fr-col-12", "fr-col-xl-9" => summary.render?, "fr-col-xl-8" => !summary.render?) }
+      = render partial: "shared/dossiers/demande", locals: { dossier: @dossier, demande_seen_at: nil, profile: 'expert' }

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

@@ -6,20 +6,15 @@
 .dossier-container.fr-mb-4w
   = render partial: 'users/dossiers/show/header', locals: { dossier: @dossier }
 
-  - if @dossier.en_construction?
-    .fr-container
-      .fr-grid-row.fr-grid-row--center
-        .fr-col-xl-10
-          = render Dossiers::EnConstructionNotSubmittedComponent.new(dossier: @dossier, user: current_user)
   .fr-container
     .fr-grid-row.fr-grid-row--center
       .fr-col-md-9
+        - if @dossier.en_construction?
+          = render Dossiers::EnConstructionNotSubmittedComponent.new(dossier: @dossier, user: current_user)
+
         = render partial: 'shared/dossiers/demande', locals: { dossier: @dossier, demande_seen_at: nil, profile: 'usager' }
 
-
-  - if !@dossier.read_only?
-    .fr-container.fr-mt-2w
-      .fr-grid-row.fr-grid-row--center
-        .fr-col-xl-8.fr-col-offset-xl-2
-          %p= link_to t('views.users.dossiers.demande.edit_dossier'), modifier_dossier_path(@dossier), class: 'fr-btn fr-btn-sm',
-            title: t('views.users.dossiers.demande.edit_dossier_title')
+        - if !@dossier.read_only?
+          .fr-px-2w.fr-mt-2w
+            %p= link_to t('views.users.dossiers.demande.edit_dossier'), modifier_dossier_path(@dossier), class: 'fr-btn fr-btn-sm',
+              title: t('views.users.dossiers.demande.edit_dossier_title')