avo 2.34.5 → 2.34.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a18c7280a487eda50ae3c5977eb8971606de858f3d7d166041fd197dcaba7650
-  data.tar.gz: ffe44e5efac3587842e1b41eec3dcdb74ad44de75b26b582e23b09c0ef537ca8
+  metadata.gz: 07a4019fae34650385f9b72af6444f8fcf582fcb9b69c64da0b9f18330db9094
+  data.tar.gz: 320fe93195ac2b24e97dac6361fa3ffe3456a695ca10e8a7edcc73d2c75945e3
 SHA512:
-  metadata.gz: 62e48f3bafebed5689634122390accc26cf500ab684c739cb58c2154e8b29c81a51abaf08867aafc397115d795e74c7eacd80dbcbdef04f4ef82aec27fba5aa3
-  data.tar.gz: 5d36a86586779c5160d48325719ee127b05e9ba733585abf91616d50a8461e95059b1dc74fc11fee4f6c8d3d64c957035f6787262e59f0bee99e132a04da2823
+  metadata.gz: 1840d1903d337a1977a9499cc204c5bb273e4b791aa97d702877e4d3212c19b61fde121bfb7f96c1f3c8b8551a11996cd55283e2207637856afb9167fa43f23b
+  data.tar.gz: 418635b25ca1e73c52f3f6f7c1426b1293c9fb1aa2d537eafb2bf3e3f9c9fc8755144fa539322fd79318da1b1189982221581f13a22632a642d524855b53a07a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.34.5)
+    avo (2.34.6)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)
@@ -421,7 +421,7 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.0)
-    view_component (3.1.0)
+    view_component (3.2.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)

data/app/components/avo/fields/file_field/index_component.rb

@@ -6,10 +6,10 @@ class Avo::Fields::FileField::IndexComponent < Avo::Fields::IndexComponent
   end
 
   def has_image_tag?
-    @field.value.attached? && @field.value.representable? && @field.is_image
+    field.value.present? && field.value.attached? && field.value.representable? && field.is_image
   end
 
   def has_audio_tag?
-    @field.value.attached? && @field.is_audio
+    field.value.present? && field.value.attached? && field.is_audio
   end
 end

data/app/components/avo/fields/index_component.rb

@@ -3,6 +3,7 @@
 class Avo::Fields::IndexComponent < Avo::BaseComponent
   include Avo::ResourcesHelper
 
+  attr_reader :field
   attr_reader :parent_resource
   attr_reader :view
 

data/app/controllers/avo/application_controller.rb

@@ -235,8 +235,15 @@ module Avo
     end
 
     def eager_load_files(resource, query)
-      if resource.attached_file_fields.present?
-        resource.attached_file_fields.map do |field|
+      # Get the non-computed file fields and try to eager load them
+      attachment_fields = resource
+        .attachment_fields
+        .reject do |field|
+          field.computed
+        end
+
+      if attachment_fields.present?
+        attachment_fields.map do |field|
           attachment = case field.class.to_s
           when "Avo::Fields::FileField"
             "attachment"

data/lib/avo/base_resource.rb

@@ -301,7 +301,7 @@ module Avo
       view_types
     end
 
-    def attached_file_fields
+    def attachment_fields
       get_field_definitions.select do |field|
         [Avo::Fields::FileField, Avo::Fields::FilesField].include? field.class
       end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.34.5" unless const_defined?(:VERSION)
+  VERSION = "2.34.6" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.34.5
+  version: 2.34.6
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-12 00:00:00.000000000 Z
+date: 2023-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord