Merge pull request #13326 from demarche-numerique/push-muznruslznky

ETQ instructeur, je peux modifier le dossier d'un usager

Author: tchak

app/assets/stylesheets/demande.scss

@@ -43,6 +43,15 @@
 
   .champ-updated {
     float: right;
+    align-items: center;
+
+    // The tooltip trigger (only present for instructeur edits) is taller than
+    // the badge by default and would stretch the row. Shrink it to the badge
+    // height so instructeur and usager badges keep the same slim appearance.
+    .fr-btn--tooltip {
+      min-height: 0;
+      padding: 0;
+    }
   }
 
   .champ-repetition {

app/assets/stylesheets/dossier_edit.scss

@@ -16,3 +16,17 @@
     text-align: right;
   }
 }
+
+.readonly-text-area {
+  max-height: 200px;
+  background-color: var(--background-contrast-grey);
+  overflow-y: scroll;
+
+  p {
+    margin-bottom: $default-padding;
+  }
+
+  dl {
+    margin-bottom: $default-padding;
+  }
+}

app/components/dossiers/champ_updated_component/champ_updated_component.html.erb

@@ -6,8 +6,8 @@
   <% if updated_by_instructeur? %>
     <button
       class="
-        fr-btn--tooltip fr-icon-question-line fr-btn--sm
-        fr-btn--tertiary-no-outline
+        fr-btn--tooltip fr-icon-information-line fr-btn--sm
+        fr-btn--tertiary-no-outline fr-pl-1v
       "
       type="button"
       aria-describedby="<%= tooltip_id %>"

app/components/dossiers/champs_rows_show_component.rb

@@ -16,6 +16,23 @@ def repetition_heading_tag
 
   private
 
+  def row_show_component(champ)
+    Dossiers::RowShowComponent.new(label: champ.libelle,
+      seen_at:, profile:,
+      content_class: champ.type_champ,
+      updated_at: updated_at_after_deposer(champ),
+      updated_by: updated_by(champ),
+      source_stream: champ.source_stream)
+  end
+
+  def updated_by(champ)
+    if usager? && champ.source_stream == Champ::INSTRUCTEUR_BUFFER_STREAM && champ.procedure.hide_instructeurs_email?
+      nil
+    else
+      champ.updated_by
+    end
+  end
+
   def updated_at_after_deposer(champ)
     return if champ.dossier.depose_at.blank?
     return if champ.new_record?
@@ -51,4 +68,8 @@ def visible?(champ)
   def each_champ(&block)
     @champs.filter { visible?(_1) }.each(&block)
   end
+
+  def usager?
+    @profile == 'usager'
+  end
 end

app/components/dossiers/champs_rows_show_component/champs_rows_show_component.html.erb

@@ -8,7 +8,7 @@
       </div>
     <% end %>
   <% else %>
-    <%= render Dossiers::RowShowComponent.new(label: champ.libelle, seen_at:, profile:, content_class: champ.type_champ, updated_at: updated_at_after_deposer(champ), updated_by: champ.updated_by, source_stream: champ.source_stream) do |c| %>
+    <%= render row_show_component(champ) do |c| %>
       <% if champ.blank? %>
         <% c.with_blank do %>
           <%= t(blank_key(champ)) %>

app/components/dossiers/changes_component/changes_component.html.erb

@@ -1,4 +1,4 @@
-<dl class="dossiers-changes-component fr-mb-0">
+<dl class="dossiers-changes-component">
   <% changed_columns.each do |changed_column| %>
     <dt><%= changed_column.label %> :</dt>
     <dd><%= change_content(changed_column) %></dd>

app/components/editable_champ/champ_label_content_component/champ_label_content_component.en.yml

@@ -1,5 +1,6 @@
 ---
 en:
-  changes_to_save: 'modifications to submit'
+  changes_to_save: 'modifications to save'
+  changes_to_submit: 'modifications to submit'
   modified_at: 'modified on %{datetime}'
   check_content_rebased: 'Information: field updated by administration. Check its content.'

app/components/editable_champ/champ_label_content_component/champ_label_content_component.fr.yml

@@ -1,5 +1,6 @@
 ---
 fr:
-  changes_to_save: 'modification à déposer'
+  changes_to_save: 'modification à enregistrer'
+  changes_to_submit: 'modification à déposer'
   modified_at: 'modifié le %{datetime}'
   check_content_rebased: 'Information : champ actualisé par l’administration. Vérifier son contenu.'

app/components/editable_champ/champ_label_content_component/champ_label_content_component.html.haml

@@ -6,9 +6,12 @@
 - if @champ.mandatory?
   = render EditableChamp::AsteriskMandatoryComponent.new
 
-- if @champ.user_buffer_changes?
+- if @champ.buffer_stream?
   %span.updated-at.highlighted
-    = t('.changes_to_save')
+    - if @champ.user_buffer_stream?
+      = t('.changes_to_submit')
+    - else
+      = t('.changes_to_save')
 - elsif @champ.updated_at.present? && @seen_at.present?
   %span.updated-at{ class: highlight_if_unseen_class }
     = t('.modified_at', datetime: try_format_datetime(@champ.updated_at))

app/components/editable_champ/editable_champ_component.rb

@@ -100,6 +100,8 @@ def stimulus_values
   def turbo_poll_url_value
     if @champ.private?
       annotation_instructeur_dossier_path(@champ.dossier.procedure, @champ.dossier, @champ.stable_id, row_id: @champ.row_id)
+    elsif @champ.dossier.stream == Champ::INSTRUCTEUR_BUFFER_STREAM
+      champ_instructeur_dossier_path(@champ.dossier.procedure, @champ.dossier, @champ.stable_id, row_id: @champ.row_id)
     else
       champ_dossier_path(@champ.dossier, @champ.stable_id, row_id: @champ.row_id)
     end