tech: section components navigate champs with the tree api

Refactor ViewableChamp::SectionComponent and EditableChamp::SectionComponent
to take a list of champs (tree entry points) and recurse through
HeaderSectionChamp#children, instead of rebuilding the tree from flat
types de champ and projecting champs one by one. Repetition rows go
through RepetitionRow#champs_tree, removing the row_id plumbing from
section components. Root callers pass dossier.champs_public_tree and
champs_private_tree.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: tchak

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

@@ -1,10 +1,9 @@
 <% each_champ do |champ| %>
   <% if champ.repetition? %>
-    <% types_de_champ = champ.dossier.revision.children_of(champ.type_de_champ) %>
-    <% champ.row_ids.each.with_index(1) do |row_id, row_number| %>
+    <% 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_number), class: "fr-h6 fr-text--bold") %>
-        <%= render ViewableChamp::SectionComponent.new(dossier: champ.dossier, types_de_champ:, row_id:, demande_seen_at: seen_at, profile:) %>
+        <%= 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 %>
   <% else %>

app/components/editable_champ/repetition_component/repetition_component.html.erb

@@ -46,8 +46,8 @@
     id="<%= dom_id(@champ, :rows) %>"
     data-repetition-toggle-all-target="rowsContainer"
   >
-    <% @champ.row_ids.each.with_index(1) do |row_id, row_number| %>
-      <%= render EditableChamp::RepetitionRowComponent.new(form: @form, dossier: @champ.dossier, champ: @champ, row_id: row_id, row_number: row_number, seen_at: @seen_at, expanded: expand_row?(row_id, @champ.row_ids.count)) %>
+    <% @champ.rows.each do |row| %>
+      <%= render EditableChamp::RepetitionRowComponent.new(form: @form, dossier: @champ.dossier, champ: @champ, row:, seen_at: @seen_at, expanded: expand_row?(row.id, @champ.row_ids.count)) %>
     <% end %>
   </div>
 

app/components/editable_champ/repetition_row_component.rb

@@ -3,13 +3,14 @@
 class EditableChamp::RepetitionRowComponent < ApplicationComponent
   include ChampAriaLabelledbyHelper
 
-  def initialize(form:, dossier:, champ:, row_id:, row_number:, expanded: false, seen_at: nil)
-    @form, @dossier, @champ, @row_id, @row_number, @expanded, @seen_at = form, dossier, champ, row_id, row_number, expanded, seen_at
+  def initialize(form:, dossier:, champ:, row:, expanded: false, seen_at: nil)
+    @form, @dossier, @champ, @row, @expanded, @seen_at = form, dossier, champ, row, expanded, seen_at
     @type_de_champ = champ.type_de_champ
     @types_de_champ = dossier.revision.children_of(@type_de_champ)
   end
 
-  attr_reader :row_id, :row_number
+  def row_id = @row.id
+  def row_number = @row.index
 
   def has_fieldset?
     @types_de_champ.size > 1
@@ -18,7 +19,7 @@ def has_fieldset?
   private
 
   def section_component
-    EditableChamp::SectionComponent.new(dossier: @dossier, types_de_champ: @types_de_champ, row_id:, row_number: @row_number)
+    EditableChamp::SectionComponent.new(dossier: @dossier, champs: @row.champs_tree, row_number:)
   end
 
   def delete_button

app/components/editable_champ/section_component.rb

@@ -2,56 +2,30 @@
 
 class EditableChamp::SectionComponent < ApplicationComponent
   include ApplicationHelper
-  include TreeableConcern
 
-  def initialize(dossier:, nodes: nil, types_de_champ: nil, row_id: nil, row_number: nil)
-    nodes ||= to_tree(types_de_champ:)
-    @dossier = dossier
-    @row_id = row_id
-    @row_number = row_number
-    @nodes = to_fieldset(nodes:)
+  def initialize(dossier:, champs:, header_section: nil, row_number: nil)
+    @dossier, @champs, @header_section, @row_number = dossier, champs, header_section, row_number
   end
 
