fix: add model-unrelated errors to alerts

.erb-lint_rubocop.yml

@@ -6,3 +6,6 @@ Layout/InitialIndentation:
 
 Lint/UselessAssignment:
   Enabled: false
+
+Layout/FirstArgumentIndentation:
+  Enabled: false

.ruby-version

@@ -1 +1 @@
-3.3.0
+3.3.1

app/components/avo/views/resource_edit_component.html.erb

@@ -19,7 +19,7 @@
     },
     multipart: true do |form| %>
     <%= render Avo::ReferrerParamsComponent.new back_path: back_path %>
-    <%= content_tag :div, class: 'space-y-12' do %>
+    <%= content_tag :div, class: "space-y-12" do %>
       <% @resource.get_items.each_with_index do |item, index| %>
         <%= render Avo::Items::SwitcherComponent.new(
           resource: @resource,
@@ -32,7 +32,7 @@
           form: form,
           parent_component: self,
           actions: @actions
-        )%>
+        ) %>
       <% end %>
 
       <% if Avo.configuration.buttons_on_form_footers %>

app/controllers/avo/base_controller.rb

@@ -231,7 +231,17 @@ def perform_action_and_record_errors(&block)
 
       # Remove duplicated errors
       if exception_message.present?
-        @errors = @errors.reject { |error| exception_message.include? error }.unshift exception_message
+        @errors = @errors.reject { |error| exception_message.include? error }
+      end
+
+      # Figure out if we have to output the exception_message
+      # Usually it means that it's not a validation error but something else
+      if exception_message.present?
+        exception_is_validation = @errors.select { |error| exception_message.include? error }.present?
+      end
+
+      if exception_is_validation || (@errors.blank? && exception_message.present?)
+        @errors << exception_message
       end
 
       @errors.any? ? false : succeeded
@@ -477,9 +487,11 @@ def update_success_action
     end
 
     def update_fail_action
+      flash.now[:error] = update_fail_message
+
       respond_to do |format|
-        flash.now[:error] = update_fail_message
         format.html { render :edit, status: :unprocessable_entity }
+        format.turbo_stream { render "update_fail_action" }
       end
     end
 

app/views/avo/base/create_fail_action.turbo_stream.erb

@@ -1,9 +1,17 @@
-<%= turbo_stream.replace(frame_id(@resource), template: "avo/base/new")  %>
+<%= turbo_stream.replace(frame_id(@resource), template: "avo/base/new") %>
 
 <%= turbo_stream.append "alerts" do %>
   <%= render Avo::FlashAlertsComponent.new flashes: flash %>
 <% end %>
 
+<% if @errors.any? %>
+  <%= turbo_stream.append("alerts") do %>
+    <% @errors.each do |message| %>
+      <%= render Avo::AlertComponent.new :error, message %>
+    <% end %>
+  <% end %>
+<% end %>
+
 <% if @record.errors.any? %>
   <%= turbo_stream.append("alerts") do %>
     <% @record.errors.full_messages.each do |message| %>

app/views/avo/base/new.html.erb

@@ -1,2 +1 @@
 <%= render @component.new(resource: @resource, record: @record, view: @view, actions: @actions) %>
-

app/views/avo/base/update_fail_action.turbo_stream.erb

@@ -0,0 +1,21 @@
+<%= turbo_stream.replace(frame_id(@resource), template: "avo/base/edit") %>
+
+<%= turbo_stream.append "alerts" do %>
+  <%= render Avo::FlashAlertsComponent.new flashes: flash %>
+<% end %>
+
+<% if @errors.any? %>
+  <%= turbo_stream.append("alerts") do %>
+    <% @errors.each do |message| %>
+      <%= render Avo::AlertComponent.new :error, message %>
+    <% end %>
+  <% end %>
+<% end %>
+
+<% if @record.errors.any? %>
+  <%= turbo_stream.append("alerts") do %>
+    <% @record.errors.full_messages.each do |message| %>
+      <%= render Avo::AlertComponent.new :error, message %>
+    <% end %>
+  <% end %>
+<% end %>

spec/dummy/app/avo/filters/course_city_filter.rb

@@ -20,7 +20,7 @@ def react
 
       # Get the first city
       cities = cities_for_countries(selected_countries.keys)
-      first_city = cities.first.first
+      first_city = cities&.first&.first
 
       # Return the first city selected as a Hash
       [[first_city, true]].to_h

spec/features/avo/exposed_methods_base_controller_spec.rb

@@ -32,7 +32,7 @@
       save
 
       expect(page).to have_text "Course not updated!"
-      expect(page).to have_text "Validation failed: Name can't be blank"
+      expect(page).to have_text "Name can't be blank"
     end
 
     let(:course_url) { "/admin/resources/courses/#{course.prefix_id}" }