feat: enhance setup wizard with improved error handling and localized messages for admin and platform creation

Author: rsmithlal

app/controllers/better_together/setup_wizard_steps_controller.rb

@@ -37,18 +37,20 @@ def create_host_platform # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
             mark_current_step_as_completed
             wizard.reload
             determine_wizard_outcome
-          else
-            flash.now[:alert] = t('.flash.please_address_errors')
-            render wizard_step_definition.template
+            return
           end
         end
-      else
-        flash.now[:alert] = t('.flash.please_address_errors')
-        render wizard_step_definition.template
       end
+
+      # If we get here, validation or save failed
+      @platform = base_platform
+      @platform.assign_attributes(platform_params) if platform_params.present?
+      flash.now[:alert] = t('.flash.please_address_errors')
+      render wizard_step_definition.template, status: :unprocessable_entity
     rescue ActiveRecord::RecordInvalid => e
+      @platform = e.record
       flash.now[:alert] = e.record.errors.full_messages.to_sentence
-      render wizard_step_definition.template
+      render wizard_step_definition.template, status: :unprocessable_entity
     end
     # rubocop:enable Metrics/MethodLength
 
@@ -73,9 +75,7 @@ def create_admin # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
 
       if @form.validate(user_params)
         ActiveRecord::Base.transaction do
-          # byebug
           user = ::BetterTogether::User.new(user_params)
-          user.build_person(person_params)
 
           if user.save!
             helpers.host_platform.person_platform_memberships.create!(
@@ -91,24 +91,24 @@ def create_admin # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
             helpers.host_community.creator = user.person
             helpers.host_community.save!
 
-            # If Devise's :confirmable is enabled, this will send a confirmation email
-            user.send_confirmation_instructions(confirmation_url: user_confirmation_path)
             mark_current_step_as_completed
             wizard.reload
             determine_wizard_outcome
-          else
-            # Handle the case where the user could not be saved
-            flash.now[:alert] = user.errors.full_messages.to_sentence
-            render wizard_step_definition.template
+            return
           end
         end
-      else
-        flash.now[:alert] = t('.flash.please_address_errors')
-        render wizard_step_definition.template
       end
+
+      # If we get here, validation or save failed
+      @user = ::BetterTogether::User.new(user_params)
+      @user.build_person unless @user.person
+      flash.now[:alert] = t('.flash.please_address_errors')
+      render wizard_step_definition.template, status: :unprocessable_entity
     rescue ActiveRecord::RecordInvalid => e
+      @user = e.record
+      @user.build_person unless @user.person
       flash.now[:alert] = e.record.errors.full_messages.to_sentence
-      render wizard_step_definition.template
+      render wizard_step_definition.template, status: :unprocessable_entity
     end
     # rubocop:enable Metrics/MethodLength
 
@@ -134,13 +134,10 @@ def platform_params
       params.require(:platform).permit(:name, :description, :url, :time_zone, :privacy)
     end
 
-    def person_params
-      params.require(:user).require(:person_attributes).permit(%i[identifier name description])
-    end
-
     def user_params
       params.require(:user).permit(
-        :email, :password, :password_confirmation
+        :email, :password, :password_confirmation,
+        person_attributes: %i[identifier name description]
       )
     end
 

app/forms/better_together/host_platform_admin_form.rb

@@ -10,7 +10,9 @@ class HostPlatformAdminForm < ::Reform::Form
     property :password
     property :password_confirmation
 
-    property :person do
+    property :person, populator: lambda { |_options|
+      self.person = model.person || model.build_person
+    } do
       property :identifier
       property :description
       property :name

app/views/better_together/wizard_step_definitions/host_setup/admin_creation.html.erb

@@ -1,6 +1,6 @@
 <% min_password_length = Devise.password_length.min %>
 
-<%= form_for @form, url: setup_wizard_step_create_admin_path(wizard_id: 'host_setup', wizard_step_definition_id: :admin_creation), method: :post, class: 'needs-validation form', id: 'admin-creation-form', data: { turbo: false, controller: 'better_together--form-validation', action: 'submit->better_together--form-validation#validateBeforeSubmit' } do |f| %>
+<%= form_for @form, url: setup_wizard_step_create_admin_path(wizard_id: 'host_setup', wizard_step_definition_id: :admin_creation), method: :post, class: 'needs-validation form', id: 'admin-creation-form', data: { controller: 'better_together--form-validation' } do |f| %>
 
   <!-- Hero Section -->
   <div class="container-fluid p-0">

app/views/better_together/wizard_step_definitions/host_setup/platform_details.html.erb

@@ -49,7 +49,7 @@
         </div>
       <% end %>
 
-      <%= form_for @form, url: setup_wizard_step_create_host_platform_path, method: :post, class: 'needs-validation', novalidate: true do |f| %>
+      <%= form_for @form, url: setup_wizard_step_create_host_platform_path, method: :post, class: 'needs-validation', data: { controller: 'better_together--form-validation' } do |f| %>
         <div class="mb-3">
           <%= f.label :name, t('.fields.name.label'), class: 'form-label' %>
           <%= f.text_field :name, autofocus: true, placeholder: t('.fields.name.placeholder'), class: "form-control#{' is-invalid' if @form.errors[:name].any?}", required: true %>

config/locales/en.yml

@@ -1461,6 +1461,13 @@ en:
           platform: Platform
           privacy: Privacy
         title: Settings
+    setup_wizard_steps:
+      create_admin:
+        flash:
+          please_address_errors: Please address the errors below.
+      create_host_platform:
+        flash:
+          please_address_errors: Please address the errors below.
     share_buttons:
       aria_label: Share on %{platform}
       bluesky: Share on Bluesky

config/locales/es.yml

@@ -1473,6 +1473,13 @@ es:
           platform: Plataforma
           privacy: Privacidad
         title: Configuración
+    setup_wizard_steps:
+      create_admin:
+        flash:
+          please_address_errors: Por favor, corrija los errores a continuación.
+      create_host_platform:
+        flash:
+          please_address_errors: Por favor, corrija los errores a continuación.
     share_buttons:
       aria_label: Compartir en %{platform}
       bluesky: Compartir en Bluesky

config/locales/fr.yml

@@ -1480,6 +1480,13 @@ fr:
           platform: Plateforme
           privacy: Confidentialité
         title: Paramètres
+    setup_wizard_steps:
+      create_admin:
+        flash:
+          please_address_errors: Veuillez corriger les erreurs ci-dessous.
+      create_host_platform:
+        flash:
+          please_address_errors: Veuillez corriger les erreurs ci-dessous.
     share_buttons:
       aria_label: Partager sur %{platform}
       bluesky: Partager sur Bluesky

config/locales/uk.yml

@@ -1476,6 +1476,13 @@ uk:
           platform: Platform
           privacy: Privacy
         title: Settings
+    setup_wizard_steps:
+      create_admin:
+        flash:
+          please_address_errors: Будь ласка, виправте помилки нижче.
+      create_host_platform:
+        flash:
+          please_address_errors: Будь ласка, виправте помилки нижче.
     share_buttons:
       aria_label: Share on %{platform}
       bluesky: Share on Bluesky