refactor(attachment): use new components

2022-05-06 12:24:01 +02:00 · 2022-05-06 12:24:01 +02:00 · bc77390cfe
commit bc77390cfe
parent 2ce389d474
17 changed files with 23 additions and 29 deletions
--- a/app/components/dossiers/message_component/message_component.html.haml
+++ b/app/components/dossiers/message_component/message_component.html.haml
@ -18,7 +18,7 @@

    - if commentaire.piece_jointe.attached?
      .attachment-link
-        = render partial: "shared/attachment/show", locals: { attachment: commentaire.piece_jointe.attachment }
+        = render Attachment::ShowComponent.new(attachment: commentaire.piece_jointe.attachment)

    - if show_reply_button?
      = button_tag type: 'button', class: 'button small message-answer-button', onclick: 'document.querySelector("#commentaire_body").focus()' do
--- a/app/views/administrateurs/attestation_templates/_informations.html.haml
+++ b/app/views/administrateurs/attestation_templates/_informations.html.haml
@ -25,7 +25,7 @@
          = tag[:description]

 %h3.header-subsection Logo de l'attestation
-= image_upload_and_render f, @attestation_template.logo, false
+= render Attachment::EditComponent.image(f, @attestation_template.logo, false)

 %p.notice
  Formats acceptés : JPG / JPEG / PNG.
@ -33,7 +33,7 @@
  Dimensions conseillées : au minimum 500 px de largeur ou de hauteur, poids maximum : 0,5 Mo.

 %h3.header-subsection Tampon de l'attestation
-= image_upload_and_render f, @attestation_template.signature, false
+= render Attachment::EditComponent.image(f, @attestation_template.signature, false)

 %p.notice
  Formats acceptés : JPG / JPEG / PNG.
--- a/app/views/administrateurs/procedures/_informations.html.haml
+++ b/app/views/administrateurs/procedures/_informations.html.haml
@ -20,7 +20,7 @@
  = f.select :zone_id, grouped_options_for_zone

 %h3.header-subsection Logo de la démarche
-= image_upload_and_render f, @procedure.logo
+= render Attachment::EditComponent.image(f, @procedure.logo)

 %h3.header-subsection Conservation des données
 = f.label :duree_conservation_dossiers_dans_ds do
@ -55,7 +55,7 @@
 = f.text_field :cadre_juridique, class: 'form-control', placeholder: 'https://www.legifrance.gouv.fr/'

 = f.label :deliberation, 'Importer le texte'
-= text_upload_and_render f, @procedure.deliberation
+= render Attachment::EditComponent.text(f, @procedure.deliberation)

 %h3.header-subsection
  RGPD
@ -73,7 +73,7 @@
 %p.notice
  Formats acceptés : .doc, .odt, .pdf, .ppt, .pptx
 - notice = @procedure.notice
-= text_upload_and_render f, @procedure.notice
+= render Attachment::EditComponent.text(f, @procedure.notice)

 - if !@procedure.locked?
  %h3.header-subsection À qui s’adresse ma démarche ?
--- a/app/views/experts/avis/instruction.html.haml
+++ b/app/views/experts/avis/instruction.html.haml
@ -12,12 +12,12 @@
    %p.introduction= @avis.introduction

    - if @avis.introduction_file.attached?
-      = render partial: 'shared/attachment/show', locals: { attachment: @avis.introduction_file.attachment }
+      = render Attachment::ShowComponent.new(attachment: @avis.introduction_file.attachment)
    %br/

    = form_for @avis, url: expert_avis_path(@avis.procedure, @avis), html: { class: 'form', data: { persisted_content_id: @avis.id } } do |f|
      = f.text_area :answer, rows: 3, placeholder: 'Votre avis', required: true, class: 'persisted-input'
-      = text_upload_and_render f, @avis.piece_justificative_file
+      = render Attachment::EditComponent.text(f, @avis.piece_justificative_file)

      .flex.justify-between.align-baseline
        %p.confidentiel.flex
