Merge pull request #9895 from demarches-simplifiees/dependabot/bundler/view_component-3.9.0

chore(deps): bump view_component from 2.82.0 to 3.9.0

Gemfile.lock

@@ -758,7 +758,7 @@ GEM
       activemodel (>= 3.0.0)
       public_suffix
     vcr (6.1.0)
-    view_component (2.82.0)
+    view_component (3.9.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)

app/components/dossiers/batch_alert_component/batch_alert_component.html.haml

@@ -1,14 +1,14 @@
 .fr-mb-5v
   - if @batch.finished_at.present?
     = render Dsfr::AlertComponent.new(title: t(".title.finish"), state: (@batch.errors? ? :warning : :success), heading_level: 'h2', extra_class_names: 'fr-my-2w') do |c|
-      - c.body do
+      - c.with_body do
         %p
           = t(".#{batch.operation}.finish.text_success", count: @batch.total_count, success_count: @batch.success_count)
 
 
   - else
     = render Dsfr::AlertComponent.new(title: t(".title.in_progress"), state: :info, heading_level: 'h2', extra_class_names: 'fr-my-2w') do |c|
-      - c.body do
+      - c.with_body do
         %p= t(".#{batch.operation}.in_progress.text_success", count: @batch.total_count, success_count: @batch.success_count)
 
         %p

app/components/dossiers/champs_rows_show_component/champs_rows_show_component.html.haml

@@ -9,7 +9,7 @@
   - else
     = render Dossiers::RowShowComponent.new(label: champ.libelle, seen_at:, profile:, content_class: champ.type_champ, updated_at: updated_after_deposer?(champ) ? champ.updated_at : nil) do |c|
       - if champ.blank?
-        - c.blank do
+        - c.with_blank do
           = t(blank_key(champ))
       - else
         - c.with_value do

app/components/dossiers/edit_footer_component/edit_footer_component.html.haml

@@ -11,7 +11,7 @@
   - if @dossier.brouillon? && !owner?
     .fr-pb-2w.invite-cannot-submit
       = render ::Dsfr::AlertComponent.new(state: :info, title: nil, size: :sm, heading_level: :p, extra_class_names:'') do |c|
-        - c.body do
+        - c.with_body do
           %p.fr-pb-0= t('.invite_notice').html_safe
 
 

app/components/dossiers/en_construction_not_submitted_component/en_construction_not_submitted_component.html.haml

@@ -1,8 +1,8 @@
 = render Dsfr::CalloutComponent.new(title: t(".title"), icon: "fr-fi-information-line") do |c|
-  - c.body do
+  - c.with_body do
     = t(".body")
 
-  - c.bottom do
+  - c.with_bottom do
     %ul.fr-mt-2w.fr-btns-group.fr-btns-group--inline
       %li= link_to t(".buttons.edit"), modifier_dossier_path(dossier), class: "fr-btn"
       %li= button_to t(".buttons.submit"), modifier_dossier_path(dossier), class: "fr-btn fr-btn--secondary", method: :post

app/components/dsfr/input_component/input_component.html.haml

@@ -31,7 +31,7 @@
   - if email?
     .suspect-email.hidden{ data: { "email-input-target": 'ariaRegion'}, aria: { live: 'off' } }
       = render Dsfr::AlertComponent.new(title: t('.email_suggest.wanna_say'), state: :info, heading_level: :div) do |c|
-        - c.body do
+        - c.with_body do
           %p{ data: { "email-input-target": 'suggestion'} } exemple@gmail.com  ?
           %p
             = button_tag type: 'button', class: 'fr-btn fr-btn--sm fr-mr-3w', data: { action: 'click->email-input#accept'} do

app/components/procedure/publication_warning_component/publication_warning_component.html.haml

@@ -1,5 +1,5 @@
 = render Dsfr::AlertComponent.new(state: :warning, title:) do |c|
-  - c.body do
+  - c.with_body do
     - error_messages.each do |(messages, path)|
       %p.mt-2
         = messages.to_sentence

app/components/profile/api_token_component/api_token_component.html.haml

@@ -21,7 +21,7 @@
       = t('.security_two')
 
   = render Dsfr::AlertComponent.new(state: :info, title: t(".security_title"), heading_level: :h4) do |c|
-    - c.body do
+    - c.with_body do
       - if @api_token.full_access?
         %p.fr-text--lg
           = t('.allowed_full_access_html')

app/components/types_de_champ_editor/champ_component/champ_component.html.haml

@@ -109,7 +109,7 @@
 
               - if type_de_champ.titre_identite?
                 = render Dsfr::AlertComponent.new(state: :info, heading_level: 'p') do |c|
-                  - c.body do
+                  - c.with_body do
                     Dans le cadre de la RGPD, le titre d’identité sera supprimé lors de l’acceptation, du refus ou du classement sans suite du dossier. Aussi, pour des raisons de sécurité, un filigrane est automatiquement ajouté aux images.
               - elsif procedure.piece_justificative_multiple?
                 %p Les usagers pourront envoyer plusieurs fichiers si nécessaire.

app/components/types_de_champ_editor/errors_summary/errors_summary.html.haml

@@ -1,7 +1,7 @@
 #errors-summary
   - if invalid?
     = render Dsfr::AlertComponent.new(state: :warning, title: "Le formulaire contient des erreurs", extra_class_names: 'fr-mb-2w') do |c|
-      - c.body do
+      - c.with_body do
         - if condition_errors?
           %p= t('.fix_conditional', count: errors_for(:condition).size)
           = error_message_for(:condition)

app/views/administrateurs/attestation_templates/_informations.html.haml

@@ -7,7 +7,7 @@
     Insérer une balise
 
   = render Dsfr::AlertComponent.new(state: :info, title: "Balises sur le conditionnel", heading_level: 'h3') do |c|
-    - c.body do
+    - c.with_body do
       Les balises pour les champs conditionnés ne sont pour le moment pas supportées.
 
   %p.notice.fr-mt-3w

app/views/administrateurs/jeton_particulier/show.html.haml

@@ -12,7 +12,7 @@
   %h1
   = form_with model: @procedure, url: admin_procedure_api_particulier_jeton_path, local: true do |f|
     = render Dsfr::AlertComponent.new(state: :info, size: :sm, extra_class_names: 'fr-mb-2w') do |c|
-      - c.body do
+      - c.with_body do
         %p
           = t('.api_particulier_description_html', app_name: APPLICATION_NAME)
 

app/views/administrateurs/mail_templates/_form.html.haml

@@ -8,7 +8,7 @@
     Insérer une balise
 
   = render Dsfr::AlertComponent.new(state: :info, title: "Balises sur le conditionnel", heading_level: 'h3') do |c|
-    - c.body do
+    - c.with_body do
       Les balises pour les champs conditionnés ne sont pour le moment pas supportées.
 
   %p.notice.fr-mt-3w

app/views/administrateurs/procedures/_informations.html.haml

@@ -1,6 +1,6 @@
 - if @procedure.locked?
   = render Dsfr::AlertComponent.new(state: :warning, title: "Cette démarche est publiée.", extra_class_names: 'fr-mb-2w') do |c|
-    - c.body do
+    - c.with_body do
       %p
         Certains éléments de la description ne sont plus modifiables.
 

app/views/administrateurs/procedures/_monavis.html.haml

@@ -1,5 +1,5 @@
 = render Dsfr::AlertComponent.new(state: :info, size: :sm, extra_class_names: 'fr-mb-2w') do |c|
-  - c.body do
+  - c.with_body do
     %p
       Proposez aux usagers de donner un avis sur votre démarche. Pour ce faire, vous devez précédemment aller sur «
       %a{ :href => "https://monavis.numerique.gouv.fr" } https://monavis.numerique.gouv.fr

app/views/administrateurs/procedures/_publication_form.html.haml

@@ -7,13 +7,13 @@
     - if procedure.draft_changed?
       %p.mb-2= t('.draft_changed_procedure_alert')
       = render Dsfr::AlertComponent.new(state: :info, size: :sm, extra_class_names: 'fr-mb-2w') do |c|
-        - c.body do
+        - c.with_body do
           = render Procedure::RevisionChangesComponent.new changes: procedure.revision_changes, previous_revision: procedure.published_revision
       - if procedure.close?
         = render partial: 'publication_form_inputs', locals: { procedure: procedure, closed_procedures: @closed_procedures, form: f }
     - elsif @procedure.brouillon? && @procedure.missing_steps.empty?
       = render Dsfr::AlertComponent.new(state: :info, size: :sm, extra_class_names: 'fr-mb-2w') do |c|
-        - c.body do
+        - c.with_body do
           %p
             = t('.faq_test_alert')
             = link_to t('.faq_test_alert_link'), t('.faq_test_alert_link_url'), **external_link_attributes

app/views/administrateurs/procedures/jeton.html.haml

@@ -11,7 +11,7 @@
   %h1
   = form_with model: @procedure, url: url_for({ controller: 'administrateurs/procedures', action: :update_jeton }) do |f|
     = render Dsfr::AlertComponent.new(state: :info, size: :sm, extra_class_names: 'fr-mb-2w') do |c|
-      - c.body do
+      - c.with_body do
         %p
           Démarches Simplifiées utilise
           = link_to 'API Entreprise', "https://entreprise.api.gouv.fr/"

app/views/administrateurs/procedures/publication.html.haml

@@ -8,7 +8,7 @@
     .fr-col-12.fr-col-offset-md-2.fr-col-md-8
       - if @procedure.draft_revision.types_de_champ_public.dubious.present?
         = render Dsfr::AlertComponent.new(state: :warning, title: t('.dubious_fields'), extra_class_names: 'fr-mb-2w') do |c|
-          - c.body do
+          - c.with_body do
             %ul
               - @procedure.draft_revision.types_de_champ_public.dubious.each do |dubious_champs|
                 %li.dubious-champs= "#{dubious_champs.libelle} (#{dubious_champs.description})"
@@ -28,7 +28,7 @@
             = link_to commencer_url(@procedure.path), commencer_url(@procedure.path), target: :blank, rel: :noopener, class: "mb-4"
 
             = render Dsfr::AlertComponent.new(state: :info, size: :sm, extra_class_names: 'fr-my-2w') do |c|
-              - c.body do
+              - c.with_body do
                 %p= t('.public_link_procedure_html', link: APPLICATION_NAME)
 
           - elsif @procedure.brouillon?
@@ -37,7 +37,7 @@
 
             - else
               = render Dsfr::AlertComponent.new(state: :warning, title: t('.missing_information_title'), heading_level: :h2) do |c|
-                - c.body do
+                - c.with_body do
                   %p= t('.missing_information_content')
                   %ul
                     - if @procedure.missing_zones?
@@ -51,19 +51,19 @@
           - else
             - if @procedure.missing_steps.include?(:service)
               = render Dsfr::AlertComponent.new(state: :warning, size: :sm, extra_class_names: 'fr-my-2w') do |c|
-                - c.body do
+                - c.with_body do
                   %p
                     = t('.missing_information_service')
                     = link_to t('.click_here'), (@current_administrateur.services.present? ? url_for(admin_services_path(procedure_id: @procedure.id)) : url_for(new_admin_service_path(procedure_id: @procedure.id)))
 
             - if @procedure.missing_steps.include?(:instructeurs)
               = render Dsfr::AlertComponent.new(state: :warning, size: :sm, extra_class_names: 'fr-my-2w') do |c|
-                - c.body do
+                - c.with_body do
                   %p
                     = t('.missing_information_instructeurs')
                     = link_to t('.click_here'), admin_procedure_groupe_instructeur_path(@procedure, @procedure.defaut_groupe_instructeur)
             = render Dsfr::AlertComponent.new(state: :warning, size: :sm, extra_class_names: 'fr-my-2w') do |c|
-              - c.body do
+              - c.with_body do
                 %p
                   = t('.missing_link')
 

app/views/administrateurs/procedures/show.html.haml

