Merge pull request #7486 from tchak/feat-form-with-conditions

feat(dossier): toggle conditional champs visibility

app/controllers/users/dossiers_controller.rb

@@ -172,7 +172,7 @@ module Users
 
       respond_to do |format|
         format.html { render :brouillon }
-        format.turbo_stream
+        format.turbo_stream { render layout: false }
       end
     end
 

app/models/champ.rb

@@ -89,8 +89,8 @@ class Champ < ApplicationRecord
     @sections ||= dossier&.sections_for(self)
   end
 
-  def mandatory_and_blank?
+  def mandatory_blank_and_visible?
-    mandatory? && blank?
+    mandatory? && blank? && visible?
   end
 
   def blank?
@@ -180,8 +180,24 @@ class Champ < ApplicationRecord
     raise NotImplemented.new(:fetch_external_data)
   end
 
+  def conditional?
+    type_de_champ.condition.present?
+  end
+
+  def visible?
+    if conditional?
+      type_de_champ.condition.compute(champs_for_condition)
+    else
+      true
+    end
+  end
+
   private
 
+  def champs_for_condition
+    private? ? dossier.champs_private : dossier.champs
+  end
+
   def html_id
     "#{stable_id}-#{id}"
   end

app/models/champs/piece_justificative_champ.rb

@@ -38,8 +38,8 @@ class Champs::PieceJustificativeChamp < Champ
     # We don’t know how to search inside documents yet
   end
 
-  def mandatory_and_blank?
+  def mandatory_blank_and_visible?
-    mandatory? && !piece_justificative_file.attached?
+    mandatory? && !piece_justificative_file.attached? && visible?
   end
 
   def for_export

app/models/champs/siret_champ.rb

@@ -24,7 +24,7 @@ class Champs::SiretChamp < Champ
     etablissement.present? ? etablissement.search_terms : [value]
   end
 
-  def mandatory_and_blank?
+  def mandatory_blank_and_visible?
-    mandatory? && Siret.new(siret: value).invalid?
+    mandatory? && Siret.new(siret: value).invalid? && visible?
   end
 end

app/models/champs/titre_identite_champ.rb

@@ -32,8 +32,8 @@ class Champs::TitreIdentiteChamp < Champ
     # We don’t know how to search inside documents yet
   end
 
-  def mandatory_and_blank?
+  def mandatory_blank_and_visible?
-    mandatory? && !piece_justificative_file.attached?
+    mandatory? && !piece_justificative_file.attached? && visible?
   end
 
   def for_export

app/models/dossier.rb

@@ -1077,7 +1077,7 @@ class Dossier < ApplicationRecord
 
   def check_mandatory_champs
     (champs + champs.filter(&:repetition?).flat_map(&:champs))
-      .filter(&:mandatory_and_blank?)
+      .filter(&:mandatory_blank_and_visible?)
       .map do |champ|
         "Le champ #{champ.libelle.truncate(200)} doit être rempli."
       end

app/views/shared/dossiers/_champ_row.html.haml

@@ -1,4 +1,4 @@
-- champs.reject(&:exclude_from_view?).each do |c|
+- champs.reject(&:exclude_from_view?).filter(&:visible?).each do |c|
   - if c.type_champ == TypeDeChamp.type_champs.fetch(:repetition)
     %tr
       %td.libelle.repetition{ colspan: 3 }

app/views/shared/dossiers/editable_champs/_editable_champ.html.haml

@@ -1,4 +1,4 @@
-.editable-champ{ class: "editable-champ-#{champ.type_champ}", id: champ.input_group_id, data: autosave_available?(champ) ? { controller: 'autosave' } : {} }
+.editable-champ{ class: "editable-champ-#{champ.type_champ} #{champ.visible? ? '' : 'hidden'}", id: champ.input_group_id, data: autosave_available?(champ) ? { controller: 'autosave' } : {} }
   - if champ.repetition?
     %h3.header-subsection= champ.libelle
     - if champ.description.present?

app/views/users/dossiers/update_brouillon.turbo_stream.haml

@@ -0,0 +1,5 @@
+- @dossier.champs.filter(&:conditional?).each do |champ|
+  - if champ.visible?
+    = turbo_stream.show champ.input_group_id
+  - else
+    = turbo_stream.hide champ.input_group_id

spec/models/champ_shared_example.rb

@@ -1,26 +1,26 @@
 shared_examples 'champ_spec' do
-  describe 'mandatory_and_blank?' do
+  describe 'mandatory_blank_and_visible?' do
     let(:type_de_champ) { build(:type_de_champ, mandatory: mandatory) }
     let(:champ) { build(:champ, type_de_champ: type_de_champ, value: value) }
     let(:value) { '' }
     let(:mandatory) { true }
 
     context 'when mandatory and blank' do
