Merge branch 'main' into codex/update-for-translation-keys-in-pagescontroller

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

Author: rsmithlal

.env.prod.sample

@@ -24,7 +24,7 @@ PORT=5000
 
 RACK_ENV=production
 RAILS_ENV=production
-RAILS_LOG_LEVEL=debug
+RAILS_LOG_LEVEL=info
 RAILS_LOG_TO_STDOUT=true
 RAILS_SERVE_STATIC_FILES=true
 

.github/workflows/rubyonrails.yml

@@ -13,11 +13,11 @@ 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'
+            rails: '7.2.2.1'
+            allowed_failure: false   # ⚠️ allowed to fail
+          - ruby: '3.4.4'
+            rails: '8.0.2'
             allowed_failure: true    # ⚠️ allowed to fail
 
     env:

app/controllers/better_together/application_controller.rb

@@ -9,6 +9,8 @@ class ApplicationController < ActionController::Base # rubocop:todo Metrics/Clas
 
     protect_from_forgery with: :exception
 
+    layout :determine_layout
+
     before_action :check_platform_setup
     before_action :set_locale
     before_action :store_user_location!, if: :storable_location?
@@ -23,12 +25,13 @@ class ApplicationController < ActionController::Base # rubocop:todo Metrics/Clas
       Rack::MiniProfiler.authorize_request if current_user&.permitted_to?('manage_platform')
     end
 
-    rescue_from ActiveRecord::RecordNotFound, with: :handle404
-    rescue_from ActionController::RoutingError, with: :handle404
+    rescue_from ActiveRecord::RecordNotFound, with: :render_not_found
+    rescue_from ActionController::RoutingError, with: :render_not_found
     rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
     rescue_from StandardError, with: :handle_error
 
-    helper_method :current_invitation, :default_url_options, :valid_platform_invitation_token_present?
+    helper_method :current_invitation, :default_url_options, :valid_platform_invitation_token_present?,
+                  :turbo_native_app?
 
     def self.default_url_options
       super.merge(locale: I18n.locale)
@@ -126,11 +129,7 @@ def valid_platform_invitation_token_present?
 
     private
 
-    def handle404
-      render_404
-    end
-
-    def render_404 # rubocop:todo Naming/VariableNumber
+    def render_not_found
       render 'errors/404', status: :not_found
     end
 
@@ -254,5 +253,13 @@ def metric_viewable_type
     def metric_viewable_id
       metric_viewable&.id
     end
+
+    def determine_layout
+      turbo_native_app? ? 'better_together/turbo_native' : 'better_together/application'
+    end
+
+    def turbo_native_app?
+      request.user_agent.to_s.include?('Turbo Native')
+    end
   end
 end

app/controllers/better_together/conversations_controller.rb

@@ -20,7 +20,7 @@ def new
       authorize @conversation
     end
 
-    def create # rubocop:todo Metrics/MethodLength
+    def create # rubocop:todo Metrics/MethodLength, Metrics/AbcSize
       @conversation = Conversation.new(conversation_params.merge(creator: helpers.current_person))
 
       authorize @conversation
@@ -33,7 +33,12 @@ def create # rubocop:todo Metrics/MethodLength
           format.html { redirect_to @conversation }
         end
       else
-        render :new
+        respond_to do |format|
+          format.turbo_stream do
+            render :create_error, status: :unprocessable_entity
+          end
+          format.html { render :new, status: :unprocessable_entity }
+        end
       end
     end
 

app/controllers/better_together/friendly_resource_controller.rb

@@ -23,7 +23,7 @@ def set_resource_instance
       # 2. By friendly on all available locales
       @resource ||= find_by_translatable
 
-      handle404 && return if @resource.nil?
+      render_not_found && return if @resource.nil?
 
       @resource
     end

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/navigation_items_controller.rb

@@ -32,15 +32,30 @@ def edit
       authorize @navigation_item
     end
 
-    def create
+    def create # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
       @navigation_item = new_navigation_item
       @navigation_item.assign_attributes(navigation_item_params)
       authorize @navigation_item
-
-      if @navigation_item.save
-        redirect_to @navigation_area, only_path: true, notice: 'Navigation item was successfully created.'
-      else
-        render :new
+      respond_to do |format|
+        if @navigation_item.save
+          flash.now[:notice] = 'Navigation item was successfully created.'
+          format.html do
+            redirect_to @navigation_area, only_path: true,
+                                          notice: 'Navigation item was successfully created.'
+          end
+          format.turbo_stream { render :create }
+        else
+          format.html { render :new, status: :unprocessable_entity }
+          format.turbo_stream do
+            render turbo_stream: [
+              turbo_stream.update('form_errors', partial: 'layouts/better_together/errors',
+                                                 locals: { object: @navigation_item }),
+              turbo_stream.update('navigation_item_form', partial: 'better_together/navigation_items/form',
+                                                          locals: { navigation_item: @navigation_item,
+                                                                    navigation_area: @navigation_area })
+            ]
+          end
+        end
       end
     end
 
@@ -74,8 +89,15 @@ def update # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
     def destroy
       authorize @navigation_item
       @navigation_item.destroy
-      redirect_to navigation_area_navigation_items_url(@navigation_area),
-                  notice: 'Navigation item was successfully destroyed.'
+      flash.now[:notice] = 'Navigation item was successfully destroyed.'
+
+      respond_to do |format|
+        format.html do
+          redirect_to navigation_area_navigation_items_url(@navigation_area),
+                      notice: 'Navigation item was successfully destroyed.'
+        end
+        format.turbo_stream { render :destroy }
+      end
     end
 
     private

app/controllers/better_together/pages_controller.rb

@@ -17,7 +17,7 @@ def index
 
     def show
       if @page.nil? || !@page.published?
-        render_404
+        render_not_found
       else
         authorize @page
         @content_blocks = @page.content_blocks
@@ -37,7 +37,7 @@ def create
       authorize @page
 
       if @page.save
-        redirect_to edit_page_path(@page), notice: t('pages.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] = t('pages.updated')
-            redirect_to edit_page_path(@page), notice: t('pages.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] = t('pages.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: t('pages.destroyed')
+      redirect_to pages_url, notice: t('flash.generic.destroyed', resource: t('resources.page'))
     end
 
     protected
@@ -95,14 +95,14 @@ def id_param
 
     private
 
-    def handle404
+    def render_not_found
       path = params[:path]
 
       # If page is not found and the path is one of the variants of the root path, render community engine promo page
       if ['home-page', 'home', "/#{I18n.locale}/", "/#{I18n.locale}", I18n.locale.to_s, 'bt', '/'].include?(path)
         render 'better_together/static_pages/community_engine'
       else
-        render_404
+        super
       end
     end
 
@@ -122,7 +122,7 @@ def safe_page_redirect_url
     def set_page
       @page = set_resource_instance
     rescue ActiveRecord::RecordNotFound
-      handle404
+      render_not_found && return
     end
 
     def page_params # rubocop:todo Metrics/MethodLength

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