@@ -32,12 +32,12 @@
 - if @procedure.draft_changed?
   .fr-container
     = render Dsfr::CalloutComponent.new(title: t(:has_changes, scope: [:administrateurs, :revision_changes]), icon: "fr-fi-information-line") do |c|
-      - c.body do
+      - c.with_body do
         = render Procedure::RevisionChangesComponent.new changes: @procedure.revision_changes, previous_revision: @procedure.published_revision
 
         = render Procedure::PublicationWarningComponent.new(procedure: @procedure)
 
-      - c.bottom do
+      - c.with_bottom do
         %ul.fr-mt-2w.fr-btns-group.fr-btns-group--inline
           - if @procedure.publiee?
             %li= button_to 'Publier les modifications', admin_procedure_publish_revision_path(@procedure), class: 'fr-btn', id: 'publish-procedure-link', data: { disable_with: "Publication...", confirm: 'Êtes-vous sûr de vouloir publier les modifications ?' }, disabled: !@procedure.draft_revision.valid? || @procedure.errors.present?, method: :put

app/views/administrateurs/services/_form.html.haml

@@ -16,7 +16,7 @@
       = link_to("annuaire-entreprises.data.gouv.fr", annuaire_link, **external_link_attributes)
 
   = render Dsfr::CalloutComponent.new(title: "Informations de contact") do |c|
-    - c.body do
+    - c.with_body do
       Votre démarche sera hébergée par #{APPLICATION_NAME} – mais nous ne pouvons pas assurer le support des démarches. Et malgré la dématérialisation, les usagers se poseront parfois des questions légitimes sur le processus administratif.
       %br
       %br

app/views/administrateurs/services/edit.html.haml

@@ -9,7 +9,7 @@
   - other_services = @service.procedures.reject {|procedure| procedure.id == @procedure.id }
   - if other_services.count > 1
     = render Dsfr::AlertComponent.new(state: :warning, title: "Modifier ce service impactera la ou les démarches qui sont rattachée/s") do |c|
-      - c.body do
+      - c.with_body do
         %ul
           - other_services.each do |proc|
             %li= "#{proc.libelle} (N° #{proc.id})"

app/views/administrateurs/sources_particulier/show.html.haml

@@ -10,7 +10,7 @@
 .container#sources-particulier-form.mb-2
   = form_with model: @procedure, url: admin_procedure_api_particulier_sources_path, local: true, html: { class: 'form' } do |f|
     = render Dsfr::AlertComponent.new(state: :info, size: :sm, extra_class_names: 'fr-mb-2w') do |c|
-      - c.body do
+      - c.with_body do
         %p
           = t('.explication_html')
 

app/views/agent_connect/agent/index.html.haml

@@ -34,7 +34,7 @@
                 %h2.fr-h6= I18n.t('views.users.sessions.new.subtitle')
 
               = render Dsfr::AlertComponent.new(state: :info, size: :sm, extra_class_names: 'fr-mb-2w') do |c|
-                - c.body do
+                - c.with_body do
                   = t('views.users.sessions.new.for_tiers_alert')
 
               .fr-fieldset__element

app/views/commencer/show.html.haml

@@ -3,7 +3,7 @@
 .commencer.form
   - if !user_signed_in?
     = render Dsfr::CalloutComponent.new(title: t(".start_procedure"), heading_level: 'h2') do |c|
-      - c.body do
+      - c.with_body do
         = render partial: 'shared/france_connect_login', locals: { url: commencer_france_connect_path(path: @procedure.path, prefill_token: @prefilled_dossier&.prefill_token) }
         %ul.fr-btns-group.fr-btns-group--inline
           %li
@@ -16,7 +16,7 @@
   - else
     - if @prefilled_dossier
       = render Dsfr::CalloutComponent.new(title: t(".prefilled_draft"), heading_level: 'h2') do |c|
-        - c.body do
+        - c.with_body do
           %p= t('.prefilled_draft_detail_html', time_ago: time_ago_in_words(@prefilled_dossier.created_at), procedure: @procedure.libelle)
           = link_to t('.go_to_prefilled_file'), url_for_dossier(@prefilled_dossier), class: 'fr-btn fr-mb-2w'
 
