Merge pull request #3701 from betagouv/dev

2019-03-28-02
This commit is contained in:
Pierre de La Morinerie 2019-03-28 16:24:55 +01:00 committed by GitHub
commit 9d174cdc3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 221 additions and 25 deletions

View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><g fill="none" fill-rule="evenodd"><path d="M11 6L9 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2v-6" stroke="#0069cc" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M0 0h24v24H0z"/></g><g transform="translate(8 -8)" fill="#0069cc"><rect ry="1" y="12" x="6" height="2" width="10"/><rect width="2" height="10" x="10" y="8" ry="1"/></g></svg>

After

Width:  |  Height:  |  Size: 446 B

View file

@ -137,6 +137,8 @@
position: relative; position: relative;
.dropdown-button { .dropdown-button {
white-space: nowrap;
&::after { &::after {
content: ""; content: "";
margin-left: $default-spacer; margin-left: $default-spacer;
@ -199,7 +201,7 @@
.dropdown-items { .dropdown-items {
li { li {
display: flex; display: flex;
padding: 2 * $default-spacer; padding: $default-padding;
color: $grey; color: $grey;
border-bottom: 1px solid $border-grey; border-bottom: 1px solid $border-grey;
font-size: 12px; font-size: 12px;
@ -219,15 +221,37 @@
background: $light-grey; background: $light-grey;
} }
&.danger {
&:hover {
background-color: $medium-red;
&,
a {
color: $white;
}
.icon {
filter: contrast(0) brightness(100);
}
}
}
&:last-child { &:last-child {
border-bottom: none; border-bottom: none;
} }
a { a {
display: flex;
color: $grey; color: $grey;
} }
// Make child links fill the whole clickable area
> a {
display: flex;
flex-grow: 1;
margin: -$default-padding;
padding: $default-padding;
}
.icon { .icon {
flex-shrink: 0; flex-shrink: 0;
} }

View file

@ -79,8 +79,4 @@
.follow-col { .follow-col {
width: 200px; width: 200px;
} }
.delete-col {
width: 150px;
}
} }

View file

@ -31,6 +31,10 @@
background-image: image-url("icons/folder.svg"); background-image: image-url("icons/folder.svg");
} }
&.new-folder {
background-image: image-url("icons/new-folder.svg");
}
&.accept { &.accept {
background-image: image-url("icons/accept.svg"); background-image: image-url("icons/accept.svg");
} }

View file

@ -0,0 +1,6 @@
.user-dossier-actions {
.dropdown-description {
font-size: 14px;
align-self: center;
}
}

View file

@ -269,7 +269,7 @@ class Admin::ProceduresController < AdminController
end end
def procedure_params def procedure_params
editable_params = [:libelle, :description, :organisation, :direction, :lien_site_web, :cadre_juridique, :deliberation, :notice, :web_hook_url, :euro_flag, :logo, :auto_archive_on] editable_params = [:libelle, :description, :organisation, :direction, :lien_site_web, :cadre_juridique, :deliberation, :notice, :expects_multiple_submissions, :web_hook_url, :euro_flag, :logo, :auto_archive_on]
if @procedure&.locked? if @procedure&.locked?
params.require(:procedure).permit(*editable_params) params.require(:procedure).permit(*editable_params)
else else

View file

@ -134,7 +134,7 @@ module Gestionnaires
end end
def avis_params def avis_params
params.require(:avis).permit(:answer) params.require(:avis).permit(:answer, :piece_justificative_file)
end end
def commentaire_params def commentaire_params

View file

@ -1,10 +1,13 @@
class Avis < ApplicationRecord class Avis < ApplicationRecord
include EmailSanitizableConcern include EmailSanitizableConcern
include VirusScanConcern
belongs_to :dossier, touch: true belongs_to :dossier, touch: true
belongs_to :gestionnaire belongs_to :gestionnaire
belongs_to :claimant, class_name: 'Gestionnaire' belongs_to :claimant, class_name: 'Gestionnaire'
has_one_attached :piece_justificative_file
validates :email, format: { with: Devise.email_regexp, message: "n'est pas valide" }, allow_nil: true validates :email, format: { with: Devise.email_regexp, message: "n'est pas valide" }, allow_nil: true
validates :claimant, presence: true validates :claimant, presence: true
@ -19,6 +22,9 @@ class Avis < ApplicationRecord
scope :by_latest, -> { order(updated_at: :desc) } scope :by_latest, -> { order(updated_at: :desc) }
scope :updated_since?, -> (date) { where('avis.updated_at > ?', date) } scope :updated_since?, -> (date) { where('avis.updated_at > ?', date) }
after_commit :create_avis_virus_scan
after_initialize { add_virus_scan_on(self.piece_justificative_file) }
# The form allows subtmitting avis requests to several emails at once, # The form allows subtmitting avis requests to several emails at once,
# hence this virtual attribute. # hence this virtual attribute.
attr_accessor :emails attr_accessor :emails
@ -48,4 +54,8 @@ class Avis < ApplicationRecord
self.email = nil self.email = nil
end end
end end
def create_avis_virus_scan
create_virus_scan(self.piece_justificative_file)
end
end end

View file

@ -0,0 +1,21 @@
module VirusScanConcern
extend ActiveSupport::Concern
attr_reader :attachment_attribute
def add_virus_scan_on(piece_justificative)
@attachment_attribute = piece_justificative
end
def virus_scan
VirusScan.find_by(blob_key: self.attachment_attribute.blob.key)
end
def create_virus_scan(piece_justificative)
if piece_justificative&.attachment&.blob.present?
VirusScan.find_or_create_by!(blob_key: piece_justificative.blob.key) do |virus_scan|
virus_scan.status = VirusScan.statuses.fetch(:pending)
end
end
end
end

View file

@ -123,6 +123,10 @@ class Procedure < ApplicationRecord
publiee_ou_archivee? publiee_ou_archivee?
end end
def accepts_new_dossiers?
!archivee?
end
# This method is needed for transition. Eventually this will be the same as brouillon?. # This method is needed for transition. Eventually this will be the same as brouillon?.
def brouillon_avec_lien? def brouillon_avec_lien?
brouillon? && path.present? brouillon? && path.present?

View file

@ -17,6 +17,11 @@ class CarrierwaveActiveStorageMigrationService
def active_storage_openstack_client! def active_storage_openstack_client!
service = ActiveStorage::Blob.service service = ActiveStorage::Blob.service
if defined?(ActiveStorage::Service::DsProxyService) &&
service.is_a?(ActiveStorage::Service::DsProxyService)
service = service.wrapped
end
if !defined?(ActiveStorage::Service::OpenStackService) || if !defined?(ActiveStorage::Service::OpenStackService) ||
!service.is_a?(ActiveStorage::Service::OpenStackService) !service.is_a?(ActiveStorage::Service::OpenStackService)
raise StandardError, 'ActiveStorage must be backed by OpenStack' raise StandardError, 'ActiveStorage must be backed by OpenStack'

View file

@ -116,6 +116,15 @@
.col-md-6 .col-md-6
%h4 Options avancées %h4 Options avancées
= f.label :expects_multiple_submissions do
= f.check_box :expects_multiple_submissions
Ajuster pour le dépôt récurrent de dossiers
%p.help-block
%i.fa.fa-info-circle
Si cette démarche est conçue pour quune même personne y dépose régulièrement plusieurs
dossiers, linterface est ajustée pour rendre plus facile la création de plusieurs dossiers
à la suite.
- if Flipflop.web_hook? - if Flipflop.web_hook?
%label{ for: :web_hook_url } Lien de rappel HTTP (webhook) %label{ for: :web_hook_url } Lien de rappel HTTP (webhook)
= f.text_field :web_hook_url, class: 'form-control', placeholder: 'https://callback.exemple.fr/' = f.text_field :web_hook_url, class: 'form-control', placeholder: 'https://callback.exemple.fr/'

View file

@ -13,6 +13,8 @@
= form_for @avis, url: gestionnaire_avis_path(@avis), html: { class: 'form' } do |f| = form_for @avis, url: gestionnaire_avis_path(@avis), html: { class: 'form' } do |f|
= f.text_area :answer, rows: 3, placeholder: 'Votre avis', required: true = f.text_area :answer, rows: 3, placeholder: 'Votre avis', required: true
= render partial: "shared/piece_jointe/pj_upload_field", locals: { pj: @avis.piece_justificative_file, object: @avis, form: f }
.flex.justify-between.align-baseline .flex.justify-between.align-baseline
%p.confidentiel.flex %p.confidentiel.flex
- if @avis.confidentiel? - if @avis.confidentiel?

View file

@ -28,4 +28,5 @@
Réponse donnée le #{l(avis.updated_at, format: '%d/%m/%y à %H:%M')} Réponse donnée le #{l(avis.updated_at, format: '%d/%m/%y à %H:%M')}
- else - else
%span.waiting En attente de réponse %span.waiting En attente de réponse
= render partial: 'shared/piece_jointe/pj_link', locals: { object: avis, pj: avis.piece_justificative_file }
%p= avis.answer %p= avis.answer

View file

@ -7,6 +7,7 @@
%span.icon.archive %span.icon.archive
%span.icon.unarchive %span.icon.unarchive
%span.icon.folder %span.icon.folder
%span.icon.new-folder
%span.icon.accept %span.icon.accept
%span.icon.refuse %span.icon.refuse
%span.icon.without-continuation %span.icon.without-continuation

View file

@ -0,0 +1,20 @@
- if pj.attached?
.pj-link
- if object.virus_scan.blank? || object.virus_scan.safe?
= link_to url_for(pj), target: '_blank', title: "Télécharger la pièce jointe" do
%span.icon.attachment
= pj.filename.to_s
- if object.virus_scan.blank?
(ce fichier na pas été analysé par notre antivirus, téléchargez-le avec précaution)
- else
= pj.filename.to_s
- if object.virus_scan.pending?
(analyse antivirus en cours
= link_to "rafraichir", request.path
)
- elsif object.virus_scan.infected?
- if user_can_upload
(virus détecté, merci denvoyer un autre fichier)
- else
(virus détecté, le téléchargement de ce fichier est bloqué)

View file

@ -0,0 +1,12 @@
.piece-justificative
- if pj.attached?
.piece-justificative-actions{ id: "piece_justificative_#{object.id}" }
.piece-justificative-action
= render partial: "shared/piece_jointe/pj_link", locals: { object: object, pj: object.piece_justificative_file, user_can_upload: true }
.piece-justificative-action
= button_tag 'Remplacer', type: 'button', class: 'button small', data: { 'toggle-target': "#champs_#{object.id}" }
= form.file_field :piece_justificative_file,
id: "champs_#{object.id}",
class: "piece-justificative-input #{'hidden' if pj.attached?}",
direct_upload: true

View file

@ -0,0 +1,24 @@
- has_delete_action = dossier.can_be_deleted_by_user?
- has_new_dossier_action = dossier.procedure.expects_multiple_submissions? && dossier.procedure.accepts_new_dossiers?
- has_actions = has_delete_action || has_new_dossier_action
- if has_actions
%span.dropdown.user-dossier-actions
%button.button.dropdown-button
Actions
.dropdown-content.fade-in-down
%ul.dropdown-items
- if has_new_dossier_action
%li
= link_to procedure_lien(dossier.procedure) do
%span.icon.new-folder
.dropdown-description
Commencer un autre dossier
- if has_delete_action
%li.danger
= link_to ask_deletion_dossier_path(dossier), method: :post, data: { disable: true, confirm: "En continuant, vous allez supprimer ce dossier ainsi que les informations quil contient. Toute suppression entraine lannulation de la démarche en cours.\n\nConfirmer la suppression ?" } do
%span.icon.delete
.dropdown-description
Supprimer le dossier

View file

@ -32,7 +32,7 @@
%th %th
%tbody %tbody
- @dossiers.each do |dossier| - @dossiers.each do |dossier|
%tr %tr{ data: { 'dossier-id': dossier.id } }
%td.folder-col %td.folder-col
= link_to(url_for_dossier(dossier), class: 'cell-link') do = link_to(url_for_dossier(dossier), class: 'cell-link') do
%span.icon.folder %span.icon.folder
@ -48,11 +48,8 @@
%td.updated-at-col %td.updated-at-col
= link_to(url_for_dossier(dossier), class: 'cell-link') do = link_to(url_for_dossier(dossier), class: 'cell-link') do
= dossier.updated_at.strftime("%d/%m/%Y") = dossier.updated_at.strftime("%d/%m/%Y")
%td.action-col.delete-col %td.action-col.action-col
- if dossier.can_be_deleted_by_user? = render partial: 'dossier_actions', locals: { dossier: dossier }
= link_to(ask_deletion_dossier_path(dossier), method: :post, class: 'button danger', data: { disable: true, confirm: "En continuant, vous allez supprimer ce dossier ainsi que les informations quil contient. Toute suppression entraine lannulation de la démarche en cours.\n\nConfirmer la suppression ?" }) do
%span.icon.delete
Supprimer
= paginate(@dossiers) = paginate(@dossiers)
- if current_user.feedbacks.empty? || current_user.feedbacks.last.created_at < 1.month.ago - if current_user.feedbacks.empty? || current_user.feedbacks.last.created_at < 1.month.ago

View file

@ -0,0 +1,5 @@
class AddExpectsMultipleSubmissionsColumnToProcedure < ActiveRecord::Migration[5.2]
def change
add_column :procedures, :expects_multiple_submissions, :boolean, default: false, null: false
end
end

View file

@ -10,7 +10,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 2019_03_18_154812) do ActiveRecord::Schema.define(version: 2019_03_27_102357) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"
@ -478,6 +478,7 @@ ActiveRecord::Schema.define(version: 2019_03_18_154812) do
t.boolean "juridique_required", default: true t.boolean "juridique_required", default: true
t.boolean "durees_conservation_required", default: true t.boolean "durees_conservation_required", default: true
t.string "path" t.string "path"
t.boolean "expects_multiple_submissions", default: false, null: false
t.index ["hidden_at"], name: "index_procedures_on_hidden_at" t.index ["hidden_at"], name: "index_procedures_on_hidden_at"
t.index ["parent_procedure_id"], name: "index_procedures_on_parent_procedure_id" t.index ["parent_procedure_id"], name: "index_procedures_on_parent_procedure_id"
t.index ["service_id"], name: "index_procedures_on_service_id" t.index ["service_id"], name: "index_procedures_on_service_id"

View file

@ -53,6 +53,7 @@ describe Gestionnaires::AvisController, type: :controller do
end end
describe '#update' do describe '#update' do
describe 'without attachment' do
before do before do
patch :update, params: { id: avis_without_answer.id, avis: { answer: 'answer' } } patch :update, params: { id: avis_without_answer.id, avis: { answer: 'answer' } }
avis_without_answer.reload avis_without_answer.reload
@ -60,8 +61,23 @@ describe Gestionnaires::AvisController, type: :controller do
it { expect(response).to redirect_to(instruction_gestionnaire_avis_path(avis_without_answer)) } it { expect(response).to redirect_to(instruction_gestionnaire_avis_path(avis_without_answer)) }
it { expect(avis_without_answer.answer).to eq('answer') } it { expect(avis_without_answer.answer).to eq('answer') }
it { expect(avis_without_answer.piece_justificative_file).to_not be_attached }
it { expect(flash.notice).to eq('Votre réponse est enregistrée.') } it { expect(flash.notice).to eq('Votre réponse est enregistrée.') }
end end
describe 'with attachment' do
let(:file) { Rack::Test::UploadedFile.new("./spec/fixtures/files/piece_justificative_0.pdf", 'application/pdf') }
before do
post :update, params: { id: avis_without_answer.id, avis: { answer: 'answer', piece_justificative_file: file } }
avis_without_answer.reload
end
it { expect(response).to redirect_to(instruction_gestionnaire_avis_path(avis_without_answer)) }
it { expect(avis_without_answer.answer).to eq('answer') }
it { expect(avis_without_answer.piece_justificative_file).to be_attached }
it { expect(flash.notice).to eq('Votre réponse est enregistrée.') }
end
end
describe '#create_commentaire' do describe '#create_commentaire' do
let(:file) { nil } let(:file) { nil }

View file

@ -71,11 +71,15 @@ describe 'user access to the list of their dossiers' do
context 'when user clicks on delete button', js: true do context 'when user clicks on delete button', js: true do
scenario 'the dossier is deleted' do scenario 'the dossier is deleted' do
within(:css, "tr[data-dossier-id=\"#{dossier_brouillon.id}\"]") do
click_on 'Actions'
page.accept_alert('Confirmer la suppression ?') do page.accept_alert('Confirmer la suppression ?') do
find(:xpath, "//a[@href='#{ask_deletion_dossier_path(dossier_brouillon)}']").click click_on 'Supprimer le dossier'
end
end end
expect(page).to have_content('Votre dossier a bien été supprimé.') expect(page).to have_content('Votre dossier a bien été supprimé.')
expect(page).not_to have_content(dossier_brouillon.procedure.libelle)
end end
end end
end end

View file

@ -0,0 +1,33 @@
describe 'users/dossiers/dossier_actions.html.haml', type: :view do
let(:procedure) { create(:procedure, :published, expects_multiple_submissions: true) }
let(:dossier) { create(:dossier, :en_construction, procedure: procedure) }
subject { render 'users/dossiers/dossier_actions.html.haml', dossier: dossier }
it { is_expected.to have_link('Commencer un autre dossier', href: commencer_url(path: procedure.path)) }
it { is_expected.to have_link('Supprimer le dossier', href: ask_deletion_dossier_path(dossier)) }
context 'when the dossier cannot be deleted' do
let(:dossier) { create(:dossier, :accepte, procedure: procedure) }
it { is_expected.not_to have_link('Supprimer le dossier') }
end
context 'when the procedure doesnt expect multiple submissions' do
let(:procedure) { create(:procedure, :published, expects_multiple_submissions: false) }
it { is_expected.not_to have_link('Commencer un autre dossier') }
end
context 'when the procedure is closed' do
let(:procedure) { create(:procedure, :archived, expects_multiple_submissions: true) }
it { is_expected.not_to have_link('Commencer un autre dossier') }
end
context 'when there are no actions to display' do
let(:procedure) { create(:procedure, :published, expects_multiple_submissions: false) }
let(:dossier) { create(:dossier, :accepte, procedure: procedure) }
it 'doesnt render the menu at all' do
expect(subject).not_to have_selector('.dropdown')
end
end
end