Merge pull request #13487 from demarche-numerique/push-yynyksyomnpw

Tech: renomme les accesseurs de champs et de types de champ

Author: tchak

app/components/conditions/routing_rules_component.rb

@@ -8,7 +8,7 @@ def initialize(groupe_instructeur:)
     @condition = groupe_instructeur.routing_rule || empty_operator(empty, empty)
     @procedure = groupe_instructeur.procedure
     @procedure_id = @procedure.id
-    @source_tdcs = @procedure.active_revision.types_de_champ_public
+    @source_tdcs = @procedure.active_revision.root_types_de_champ_public
     @champ_value_in_condition = @procedure.champ_value_in_condition?
   end
 

app/components/types_de_champ_editor/estimated_fill_duration_component.rb

@@ -17,7 +17,7 @@ def render?
   end
 
   def show?
-    !annotations? && @revision.types_de_champ_public.present?
+    !annotations? && @revision.root_types_de_champ_public.present?
   end
 
   def estimated_fill_duration_minutes

app/components/viewable_champ/header_sections_summary_component.rb

@@ -8,9 +8,9 @@ def initialize(dossier:, is_private:)
     @is_private = is_private
 
     @header_sections = if is_private
-      dossier.revision.types_de_champ_private
+      dossier.revision.root_types_de_champ_private
     else
-      dossier.revision.types_de_champ_public
+      dossier.revision.root_types_de_champ_public
     end.filter(&:header_section?)
   end
 

app/controllers/instructeurs/dossiers_controller.rb

@@ -380,7 +380,7 @@ def update_annotations
 
       respond_to do |format|
         format.turbo_stream do
-          @to_show, @to_hide, @to_update = champs_to_turbo_update(champs_attributes_params(:private), dossier.project_champs_private_all)
+          @to_show, @to_hide, @to_update = champs_to_turbo_update(champs_attributes_params(:private), dossier.flat_champs_private)
         end
       end
     end
@@ -398,7 +398,7 @@ def annotation
 
       respond_to do |format|
         format.turbo_stream do
-          @to_show, @to_hide, @to_update = champ_to_turbo_update(annotation, dossier.project_champs_private_all)
+          @to_show, @to_hide, @to_update = champ_to_turbo_update(annotation, dossier.flat_champs_private)
 
           render :update_annotations, layout: false
         end

app/controllers/instructeurs/edit_controller.rb

@@ -21,7 +21,7 @@ def update
 
       respond_to do |format|
         format.turbo_stream do
-          @to_show, @to_hide, @to_update = champs_to_turbo_update(champs_attributes_params(:public), dossier.project_champs_public_all)
+          @to_show, @to_hide, @to_update = champs_to_turbo_update(champs_attributes_params(:public), dossier.flat_champs_public)
           render layout: false
         end
       end
@@ -59,7 +59,7 @@ def champ
 
       respond_to do |format|
         format.turbo_stream do
-          @to_show, @to_hide, @to_update = champ_to_turbo_update(champ, dossier.project_champs_public_all)
+          @to_show, @to_hide, @to_update = champ_to_turbo_update(champ, dossier.flat_champs_public)
           render :update, layout: false
         end
       end

app/controllers/prefill_type_de_champs_controller.rb

@@ -14,7 +14,7 @@ def retrieve_procedure
   end
 
   def set_prefill_type_de_champ
-    type_de_champ = @procedure.active_revision.types_de_champ_public.filter(&:fillable?).find { _1.stable_id == params[:id].to_i }
+    type_de_champ = @procedure.active_revision.root_types_de_champ_public.filter(&:fillable?).find { _1.stable_id == params[:id].to_i }
     raise ActiveRecord::RecordNotFound if type_de_champ.blank?
     @type_de_champ = TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ, @procedure.active_revision)
   end

app/controllers/users/dossiers_controller.rb

@@ -337,7 +337,7 @@ def update
 
       respond_to do |format|
         format.turbo_stream do
-          @to_show, @to_hide, @to_update = champs_to_turbo_update(champs_attributes_params(:public), dossier.project_champs_public_all)
+          @to_show, @to_hide, @to_update = champs_to_turbo_update(champs_attributes_params(:public), dossier.flat_champs_public)
           render :update, layout: false
         end
       end
@@ -357,7 +357,7 @@ def champ
       champ.validate(:champ_value) if champ.done?
       respond_to do |format|
         format.turbo_stream do
-          @to_show, @to_hide, @to_update = champ_to_turbo_update(champ, dossier.project_champs_public_all)
+          @to_show, @to_hide, @to_update = champ_to_turbo_update(champ, dossier.flat_champs_public)
 
           render :update, layout: false
         end

app/dashboards/dossier_dashboard.rb

@@ -24,7 +24,7 @@ class DossierDashboard < Administrate::BaseDashboard
     en_construction_at: Field::DateTime,
     en_instruction_at: Field::DateTime,
     processed_at: Field::DateTime,
-    project_champs_public: ChampCollectionField,
+    root_champs_public: ChampCollectionField,
     groupe_instructeur: Field::BelongsTo,
   }.freeze
 
@@ -48,7 +48,7 @@ class DossierDashboard < Administrate::BaseDashboard
     :state,
     :procedure,
     :groupe_instructeur,
-    :project_champs_public,
+    :root_champs_public,
     :created_at,
     :updated_at,
     :hidden_by_user_at,

app/graphql/types/dossier_type.rb

@@ -168,17 +168,17 @@ def avis(id: nil)
 
     def champs(id: nil)
       if id.present?
-        find_record_by_typed_id(object.project_champs_public, id, attribute: :stable_id)
+        find_record_by_typed_id(object.root_champs_public, id, attribute: :stable_id)
       else
-        object.project_champs_public.filter(&:visible?)
+        object.root_champs_public.filter(&:visible?)
       end
     end
 
     def annotations(id: nil)
       if id.present?
-        find_record_by_typed_id(object.project_champs_private, id, attribute: :stable_id)
+        find_record_by_typed_id(object.root_champs_private, id, attribute: :stable_id)
       else
-        object.project_champs_private.filter(&:visible?)
+        object.root_champs_private.filter(&:visible?)
       end
     end
 

app/models/champs/referentiel_champ.rb

@@ -57,9 +57,9 @@ def prefillable_stable_ids
   def prefillable_champs
     elligible_stable_ids = prefillable_stable_ids
     if public?
-      dossier.project_champs_public
+      dossier.root_champs_public
     else
-      dossier.project_champs_private
+      dossier.root_champs_private
     end.filter do |champ|
       if champ.repetition?
         dossier.revision.children_of(champ.type_de_champ).any? { _1.stable_id.in?(elligible_stable_ids) }