@@ -26,7 +26,7 @@
     - elsif @drafts.size == 1 && @not_drafts.empty?
       - dossier = @drafts.first
       = render Dsfr::CalloutComponent.new(title: t(".already_draft"), heading_level: 'h2') do |c|
-        - c.body do
+        - c.with_body do
           %p
             = t('.already_draft_detail_html', time_ago: time_ago_in_words(dossier.created_at), procedure: @procedure.libelle)
           %ul.fr-btns-group.fr-btns-group--inline
@@ -36,7 +36,7 @@
     - elsif @not_drafts.size == 1
       - dossier = @not_drafts.first
       = render Dsfr::CalloutComponent.new(title: t(".already_not_draft"), heading_level: 'h2') do |c|
-        - c.body do
+        - c.with_body do
           %p
             = t('.already_not_draft_detail_html', time_ago: time_ago_in_words(dossier.depose_at), procedure: @procedure.libelle)
           %ul.fr-btns-group.fr-btns-group--inline
@@ -45,7 +45,7 @@
 
     - else
       = render Dsfr::CalloutComponent.new(title: t(".existing_dossiers"), heading_level: 'h2') do |c|
-        - c.body do
+        - c.with_body do
           %ul.fr-btns-group.fr-btns-group--inline
             %li= link_to t('.show_dossiers'), dossiers_path(procedure_id: @procedure.id), class: "fr-btn"
             %li= link_to t('.start_new_file'), url_for_new_dossier(@revision), class: "fr-btn fr-btn--secondary"

app/views/devise/passwords/edit.html.haml

@@ -19,7 +19,7 @@
           .fr-fieldset__element
             = render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field,
               opts: { autofocus: 'true', autocomplete: 'new-password', minlength: PASSWORD_MIN_LENGTH, data: { controller: populated_resource.validate_password_complexity? ? 'turbo-input' : false, turbo_input_url_value: show_password_complexity_path }}) do |c|
-              - c.describedby do
+              - c.with_describedby do
                 - if populated_resource.validate_password_complexity?
                   %div{ id: c.describedby_id }
                     #password_complexity

app/views/instructeurs/contact_informations/_form.html.haml

@@ -2,7 +2,7 @@
   = hidden_field_tag :from_admin, params[:from_admin]
 
   = render Dsfr::CalloutComponent.new(title: "Informations de contact") do |c|
-    - c.body do
+    - c.with_body do
       Votre démarche est hébergée par #{APPLICATION_NAME} – mais nous ne pouvons pas assurer le support des démarches. Et malgré la dématérialisation, les usagers se posent parfois des questions légitimes sur le processus administratif.
       %br
       %br

app/views/instructeurs/procedures/_last_export_alert.html.haml

@@ -1,7 +1,7 @@
 - if export.present?
   %div{ data: export.pending? ? { controller: "turbo-poll", turbo_poll_url_value: polling_last_export_instructeur_procedure_path(export_format: export.format, statut: statut), turbo_poll_interval_value: 5_000, turbo_poll_max_checks_value: 6 } : {} }
     = render Dsfr::AlertComponent.new(state: :info, size: :sm, extra_class_names: 'fr-my-2w') do |c|
-      - c.body do
+      - c.with_body do
         %p
           - if export.pending?
             = t('instructeurs.procedures.last_export_pending')

app/views/instructeurs/procedures/email_notifications.html.haml

@@ -10,7 +10,7 @@
 
   = form_for @assign_to, url: update_email_notifications_instructeur_procedure_path(@procedure), html: { class: 'form' } do |form|
     = render Dsfr::AlertComponent.new(state: :info, size: :sm, extra_class_names: 'fr-mb-2w') do |c|
-      - c.body do
+      - c.with_body do
         %p
           = t('.subtitle')
 

app/views/instructeurs/procedures/exports.html.haml

@@ -17,7 +17,7 @@
 
     - if @exports.any?{_1.format == Export.formats.fetch(:zip)}
       = render Dsfr::AlertComponent.new(title: t('.title_zip'), state: :info, extra_class_names: 'fr-mb-3w') do |c|
