Merge branch 'main' into upgrade/rails/8.0

Signed-off-by: Robert Smith <[email protected]>

Author: rsmithlal

.github/workflows/rubyonrails.yml

@@ -13,12 +13,12 @@ jobs:
           - ruby: '3.4.4'
             rails: '7.1.5.1'
             allowed_failure: false   # ✅ required
-          # - ruby: '3.4.4'
-          #   rails: '7.2'
-          #   allowed_failure: true    # ⚠️ allowed to fail
           - ruby: '3.4.4'
-            rails: '8.0'
-            allowed_failure: false    # ⚠️ allowed to fail
+            rails: '7.2.2.1'
+            allowed_failure: false   # ✅ required
+          - ruby: '3.4.4'
+            rails: '8.0.2'
+            allowed_failure: false    # ✅ required
 
     env:
       RAILS_ENV: test

app/controllers/better_together/metrics/link_click_reports_controller.rb

@@ -41,7 +41,7 @@ def create # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
 
         respond_to do |format| # rubocop:todo Metrics/BlockLength
           if @link_click_report.persisted?
-            flash[:notice] = 'Report was successfully created.'
+            flash[:notice] = t('flash.generic.created', resource: t('resources.report'))
             format.html { redirect_to metrics_link_click_reports_path, notice: flash[:notice] }
             format.turbo_stream do
               render turbo_stream: [
@@ -55,7 +55,7 @@ def create # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
               ]
             end
           else