--- a/app/views/experts/avis/shared/avis/_form.html.haml
+++ b/app/views/experts/avis/shared/avis/_form.html.haml
@ -7,7 +7,7 @@
    = f.text_area :introduction, rows: 3, value: avis.introduction || 'Bonjour, merci de me donner votre avis sur ce dossier.', required: true
    %p.tab-title Ajouter une pièce jointe
    .form-group
-      = text_upload_and_render f, avis.introduction_file
+      = render Attachment::EditComponent.text(f, avis.introduction_file)

    - if linked_dossiers.present?
      = f.check_box :invite_linked_dossiers, {}, true, false
--- a/app/views/experts/shared/avis/_form.html.haml
+++ b/app/views/experts/shared/avis/_form.html.haml
@ -14,7 +14,7 @@
      = f.text_area :introduction, rows: 3, value: avis.introduction || 'Bonjour, merci de me donner votre avis sur ce dossier.', required: true, class: 'persisted-input'
      %p.tab-title Ajouter une pièce jointe
      .form-group
-        = text_upload_and_render f, avis.introduction_file
+        = render Attachment::EditComponent.text(f, avis.introduction_file)

      - if linked_dossiers.present?
        = f.check_box :invite_linked_dossiers, {}, true, false
--- a/app/views/experts/shared/avis/_list.html.haml
+++ b/app/views/experts/shared/avis/_list.html.haml
@ -33,6 +33,6 @@
                  %span.waiting
                    = t('en_attente', scope: 'views.shared.avis')
              - if avis.piece_justificative_file.attached?
-                = render partial: 'shared/attachment/show', locals: { attachment: avis.piece_justificative_file.attachment }
+                = render Attachment::ShowComponent.new(attachment: avis.piece_justificative_file.attachment)
              .answer-body
                = simple_format(avis.answer)
--- a/app/views/instructeurs/avis/instruction.html.haml
+++ b/app/views/instructeurs/avis/instruction.html.haml
@ -12,12 +12,12 @@
    %p.introduction= @avis.introduction

    - if @avis.introduction_file.attached?
-      = render partial: 'shared/attachment/show', locals: { attachment: @avis.introduction_file.attachment }
+      = render Attachment::ShowComponent.new(attachment: @avis.introduction_file.attachment)
    %br/

    = form_for @avis, url: instructeur_avis_path(@avis.procedure, @avis), html: { class: 'form' } do |f|
      = f.text_area :answer, rows: 3, placeholder: 'Votre avis', required: true
-      = text_upload_and_render f, @avis.piece_justificative_file
+      = render Attachment::EditComponent.text(f, @avis.piece_justificative_file)

      .flex.justify-between.align-baseline
        %p.confidentiel.flex
--- a/app/views/instructeurs/procedures/email_usagers.html.haml
+++ b/app/views/instructeurs/procedures/email_usagers.html.haml
@ -26,7 +26,7 @@
                %p= message.body
                .answer.flex.align-start
                  - if message.piece_jointe.present?
-                    = render partial: 'shared/attachment/show', locals: { attachment: message.piece_jointe.attachment }
+                    = render Attachment::ShowComponent.new(attachment: message.piece_jointe.attachment)
  - else
    .page-title.center
      %h2 Il n'y a aucun dossier en brouillon dans vos groupes instructeurs
--- a/app/views/instructeurs/procedures/show.html.haml
+++ b/app/views/instructeurs/procedures/show.html.haml
@ -63,7 +63,7 @@
          = render partial: "dossiers_filter", locals: { procedure: @procedure, procedure_presentation: @procedure_presentation, current_filters: @current_filters, statut: @statut, displayed_fields_options: @displayed_fields_options }
        - if @dossiers_count > 0
          .dossiers-export
-            = render partial: "dossiers_export", locals: { procedure: @procedure, exports: @exports, statut: @statut, count: @dossiers_count }
+            = render Dossiers::ExportComponent.new(procedure: @procedure, exports: @exports, statut: @statut, count: @dossiers_count)

      %table.table.dossiers-table.hoverable
        %thead
