From b47c312451ad29c331061925b0fdce1d4960c7d4 Mon Sep 17 00:00:00 2001
From: Paul Bob <69730720+Paul-Bob@users.noreply.github.com>
Date: Wed, 24 Jul 2024 11:48:10 +0300
Subject: [PATCH] fix: exclude rails 7.1 version error from production (#3042)

* fix: exclude error manager from production

* keep error manager on prod

* tweaks
---
 app/views/avo/partials/_custom_tools_alert.html.erb           | 2 +-
 lib/avo.rb                                                    | 3 ++-
 lib/avo/error_manager.rb                                      | 4 ++--
 .../app/avo/resource_tools/team_membership_tool_playground.rb | 2 +-
 spec/dummy/app/avo/resources/membership.rb                    | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/views/avo/partials/_custom_tools_alert.html.erb b/app/views/avo/partials/_custom_tools_alert.html.erb
index b836597ff6..6b533f368d 100644
--- a/app/views/avo/partials/_custom_tools_alert.html.erb
+++ b/app/views/avo/partials/_custom_tools_alert.html.erb
@@ -5,7 +5,7 @@
     </a>
   </div>
 <% end %>
-<% if Avo.error_manager.has_errors?.present? %>
+<% if Avo.error_manager.has_errors? %>
   <% Avo.error_manager.all.each do |error| %>
     <% if error.is_a? Hash %>
       <%
diff --git a/lib/avo.rb b/lib/avo.rb
index 04ccb98de7..dfd9df1090 100644
--- a/lib/avo.rb
+++ b/lib/avo.rb
@@ -73,7 +73,8 @@ def boot
     # Runs on each request
     def init
       Avo::Current.error_manager = Avo::ErrorManager.build
-      check_rails_version_issues
+      # Check rails version issues only on NON Production environments
+      check_rails_version_issues unless Rails.env.production?
       Avo::Current.resource_manager = Avo::Resources::ResourceManager.build
       Avo::Current.tool_manager = Avo::Tools::ToolManager.build
 
diff --git a/lib/avo/error_manager.rb b/lib/avo/error_manager.rb
index b3e4248a4a..ffc668a27f 100644
--- a/lib/avo/error_manager.rb
+++ b/lib/avo/error_manager.rb
@@ -15,11 +15,11 @@ def initialize
     end
 
     def add(error)
-      errors << error
+      @errors << error
     end
 
     def has_errors?
-      errors.present?
+      @errors.present?
     end
   end
 end
diff --git a/spec/dummy/app/avo/resource_tools/team_membership_tool_playground.rb b/spec/dummy/app/avo/resource_tools/team_membership_tool_playground.rb
index 79acde8784..c308de2fb3 100644
--- a/spec/dummy/app/avo/resource_tools/team_membership_tool_playground.rb
+++ b/spec/dummy/app/avo/resource_tools/team_membership_tool_playground.rb
@@ -1,4 +1,4 @@
-class TeamMembershipToolPlayground < Avo::BaseResourceTool
+class Avo::ResourceTools::TeamMembershipToolPlayground < Avo::BaseResourceTool
   self.name = "Team membership tool playground"
   # self.partial = "avo/resource_tools/team_membership_tool_playground"
 end
diff --git a/spec/dummy/app/avo/resources/membership.rb b/spec/dummy/app/avo/resources/membership.rb
index 338a395a40..b850d1c52d 100644
--- a/spec/dummy/app/avo/resources/membership.rb
+++ b/spec/dummy/app/avo/resources/membership.rb
@@ -34,5 +34,5 @@ def fields
     field :team, as: :belongs_to
   end
 
-  # tool TeamMembershipToolPlayground, show_on: :all
+  # tool Avo::ResourceTools::TeamMembershipToolPlayground, show_on: :all
 end