DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #9695 from tchak/use-types-de-champ-as-source-of-truth

Browse source 
refactor(dossier): use revision as source of truth to diplay champs
This commit is contained in:
Paul Chavard 2024-03-04 15:03:02 +00:00 • committed by GitHub
commit a247ec6c12
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
47 changed files with 374 additions and 351 deletions
Download patch file Download diff file Expand all files Collapse all files

89
spec/views/shared/dossiers/_champs.html.haml_spec.rb
View file

@ -2,6 +2,9 @@ describe 'shared/dossiers/champs', type: :view do
let(:instructeur) { create(:instructeur) }
let(:demande_seen_at) { nil }
let(:profile) { "instructeur" }
let(:procedure) { create(:procedure, types_de_champ_public:) }
let(:dossier) { create(:dossier, :with_populated_champs, procedure:) }
let(:types_de_champ) { dossier.revision.types_de_champ_public }
before do
view.extend DossierHelper
@ -12,17 +15,23 @@ describe 'shared/dossiers/champs', type: :view do
end
end
subject { render 'shared/dossiers/champs', champs:, dossier:, demande_seen_at:, profile: }
subject { render 'shared/dossiers/champs', types_de_champ:, dossier:, demande_seen_at:, profile: }
context "there are some champs" do
let(:dossier) { create(:dossier) }
let(:champ1) { create(:champ_checkbox, dossier: dossier, value: 'true') }
let(:champ2) { create(:champ_header_section, dossier: dossier, value: "Section") }
let(:champ3) { create(:champ_explication, dossier: dossier, value: "mazette") }
let(:champ4) { create(:champ_dossier_link, dossier: dossier, value: dossier.id) }
let(:champ5) { create(:champ_textarea, dossier: dossier, value: "Some long text in a textarea.") }
let(:champ6) { create(:champ_rna, value: "W173847273") }
let(:champs) { [champ1, champ2, champ3, champ4, champ5, champ6] }
let(:types_de_champ_public) { [{ type: :checkbox }, { type: :header_section }, { type: :explication }, { type: :dossier_link }, { type: :textarea }, { type: :rna }] }
let(:champ1) { dossier.champs[0] }
let(:champ2) { dossier.champs[1] }
let(:champ3) { dossier.champs[2] }
let(:champ4) { dossier.champs[3] }
let(:champ5) { dossier.champs[4] }
let(:champ6) { dossier.champs[5] }
before do
champ1.update(value: 'true')
champ4.update(value: dossier.id)
champ5.update(value: "Some long text in a textarea.")
champ6.update(value: "W173847273")
end
it "renders titles and values of champs" do
expect(subject).to include(champ1.libelle)
@ -41,26 +50,34 @@ describe 'shared/dossiers/champs', type: :view do
it "doesn't render explication champs" do
expect(subject).not_to include(champ3.libelle)
expect(subject).not_to include(champ3.value)
end
end
context "with auto-link" do
let(:types_de_champ_public) { [{ type: :text }, { type: :textarea }] }
let(:champ1) { dossier.champs[0] }
let(:champ2) { dossier.champs[1] }
before do
champ1.update(value: 'https://github.com/tchak')
champ2.update(value: "https://github.com/LeSim")
end
context "with auto-link" do
let(:champ1) { create(:champ_text, value: "https://github.com/tchak") }
let(:champ2) { create(:champ_textarea, value: "https://github.com/LeSim") }
let(:link1) { '<a href="https://github.com/tchak" target="_blank" rel="noopener">https://github.com/tchak</a>' }
let(:link2) { '<a href="https://github.com/LeSim" target="_blank" rel="noopener">https://github.com/LeSim</a>' }
let(:link1) { '<a href="https://github.com/tchak" target="_blank" rel="noopener">https://github.com/tchak</a>' }
let(:link2) { '<a href="https://github.com/LeSim" target="_blank" rel="noopener">https://github.com/LeSim</a>' }
it "render links" do
expect(subject).to include(link1)
expect(subject).to include(link2)
end
it "render links" do
expect(subject).to include(link1)
expect(subject).to include(link2)
end
end
context "with a dossier champ, but we are not authorized to acces the dossier" do
let(:dossier) { create(:dossier) }
let(:champ) { create(:champ_dossier_link, dossier: dossier, value: dossier.id) }
let(:champs) { [champ] }
let(:types_de_champ_public) { [{ type: :dossier_link }] }
before do
dossier.champs.first.update(value: dossier.id)
end
it { is_expected.not_to have_link("Dossier nº #{dossier.id}") }
it { is_expected.to include("Dossier nº #{dossier.id}") }
@ -68,9 +85,11 @@ describe 'shared/dossiers/champs', type: :view do
end
context "with a dossier_link champ but without value" do
let(:dossier) { create(:dossier) }
let(:champ) { create(:champ_dossier_link, dossier: dossier, value: nil) }
let(:champs) { [champ] }
let(:types_de_champ_public) { [{ type: :dossier_link }] }
before do
dossier.champs.first.update(value: nil)
end
it { is_expected.not_to include("non saisi") }
@ -81,9 +100,11 @@ describe 'shared/dossiers/champs', type: :view do
end
context "with a piece justificative without value" do
let(:dossier) { create(:dossier) }
let(:champ) { create(:champ_without_piece_justificative, dossier:) }
let(:champs) { [champ] }
let(:types_de_champ_public) { [{ type: :piece_justificative }] }
before do
dossier.champs.first.piece_justificative_file.purge
end
it { is_expected.not_to include("pièce justificative non saisie") }
@ -94,9 +115,9 @@ describe 'shared/dossiers/champs', type: :view do
end
context "with seen_at" do
let(:dossier) { create(:dossier, :en_construction, depose_at: 1.day.ago) }
let(:champ1) { create(:champ_checkbox, dossier: dossier, value: 'true') }
let(:champs) { [champ1] }
let(:types_de_champ_public) { [{ type: :checkbox }] }
let(:dossier) { create(:dossier, :en_construction, :with_populated_champs, procedure:, depose_at: 1.day.ago) }
let(:champ1) { dossier.champs[0] }
context "with a demande_seen_at after champ updated_at" do
let(:demande_seen_at) { champ1.updated_at + 1.hour }
@ -105,9 +126,13 @@ describe 'shared/dossiers/champs', type: :view do
end
context "with champ updated_at at depose_at" do
let(:champ1) { create(:champ_checkbox, dossier: dossier, value: 'true', updated_at: dossier.depose_at) }
let(:champ1) { dossier.champs[0] }
let(:demande_seen_at) { champ1.updated_at - 1.hour }
before do
champ1.update(value: 'false', updated_at: dossier.depose_at)
end
it { is_expected.not_to have_css(".fr-badge--new") }
end

