Catch errors for field_resource and target_resource on HasBaseField a…

…nd BelongsToField
avo-hq · Dec 6, 2023 · 0642a60 · 0642a60
1 parent 41df23b
commit 0642a60
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/lib/avo/fields/base_field.rb b/lib/avo/fields/base_field.rb
@@ -289,6 +289,12 @@ def on_create?
       def in_action?
         @action.present?
       end
+
+      def get_resource_by_model_class(model_class)
+        resource = Avo.resource_manager.get_resource_by_model_class(model_class)
+
+        resource || (raise Avo::MissingResourceError.new(model_class))
+      end
     end
   end
 end
diff --git a/lib/avo/fields/belongs_to_field.rb b/lib/avo/fields/belongs_to_field.rb
@@ -234,7 +234,7 @@ def target_resource
 
         if is_polymorphic?
           if value.present?
-            return Avo.resource_manager.get_resource_by_model_class(value.class)
+            return get_resource_by_model_class(value.class)
           else
             return nil
           end
@@ -243,9 +243,9 @@ def target_resource
         reflection_key = polymorphic_as || id
 
         if @record._reflections[reflection_key.to_s].klass.present?
-          Avo.resource_manager.get_resource_by_model_class @record._reflections[reflection_key.to_s].klass.to_s
+          get_resource_by_model_class(@record._reflections[reflection_key.to_s].klass.to_s)
         elsif @record._reflections[reflection_key.to_s].options[:class_name].present?
-          Avo.resource_manager.get_resource_by_model_class @record._reflections[reflection_key.to_s].options[:class_name]
+          get_resource_by_model_class(@record._reflections[reflection_key.to_s].options[:class_name])
         else
           App.get_resource_by_name reflection_key.to_s
         end

diff --git a/lib/avo/fields/has_base_field.rb b/lib/avo/fields/has_base_field.rb
@@ -27,7 +27,7 @@ def initialize(id, **args, &block)
       end
 
       def field_resource
-        resource || Avo.resource_manager.get_resource_by_model_class(@record.class)
+        resource || get_resource_by_model_class(@record.class)
       end
 
       def turbo_frame
@@ -57,9 +57,9 @@ def field_label
 
       def target_resource
         if @record._reflections[id.to_s].klass.present?
-          Avo.resource_manager.get_resource_by_model_class @record._reflections[id.to_s].klass.to_s
+          get_resource_by_model_class(@record._reflections[id.to_s].klass.to_s)
         elsif @record._reflections[id.to_s].options[:class_name].present?
-          Avo.resource_manager.get_resource_by_model_class @record._reflections[id.to_s].options[:class_name]
+          get_resource_by_model_class(@record._reflections[id.to_s].options[:class_name])
         else
           Avo.resource_manager.get_resource_by_name id.to_s
         end