--- a/app/views/instructeurs/shared/avis/_form.html.haml
+++ b/app/views/instructeurs/shared/avis/_form.html.haml
@ -21,7 +21,7 @@
    = f.text_area :introduction, rows: 3, value: avis.introduction || 'Bonjour, merci de me donner votre avis sur ce dossier.', required: true, class: "persisted-input"
    %p.tab-title Ajouter une pièce jointe
    .form-group
-      = text_upload_and_render f, avis.introduction_file
+      = render Attachment::EditComponent.text(f, avis.introduction_file)

    - if linked_dossiers.present?
      = f.check_box :invite_linked_dossiers, {}, true, false
--- a/app/views/instructeurs/shared/avis/_list.html.haml
+++ b/app/views/instructeurs/shared/avis/_list.html.haml
@ -41,11 +41,11 @@
                      |
                      = link_to(t('revoke', scope: 'helpers.label'), revoquer_instructeur_avis_path(avis.procedure, avis), data: { confirm: t('revoke', scope: 'helpers.confirmation', email: avis.expert.email) }, method: :patch)
              - if avis.introduction_file.attached?
-                = render partial: 'shared/attachment/show', locals: { attachment: avis.introduction_file.attachment }
+                = render Attachment::ShowComponent.new(attachment: avis.introduction_file.attachment)
                .answer-body.mb-3
                  %p #{t('views.instructeurs.avis.introduction_file_explaination')} #{avis.claimant.email}

              - if avis.piece_justificative_file.attached?
-                = render partial: 'shared/attachment/show', locals: { attachment: avis.piece_justificative_file.attachment }
+                = render Attachment::ShowComponent.new(attachment: avis.piece_justificative_file.attachment)
              .answer-body
                = simple_format(avis.answer)
--- a/app/views/shared/champs/piece_justificative/_show.html.haml
+++ b/app/views/shared/champs/piece_justificative/_show.html.haml
@ -1,5 +1,5 @@
 - pj = champ.piece_justificative_file
 - if pj.attached?
-  = render partial: "shared/attachment/show", locals: { attachment: pj.attachment }
+  = render Attachment::ShowComponent.new(attachment: pj.attachment)
 - else
  Pièce justificative non fournie
--- a/app/views/shared/dossiers/_infos_generales.html.haml
+++ b/app/views/shared/dossiers/_infos_generales.html.haml
@ -8,4 +8,4 @@
      %td.libelle Justificatif :
      %td
        .action
-          = render partial: 'shared/attachment/show', locals: { attachment: dossier.justificatif_motivation.attachment }
+          = render Attachment::ShowComponent.new(attachment: dossier.justificatif_motivation.attachment)
--- a/app/views/shared/dossiers/editable_champs/_piece_justificative.html.haml
+++ b/app/views/shared/dossiers/editable_champs/_piece_justificative.html.haml
@ -1,4 +1 @@
-= render 'shared/attachment/edit',
-  { form: form,
-    attached_file: champ.piece_justificative_file,
-    template: champ.type_de_champ.piece_justificative_template, user_can_destroy: true }
+= render Attachment::EditComponent.new(form: form, attached_file: champ.piece_justificative_file, template: champ.type_de_champ.piece_justificative_template, user_can_destroy: true)
--- a/app/views/shared/dossiers/editable_champs/_titre_identite.html.haml
+++ b/app/views/shared/dossiers/editable_champs/_titre_identite.html.haml
@ -1,4 +1 @@
-= render 'shared/attachment/edit',
-  { form: form,
-    attached_file: champ.piece_justificative_file,
-    user_can_destroy: true }
+= render Attachment::EditComponent.new(form: form, attached_file: champ.piece_justificative_file, user_can_destroy: true)
--- a/app/views/users/dossiers/show/_download_justificatif.html.haml
+++ b/app/views/users/dossiers/show/_download_justificatif.html.haml
@ -1,2 +1,2 @@
 - if dossier.present? && dossier.justificatif_motivation.attached?
-  = render partial: "shared/attachment/show", locals: { attachment: dossier.justificatif_motivation.attachment }
+  = render Attachment::ShowComponent.new(attachment: dossier.justificatif_motivation.attachment)