93
spec/views/shared/dossiers/_edit.html.haml_spec.rb
View file

@ -6,29 +6,34 @@ describe 'shared/dossiers/edit', type: :view do
subject { render 'shared/dossiers/edit', dossier: dossier, apercu: false }
context 'when there are some champs' do
let(:dossier) { create(:dossier) }
let(:champ_checkbox) { create(:champ_checkbox, dossier: dossier, value: 'true') }
let(:champ_header_section) { create(:champ_header_section, dossier: dossier, value: 'Section') }
let(:champ_explication) { create(:champ_explication, dossier: dossier, value: 'mazette') }
let(:champ_dossier_link) { create(:champ_dossier_link, dossier: dossier, value: dossier.id) }
let(:champ_textarea) { create(:champ_textarea, dossier: dossier, value: 'Some long text in a textarea.') }
let(:champs) { [champ_checkbox, champ_header_section, champ_explication, champ_dossier_link, champ_textarea] }
let(:procedure) { create(:procedure, types_de_champ_public:) }
let(:dossier) { create(:dossier, :with_populated_champs, procedure:) }
before { dossier.champs_public << champs }
context 'when there are some champs' do
let(:champs_by_stable_id_with_row) { dossier.champs_by_stable_id_with_row }
let(:type_de_champ_header_section) { procedure.draft_types_de_champ_public.find(&:header_section?) }
let(:type_de_champ_explication) { procedure.draft_types_de_champ_public.find(&:explication?) }
let(:type_de_champ_dossier_link) { procedure.draft_types_de_champ_public.find(&:dossier_link?) }
let(:type_de_champ_checkbox) { procedure.draft_types_de_champ_public.find(&:checkbox?) }
let(:type_de_champ_textarea) { procedure.draft_types_de_champ_public.find(&:textarea?) }
let(:champ_checkbox) { champs_by_stable_id_with_row[[type_de_champ_checkbox.stable_id]] }
let(:champ_dossier_link) { champs_by_stable_id_with_row[[type_de_champ_dossier_link.stable_id]] }
let(:champ_textarea) { champs_by_stable_id_with_row[[type_de_champ_textarea.stable_id]] }
let(:types_de_champ_public) { [{ type: :checkbox }, { type: :header_section }, { type: :explication }, { type: :dossier_link }, { type: :textarea }] }
it 'renders labels and editable values of champs' do
expect(subject).to have_field(champ_checkbox.libelle, checked: true)
expect(subject).to have_css(".header-section", text: champ_header_section.libelle)
expect(subject).to have_text(champ_explication.libelle)
expect(subject).to have_field(champ_dossier_link.libelle, with: champ_dossier_link.value)
expect(subject).to have_css(".header-section", text: type_de_champ_header_section.libelle)
expect(subject).to have_text(type_de_champ_explication.libelle)
expect(subject).to have_field(type_de_champ_dossier_link.libelle, with: champ_dossier_link.value)
expect(subject).to have_field(champ_textarea.libelle, with: champ_textarea.value)
end
context "with standard champs" do
let(:champ_email) { create(:champ_email, dossier: dossier) }
let(:champ_phone) { create(:champ_phone, dossier: dossier) }
let(:champs) { [champ_email, champ_phone] }
let(:types_de_champ_public) { [{ type: :email }, { type: :phone }] }
it "does not render basic placeholders" do
expect(subject).not_to have_css('input[type="email"][placeholder$="exemple.fr"]')
@ -38,17 +43,18 @@ describe 'shared/dossiers/edit', type: :view do
end
context 'with a single-value list' do
let(:dossier) { create(:dossier) }
let(:type_de_champ) { create(:type_de_champ_drop_down_list, mandatory: mandatory, procedure: dossier.procedure) }
let(:champ) { create(:champ_drop_down_list, dossier: dossier, type_de_champ: type_de_champ, value: value) }
let(:types_de_champ_public) { [{ type: :drop_down_list, options:, mandatory: }] }
let(:champ) { dossier.champs_public.first }
let(:type_de_champ) { champ.type_de_champ }
let(:enabled_options) { type_de_champ.drop_down_list_enabled_non_empty_options }
let(:mandatory) { true }
before { dossier.champs_public << champ }
let(:options) { nil }
context 'when the list is short' do
let(:value) { 'val1' }
before { champ.update(value:) }
it 'renders the list as radio buttons' do
expect(subject).to have_selector('input[type=radio]', count: enabled_options.count)
end
@ -65,7 +71,9 @@ describe 'shared/dossiers/edit', type: :view do
context 'when the list is long' do
let(:value) { 'alpha' }
let(:type_de_champ) { create(:type_de_champ_drop_down_list, :long, procedure: dossier.procedure) }
let(:options) { [:long] }
before { champ.update(value:) }
it 'renders the list as a dropdown' do
expect(subject).to have_select(type_de_champ.libelle, options: enabled_options + [''])
@ -74,21 +82,18 @@ describe 'shared/dossiers/edit', type: :view do
end
context 'with a multiple-values list' do
let(:dossier) { create(:dossier) }
let(:type_de_champ) { create(:type_de_champ_multiple_drop_down_list, procedure: dossier.procedure, drop_down_list_value: drop_down_list_value) }
let(:champ) { create(:champ_multiple_drop_down_list, dossier: dossier, type_de_champ: type_de_champ, value: champ_value) }
let(:types_de_champ_public) { [{ type: :multiple_drop_down_list, options: }] }
let(:champ) { dossier.champs.first }
let(:type_de_champ) { champ.type_de_champ }
let(:options) { type_de_champ.drop_down_list_options }
let(:enabled_options) { type_de_champ.drop_down_list_enabled_non_empty_options }
before { dossier.champs_public << champ }
context 'when the list is short' do
let(:drop_down_list_value) { ['valid', 'invalid', 'not sure yet'].join("\r\n") }
let(:champ_value) { ['invalid'].to_json }
let(:options) { ['valid', 'invalid', 'not sure yet'] }
it 'renders the list as checkboxes' do
expect(subject).to have_selector('input[type=checkbox]', count: enabled_options.count)
expect(subject).to have_selector('input[type=checkbox][checked=checked]', count: 1)
expect(subject).to have_selector('input[type=checkbox][checked=checked]', count: 2)
end
it 'adds an extra hidden input, to send a blank value even when all checkboxes are unchecked' do
@ -97,8 +102,7 @@ describe 'shared/dossiers/edit', type: :view do
end
context 'when the list is long' do
let(:drop_down_list_value) { ['peach', 'banana', 'pear', 'apricot', 'apple', 'grapefruit'].join("\r\n") }
let(:champ_value) { ['banana', 'grapefruit'].to_json }
let(:options) { ['peach', 'banana', 'pear', 'apricot', 'apple', 'grapefruit'] }
it 'renders the list as a multiple-selection dropdown' do
expect(subject).to have_selector('select')
@ -107,13 +111,11 @@ describe 'shared/dossiers/edit', type: :view do
end
context 'with a mandatory piece justificative' do
let(:dossier) { create(:dossier) }
let(:type_de_champ) { create(:type_de_champ_piece_justificative, procedure: dossier.procedure, mandatory: true) }
let(:champ) { create(:champ_piece_justificative, dossier: dossier, type_de_champ: type_de_champ) }
let(:types_de_champ_public) { [{ type: :piece_justificative, mandatory: true }] }
let(:champ) { dossier.champs.first }
context 'when dossier is en construction' do
let(:dossier) { create(:dossier, :en_construction) }
before { dossier.champs_public << champ }
let(:dossier) { create(:dossier, :en_construction, :with_populated_champs, procedure:) }
it 'can delete a piece justificative' do
expect(subject).to have_selector("[title='Supprimer le fichier #{champ.piece_justificative_file.attachments[0].filename}']")
@ -121,10 +123,6 @@ describe 'shared/dossiers/edit', type: :view do
end
context 'when dossier is brouillon' do
before do
dossier.champs_public << champ
end
it 'can delete a piece justificative' do
expect(subject).to have_selector("[title='Supprimer le fichier #{champ.piece_justificative_file.attachments[0].filename}']")
end
@ -132,16 +130,11 @@ describe 'shared/dossiers/edit', type: :view do
end
context 'with a routed procedure' do
let(:procedure_routee) do
create(:procedure, :routee)
end
let!(:drop_down_tdc) { create(:type_de_champ_drop_down_list, procedure: procedure_routee, drop_down_options: options) }
let(:options) { procedure_routee.groupe_instructeurs.pluck(:label) }
let(:dossier) { create(:dossier, procedure: procedure_routee) }
let(:champs) { [champ_drop_down] }
let(:champ_drop_down) { create(:champ_drop_down_list, dossier: dossier, type_de_champ: drop_down_tdc, value: options.first) }
before { dossier.champs_public << champs }
let(:groupe_instructeur) { create(:groupe_instructeur) }
let(:procedure) { create(:procedure, :routee, groupe_instructeurs: [groupe_instructeur], types_de_champ_public: [{ type: :drop_down_list, options: }]) }
let(:options) { [groupe_instructeur.label] }
let(:dossier) { create(:dossier, procedure:) }
let(:champ_drop_down) { dossier.champs.first }
it 'renders the libelle of the type de champ used for routing' do
expect(subject).to include(champ_drop_down.libelle)