-            flash.now[:alert] = 'Error creating report.'
+            flash.now[:alert] = t('flash.generic.error_create', resource: t('resources.report'))
             format.html { render :new, status: :unprocessable_entity }
             format.turbo_stream do
               render turbo_stream: [

app/controllers/better_together/metrics/page_view_reports_controller.rb

@@ -39,7 +39,7 @@ def create # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
 
         respond_to do |format| # rubocop:todo Metrics/BlockLength
           if @page_view_report.persisted?
-            flash[:notice] = 'Report was successfully created.'
+            flash[:notice] = t('flash.generic.created', resource: t('resources.report'))
             format.html { redirect_to metrics_page_view_reports_path, notice: flash[:notice] }
             format.turbo_stream do
               render turbo_stream: [
@@ -55,7 +55,7 @@ def create # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
               ]
             end
           else
-            flash.now[:alert] = 'Error creating report.'
+            flash.now[:alert] = t('flash.generic.error_create', resource: t('resources.report'))
             format.html { render :new, status: :unprocessable_entity }
             format.turbo_stream do
               render turbo_stream: [

app/controllers/better_together/pages_controller.rb

@@ -37,7 +37,7 @@ def create
       authorize @page
 
       if @page.save
-        redirect_to edit_page_path(@page), notice: 'Page was successfully created.'
+        redirect_to edit_page_path(@page), notice: t('flash.generic.created', resource: t('resources.page'))
       else
         render :new
       end
@@ -53,11 +53,11 @@ def update # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
       respond_to do |format|
         if @page.update(page_params)
           format.html do
-            flash[:notice] = 'Page was successfully updated.'
-            redirect_to edit_page_path(@page), notice: 'Page was successfully updated.'
+            flash[:notice] = t('flash.generic.updated', resource: t('resources.page'))
+            redirect_to edit_page_path(@page), notice: t('flash.generic.updated', resource: t('resources.page'))
           end
           format.turbo_stream do
-            flash.now[:notice] = 'Page was successfully updated.'
+            flash.now[:notice] = t('flash.generic.updated', resource: t('resources.page'))
             render turbo_stream: [
               turbo_stream.replace(helpers.dom_id(@page, 'form'), partial: 'form',
                                                                   locals: { page: @page }),
@@ -77,7 +77,7 @@ def update # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
     def destroy
       authorize @page
       @page.destroy
-      redirect_to pages_url, notice: 'Page was successfully destroyed.'
+      redirect_to pages_url, notice: t('flash.generic.destroyed', resource: t('resources.page'))
     end
 
     protected

app/controllers/better_together/person_community_memberships_controller.rb

@@ -13,7 +13,7 @@ def create # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
 
       respond_to do |format|
         if @person_community_membership.save
-          flash[:notice] = 'Member was successfully added.'
+          flash[:notice] = t('flash.generic.created', resource: t('resources.member'))
           format.html { redirect_to @community, notice: flash[:notice] }
           format.turbo_stream do
             render turbo_stream: [
@@ -26,7 +26,7 @@ def create # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
             ]
           end
         else
-          flash.now[:alert] = 'Error adding member.'
+          flash.now[:alert] = t('flash.generic.error_create', resource: t('resources.member'))
           format.html { redirect_to @community, alert: @person_community_membership.errors.full_messages.to_sentence }
           format.turbo_stream do
             render turbo_stream: [
@@ -44,7 +44,7 @@ def destroy # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
       authorize @person_community_membership
 
       if @person_community_membership.destroy
-        flash.now[:notice] = 'Member was successfully removed.'
+        flash.now[:notice] = t('flash.generic.removed', resource: t('resources.member'))
         respond_to do |format|
           format.html { redirect_to @community }
           format.turbo_stream do
@@ -56,7 +56,7 @@ def destroy # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
           end
         end
       else
-        flash.now[:error] = 'Failed to remove member.'
+        flash.now[:error] = t('flash.generic.error_remove', resource: t('resources.member'))
         respond_to do |format|
           format.html { redirect_to @community, alert: flash.now[:error] }
           format.turbo_stream do

app/controllers/better_together/platform_invitations_controller.rb

@@ -21,7 +21,7 @@ def create # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
 
       respond_to do |format|
         if @platform_invitation.save
-          flash[:notice] = 'Invitation was successfully created.'
+          flash[:notice] = t('flash.generic.created', resource: t('resources.invitation'))
           format.html { redirect_to @platform, notice: flash[:notice] }
           format.turbo_stream do
             render turbo_stream: [
@@ -34,7 +34,7 @@ def create # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
             ]
           end
         else
-          flash.now[:alert] = 'Error creating platform_invitation.'
+          flash.now[:alert] = t('flash.generic.error_create', resource: t('resources.invitation'))
           format.html { redirect_to @platform, alert: @platform_invitation.errors.full_messages.to_sentence }
           format.turbo_stream do
             render turbo_stream: [
@@ -52,7 +52,7 @@ def destroy # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
       authorize @platform_invitation
 
       if @platform_invitation.destroy
-        flash.now[:notice] = 'Invitation was successfully removed.'
+        flash.now[:notice] = t('flash.generic.removed', resource: t('resources.invitation'))
         respond_to do |format|
           format.html { redirect_to @platform }
           format.turbo_stream do
@@ -64,7 +64,7 @@ def destroy # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
           end
         end
       else
-        flash.now[:error] = 'Failed to remove platform_invitation.'
+        flash.now[:error] = t('flash.generic.error_remove', resource: t('resources.invitation'))
         respond_to do |format|
           format.html { redirect_to @platform, alert: flash.now[:error] }
           format.turbo_stream do
@@ -82,7 +82,7 @@ def resend # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
       authorize @platform_invitation
 
       BetterTogether::PlatformInvitationMailerJob.perform_later(@platform_invitation.id)
-      flash[:notice] = 'Invitation email has been queued for sending.'
+      flash[:notice] = t('flash.generic.queued', resource: t('resources.invitation_email'))
 
       respond_to do |format|
         format.html { redirect_to @platform, notice: flash[:notice] }

app/models/better_together/address.rb

@@ -68,7 +68,7 @@ def update_buildings
     def at_least_one_address_type
       return if physical || postal
 
-      errors.add(:base, 'Address must be either physical, postal, or both')
+      errors.add(:base, I18n.t('errors.models.address_missing_type'))
     end
 
     def resolve_format(format, included, excluded)

app/models/better_together/person_block.rb

@@ -13,13 +13,13 @@ class PersonBlock < ApplicationRecord
     private
 
     def not_self
-      errors.add(:blocked_id, 'cannot block yourself') if blocker_id == blocked_id
+      errors.add(:blocked_id, I18n.t('errors.person_block.cannot_block_self')) if blocker_id == blocked_id
     end
 
     def blocked_not_platform_manager
       return unless blocked&.permitted_to?('manage_platform')
 
-      errors.add(:blocked, 'cannot be a platform manager')
+      errors.add(:blocked, I18n.t('errors.person_block.cannot_block_manager'))
     end
   end
 end

app/models/better_together/wizard_step.rb

@@ -43,7 +43,7 @@ def unique_uncompleted_step_per_person # rubocop:todo Metrics/AbcSize, Metrics/M
 
         # If the number of completed steps is equal to or exceeds the max completions allowed, add an error
         if completed_steps_count >= wizard.max_completions
-          errors.add(:base, 'Maximum number of completions reached for this wizard and step definition.')
+          errors.add(:base, I18n.t('errors.wizard.max_completions'))
           return
         end
       end
@@ -57,7 +57,7 @@ def unique_uncompleted_step_per_person # rubocop:todo Metrics/AbcSize, Metrics/M
 
       return unless existing_step
 
-      errors.add(:base, 'Only one uncompleted step per person is allowed.')
+      errors.add(:base, I18n.t('errors.wizard.one_uncompleted'))
     end
     # rubocop:enable Metrics/MethodLength
 
@@ -68,7 +68,7 @@ def validate_step_completions
 
       return unless completed_steps_count >= wizard.max_completions
 
-      errors.add(:base, "Number of completions for this step has reached the wizard's max completions limit.")
+      errors.add(:base, I18n.t('errors.wizard.step_limit'))
     end
   end
 end

app/models/concerns/better_together/host.rb

@@ -29,7 +29,7 @@ def set_as_host
     def single_host_record
       return unless host && self.class.where.not(id:).exists?(host: true)
 
-      errors.add(:host, 'can only be set for one record')
+      errors.add(:host, I18n.t('errors.models.host_single'))
     end
   end
 end