Enter through form new with proper start screen

Author: skelz0r

app/controllers/authorization_request_forms_controller.rb

@@ -11,13 +11,9 @@ def index
   def new
     authorize @authorization_request_form, :new?
 
-    @authorization_request = authorization_request_class.new(
-      applicant: current_user,
-      organization: current_organization,
-      form_uid: @authorization_request_form.uid,
-    )
+    @authorization_definition = @authorization_request_form.authorization_definition
 
-    render view_path
+    render 'authorization_requests/new'
   end
 
   def create

app/helpers/authorization_requests_helpers.rb

@@ -1,7 +1,7 @@
 module AuthorizationRequestsHelpers
-  def start_authorization_request_form(form)
+  def start_authorization_request_form(form, cta: t('start_authorization_request_form.cta'))
     authorization_request_form(form.authorization_request_class.new(form_uid: form.uid)) do |f|
-      f.submit t('start_authorization_request_form.cta'), name: :start, id: dom_id(form, :start_authorization_request), class: %w[fr-btn fr-icon-save-line fr-btn--icon-left]
+      f.submit cta, name: :start, id: dom_id(form, :start_authorization_request), class: %w[fr-btn fr-icon-save-line fr-btn--icon-left]
     end
   end
 

app/views/authorization_requests/new.html.erb

@@ -5,6 +5,12 @@
 </div>
 
 <div class="fr-mb-4w">
+  <% if @authorization_request_form.present? %>
+    <h5>
+      <%= t('.current_form', authorization_request_form_name: @authorization_request_form.name) %>
+    </h5>
+  <% end %>
+
   <p>
     <%= t('.organization.start_text', organization_raison_sociale: current_organization.raison_sociale, organization_siret: current_organization.siret).html_safe %>
   </p>
@@ -39,8 +45,8 @@
       <% end %>
   </div>
 
-  <% if @authorization_definition.available_forms.one? %>
-    <% authorization_request_form = @authorization_definition.available_forms.first %>
+  <% if @authorization_request_form || @authorization_definition.available_forms.one? %>
+    <% authorization_request_form = @authorization_request_form || @authorization_definition.available_forms.first %>
 
     <% if authorization_request_form.multiple_steps? %>
       <p>
@@ -62,7 +68,7 @@
 
         <br />
 
-        <%= start_authorization_request_form(authorization_request_form) %>
+        <%= start_authorization_request_form(authorization_request_form, cta: t('.cta', authorization_name: @authorization_definition.name)) %>
       </p>
     <% end %>
   <% else %>

config/locales/fr.yml

@@ -89,6 +89,7 @@ fr:
       cta: Remplir une demande
     new:
       title: &start_new_habilitation_title Démarrer une nouvelle habilitation pour %{authorization_name}
+      current_form: Via le formulaire " %{authorization_request_form_name} "
       organization:
         start_text: "Vous êtes sur le point de démarrer une nouvelle demande d'habilitation pour le compte de <strong>%{organization_raison_sociale}</strong> (numéro de siret: <a href=\"https://annuaire-entreprises.data.gouv.fr/etablissement/%{organization_siret}\" target=\"_blank\">%{organization_siret}</a>)."
         callout: