Utilisation de la Gem dsfr-form_builder

betagouv · Jan 23, 2025 · 5b222fa · 5b222fa
1 parent b4a9075
commit 5b222fa
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 108 deletions.
diff --git a/Gemfile b/Gemfile
@@ -132,6 +132,7 @@ gem "rails_autolink"
 # ActionView helper to render currently active links
 gem "active_link_to"
 gem "dsfr-view-components"
+gem "dsfr-form_builder", "= 0.0.2" # On fixe la version tant qu’on est pas en 1.0
 
 # Easily create styled HTML emails in Rails.
 gem "premailer-rails" # Mail formatting

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -238,6 +238,10 @@ GEM
       dotenv (= 2.8.1)
       railties (>= 3.2)
     drb (2.2.1)
+    dsfr-form_builder (0.0.2)
+      actionview (>= 6.1, < 9.0)
+      activemodel (>= 6.1, < 9.0)
+      activesupport (>= 6.1, < 9.0)
     dsfr-view-components (1.5.1)
       html-attributes-utils (~> 1)
       pagy (~> 6)
@@ -761,6 +765,7 @@ DEPENDENCIES
   doorkeeper-i18n
   dotenv-rails
   drb
+  dsfr-form_builder (= 0.0.2)
   dsfr-view-components
   factory_bot
   faker

diff --git a/app/form_builders/dsfr_form_builder.rb b/app/form_builders/dsfr_form_builder.rb
diff --git a/app/views/admin/territories/invitations_devise/edit.html.slim b/app/views/admin/territories/invitations_devise/edit.html.slim
@@ -12,7 +12,7 @@
         p.fr-mt-3w.fr-hr-or = "ou"
 
       h2 Se créer un compte avec un mot de passe
-      = form_for resource, as: resource_name, url: invitation_path(resource_name), html: { method: :put }, builder: DsfrFormBuilder, display_required_tags: false do |f|
+      = form_for resource, as: resource_name, url: invitation_path(resource_name), html: { method: :put }, builder: Dsfr::FormBuilder, display_required_tags: false do |f|
         p.fr-hint-text Tous les champs sont obligatoires.
         = render "devise/shared/dsfr_error_messages", resource: resource
         = f.hidden_field :invitation_token

diff --git a/app/views/agents/sessions/new.html.slim b/app/views/agents/sessions/new.html.slim
@@ -14,7 +14,7 @@ h1.rdv-text-align-center.text-dark.mt-0.font-weight-bold.mb-4 Connexion à #{cur
 p.fr-hr-or ou
 
 p.text-muted.mb-2 Entrez votre email et votre mot de passe.
-= form_for resource, as: resource_name, url: session_path(resource_name), builder: DsfrFormBuilder do |f|
+= form_for resource, as: resource_name, url: session_path(resource_name), builder: Dsfr::FormBuilder do |f|
   = render "devise/shared/error_messages", resource: resource
   .form-group
     = f.dsfr_email_field :email, label: "Adresse email", hint: "Format attendu : [email protected]"

diff --git a/app/views/devise/passwords/edit.html.slim b/app/views/devise/passwords/edit.html.slim
@@ -4,7 +4,7 @@
 - if @from_confirmation
   p.text-muted Pour finaliser votre inscription, veuillez définir un mot de passe.
 
-= form_for resource, as: resource_name, url: password_path(resource_name), html: { method: :put }, builder: DsfrFormBuilder do |f|
+= form_for resource, as: resource_name, url: password_path(resource_name), html: { method: :put }, builder: Dsfr::FormBuilder do |f|
   = f.hidden_field :reset_password_token
   .form-group
     = render "common/form/new_password_input", f: f

diff --git a/app/views/devise/passwords/new.html.slim b/app/views/devise/passwords/new.html.slim
@@ -1,4 +1,4 @@
-= form_for resource, as: resource_name, url: password_path(resource_name), builder: DsfrFormBuilder do |f|
+= form_for resource, as: resource_name, url: password_path(resource_name), builder: Dsfr::FormBuilder do |f|
   .text-center.w-75.m-auto
     h4.text-dark-50.text-center.mt-0.font-weight-bold Mot de passe oublié ?
     p.text-muted.mb-4 Entrez votre email pour recevoir un lien de réinitialisation de mot de passe

diff --git a/app/views/users/invitations/edit.html.slim b/app/views/users/invitations/edit.html.slim
@@ -4,7 +4,7 @@
   = render "users/rdv_wizard_steps/rdv_wizard_summary", rdv_wizard: @rdv_wizard if @rdv_wizard.present?
 
   .card-body
-    = form_for resource, as: resource_name, url: invitation_path(resource_name), html: { method: :put }, builder: DsfrFormBuilder do |f|
+    = form_for resource, as: resource_name, url: invitation_path(resource_name), html: { method: :put }, builder: Dsfr::FormBuilder do |f|
       .rdv-text-align-center.w-75.m-auto
       = render "devise/shared/dsfr_error_messages", resource: resource
       = f.hidden_field :invitation_token

diff --git a/app/views/users/passwords/edit.html.slim b/app/views/users/passwords/edit.html.slim
@@ -5,7 +5,7 @@
     - if @from_confirmation
       p.rdv-color-text-mention-grey Pour finaliser votre inscription, veuillez définir un mot de passe.
 
-    = form_for resource, as: resource_name, url: password_path(resource_name), html: { method: :put }, builder: DsfrFormBuilder do |f|
+    = form_for resource, as: resource_name, url: password_path(resource_name), html: { method: :put }, builder: Dsfr::FormBuilder do |f|
       = f.hidden_field :reset_password_token
       .form-group
         = render "common/form/new_password_input", f: f

diff --git a/app/views/users/registrations/edit.html.slim b/app/views/users/registrations/edit.html.slim
@@ -5,7 +5,7 @@
     - if resource.logged_once_with_franceconnect?
       .fr-alert.fr-alert--info.fr-mb-3w
         | Vous pouvez ici changer l'email et le mot de passe de votre compte #{current_domain.name}, et pas ceux de FranceConnect
-    = form_for resource, as: resource_name, url: registration_path(resource_name), remote: request.xhr?, html: { method: :put }, builder: DsfrFormBuilder do |f|
+    = form_for resource, as: resource_name, url: registration_path(resource_name), remote: request.xhr?, html: { method: :put }, builder: Dsfr::FormBuilder do |f|
       = f.dsfr_email_field :email, value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email)
       - if devise_mapping.confirmable? && resource.pending_reconfirmation?
         .form-text.rdv-color-text-mention-grey.mb-2

diff --git a/app/views/users/registrations/new.html.slim b/app/views/users/registrations/new.html.slim
@@ -4,7 +4,7 @@
   = render "users/rdv_wizard_steps/rdv_wizard_summary", rdv_wizard: @rdv_wizard if @rdv_wizard.present?
 
   .card-body
-    = form_for resource, as: :user, url: registration_path(resource_name), builder: DsfrFormBuilder do |f|
+    = form_for resource, as: :user, url: registration_path(resource_name), builder: Dsfr::FormBuilder do |f|
       - if current_domain.france_connect_enabled || params[:force_franceconnect].present?
         h2 Se créer un compte avec FranceConnect
         = render "common/franceconnect_button"

diff --git a/app/views/users/sessions/new.html.slim b/app/views/users/sessions/new.html.slim
@@ -12,7 +12,7 @@
 
     h2 Se connecter avec son compte
 
-    = form_for resource, as: resource_name, url: session_path(resource_name), builder: DsfrFormBuilder do |f|
+    = form_for resource, as: resource_name, url: session_path(resource_name), builder: Dsfr::FormBuilder do |f|
       = render "devise/shared/error_messages", resource: resource
       = f.dsfr_email_field :email, autofocus: true, hint: "Format attendu : [email protected]", require: true, label: "Adresse email"
       = render "common/form/current_password_input", f:, forgotten_password_link: true