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

Merge pull request #8666 from colinux/fix-personnes-impliquees-combobox

Browse source 
fix(instructeurs): combobox layout in "personnes impliquees" tab
This commit is contained in:
Colin Darie 2023-02-21 18:28:02 +01:00 • committed by GitHub
commit e87bb24872
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/personnes_impliquees.scss
View file

@ -10,7 +10,7 @@
} }
[data-react-component-value^="ComboMultiple"] { [data-react-component-value^="ComboMultiple"] {
margin-bottom: $default-fields-spacer; margin-bottom: 0;
[data-reach-combobox-token-list] { [data-reach-combobox-token-list] {
padding: 0.5 * $default-padding; padding: 0.5 * $default-padding;

19
app/views/instructeurs/dossiers/_envoyer_dossier_block.html.haml
View file

@ -6,14 +6,13 @@
- else - else
%p.tab-paragrah.mb-1 %p.tab-paragrah.mb-1
Le destinataire suivra automatiquement le dossier Le destinataire suivra automatiquement le dossier
= form_for dossier, url: send_to_instructeurs_instructeur_dossier_path(dossier.procedure, dossier), method: :post, html: { class: 'form recipients-form' } do |f| = form_for dossier, url: send_to_instructeurs_instructeur_dossier_path(dossier.procedure, dossier), method: :post, html: { class: 'form recipients-form fr-mb-4w' } do |f|
.flex.justify-start.align-start = hidden_field_tag :recipients, nil
= hidden_field_tag :recipients, nil = react_component("ComboMultiple",
= react_component("ComboMultiple", options: potential_recipients.map{|r| [r.email, r.id]},
options: potential_recipients.map{|r| [r.email, r.id]}, selected: [], disabled: [],
selected: [], disabled: [], group: '.recipients-form',
group: '.recipients-form', name: 'recipients',
name: 'recipients', label: 'Emails')
label: 'Emails')
= f.submit "Envoyer", class: "button large send gap-left" = f.submit "Envoyer", class: "fr-btn fr-mt-2w"

4
spec/views/instructeur/dossiers/_envoyer_dossier_block.html.haml_spec.rb
View file

@ -14,14 +14,14 @@ describe 'instructeurs/dossiers/envoyer_dossier_block.html.haml', type: :view do
let(:potential_recipients) { [instructeur] } let(:potential_recipients) { [instructeur] }
it { is_expected.to match(/data-react-props.*#{instructeur.email}/) } it { is_expected.to match(/data-react-props.*#{instructeur.email}/) }
it { is_expected.to have_css(".button.send") } it { is_expected.to have_css(".fr-btn") }
end end
context "there is no other instructeur for the procedure" do context "there is no other instructeur for the procedure" do
let(:potential_recipients) { [] } let(:potential_recipients) { [] }
it { is_expected.not_to have_css("select") } it { is_expected.not_to have_css("select") }
it { is_expected.not_to have_css(".button.send") } it { is_expected.not_to have_css(".fr-btn") }
it { is_expected.to have_content("Vous êtes le seul instructeur assigné sur cette démarche") } it { is_expected.to have_content("Vous êtes le seul instructeur assigné sur cette démarche") }
end end
end end