ETQ admin et instructeur, le sommaire inclut les répétitions et leurs sections

Author: tchak

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

@@ -1,11 +1,13 @@
 <% each_champ do |champ| %>
   <% if champ.repetition? %>
-    <% champ.rows.each do |row| %>
-      <div class="fr-background-alt--grey fr-p-2w fr-my-3w fr-ml-2w champ-repetition">
-        <%= tag.send(repetition_heading_tag, t(".repetition_heading", libelle: champ.libelle, row_number: row.index), class: "fr-h6 fr-text--bold") %>
-        <%= render ViewableChamp::SectionComponent.new(dossier: champ.dossier, champs: row.champs_tree, demande_seen_at: seen_at, profile:) %>
-      </div>
-    <% end %>
+    <div id="<%= champ.html_id %>">
+      <% champ.rows.each do |row| %>
+        <div class="fr-background-alt--grey fr-p-2w fr-my-3w fr-ml-2w champ-repetition">
+          <%= tag.send(repetition_heading_tag, t(".repetition_heading", libelle: champ.libelle, row_number: row.index), class: "fr-h6 fr-text--bold") %>
+          <%= render ViewableChamp::SectionComponent.new(dossier: champ.dossier, champs: row.champs_tree, demande_seen_at: seen_at, profile:) %>
+        </div>
+      <% end %>
+    </div>
   <% else %>
     <%= render row_show_component(champ) do |c| %>
       <% if champ.blank? %>

app/components/types_de_champ_editor/header_sections_summary_component.rb

@@ -6,9 +6,9 @@ def initialize(procedure:, is_private:)
     @is_private = is_private
   end
 
-  # Header sections in document order, as [type_de_champ, level] pairs.
-  def header_sections
-    @header_sections ||= revision.header_sections_with_depth(is_private: @is_private)
+  # Header sections and repetitions in document order, as [type_de_champ, level] pairs.
+  def sections
+    @sections ||= revision.sections_with_depth(is_private: @is_private)
   end
 
   def href(type_de_champ) # used by type de champ editor to anchor elements

app/components/types_de_champ_editor/header_sections_summary_component/header_sections_summary_component.html.haml

@@ -1,10 +1,10 @@
-#summary{ class: header_sections.present? ? 'fr-col-12 fr-col-md-3' : '' }
-  - if header_sections.present?
+#summary{ class: sections.present? ? 'fr-col-12 fr-col-md-3' : '' }
+  - if sections.present?
     %nav.fr-sidemenu.sticky.fr-hidden.fr-unhidden-md{ "aria-labelledby" => "fr-summary-title", role: "navigation" }
       %ul.fr-sidemenu__list
-        - header_sections.each do |header, level|
+        - sections.each do |type_de_champ, level|
           %li.fr-sidemenu__item
             - if level == 1
-              %a.fr-sidemenu__link{ href: href(header) }= header.libelle
+              %a.fr-sidemenu__link{ href: href(type_de_champ) }= type_de_champ.libelle
             - else
-              %a.fr-sidemenu__link{ class: level >= 3 ? 'custom-link-grey': '', href: href(header) }= "-- #{header.libelle}"
+              %a.fr-sidemenu__link{ class: level >= 3 ? 'custom-link-grey': '', href: href(type_de_champ) }= "-- #{type_de_champ.libelle}"

app/components/viewable_champ/header_sections_summary_component.rb

@@ -6,14 +6,28 @@ def initialize(dossier:, is_private:)
     @is_private = is_private
   end
 
-  # Header sections in document order, as [type_de_champ, level] pairs.
-  def header_sections
-    @header_sections ||= @dossier.revision.header_sections_with_depth(is_private: @is_private)
+  # Header sections and repetitions in document order, as [type_de_champ, level] pairs.
+  def sections
+    @sections ||= @dossier.revision.sections_with_depth(is_private: @is_private)
   end
 
-  def render? = header_sections.any?
+  def render? = sections.any?
 
-  def href(header_section) # used by viewable champs to anchor elements
-    "##{header_section.html_id}"
+  def href(type_de_champ) # used by viewable champs to anchor elements
+    "##{anchor_id(type_de_champ)}"
+  end
+
+  private
+
+  def revision = @dossier.revision
+
+  # Sections inside a repetition are rendered once per row: anchor to the first
+  # row's occurrence, or to the repetition itself when there are no rows yet.
+  def anchor_id(type_de_champ)
+    repetition = type_de_champ.repetition(revision)
+    return type_de_champ.html_id if repetition.nil?
+
+    row_id = @dossier.repetition_row_ids(repetition).first
+    row_id.present? ? type_de_champ.html_id(row_id) : repetition.html_id
   end
 end

app/components/viewable_champ/header_sections_summary_component/header_sections_summary_component.html.haml

@@ -1,9 +1,9 @@
 #summary.fr-col-12.fr-col-xl-3
   %nav.fr-sidemenu.sticky.fr-hidden.fr-unhidden-xl{ "aria-labelledby" => "fr-summary-title", role: "navigation" }
     %ul.fr-sidemenu__list
-      - header_sections.each do |header_section, level|
+      - sections.each do |type_de_champ, level|
         %li.fr-sidemenu__item
           - if level == 1
-            %a.fr-sidemenu__link{ href: href(header_section) }= header_section.libelle
+            %a.fr-sidemenu__link{ href: href(type_de_champ) }= type_de_champ.libelle
           - else