-        - c.body do
+        - c.with_body do
           %p= t('.export_description_zip_html')
 
   - else

app/views/shared/archives/_notice.html.haml

@@ -1,5 +1,5 @@
 = render Dsfr::AlertComponent.new(title: "Gestion de vos archives", state: :info) do |c|
-  - c.body do
+  - c.with_body do
     %p
       L'archivage de votre démarche se fait mensuellement. Pour chaque mois depuis la publication de votre démarche vous pouvez faire une demande de création d'archive.
 

app/views/users/dossiers/_dossiers_list.html.haml

@@ -52,20 +52,20 @@
 
       - if dossier.procedure.close? && !dossier.termine?
         = render Dsfr::AlertComponent.new(state: :info, size: :sm, extra_class_names: "fr-mb-2w") do |c|
-          - c.body do
+          - c.with_body do
             %p
               = t('views.users.dossiers.dossiers_list.procedure_closed')
 
       - if dossier.pending_correction?
         = render Dsfr::AlertComponent.new(state: :warning, size: :sm, extra_class_names: "fr-mb-2w") do |c|
-          - c.body do
+          - c.with_body do
             %p
               = t('views.users.dossiers.dossiers_list.pending_correction')
 
       - if dossier.transfer.present?
         - if @statut == "dossiers-transferes"
           = render Dsfr::AlertComponent.new(state: :info, size: :sm) do |c|
-            - c.body do
+            - c.with_body do
               %p
                 - if dossier.transfer.from_support?
                   = t('views.users.dossiers.transfers.receiver_demande_en_cours_from_support', id: dossier.id, email: dossier.user.email)
@@ -76,7 +76,7 @@
                 = link_to t('views.users.dossiers.transfers.reject'), transfer_path(dossier.transfer), class: "fr-link", method: :delete
         - else
           = render Dsfr::AlertComponent.new(state: :info, size: :sm, extra_class_names: "fr-mb-2w") do |c|
-            - c.body do
+            - c.with_body do
               %p
                 - if dossier.transfer.from_support?
                   = t('views.users.dossiers.transfers.sender_demande_en_cours_from_support', id: dossier.id, email: dossier.transfer.email)

app/views/users/dossiers/_procedure_removed_banner.html.haml

@@ -1,6 +1,6 @@
 - title = dossier.procedure.discarded? ? "procedure_deleted_title" : "procedure_close_title"
 = render Dsfr::AlertComponent.new(state: :warning, title: t("users.dossiers.header.banner.#{title}"), extra_class_names: 'fr-mb-2w') do |c|
-  - c.body do
+  - c.with_body do
     - if dossier.termine? && dossier.procedure.discarded?
       %p
         = t('users.dossiers.header.banner.procedure_deleted_dossier_termine_content')

app/views/users/profil/show.html.haml

@@ -65,7 +65,7 @@
 
       - if @waiting_transfers.present?
         = render Dsfr::AlertComponent.new(title: t('.waiting_transfers'), state: :warning, heading_level: 'h2', extra_class_names: 'fr-mt-2w') do |c|
-          - c.body do
+          - c.with_body do
             %ul
               - @waiting_transfers.each do |email, nb_dossier|
                 %li= t('.one_waiting_transfer', email: email, count: nb_dossier)

app/views/users/registrations/new.html.haml

@@ -19,7 +19,7 @@
 
       .fr-fieldset__element
         = render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field, opts: { autocomplete: 'new-password', minlength: PASSWORD_MIN_LENGTH }) do |c|
-          - c.describedby do
+          - c.with_describedby do
             = render partial: "devise/password_rules", locals: { id: c.describedby_id }
 
     %ul.fr-btns-group

spec/components/main_navigation/announces_link_component_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe MainNavigation::AnnouncesLinkComponent, type: :component do
       user.build_instructeur
     end
 
-    allow(controller).to receive(:current_user).and_return(user)
+    allow_any_instance_of(ApplicationController).to receive(:current_user).and_return(user)
   end
 
   subject { render_inline(described_class.new) }