Merge pull request #9199 from tchak/fix-optional-champs

fix(dossier): only show optional text on public champs

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

@@ -1,8 +1,9 @@
 = @champ.libelle
-- if @champ.mandatory? && @champ.type_champ != "checkbox"
-  = render EditableChamp::AsteriskMandatoryComponent.new
-- elsif !@champ.mandatory?
-  = "#{t('.optional_champ')}"
+- if @champ.public? && !@champ.checkbox?
+  - if @champ.mandatory?
+    = render EditableChamp::AsteriskMandatoryComponent.new
+  - else
+    = "#{t('.optional_champ')}"
 
 - if @champ.forked_with_changes?
   %span.updated-at.highlighted

app/models/champ.rb

@@ -59,6 +59,7 @@ class Champ < ApplicationRecord
     :region?,
     :titre_identite?,
     :header_section?,
+    :checkbox?,
     :simple_drop_down_list?,
     :linked_drop_down_list?,
     :non_fillable?,

app/models/type_de_champ.rb

@@ -396,6 +396,10 @@ class TypeDeChamp < ApplicationRecord
     type_champ == TypeDeChamp.type_champs.fetch(:datetime)
   end
 
+  def checkbox?
+    type_champ == TypeDeChamp.type_champs.fetch(:checkbox)
+  end
+
   def public?
     !private?
   end