-      it { expect(champ.mandatory_and_blank?).to be(true) }
+      it { expect(champ.mandatory_blank_and_visible?).to be(true) }
     end
 
     context 'when carte mandatory and blank' do
       let(:type_de_champ) { build(:type_de_champ_carte, mandatory: mandatory) }
       let(:champ) { build(:champ_carte, type_de_champ: type_de_champ, value: value) }
       let(:value) { nil }
-      it { expect(champ.mandatory_and_blank?).to be(true) }
+      it { expect(champ.mandatory_blank_and_visible?).to be(true) }
     end
 
     context 'when multiple_drop_down_list mandatory and blank' do
       let(:type_de_champ) { build(:type_de_champ_multiple_drop_down_list, mandatory: mandatory) }
       let(:champ) { build(:champ_multiple_drop_down_list, type_de_champ: type_de_champ, value: value) }
       let(:value) { '[]' }
-      it { expect(champ.mandatory_and_blank?).to be(true) }
+      it { expect(champ.mandatory_blank_and_visible?).to be(true) }
     end
 
     context 'when repetition blank' do
@@ -39,18 +39,18 @@ shared_examples 'champ_spec' do
 
     context 'when not blank' do
       let(:value) { 'yop' }
-      it { expect(champ.mandatory_and_blank?).to be(false) }
+      it { expect(champ.mandatory_blank_and_visible?).to be(false) }
     end
 
     context 'when not mandatory' do
       let(:mandatory) { false }
-      it { expect(champ.mandatory_and_blank?).to be(false) }
+      it { expect(champ.mandatory_blank_and_visible?).to be(false) }
     end
 
     context 'when not mandatory or blank' do
       let(:value) { 'u' }
       let(:mandatory) { false }
-      it { expect(champ.mandatory_and_blank?).to be(false) }
+      it { expect(champ.mandatory_blank_and_visible?).to be(false) }
     end
   end
 

spec/models/champs/linked_drop_down_list_champ_spec.rb

@@ -78,7 +78,7 @@ describe Champs::LinkedDropDownListChamp do
       let(:type_de_champ) { build(:type_de_champ_linked_drop_down_list, drop_down_list_value: value) }
 
       it 'blank is fine' do
-        is_expected.not_to be_mandatory_and_blank
+        is_expected.not_to be_mandatory_blank_and_visible
       end
     end
 
@@ -86,27 +86,27 @@ describe Champs::LinkedDropDownListChamp do
       let(:type_de_champ) { build(:type_de_champ_linked_drop_down_list, mandatory: true, drop_down_list_value: value) }
 
       context 'when there is no value' do
-        it { is_expected.to be_mandatory_and_blank }
+        it { is_expected.to be_mandatory_blank_and_visible }
       end
 
       context 'when there is a primary value' do
         before { subject.primary_value = 'Primary' }
 
         context 'when there is no secondary value' do
-          it { is_expected.to be_mandatory_and_blank }
+          it { is_expected.to be_mandatory_blank_and_visible }
         end
 
         context 'when there is a secondary value' do
           before { subject.secondary_value = 'Secondary' }
 
-          it { is_expected.not_to be_mandatory_and_blank }
+          it { is_expected.not_to be_mandatory_blank_and_visible }
         end
 
         context 'when there is nothing to select for the secondary value' do
           let(:value) { "--A--\nAbbott\nAbelard\n--B--\n--C--\nCynthia" }
           before { subject.primary_value = 'B' }
 
-          it { is_expected.not_to be_mandatory_and_blank }
+          it { is_expected.not_to be_mandatory_blank_and_visible }
         end
       end
     end

spec/system/users/brouillon_spec.rb

@@ -271,6 +271,28 @@ describe 'The user' do
     expect(page).to have_text('file.pdf')
   end
 
+  context 'with condition' do
+    include Logic
+
+    let(:procedure) { create(:procedure, :published, :for_individual, :with_yes_no, :with_type_de_champ) }
+    let(:revision) { procedure.published_revision }
+    let(:yes_no_type_de_champ) { revision.types_de_champ.first }
+    let(:type_de_champ) { revision.types_de_champ.last }
+    let(:condition) { ds_eq(champ_value(yes_no_type_de_champ.stable_id), constant(true)) }
+
+    before { type_de_champ.update(condition: condition) }
+
+    scenario 'fill a dossier', js: true do
+      log_in(user, procedure)
+
+      fill_individual
+
+      expect(page).to have_field(type_de_champ.libelle, with: '', visible: false)
+      choose('Oui')
+      expect(page).to have_field(type_de_champ.libelle, with: '', visible: true)
+    end
+  end
+
   context 'draft autosave' do
     scenario 'autosave a draft', js: true do
       log_in(user, simple_procedure)