-            %a.fr-sidemenu__link{ class: level >= 3 ? 'custom-link-grey': '', href: href(header_section) }= "-- #{header_section.libelle}"
+            %a.fr-sidemenu__link{ class: level >= 3 ? 'custom-link-grey': '', href: href(type_de_champ) }= "-- #{type_de_champ.libelle}"

app/models/procedure_revision.rb

@@ -24,13 +24,13 @@ def types_de_champ_private = revision_types_de_champ_private.map(&:type_de_champ
   def types_de_champ_public_tree = to_tree_roots(types_de_champ: types_de_champ_public)
   def types_de_champ_private_tree = to_tree_roots(types_de_champ: types_de_champ_private)
 
-  # Header sections in document order, as [type_de_champ, depth] pairs. Depth
-  # is the position in the tree; it can differ from the stored
+  # Header sections and repetitions in document order, as [type_de_champ, depth]
+  # pairs. Depth is the position in the tree; it can differ from the stored
   # header_section_level (used by heading tags via level_for_revision) when
   # levels are skipped.
-  def header_sections_with_depth(is_private: false)
+  def sections_with_depth(is_private: false)
     tree = is_private ? types_de_champ_private_tree : types_de_champ_public_tree
-    flatten_header_sections(tree, 1)
+    flatten_sections(tree, 1)
   end
 
   has_one :draft_procedure, -> { with_discarded }, class_name: 'Procedure', foreign_key: :draft_revision_id, dependent: :nullify, inverse_of: :draft_revision
@@ -349,9 +349,9 @@ def apply_llm_rule_suggestion_items(changes)
 
   private
 
-  def flatten_header_sections(types_de_champ, depth)
-    types_de_champ.filter(&:header_section?).flat_map do |tdc|
-      [[tdc, depth], *flatten_header_sections(tdc.children(self), depth + 1)]
+  def flatten_sections(types_de_champ, depth)
+    types_de_champ.filter { it.header_section? || it.repetition? }.flat_map do |tdc|
+      [[tdc, depth], *flatten_sections(tdc.children(self), depth + 1)]
     end
   end
 

spec/components/champ_header_sections_summary_component_spec.rb

@@ -15,15 +15,34 @@
     ]
   end
   let(:procedure) { create(:procedure, types_de_champ_public: types_de_champ, types_de_champ_private: types_de_champ) }
-  let(:dossier) { create(:dossier, procedure:) }
+  let(:dossier) { create(:dossier, :with_populated_champs, procedure:) }
   let(:component) { described_class.new(dossier:, is_private:) }
   let(:types_de_champ_public) { dossier.revision.types_de_champ_public.filter(&:header_section?) }
   let(:types_de_champ_private) { dossier.revision.types_de_champ_private.filter(&:header_section?) }
+  let(:repetition_tdc) { dossier.revision.types_de_champ_public.find(&:repetition?) }
+  let(:section_in_repetition) { dossier.revision.children_of(repetition_tdc).find(&:header_section?) }
 
   context 'public' do
     it do
       types_de_champ_public.each { expect(subject).to have_selector("a[href='##{_1.html_id}']") }
     end
+
+    it 'anchors the repetition and its sections (on the first row)' do
+      first_row_id = dossier.repetition_row_ids(repetition_tdc).first
+      expect(subject).to have_selector("a[href='##{repetition_tdc.html_id}']")
+      expect(subject).to have_selector("a[href='##{section_in_repetition.html_id(first_row_id)}']")
+    end
+
+    context 'when the repetition has no rows' do
+      let(:types_de_champ) do
+        [{ type: :repetition, mandatory: false, children: [{ type: :text }, { type: :header_section, level: 1 }] }]
+      end
+      let(:dossier) { create(:dossier, procedure:) }
+
+      it 'anchors the section to the repetition itself' do
+        expect(subject).to have_selector("a[href='##{repetition_tdc.html_id}']", count: 2)
+      end
+    end
   end
 
   context 'private' do

spec/components/types_de_champ_editor/header_sections_summary_component_spec.rb

@@ -19,18 +19,21 @@
       ]
     end
 
-    it 'renders header sections with their depth, ignoring sections inside repetitions' do
+    it 'renders header sections and repetitions with their depth' do
       expect(subject).to have_selector("a", text: /\As1\z/)
       expect(subject).to have_selector("a", text: '-- s1.1')
       expect(subject).to have_selector("a.custom-link-grey", text: '-- s1.1.1')
+      expect(subject).to have_selector("a.custom-link-grey", text: '-- rep')
+      expect(subject).to have_selector("a.custom-link-grey", text: '-- rs1')
       expect(subject).to have_selector("a", text: /\As2\z/)
-      expect(subject).not_to have_text('rs1')
       expect(subject).not_to have_text('t1')
     end
 
     it 'anchors links to the editor coordinates' do
-      coordinate = procedure.draft_revision.revision_types_de_champ.find { _1.libelle == 's1' }
-      expect(subject).to have_selector("a[href='##{ActionView::RecordIdentifier.dom_id(coordinate, :type_de_champ_editor)}']")
+      ['s1', 'rep', 'rs1'].each do |libelle|
+        coordinate = procedure.draft_revision.revision_types_de_champ.find { _1.libelle == libelle }
+        expect(subject).to have_selector("a[href='##{ActionView::RecordIdentifier.dom_id(coordinate, :type_de_champ_editor)}']")
+      end
     end
   end