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

Merge branch 'main' into helpscout/1987597382

Browse source
This commit is contained in:
mfo 2022-09-08 12:03:01 +02:00 committed by GitHub
commit 44f366d7f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
73 changed files with 215 additions and 365 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/assets/stylesheets/dsfr.scss
View file

@ -15,3 +15,16 @@ select {
.button.primary {
font-weight: bold;
}
// fix firefox < 80 not supporting "appearance: auto" on inputs
// scss-lint:disable DuplicateProperty
input[type="checkbox"] {
-moz-appearance: checkbox;
-moz-appearance: auto;
}
input[type="radio"] {
-moz-appearance: radio;
-moz-appearance: auto;
}
// scss-lint:enable DuplicateProperty

6
app/components/editable_champ/address_component.rb
View file

@ -1,7 +1,3 @@
class EditableChamp::AddressComponent < ApplicationComponent
class EditableChamp::AddressComponent < EditableChamp::EditableChampBaseComponent
include ApplicationHelper
def initialize(form:, champ:)
@form, @champ = form, champ
end
end

6
app/components/editable_champ/annuaire_education_component.rb
View file

@ -1,7 +1,3 @@
class EditableChamp::AnnuaireEducationComponent < ApplicationComponent
class EditableChamp::AnnuaireEducationComponent < EditableChamp::EditableChampBaseComponent
include ApplicationHelper
def initialize(form:, champ:)
@form, @champ = form, champ
end
end

6
app/components/editable_champ/carte_component.rb
View file

@ -1,7 +1,3 @@
class EditableChamp::CarteComponent < ApplicationComponent
class EditableChamp::CarteComponent < EditableChamp::EditableChampBaseComponent
include ApplicationHelper
def initialize(form:, champ:)
@form, @champ = form, champ
end
end

6
app/components/editable_champ/champ_label_component.rb
View file

@ -1,5 +1,7 @@
class EditableChamp::ChampLabelComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
include StringToHtmlHelper
def initialize(form:, champ:, seen_at: nil)
@form, @champ, @seen_at = form, champ, seen_at
end
end

10
app/components/editable_champ/champ_label_component/champ_label_component.html.haml
View file

@ -1,10 +1,10 @@
= # we do this trick because some html elements should use 'label' and some should be plain paragraphs
- if @champ.html_label?
= @form.label @champ.main_value_name, id: champ.labelledby_id, for: champ.input_id do
= render partial: 'shared/dossiers/editable_champs/champ_label_content', locals: { champ: champ, seen_at: seen_at }
= @form.label @champ.main_value_name, id: @champ.labelledby_id, for: @champ.input_id do
= render EditableChamp::ChampLabelContentComponent.new champ: @champ, seen_at: @seen_at
- else
.@form-label.mb-4
= render partial: 'shared/dossiers/editable_champs/champ_label_content', locals: { champ: champ, seen_at: seen_at }
.form-label.mb-4
= render EditableChamp::ChampLabelContentComponent.new champ: @champ, seen_at: @seen_at
- if @champ.description.present?
.notice{ id: @champ.describedby_id }= string_to_html(champ.description)
.notice{ id: @champ.describedby_id }= string_to_html(@champ.description)

4
app/components/editable_champ/champ_label_content_component.rb
View file

@ -1,5 +1,5 @@
class EditableChamp::ChampLabelContentComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
def initialize(champ:, seen_at: nil)
@champ, @seen_at = champ, seen_at
end
end

6
app/components/editable_champ/champ_label_content_component/champ_label_content_component.html.haml
View file

@ -2,10 +2,10 @@
- if @champ.type_de_champ.mandatory?
%span.mandatory *
- if @champ.updated_at.present? && seen_at.present?
%span.updated-at{ class: highlight_if_unseen_class(seen_at, @champ.updated_at) }
- if @champ.updated_at.present? && @seen_at.present?
%span.updated-at{ class: highlight_if_unseen_class(@seen_at, @champ.updated_at) }
= "modifié le #{try_format_datetime(@champ.updated_at)}"
- if @champ.rebased_at.present? && champ.rebased_at > (seen_at || champ.updated_at) && current_user.owns_or_invite?(champ.dossier)
- if @champ.rebased_at.present? && @champ.rebased_at > (@seen_at || @champ.updated_at) && controller.current_user.owns_or_invite?(@champ.dossier)
%span.updated-at.highlighted
Le type de ce @champ où sa description a été modifiée par l'administration. Vérifier son contenu.

5
app/components/editable_champ/checkbox_component.rb
View file

@ -1,5 +1,2 @@
class EditableChamp::CheckboxComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::CheckboxComponent < EditableChamp::EditableChampBaseComponent
end

5
app/components/editable_champ/civilite_component.rb
View file

@ -1,5 +1,2 @@
class EditableChamp::CiviliteComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::CiviliteComponent < EditableChamp::EditableChampBaseComponent
end

5
app/components/editable_champ/cnaf_component.rb
View file

@ -1,5 +1,2 @@
class EditableChamp::CnafComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::CnafComponent < EditableChamp::EditableChampBaseComponent
end

6
app/components/editable_champ/communes_component.rb
View file

@ -1,7 +1,3 @@
class EditableChamp::CommunesComponent < ApplicationComponent
class EditableChamp::CommunesComponent < EditableChamp::EditableChampBaseComponent
include ApplicationHelper
def initialize(form:, champ:)
@form, @champ = form, champ
end
end

5
app/components/editable_champ/date_component.rb
View file

@ -1,5 +1,2 @@
class EditableChamp::DateComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::DateComponent < EditableChamp::EditableChampBaseComponent
end

6
app/components/editable_champ/datetime_component.rb
View file

@ -1,8 +1,4 @@
class EditableChamp::DatetimeComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::DatetimeComponent < EditableChamp::EditableChampBaseComponent
def datetime_start_year(date)
if date == nil || date.year == 0 || date.year >= Date.today.year - 1
Date.today.year - 1

5
app/components/editable_champ/decimal_number_component.rb
View file

@ -1,5 +1,2 @@
class EditableChamp::DecimalNumberComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::DecimalNumberComponent < EditableChamp::EditableChampBaseComponent
end

6
app/components/editable_champ/departements_component.rb
View file

@ -1,7 +1,3 @@
class EditableChamp::DepartementsComponent < ApplicationComponent
class EditableChamp::DepartementsComponent < EditableChamp::EditableChampBaseComponent
include ApplicationHelper
def initialize(form:, champ:)
@form, @champ = form, champ
end
end

5
app/components/editable_champ/dgfip_component.rb
View file

@ -1,5 +1,2 @@
class EditableChamp::DgfipComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::DgfipComponent < EditableChamp::EditableChampBaseComponent
end

5
app/components/editable_champ/dossier_link_component.rb
View file

@ -1,5 +1,2 @@
class EditableChamp::DossierLinkComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::DossierLinkComponent < EditableChamp::EditableChampBaseComponent
end

5
app/components/editable_champ/drop_down_list_component.rb
View file

@ -1,5 +1,2 @@
class EditableChamp::DropDownListComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::DropDownListComponent < EditableChamp::EditableChampBaseComponent
end

5
app/components/editable_champ/drop_down_other_input_component.rb
View file

@ -1,5 +1,2 @@
class EditableChamp::DropDownOtherInputComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::DropDownOtherInputComponent < EditableChamp::EditableChampBaseComponent
end

5
app/components/editable_champ/editable_champ_base_component.rb Normal file
View file

@ -0,0 +1,5 @@
class EditableChamp::EditableChampBaseComponent < ApplicationComponent
def initialize(form:, champ:, seen_at: nil)
@form, @champ, @seen_at = form, champ, seen_at
end
end

44
app/components/editable_champ/editable_champ_component.rb
View file

@ -1,5 +1,45 @@
class EditableChamp::EditableChampComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
include StringToHtmlHelper
def initialize(form:, champ:, seen_at: nil)
@form, @champ, @seen_at = form, champ, seen_at
end
private
def has_label?(champ)
types_without_label = [TypeDeChamp.type_champs.fetch(:header_section), TypeDeChamp.type_champs.fetch(:explication)]
!types_without_label.include?(@champ.type_champ)
end
def component_class
"EditableChamp::#{@champ.type_champ.camelcase}Component".constantize
end
def html_options
{
class: "editable-champ-#{@champ.type_champ} #{'hidden' if !@champ.visible?}",
id: @champ.input_group_id,
data: { controller: stimulus_controller }
}
end
def stimulus_controller
if !@champ.repetition? && @champ.fillable?
# This is an editable champ. Lets find what controllers it might need.
controllers = []
# This is a public champ – it can have an autosave controller.
if @champ.public?
controllers << 'autosave'
end
# This is a dropdown champ. Activate special behaviours it might have.
if @champ.simple_drop_down_list? || @champ.linked_drop_down_list?
controllers << 'champ-dropdown'
end
controllers.join(' ')
end
end
end

8
app/components/editable_champ/editable_champ_component/editable_champ_component.html.haml
View file

@ -1,13 +1,13 @@
.editable-@champ{ class: "editable-champ-#{champ.type_champ} #{champ.visible? ? '' : 'hidden'}", id: champ.input_group_id, data: editable_champ_controller(champ) }
.editable-champ{ html_options }
- if @champ.repetition?
%h3.header-subsection= @champ.libelle
- if @champ.description.present?
%p.notice= string_to_html(@champ.description, false)
- elsif has_label?(@champ)
= render partial: 'shared/dossiers/editable_champs/champ_label', locals: { form: @form, champ: champ, seen_at: defined?(seen_at) ? seen_at : nil }
= render EditableChamp::ChampLabelComponent.new form: @form, champ: @champ, seen_at: @seen_at
- if @champ.type_champ == "titre_identite"
%p.notice Carte nationale d’identité (uniquement le recto), passeport, titre de séjour ou autre justificatif d’identité. Formats acceptés : jpg/png
= @form.hidden_field :id, value: @champ.id, data: champ.repetition? ? { id: true } : {}
= render partial: "shared/dossiers/editable_champs/#{champ.type_champ}", locals: { form: @form, champ: champ }
= @form.hidden_field :id, value: @champ.id, data: @champ.repetition? ? { id: true } : {}
= render component_class.new(form: @form, champ: @champ, seen_at: @seen_at)

5
app/components/editable_champ/email_component.rb
View file

@ -1,5 +1,2 @@
class EditableChamp::EmailComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::EmailComponent < EditableChamp::EditableChampBaseComponent
end

5
app/components/editable_champ/engagement_component.rb
View file

@ -1,5 +1,2 @@
class EditableChamp::EngagementComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::EngagementComponent < EditableChamp::EditableChampBaseComponent
end

6
app/components/editable_champ/explication_component.rb
View file

@ -1,7 +1,3 @@
class EditableChamp::ExplicationComponent < ApplicationComponent
class EditableChamp::ExplicationComponent < EditableChamp::EditableChampBaseComponent
include StringToHtmlHelper
def initialize(form:, champ:)
@form, @champ = form, champ
end
end

5
app/components/editable_champ/header_section_component.rb
View file

@ -1,5 +1,2 @@
class EditableChamp::HeaderSectionComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::HeaderSectionComponent < EditableChamp::EditableChampBaseComponent
end

5
app/components/editable_champ/iban_component.rb
View file

@ -1,5 +1,2 @@
class EditableChamp::IbanComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::IbanComponent < EditableChamp::EditableChampBaseComponent
end

5
app/components/editable_champ/integer_number_component.rb
View file

@ -1,5 +1,2 @@
class EditableChamp::IntegerNumberComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::IntegerNumberComponent < EditableChamp::EditableChampBaseComponent
end

6
app/components/editable_champ/linked_drop_down_list_component.rb
View file

@ -1,5 +1,3 @@
class EditableChamp::LinkedDropDownListComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::LinkedDropDownListComponent < EditableChamp::EditableChampBaseComponent
include StringToHtmlHelper
end

2
app/components/editable_champ/linked_drop_down_list_component/linked_drop_down_list_component.html.haml
View file

@ -10,7 +10,7 @@
- if @champ.type_de_champ.mandatory?
%span.mandatory *
- if @champ.drop_down_secondary_description.present?
.notice{ id: "#{@champ.describedby_id}-secondary" }= helpers.string_to_html(@champ.drop_down_secondary_description)
.notice{ id: "#{@champ.describedby_id}-secondary" }= string_to_html(@champ.drop_down_secondary_description)
= @form.select :secondary_value,
@champ.secondary_options[@champ.primary_value],
{},

5
app/components/editable_champ/mesri_component.rb
View file

@ -1,5 +1,2 @@
class EditableChamp::MesriComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::MesriComponent < EditableChamp::EditableChampBaseComponent
end

6
app/components/editable_champ/multiple_drop_down_list_component.rb
View file

@ -1,7 +1,3 @@
class EditableChamp::MultipleDropDownListComponent < ApplicationComponent
class EditableChamp::MultipleDropDownListComponent < EditableChamp::EditableChampBaseComponent
include ApplicationHelper
def initialize(form:, champ:)
@form, @champ = form, champ
end
end

5
app/components/editable_champ/number_component.rb
View file

@ -1,5 +1,2 @@
class EditableChamp::NumberComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::NumberComponent < EditableChamp::EditableChampBaseComponent
end

6
app/components/editable_champ/pays_component.rb
View file

@ -1,7 +1,3 @@
class EditableChamp::PaysComponent < ApplicationComponent
class EditableChamp::PaysComponent < EditableChamp::EditableChampBaseComponent
include ApplicationHelper
def initialize(form:, champ:)
@form, @champ = form, champ
end
end

5
app/components/editable_champ/phone_component.rb
View file

@ -1,5 +1,2 @@
class EditableChamp::PhoneComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::PhoneComponent < EditableChamp::EditableChampBaseComponent
end

5
app/components/editable_champ/piece_justificative_component.rb
View file

@ -1,5 +1,2 @@
class EditableChamp::PieceJustificativeComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::PieceJustificativeComponent < EditableChamp::EditableChampBaseComponent
end

5
app/components/editable_champ/pole_emploi_component.rb
View file

@ -1,5 +1,2 @@
class EditableChamp::PoleEmploiComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::PoleEmploiComponent < EditableChamp::EditableChampBaseComponent
end

6
app/components/editable_champ/regions_component.rb
View file

@ -1,7 +1,3 @@
class EditableChamp::RegionsComponent < ApplicationComponent
class EditableChamp::RegionsComponent < EditableChamp::EditableChampBaseComponent
include ApplicationHelper
def initialize(form:, champ:)
@form, @champ = form, champ
end
end

5
app/components/editable_champ/repetition_component.rb
View file

@ -1,5 +1,2 @@
class EditableChamp::RepetitionComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::RepetitionComponent < EditableChamp::EditableChampBaseComponent
end

2
app/components/editable_champ/repetition_component/repetition_component.html.haml
View file

@ -1,6 +1,6 @@
.repetition{ id: dom_id(@champ, :rows) }
- @champ.rows.each do |champs|
= render EditableChamp::RepetitionRowComponent.new(form: @form, champ: @champ, row: champs)
= render EditableChamp::RepetitionRowComponent.new(form: @form, champ: @champ, row: champs, seen_at: @seen_at)
.actions{ 'data-turbo': 'true' }
= link_to champs_repetition_path(@champ.id), data: { turbo_method: :post }, class: 'button add-row' do

4
app/components/editable_champ/repetition_row_component.rb
View file

@ -1,5 +1,5 @@
class EditableChamp::RepetitionRowComponent < ApplicationComponent
def initialize(form:, champ:, row:)
@form, @champ, @row = form, champ, row
def initialize(form:, champ:, row:, seen_at: nil)
@form, @champ, @row, @seen_at = form, champ, row, seen_at
end
end

2
app/components/editable_champ/repetition_row_component/repetition_row_component.html.haml
View file

@ -2,7 +2,7 @@
.row{ id: row_dom_id }
- @row.each do |champ|
= fields_for champ.input_name, champ do |form|
= render partial: 'shared/dossiers/editable_champs/editable_champ', locals: { form: form, champ: champ }
= render EditableChamp::EditableChampComponent.new form: form, champ: champ, seen_at: @seen_at
.flex.row-reverse{ 'data-turbo': 'true' }
= link_to champs_repetition_path(@champ.id, champ_ids: @row.map(&:id), row_id: row_dom_id), data: { turbo_method: :delete }, class: 'button danger remove-row' do

5
app/components/editable_champ/siret_component.rb
View file

@ -1,5 +1,2 @@
class EditableChamp::SiretComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::SiretComponent < EditableChamp::EditableChampBaseComponent
end

5
app/components/editable_champ/text_component.rb
View file

@ -1,5 +1,2 @@
class EditableChamp::TextComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::TextComponent < EditableChamp::EditableChampBaseComponent
end

6
app/components/editable_champ/textarea_component.rb
View file

@ -1,7 +1,3 @@
class EditableChamp::TextareaComponent < ApplicationComponent
class EditableChamp::TextareaComponent < EditableChamp::EditableChampBaseComponent
include HtmlToStringHelper
def initialize(form:, champ:)
@form, @champ = form, champ
end
end

5
app/components/editable_champ/titre_identite_component.rb
View file

@ -1,5 +1,2 @@
class EditableChamp::TitreIdentiteComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::TitreIdentiteComponent < EditableChamp::EditableChampBaseComponent
end

5
app/components/editable_champ/yes_no_component.rb
View file

@ -1,5 +1,2 @@
class EditableChamp::YesNoComponent < ApplicationComponent
def initialize(form:, champ:)
@form, @champ = form, champ
end
class EditableChamp::YesNoComponent < EditableChamp::EditableChampBaseComponent
end

30
app/controllers/users/dossiers_controller.rb
View file

@ -188,19 +188,15 @@ module Users
def update
@dossier = dossier_with_champs
errors = update_dossier_and_compute_errors
if check_conditions?
assign_dossier_and_check_conditions
render :update_brouillon
else
errors = update_dossier_and_compute_errors
if errors.present?
flash.now.alert = errors
end
if errors.present?
flash.now.alert = errors
render :modifier
else
redirect_to demande_dossier_path(@dossier)
end
respond_to do |format|
format.html { render :modifier }
format.turbo_stream { render layout: false }
end
end
@ -308,18 +304,6 @@ module Users
private
def check_conditions?
params[:check_conditions] && champs_params[:dossier]
end
def assign_dossier_and_check_conditions
@dossier.assign_attributes(champs_params[:dossier])
# We need to set dossier on champs, otherwise dossier will be reloaded
@dossier.champs.each do |champ|
champ.association(:dossier).target = @dossier
end
end
# if the status tab is filled, then this tab
# else first filled tab
# else en-cours

45
app/helpers/champ_helper.rb
View file

@ -1,17 +1,4 @@
module ChampHelper
def has_label?(champ)
types_without_label = [TypeDeChamp.type_champs.fetch(:header_section), TypeDeChamp.type_champs.fetch(:explication)]
!types_without_label.include?(champ.type_champ)
end
def champ_carte_params(champ)
if champ.persisted?
{ champ_id: champ.id }
else
{ type_de_champ_id: champ.type_de_champ_id }
end
end
def format_text_value(text)
sanitized_text = sanitize(text)
auto_linked_text = Anchored::Linker.auto_link(sanitized_text, target: '_blank', rel: 'noopener') do |link_href|
@ -27,36 +14,4 @@ module ChampHelper
piece_justificative_template_admin_procedure_type_de_champ_url(stable_id: object.stable_id, procedure_id: object.procedure.id)
end
end
def autosave_available?(champ)
# FIXME: enable autosave on champs private? once we figured out how to batch audit events
champ.dossier.brouillon? && !champ.repetition?
end
def editable_champ_controller(champ)
if !champ.repetition? && !champ.non_fillable?
# This is an editable champ. Lets find what controllers it might need.
controllers = []
# This is a public champ – it can have an autosave controller.
if champ.public?
# This is a champ on dossier in draft state. Activate autosave.
if champ.dossier.brouillon?
controllers << 'autosave'
# This is a champ on a dossier in en_construction state. Enable conditions checker.
elsif champ.public? && champ.dossier.en_construction?
controllers << 'check-conditions'
end
end
# This is a dropdown champ. Activate special behaviours it might have.
if champ.simple_drop_down_list? || champ.linked_drop_down_list?
controllers << 'champ-dropdown'
end
if controllers.present?
{ controller: controllers.join(' ') }
end
end
end
end

12
app/javascript/controllers/autosave_controller.ts
View file

@ -42,7 +42,10 @@ export class AutosaveController extends ApplicationController {
this.#latestPromise = Promise.resolve();
this.onGlobal('autosave:retry', () => this.didRequestRetry());
this.on('change', (event) => this.onChange(event));
this.on('input', (event) => this.onInput(event));
if (this.saveOnInput) {
this.on('input', (event) => this.onInput(event));
}
}
disconnect() {
@ -80,7 +83,8 @@ export class AutosaveController extends ApplicationController {
this.debounce(this.enqueueAutosaveRequest, AUTOSAVE_DEBOUNCE_DELAY);
} else if (
isSelectElement(target) ||
isCheckboxOrRadioInputElement(target)
isCheckboxOrRadioInputElement(target) ||
(!this.saveOnInput && isTextInputElement(target))
) {
this.enqueueAutosaveRequest();
}
@ -99,6 +103,10 @@ export class AutosaveController extends ApplicationController {
}
}
private get saveOnInput() {
return !!this.form?.dataset.saveOnInput;
}
private didRequestRetry() {
if (this.#needsRetry) {
this.enqueueAutosaveRequest();

1
app/models/champ.rb
View file

@ -51,6 +51,7 @@ class Champ < ApplicationRecord
:simple_drop_down_list?,
:linked_drop_down_list?,
:non_fillable?,
:fillable?,
:cnaf?,
:dgfip?,
:pole_emploi?,

4
app/models/type_de_champ.rb
View file

@ -186,6 +186,10 @@ class TypeDeChamp < ApplicationRecord
drop_down_other == "1" || drop_down_other == true
end
def fillable?
!non_fillable?
end
def non_fillable?
type_champ.in?([
TypeDeChamp.type_champs.fetch(:header_section),

3
app/views/champs/piece_justificative/show.turbo_stream.haml
View file

@ -1,5 +1,6 @@
= fields_for @champ.input_name, @champ do |form|
= turbo_stream.morph @champ.input_group_id, partial: "shared/dossiers/editable_champs/editable_champ", locals: { champ: @champ, form: form }
= turbo_stream.morph @champ.input_group_id do
= render EditableChamp::EditableChampComponent.new champ: @champ, form: form
- if @champ.piece_justificative_file.attached?
- attachment = @champ.piece_justificative_file.attachment

17
app/views/instructeurs/dossiers/_autosave.html.haml
View file

@ -1,17 +0,0 @@
.autosave.autosave-state-idle{ data: { controller: 'autosave-status' } }
%p.autosave-explanation
%span.autosave-explanation-text
= t('views.instructeurs.dossiers.autosave.autosave_draft')
%p.autosave-status.succeeded
%span.autosave-icon.icon.accept
%span.autosave-label
= t('views.instructeurs.dossiers.autosave.autosave_confirmation')
%p.autosave-status.failed
%span.autosave-icon ⚠️
%span.autosave-label Impossible d’enregistrer les annotations
%button.button.small.autosave-retry{ type: :button, data: { action: 'autosave-status#onClickRetryButton', autosave_status_target: 'retryButton' } }
%span.autosave-retry-label réessayer
%span.autosave-retrying-label enregistrement en cours…

2
app/views/root/landing.html.haml
View file

@ -27,7 +27,7 @@
%p.role-panel-explanation Réalisez vos demandes en toute simplicité et retrouvez vos dossiers en ligne
= link_to "Comment trouver ma démarche ?", COMMENT_TROUVER_MA_DEMARCHE_URL, class: "fr-btn fr-btn--lg fr-mr-1w fr-mb-2w", **external_link_attributes
= link_to "Se connecter", new_user_session_path, class: "fr-btn fr-btn--secondary fr-btn--lg", **external_link_attributes
= link_to "Se connecter", new_user_session_path, class: "fr-btn fr-btn--secondary fr-btn--lg"
- cache "numbers-panel", :expires_in => 3.hours do
.landing-panel

4
app/views/root/patron.html.haml
View file

@ -45,9 +45,7 @@
%form.form
= form_for @dossier, url: '', html: { class: 'form' } do |f|
= f.fields_for :champs do |champ_form|
- champ = champ_form.object
= render partial: "shared/dossiers/editable_champs/editable_champ",
locals: { champ: champ, form: champ_form, seen_at: nil }
= render EditableChamp::EditableChampComponent.new champ: champ_form.object, form: champ_form
.editable-champ.editable-champ-text
%label Mot de passe

12
app/views/users/dossiers/_autosave.html.haml → app/views/shared/dossiers/_autosave.html.haml
View file

@ -1,13 +1,19 @@
.autosave.autosave-state-idle{ data: { controller: 'autosave-status' } }
%p.autosave-explanation
%span.autosave-explanation-text
= t('views.users.dossiers.autosave.autosave_draft')
= link_to t('views.users.dossiers.autosave.more_infos'), FAQ_AUTOSAVE_URL, target: '_blank', rel: 'noopener', class: 'autosave-more-infos'
- if dossier.brouillon?
= t('views.users.dossiers.autosave.draft_explanation')
- else
= t('views.users.dossiers.autosave.explanation')
= link_to t('views.users.dossiers.autosave.more_information'), FAQ_AUTOSAVE_URL, target: '_blank', rel: 'noopener', class: 'autosave-more-infos'
%p.autosave-status.succeeded
%span.autosave-icon.icon.accept
%span.autosave-label
= t('views.users.dossiers.autosave.autosave_confirmation')
- if dossier.brouillon?
= t('views.users.dossiers.autosave.draft_confirmation')
- else
= t('views.users.dossiers.autosave.confirmation')
= link_to t('views.users.dossiers.autosave.more_information'), FAQ_AUTOSAVE_URL, target: '_blank', rel: 'noopener', class: 'autosave-more-infos'
%p.autosave-status.failed

24
app/views/shared/dossiers/_edit.html.haml
View file

@ -2,7 +2,7 @@
= render partial: "shared/dossiers/submit_is_over", locals: { dossier: dossier }
- if dossier.brouillon?
- form_options = { url: brouillon_dossier_url(dossier), method: :patch }
- form_options = { url: brouillon_dossier_url(dossier), method: :patch, data: { save_on_input: true } }
- else
- form_options = { url: modifier_dossier_url(dossier), method: :patch }
@ -23,7 +23,7 @@
%hr
- if dossier.show_groupe_instructeur_selector?
%span{ data: { controller: dossier.brouillon? ? 'autosave' : 'check-conditions' } }
%span{ data: { controller: 'autosave' } }
= f.label :groupe_instructeur_id do
= dossier.procedure.routing_criteria_name
%span.mandatory *
@ -33,25 +33,19 @@
- dossier.champs.each do |champ|
= fields_for champ.input_name, champ do |form|
= render partial: "shared/dossiers/editable_champs/editable_champ", locals: { form: form, champ: champ }
= render EditableChamp::EditableChampComponent.new form: form, champ: champ
- if !dossier.for_procedure_preview?
.dossier-edit-sticky-footer
.send-dossier-actions-bar
- if dossier.brouillon?
= render partial: 'users/dossiers/autosave'
= render partial: 'shared/dossiers/autosave', locals: { dossier: dossier }
- if dossier.can_transition_to_en_construction?
= f.button t('views.shared.dossiers.edit.submit_dossier'),
name: :submit_draft,
value: true,
class: 'button send primary',
disabled: !current_user.owns?(dossier),
data: { 'disable-with': "Envoi en cours…" }
- else
= f.button t('views.shared.dossiers.edit.save_changes'),
- if dossier.can_transition_to_en_construction?
= f.button t('views.shared.dossiers.edit.submit_dossier'),
name: :submit_draft,
value: true,
class: 'button send primary',
disabled: !current_user.owns?(dossier),
data: { 'disable-with': "Envoi en cours…" }
- if dossier.brouillon? && !current_user.owns?(dossier)

11
app/views/shared/dossiers/_edit_annotations.html.haml
View file

@ -4,16 +4,11 @@
= form_for dossier, url: annotations_instructeur_dossier_path(dossier.procedure, dossier), html: { class: 'form', multipart: true } do |f|
- dossier.champs_private.each do |champ|
= fields_for champ.input_name, champ do |form|
= render partial: "shared/dossiers/editable_champs/editable_champ", locals: { form: form, champ: champ, seen_at: seen_at }
= render EditableChamp::EditableChampComponent.new form: form, champ: champ, seen_at: seen_at
- if !dossier.for_procedure_preview?
- if autosave_available?(dossier.champs_private.first)
.dossier-edit-sticky-footer
.send-dossier-actions-bar
= render partial: 'autosave'
- else
.send-wrapper
= f.submit 'Sauvegarder', class: 'button primary send', data: { disable: true }
.send-wrapper
= f.submit 'Sauvegarder', class: 'button primary send', data: { disable: true }
- else
%h2.empty-text Aucune annotation privée

10
app/views/shared/dossiers/editable_champs/_champ_label.html.haml
View file

@ -1,10 +0,0 @@
= # we do this trick because some html elements should use 'label' and some should be plain paragraphs
- if champ.html_label?
= form.label champ.main_value_name, id: champ.labelledby_id, for: champ.input_id do
= render partial: 'shared/dossiers/editable_champs/champ_label_content', locals: { champ: champ, seen_at: seen_at }
- else
.form-label.mb-4
= render partial: 'shared/dossiers/editable_champs/champ_label_content', locals: { champ: champ, seen_at: seen_at }
- if champ.description.present?
.notice{ id: champ.describedby_id }= string_to_html(champ.description)

11
app/views/shared/dossiers/editable_champs/_champ_label_content.html.haml
View file

@ -1,11 +0,0 @@
#{champ.libelle}
- if champ.type_de_champ.mandatory?
%span.mandatory *
- if champ.updated_at.present? && seen_at.present?
%span.updated-at{ class: highlight_if_unseen_class(seen_at, champ.updated_at) }
= "modifié le #{try_format_datetime(champ.updated_at)}"
- if champ.rebased_at.present? && champ.rebased_at > (seen_at || champ.updated_at) && current_user.owns_or_invite?(champ.dossier)
%span.updated-at.highlighted
Le type de ce champ où sa description a été modifiée par l'administration. Vérifier son contenu.

13
app/views/shared/dossiers/editable_champs/_editable_champ.html.haml
View file

@ -1,13 +0,0 @@
.editable-champ{ class: "editable-champ-#{champ.type_champ} #{champ.visible? ? '' : 'hidden'}", id: champ.input_group_id, data: editable_champ_controller(champ) }
- if champ.repetition?
%h3.header-subsection= champ.libelle
- if champ.description.present?
%p.notice= string_to_html(champ.description, false)
- elsif has_label?(champ)
= render partial: 'shared/dossiers/editable_champs/champ_label', locals: { form: form, champ: champ, seen_at: defined?(seen_at) ? seen_at : nil }
- if champ.type_champ == "titre_identite"
%p.notice Carte nationale d’identité (uniquement le recto), passeport, titre de séjour ou autre justificatif d’identité. Formats acceptés : jpg/png
= form.hidden_field :id, value: champ.id, data: champ.repetition? ? { id: true } : {}
= render "EditableChamp::#{champ.type_champ.camelcase}Component".constantize.new(form: form, champ: champ)

5
app/views/users/dossiers/update.turbo_stream.haml Normal file
View file

@ -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

10
config/locales/en.yml
View file

@ -137,7 +137,6 @@ en:
edit:
autosave: Your file is automatically saved after each modification. You can close the window at any time and pick up where you left off later.
submit_dossier: Submit the file
save_changes: Save the changes of the file
messages:
form:
send_message: "Send message"
@ -151,9 +150,6 @@ en:
edit_identity: "Edit identity data"
instructeurs:
dossiers:
autosave:
autosave_draft: Your annotations are automatically saved.
autosave_confirmation: Annotations saved
tab_steps:
to_follow: to follow
total: total
@ -192,8 +188,10 @@ en:
dossiers:
archived_dossier: "Your file will be kept %{duree_conservation_dossiers_dans_ds} more months"
autosave:
autosave_draft: Your draft is automatically saved.
autosave_confirmation: Draft saved
explanation: Your file is automatically saved.
confirmation: File saved
draft_explanation: Your draft is automatically saved.
draft_confirmation: Draft saved
more_information: More informations
identite:
identity_data: Identity data

13
config/locales/fr.yml
View file

@ -132,7 +132,6 @@ fr:
edit:
autosave: Votre dossier est enregistré automatiquement après chaque modification. Vous pouvez à tout moment fermer la fenêtre et reprendre plus tard là où vous en étiez.
submit_dossier: Déposer le dossier
save_changes: Enregistrer les modifications du dossier
messages:
form:
send_message: "Envoyer le message"
@ -146,9 +145,6 @@ fr:
edit_identity: "Modifier l’identité"
instructeurs:
dossiers:
autosave:
autosave_draft: Vos annotations sont automatiquement enregistrées.
autosave_confirmation: Annotations enregistrées
tab_steps:
to_follow: à suivre
total: au total
@ -188,10 +184,11 @@ fr:
dossiers:
archived_dossier: "Votre dossier sera conservé %{duree_conservation_dossiers_dans_ds} mois supplémentaire"
autosave:
autosave_draft: Votre brouillon est automatiquement enregistré.
autosave_confirmation: Brouillon enregistré
more_information: More informations
more_infos: En savoir plus
explanation: Votre dossier est automatiquement enregistré.
confirmation: Dossier enregistré
draft_explanation: Votre brouillon est automatiquement enregistré.
draft_confirmation: Brouillon enregistré
more_information: En savoir plus
identite:
identity_data: Données d’identité
civility: Civilité

28
spec/helpers/champ_helper_spec.rb → spec/components/editable_champ/editable_champ_component_spec.rb
View file

@ -1,46 +1,50 @@
describe ChampHelper, type: :helper do
describe EditableChamp::EditableChampComponent, type: :component do
let(:component) { described_class.new(form: nil, champ: champ) }
describe "editable_champ_controller" do
let(:dossier) { create(:dossier) }
let(:champ) { create(:champ, dossier: dossier) }
let(:controllers) { [] }
let(:data) { { controller: controllers.join(' ') } }
let(:data) { controllers.join(' ') }
subject { component.send(:stimulus_controller) }
context 'when an editable champ' do
let(:controllers) { ['autosave'] }
it { expect(editable_champ_controller(champ)).to eq(data) }
it { expect(subject).to eq(data) }
end
context 'when a repetition champ' do
let(:champ) { create(:champ_repetition, dossier: dossier) }
it { expect(editable_champ_controller(champ)).to eq(nil) }
it { expect(subject).to eq(nil) }
end
context 'when a private champ' do
let(:champ) { create(:champ, dossier: dossier, private: true) }
it { expect(editable_champ_controller(champ)).to eq(nil) }
it { expect(subject).to eq('') }
end
context 'when a dossier is en_construction' do
let(:controllers) { ['check-conditions'] }
let(:controllers) { ['autosave'] }
let(:dossier) { create(:dossier, :en_construction) }
it { expect(editable_champ_controller(champ)).to eq(data) }
it { expect(subject).to eq(data) }
context 'when a public dropdown champ' do
let(:controllers) { ['check-conditions', 'champ-dropdown'] }
let(:controllers) { ['autosave', 'champ-dropdown'] }
let(:champ) { create(:champ_drop_down_list, dossier: dossier) }
it { expect(editable_champ_controller(champ)).to eq(data) }
it { expect(subject).to eq(data) }
end
context 'when a private dropdown champ' do
let(:controllers) { ['champ-dropdown'] }
let(:champ) { create(:champ_drop_down_list, dossier: dossier, private: true) }
it { expect(editable_champ_controller(champ)).to eq(data) }
it { expect(subject).to eq(data) }
end
end
@ -48,14 +52,14 @@ describe ChampHelper, type: :helper do
let(:controllers) { ['autosave', 'champ-dropdown'] }
let(:champ) { create(:champ_drop_down_list, dossier: dossier) }
it { expect(editable_champ_controller(champ)).to eq(data) }
it { expect(subject).to eq(data) }
end
context 'when a private dropdown champ' do
let(:controllers) { ['champ-dropdown'] }
let(:champ) { create(:champ_drop_down_list, dossier: dossier, private: true) }
it { expect(editable_champ_controller(champ)).to eq(data) }
it { expect(subject).to eq(data) }
end
end
end

6
spec/controllers/users/dossiers_controller_spec.rb
View file

@ -649,7 +649,7 @@ describe Users::DossiersController, type: :controller do
expect(dossier.reload.state).to eq(Dossier.states.fetch(:en_construction))
end
it { is_expected.to redirect_to(demande_dossier_path(dossier)) }
it { is_expected.to have_http_status(:ok) }
context 'when only a single file champ are modified' do
# A bug in ActiveRecord causes records changed through grand-parent <-> parent <-> child
@ -726,7 +726,7 @@ describe Users::DossiersController, type: :controller do
it 'does not raise any errors' do
subject
expect(response).to redirect_to(demande_dossier_path(dossier))
expect(response).to have_http_status(:ok)
end
end
@ -741,7 +741,7 @@ describe Users::DossiersController, type: :controller do
it { expect(first_champ.reload.value).to eq('beautiful value') }
it { expect(dossier.reload.state).to eq(Dossier.states.fetch(:en_construction)) }
it { expect(response).to redirect_to(demande_dossier_path(dossier)) }
it { expect(response).to have_http_status(:ok) }
end
context 'when the dossier is followed by an instructeur' do

5
spec/system/routing/full_scenario_spec.rb
View file

@ -120,7 +120,8 @@ describe 'The routing', js: true do
click_on 'Modifier mon dossier'
fill_in litteraire_user.dossiers.first.champs.first.libelle, with: 'some value'
click_on 'Enregistrer les modifications du dossier'
blur
expect(page).to have_css('span', text: 'Dossier enregistré', visible: true)
log_out
# the litteraires instructeurs should have a notification
@ -214,7 +215,7 @@ describe 'The routing', js: true do
expect(page).not_to have_selector("option", text: "Groupe inactif")
select(new_group, from: 'dossier_groupe_instructeur_id')
click_on "Enregistrer les modifications du dossier"
expect(page).to have_css('span', text: 'Dossier enregistré', visible: true)
expect(page).to have_text(new_group)
log_out

3
spec/system/users/brouillon_spec.rb
View file

@ -390,6 +390,9 @@ describe 'The user' do
expect(page).to have_no_css('label', text: 'tonnage', visible: true)
fill_in('age', with: '18')
blur
expect(page).to have_css('span', text: 'Dossier enregistré', visible: true)
# the champ keeps their previous value so they are all displayed
expect(page).to have_css('label', text: 'permis de conduire', visible: true)
expect(page).to have_css('label', text: 'tonnage', visible: true)

6
spec/system/users/dossier_details_spec.rb
View file

@ -48,8 +48,10 @@ describe 'Dossier details:' do
expect(page).to have_current_path(dossier_path(dossier))
end
it_behaves_like 'the user can edit the submitted demande'
it_behaves_like 'the user can send messages to the instructeur'
context 'with js', js: true do
it_behaves_like 'the user can edit the submitted demande'
it_behaves_like 'the user can send messages to the instructeur'
end
private

5
spec/system/users/dossier_shared_examples.rb
View file

@ -10,9 +10,12 @@ RSpec.shared_examples 'the user can edit the submitted demande' do
expect(page).to have_current_path(modifier_dossier_path(dossier))
fill_in('Texte obligatoire', with: 'Nouveau texte')
click_on 'Enregistrer les modifications du dossier'
blur
expect(page).to have_css('span', text: 'Dossier enregistré', visible: true)
click_on 'Demande'
expect(page).to have_current_path(demande_dossier_path(dossier))
expect(page).to have_content('Nouveau texte')
end
end

2
spec/system/users/invite_spec.rb
View file

@ -127,7 +127,7 @@ describe 'Invitations' do
expect(page).to have_text("user_invite@exemple.fr")
end
context 'as an invited user' do
context 'as an invited user', js: true do
before do
navigate_to_invited_dossier(invite)
expect(page).to have_current_path(dossier_path(invite.dossier))