+ return `
`;
diff --git a/app/javascript/shared/utils.js b/app/javascript/shared/utils.js
index 26603d954..d360af45f 100644
--- a/app/javascript/shared/utils.js
+++ b/app/javascript/shared/utils.js
@@ -13,8 +13,14 @@ export function hide(el) {
el && el.classList.add('hidden');
}
-export function toggle(el) {
- el && el.classList.toggle('hidden');
+export function toggle(el, force) {
+ if (force == undefined) {
+ el & el.classList.toggle('hidden');
+ } else if (force) {
+ el && el.classList.remove('hidden');
+ } else {
+ el && el.classList.add('hidden');
+ }
}
export function enable(el) {
diff --git a/app/views/champs/piece_justificative/show.js.erb b/app/views/champs/piece_justificative/show.js.erb
new file mode 100644
index 000000000..e921f9556
--- /dev/null
+++ b/app/views/champs/piece_justificative/show.js.erb
@@ -0,0 +1,17 @@
+<% dossier = @champ.dossier %>
+
+<%= fields_for dossier do |form| %>
+ <%= form.fields_for :champs, dossier.champs.where(id: @champ.id), include_id: false do |champ_form| %>
+ <% render_to_element(".editable-champ[data-champ-id=\"#{@champ.id}\"]",
+ partial: 'shared/dossiers/editable_champs/editable_champ',
+ locals: {
+ champ: @champ,
+ form: champ_form
+ }) %>
+ <% end %>
+<% end %>
+
+<% attachment = @champ.piece_justificative_file.attachment %>
+<% if attachment.virus_scanner.pending? %>
+ <%= fire_event('attachment:update', { url: attachment_url(attachment.id, { signed_id: attachment.blob.signed_id, user_can_upload: true }) }.to_json ) %>
+<% end %>
diff --git a/app/views/root/patron.html.haml b/app/views/root/patron.html.haml
index 507cb1ee1..0a66b983d 100644
--- a/app/views/root/patron.html.haml
+++ b/app/views/root/patron.html.haml
@@ -32,6 +32,7 @@
%span.icon.phone
%span.icon.clock
%span.icon.preview
+ %span.icon.retry
%span.icon.download
%span.icon.download-white
%span.icon.move-handle
diff --git a/app/views/shared/attachment/_edit.html.haml b/app/views/shared/attachment/_edit.html.haml
index e250fd6e8..9c4cfbd35 100644
--- a/app/views/shared/attachment/_edit.html.haml
+++ b/app/views/shared/attachment/_edit.html.haml
@@ -22,7 +22,17 @@
.attachment-action
= button_tag 'Remplacer', type: 'button', class: 'button small', data: { 'toggle-target': ".attachment-input-#{attachment_id}" }
+ .attachment-error.hidden
+ .attachment-error-message
+ %p.attachment-error-title
+ Une erreur s’est produite pendant l’envoi du fichier.
+ %p.attachment-error-description
+ = button_tag type: 'button', class: 'button attachment-error-retry', data: { 'input-target': ".attachment-input-#{attachment_id}" } do
+ %span.icon.retry
+ Ré-essayer
+
= form.file_field attached_file.name,
class: "attachment-input attachment-input-#{attachment_id} #{'hidden' if persisted}",
accept: accept,
- direct_upload: true
+ direct_upload: true,
+ data: { 'auto-attach-url': auto_attach_url(form, form.object) }
diff --git a/app/views/shared/dossiers/editable_champs/_editable_champ.html.haml b/app/views/shared/dossiers/editable_champs/_editable_champ.html.haml
index 1d7b79355..a446bf5f7 100644
--- a/app/views/shared/dossiers/editable_champs/_editable_champ.html.haml
+++ b/app/views/shared/dossiers/editable_champs/_editable_champ.html.haml
@@ -1,4 +1,4 @@
-.editable-champ{ class: "editable-champ-#{champ.type_champ}" }
+.editable-champ{ class: "editable-champ-#{champ.type_champ}", data: { 'champ-id': champ.id } }
- if champ.repetition?
%h3.header-subsection= champ.libelle
- if champ.description.present?
diff --git a/config/initializers/flipper.rb b/config/initializers/flipper.rb
index d434f6a72..e19f6e978 100644
--- a/config/initializers/flipper.rb
+++ b/config/initializers/flipper.rb
@@ -31,6 +31,7 @@ features = [
:insee_api_v3,
:instructeur_bypass_email_login_token,
:autosave_dossier_draft,
+ :autoupload_dossier_attachments,
:maintenance_mode,
:mini_profiler,
:operation_log_serialize_subject,
diff --git a/config/routes.rb b/config/routes.rb
index c3cb95419..112a71b5b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -119,6 +119,7 @@ Rails.application.routes.draw do
get ':position/dossier_link', to: 'dossier_link#show', as: :dossier_link
post ':position/carte', to: 'carte#show', as: :carte
post ':position/repetition', to: 'repetition#show', as: :repetition
+ put ':position/piece_justificative', to: 'piece_justificative#update', as: :piece_justificative
end
get 'attachments/:id', to: 'attachments#show', as: :attachment
diff --git a/spec/controllers/champs/piece_justificative_controller_spec.rb b/spec/controllers/champs/piece_justificative_controller_spec.rb
new file mode 100644
index 000000000..493d4d46f
--- /dev/null
+++ b/spec/controllers/champs/piece_justificative_controller_spec.rb
@@ -0,0 +1,65 @@
+describe Champs::PieceJustificativeController, type: :controller do
+ let(:user) { create(:user) }
+ let(:procedure) { create(:procedure, :published, :with_piece_justificative) }
+ let(:dossier) { create(:dossier, user: user, procedure: procedure) }
+ let(:champ) { dossier.champs.first }
+
+ describe '#update' do
+ render_views
+ before { sign_in user }
+
+ subject do
+ put :update, params: {
+ position: '1',
+ champ_id: champ.id,
+ blob_signed_id: file
+ }, format: 'js'
+ end
+
+ context 'when the file is valid' do
+ let(:file) { Rack::Test::UploadedFile.new('spec/fixtures/files/piece_justificative_0.pdf', 'application/pdf') }
+
+ it 'attach the file' do
+ subject
+ champ.reload
+ expect(champ.piece_justificative_file.attached?).to be true
+ expect(champ.piece_justificative_file.filename).to eq('piece_justificative_0.pdf')
+ end
+
+ it 'renders the attachment template as Javascript' do
+ subject
+ expect(response.status).to eq(200)
+ expect(response.body).to include("editable-champ[data-champ-id=\"#{champ.id}\"]")
+ end
+ end
+
+ context 'when the file is invalid' do
+ let(:file) { Rack::Test::UploadedFile.new('spec/fixtures/files/invalid_file_format.json', 'application/json') }
+
+ # TODO: for now there are no validators on the champ piece_justificative_file,
+ # so we have to mock a failing validation.
+ # Once the validators will be enabled, remove those mocks, and let the usual
+ # validation fail naturally.
+ #
+ # See https://github.com/betagouv/demarches-simplifiees.fr/issues/4926
+ before do
+ champ
+ expect_any_instance_of(Champs::PieceJustificativeChamp).to receive(:save).and_return(false)
+ expect_any_instance_of(Champs::PieceJustificativeChamp).to receive(:errors)
+ .and_return(double(full_messages: ['La pièce justificative n’est pas d’un type accepté']))
+ end
+
+ it 'doesn’t attach the file' do
+ subject
+ expect(champ.reload.piece_justificative_file.attached?).to be false
+ end
+
+ it 'renders an error' do
+ subject
+ expect(response.status).to eq(422)
+ expect(response.header['Content-Type']).to include('application/json')
+ expect(JSON.parse(response.body)).to eq({ 'errors' => ['La pièce justificative n’est pas d’un type accepté'] })
+ end
+ end
+ end
+end
diff --git a/spec/features/users/brouillon_spec.rb b/spec/features/users/brouillon_spec.rb
index 2b45260b4..cd992974f 100644
--- a/spec/features/users/brouillon_spec.rb
+++ b/spec/features/users/brouillon_spec.rb
@@ -5,9 +5,6 @@ feature 'The user' do
let!(:procedure) { create(:procedure, :published, :for_individual, :with_all_champs_mandatory) }
let(:user_dossier) { user.dossiers.first }
- # TODO: check
- # the order
- # there are no extraneous input
scenario 'fill a dossier', js: true, vcr: { cassette_name: 'api_geo_departements_regions_et_communes' } do
log_in(user, procedure)
@@ -160,6 +157,14 @@ feature 'The user' do
create(:procedure, :published, :for_individual, types_de_champ: tdcs)
end
+ let(:procedure_with_pjs) do
+ tdcs = [
+ create(:type_de_champ_piece_justificative, mandatory: true, libelle: 'Pièce justificative 1', order_place: 1),
+ create(:type_de_champ_piece_justificative, mandatory: true, libelle: 'Pièce justificative 2', order_place: 2)
+ ]
+ create(:procedure, :published, :for_individual, types_de_champ: tdcs)
+ end
+
scenario 'adding, replacing and removing attachments', js: true do
log_in(user, procedure_with_pj)
fill_individual
@@ -191,6 +196,85 @@ feature 'The user' do
expect(page).to have_no_text('RIB.pdf')
end
+ context 'when the auto-uploads of attachments is enabled' do
+ before do
+ Flipper.enable_actor(:autoupload_dossier_attachments, user)
+ end
+
+ scenario 'add an attachment', js: true do
+ log_in(user, procedure_with_pjs)
+ fill_individual
+
+ # Add attachments
+ find_field('Pièce justificative 1').attach_file(Rails.root + 'spec/fixtures/files/file.pdf')
+ find_field('Pièce justificative 2').attach_file(Rails.root + 'spec/fixtures/files/RIB.pdf')
+
+ # Expect the files to be uploaded immediately
+ expect(page).to have_text('analyse antivirus en cours', count: 2)
+ expect(page).to have_text('file.pdf')
+ expect(page).to have_text('RIB.pdf')
+
+ # Expect the submit buttons to be enabled
+ expect(page).to have_button('Enregistrer le brouillon', disabled: false)
+ expect(page).to have_button('Déposer le dossier', disabled: false)
+
+ # Reload the current page
+ visit current_path
+
+ # Expect the files to have been saved on the dossier
+ expect(page).to have_text('file.pdf')
+ expect(page).to have_text('RIB.pdf')
+ end
+
+ # TODO: once we're running on Rails 6, re-enable the validator on PieceJustificativeChamp,
+ # and unmark this spec as pending.
+ #
+ # See piece_justificative_champ.rb
+ # See https://github.com/betagouv/demarches-simplifiees.fr/issues/4926
+ scenario 'add an invalid attachment', js: true, pending: true do
+ log_in(user, procedure_with_pjs)
+ fill_individual
+
+ # Test invalid file type
+ attach_file('Pièce justificative 1', Rails.root + 'spec/fixtures/files/invalid_file_format.json')
+ expect(page).to have_text('La pièce justificative n’est pas d’un type accepté')
+ expect(page).to have_no_button('Ré-essayer', visible: true)
+
+ # Replace the file by another with a valid type
+ attach_file('Pièce justificative 1', Rails.root + 'spec/fixtures/files/piece_justificative_0.pdf')
+ expect(page).to have_no_text('La pièce justificative n’est pas d’un type accepté')
+ expect(page).to have_text('analyse antivirus en cours')
+ expect(page).to have_text('piece_justificative_0.pdf')
+ end
+
+ scenario 'retry on transcient upload error', js: true do
+ log_in(user, procedure_with_pjs)
+ fill_individual
+
+ # Test auto-upload failure
+ logout(:user) # Make the subsequent auto-upload request fail
+ attach_file('Pièce justificative 1', Rails.root + 'spec/fixtures/files/file.pdf')
+ expect(page).to have_text('Une erreur s’est produite pendant l’envoi du fichier')
+ expect(page).to have_button('Ré-essayer', visible: true)
+ expect(page).to have_button('Enregistrer le brouillon', disabled: false)
+ expect(page).to have_button('Déposer le dossier', disabled: false)
+
+ # Test that retrying after a failure works
+ login_as(user, scope: :user) # Make the auto-upload request work again
+ click_on('Ré-essayer', visible: true)
+ expect(page).to have_text('analyse antivirus en cours')
+ expect(page).to have_text('file.pdf')
+ expect(page).to have_button('Enregistrer le brouillon', disabled: false)
+ expect(page).to have_button('Déposer le dossier', disabled: false)
+
+ # Reload the current page
+ visit current_path
+
+ # Expect the file to have been saved on the dossier
+ expect(page).to have_text('file.pdf')
+ end
+ end
+
context 'when the draft autosave is enabled' do
before do
Flipper.enable_actor(:autosave_dossier_draft, user)
diff --git a/spec/fixtures/files/invalid_file_format.json b/spec/fixtures/files/invalid_file_format.json
new file mode 100644
index 000000000..d3efb6fc9
--- /dev/null
+++ b/spec/fixtures/files/invalid_file_format.json
@@ -0,0 +1,3 @@
+{
+ "text": "The format of this attachment is rejected by most uploaders."
+}