avo 3.6.3 → 3.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c1a1850dcbe5a9b1d2756241fe2983fb8d89a1dfecffb99bedefdb5d1cf93f9
-  data.tar.gz: a246d51c7555b95a849077fb5a727751c0def5f08dd18b92ee559c591404177e
+  metadata.gz: 1686cd42a28d62d2877e3db2582df2ad34a6e30d27002151c1f3cc3b92490ac7
+  data.tar.gz: 319d4b0e6ad38d87e88379cef31c8ec650961643c5268d86b20e5579bb693b35
 SHA512:
-  metadata.gz: 837aecd1b17eb2cd2b20448ee9826ea82ad72c6dbc754bf37dbf797f3f72be54c88b97b8efe70991ab00a6bc8a5e129caed5fff2fd97f8dfe22c4087380032d2
-  data.tar.gz: caa6839f4f059e8e2ee596f1df9b8a02780c1b59dc5f540a2963305e6cfd00f811850157d550a200808b2b98680ff992b9144242db36c8860d0f0a3973597374
+  metadata.gz: 6bb3637bf610b0ee8b78642685661015e26371d44e9dd7c31bf3e0796b89c9698f4e026a37f0378c4457e933a381f63040e66cd3dc55f155e7ba74e746b7b743
+  data.tar.gz: '081b731423609d9f8f53dd1fa1866b37674aacf3374f7911d582b426a533ee1caf3d390563c7d2807db52a58db916c6ced8099ec1d703ffc2c13c1d31882b950'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (3.6.3)
+    avo (3.6.4)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

data/app/components/avo/index/resource_table_component.rb

@@ -4,7 +4,9 @@ class Avo::Index::ResourceTableComponent < Avo::BaseComponent
   include Avo::ApplicationHelper
   attr_reader :pagy, :query
 
-  def before_render = cache_table_rows
+  def before_render
+    @header_fields, @table_row_components = cache_table_rows
+  end
 
   def initialize(resources: nil, resource: nil, reflection: nil, parent_record: nil, parent_resource: nil, pagy: nil, query: nil, actions: nil)
     @resources = resources
@@ -45,33 +47,33 @@ class Avo::Index::ResourceTableComponent < Avo::BaseComponent
   def cache_table_rows
     # Cache the execution of the following block if caching is enabled in Avo configuration
     cache_if Avo.configuration.cache_resources_on_index_view, @resource.cache_hash(@parent_record), expires_in: 1.day do
-      # Initialize arrays to hold header fields and table row components
-      @header_fields = []
-      @table_row_components = []
-
-      generate_table_row_components
-
-      # Remove duplicate header fields based on table_header_label
-      @header_fields.uniq!(&:table_header_label)
+      header_fields, table_row_components = generate_table_row_components
 
       # Create an array of header field labels used for each row to render values on the right column
-      @header_fields_ids = @header_fields.map(&:table_header_label)
+      header_fields_ids = header_fields.map(&:table_header_label)
 
       # Assign header field IDs to each TableRowComponent
       # We assign it here because only complete header fields array after last table row.
-      @table_row_components.map { |table_row_component| table_row_component.header_fields = @header_fields_ids }
+      table_row_components.map { |table_row_component| table_row_component.header_fields = header_fields_ids }
+
+      # Return header fields and table row components
+      return [header_fields, table_row_components]
     end
   end
 
   def generate_table_row_components
+    # Initialize arrays to hold header fields and table row components
+    header_fields = []
+    table_row_components = []
+
     # Loop through each resource in @resources
     @resources.each do |resource|
       # Get fields for the current resource and concat them to the @header_fields
       row_fields = resource.get_fields(reflection: @reflection, only_root: true)
-      @header_fields.concat row_fields
+      header_fields.concat row_fields
 
       # Create a TableRowComponent instance for the resource and add it to @table_row_components
-      @table_row_components << Avo::Index::TableRowComponent.new(
+      table_row_components << Avo::Index::TableRowComponent.new(
         resource: resource,
         fields: row_fields,
         reflection: @reflection,
@@ -80,5 +82,10 @@ class Avo::Index::ResourceTableComponent < Avo::BaseComponent
         actions: @actions
       )
     end
+
+    # Remove duplicate header fields based on table_header_label
+    header_fields.uniq!(&:table_header_label)
+
+    [header_fields, table_row_components]
   end
 end

data/lib/avo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 3.6.3
+  version: 3.6.4
 platform: ruby
 authors:
 - Adrian Marin