-  def render_within_fieldset?
-    first_champ_is_an_header_section?
-  end
+  attr_reader :header_section
 
-  def header_section
-    node = @nodes.first
-    @dossier.project_champ(node, row_id: @row_id) if node.is_a?(TypeDeChamp) && node.header_section?
+  def render_within_fieldset?
+    header_section.present?
   end
 
   def splitted_tail
-    tail.map { split_section_champ(_1) }
-  end
-
-  def tail
-    return @nodes if !first_champ_is_an_header_section?
-    _, *rest_of_champ = @nodes
-
-    rest_of_champ
+    @champs.map { split_section_champ(it) }
   end
 
   def tag_for_depth
     "h#{header_section.level + 1}"
   end
 
-  def split_section_champ(node)
-    case node
-    when EditableChamp::SectionComponent
-      [node, nil]
+  def split_section_champ(champ)
+    if champ.header_section?
+      [EditableChamp::SectionComponent.new(dossier: @dossier, champs: champ.children, header_section: champ), nil]
     else
-      [nil, @dossier.project_champ(node, row_id: @row_id)]
+      [nil, champ]
     end
   end
-
-  private
-
-  def to_fieldset(nodes:)
-    nodes.map { _1.is_a?(Array) ? EditableChamp::SectionComponent.new(dossier: @dossier, nodes: _1, row_id: @row_id) : _1 }
-  end
-
-  def first_champ_is_an_header_section?
-    header_section.present?
-  end
 end

app/components/viewable_champ/section_component.rb

@@ -2,38 +2,25 @@
 
 class ViewableChamp::SectionComponent < ApplicationComponent
   include ApplicationHelper
-  include TreeableConcern
 
-  def initialize(dossier:, nodes: nil, types_de_champ: nil, row_id: nil, demande_seen_at:, profile:)
-    @dossier, @demande_seen_at, @profile, @row_id = dossier, demande_seen_at, profile, row_id
-    nodes ||= to_tree(types_de_champ:)
-    @nodes = to_sections(nodes:)
+  def initialize(dossier:, champs:, header_section: nil, demande_seen_at:, profile:)
+    @dossier, @header_section = dossier, header_section
+    @demande_seen_at, @profile = demande_seen_at, profile
+    @section_champs, @champs = champs.partition(&:header_section?)
   end
 
   private
 
+  attr_reader :header_section, :champs
+
   def section_id
     @section_id ||= header_section ? dom_id(header_section, :content) : SecureRandom.uuid
   end
 
-  def header_section
-    node = @nodes.first
-    @dossier.project_champ(node, row_id: @row_id) if node.is_a?(TypeDeChamp) && node.header_section?
-  end
-
-  def champs
-    tail.filter_map { _1.is_a?(TypeDeChamp) ? @dossier.project_champ(_1, row_id: @row_id) : nil }
-  end
-
   def sections
-    tail.filter { _1.is_a?(ViewableChamp::SectionComponent) }
-  end
-
-  def tail
-    return @nodes if header_section.nil?
-    _, *rest_of_champ = @nodes
-
-    rest_of_champ
+    @sections ||= @section_champs.map do |champ|
+      ViewableChamp::SectionComponent.new(dossier: @dossier, champs: champ.children, header_section: champ, demande_seen_at: @demande_seen_at, profile: @profile)
+    end
   end
 
   def reset_tag_for_depth
@@ -53,10 +40,4 @@ def repetition_heading_level
     # there are 2 levels of heading before the repetition heading
     [relative_level + 2, 6].min
   end
-
-  private
-
-  def to_sections(nodes:)
-    nodes.map { _1.is_a?(Array) ? ViewableChamp::SectionComponent.new(dossier: @dossier, nodes: _1, demande_seen_at: @demande_seen_at, profile: @profile, row_id: @row_id) : _1 }
-  end
 end

app/controllers/champs/repetition_controller.rb

@@ -2,9 +2,9 @@
 
 class Champs::RepetitionController < Champs::ChampController
   def add
-    @row_id = @champ.add_row(updated_by: current_user.email)
+    row_id = @champ.add_row(updated_by: current_user.email)
+    @row = @champ.rows.find { it.id == row_id }
     @first_champ_id = @champ.focusable_input_id
-    @row_number = @row_id.nil? ? 0 : @champ.row_ids.find_index(@row_id) + 1
     @champ.update_timestamps
   end
 

app/views/champs/repetition/add.turbo_stream.erb

@@ -1,6 +1,6 @@
-<% if @row_id.present? %>
+<% if @row.present? %>
   <%= fields_for @champ.input_name, @champ do |form| %>
-    <%= turbo_stream.append dom_id(@champ, :rows), render(EditableChamp::RepetitionRowComponent.new(form: form, dossier: @champ.dossier, champ: @champ, row_id: @row_id, row_number: @row_number, expanded: true)) %>
+    <%= turbo_stream.append dom_id(@champ, :rows), render(EditableChamp::RepetitionRowComponent.new(form: form, dossier: @champ.dossier, champ: @champ, row: @row, expanded: true)) %>
 
     <% if @first_champ_id %>
       <%= turbo_stream.focus(@first_champ_id, delay: 50) %>

app/views/champs/repetition/remove.turbo_stream.erb

@@ -3,9 +3,9 @@
 <% end %>
 
 <%= turbo_stream.update dom_id(@champ, :rows) do %>
-  <% @champ.row_ids.each.with_index(1) do |row_id, row_number| %>
+  <% @champ.rows.each do |row| %>
     <%= fields_for @champ.input_name, @champ do |form| %>
-      <%= render EditableChamp::RepetitionRowComponent.new(form: form, dossier: @champ.dossier, champ: @champ, row_id: row_id, row_number: row_number, seen_at: nil, expanded: row_number == 1) %>
+      <%= render EditableChamp::RepetitionRowComponent.new(form: form, dossier: @champ.dossier, champ: @champ, row:, seen_at: nil, expanded: row.index == 1) %>
     <% end %>
   <% end %>
 <% end %>

app/views/instructeurs/dossiers/print.html.haml

@@ -15,15 +15,13 @@
 
 %h2 Formulaire
 
-- types_de_champ_public = @dossier.revision.types_de_champ_public
-- if types_de_champ_public.any? || @dossier.procedure.routing_enabled?
-  = render ViewableChamp::SectionComponent.new(dossier: @dossier, types_de_champ: types_de_champ_public, demande_seen_at: nil, profile: 'instructeur')
+- if @dossier.revision.types_de_champ_public.any? || @dossier.procedure.routing_enabled?
+  = render ViewableChamp::SectionComponent.new(dossier: @dossier, champs: @dossier.champs_public_tree, demande_seen_at: nil, profile: 'instructeur')
 
 %h2 Annotations privées
 
-- types_de_champ_private = @dossier.revision.types_de_champ_private
-- if types_de_champ_private.any?
-  = render ViewableChamp::SectionComponent.new(dossier: @dossier, types_de_champ: types_de_champ_private, demande_seen_at: nil, profile: 'instructeur')
+- if @dossier.revision.types_de_champ_private.any?
+  = render ViewableChamp::SectionComponent.new(dossier: @dossier, champs: @dossier.champs_private_tree, demande_seen_at: nil, profile: 'instructeur')
 - else
   Aucune annotation privée
 

app/views/instructeurs/dossiers/show_submitted_revision.html.erb

@@ -34,7 +34,7 @@
         data-clipboard2-copy-text-value="<%= t('clipboard.copy') %>"
         data-clipboard2-copied-text-value="<%= t('clipboard.copied') %>"
       >
-        <%= render ViewableChamp::SectionComponent.new(dossier: @dossier, types_de_champ: @dossier.revision.types_de_champ_public, demande_seen_at: @demande_seen_at, profile: 'instructeur') %>
+        <%= render ViewableChamp::SectionComponent.new(dossier: @dossier, champs: @dossier.champs_public_tree, demande_seen_at: @demande_seen_at, profile: 'instructeur') %>
       </div>
     </div>
   </div>