avo 3.0.3 → 3.0.4

data/app/components/avo/resource_component.rb

@@ -114,7 +114,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
   end
 
   def sidebars
-    return if Avo.license.lacks_with_trial(:resource_sidebar)
+    return [] if Avo.license.lacks_with_trial(:resource_sidebar)
 
     @item.items.select do |item|
       item.is_sidebar?

data/lib/avo/concerns/has_items.rb

@@ -87,19 +87,19 @@ module Avo
           unless only_root
             # Dive into panels to fetch their fields
             if item.is_panel?
-              fields << extract_fields_from_items(item)
+              fields << extract_fields(item)
             end
 
             # Dive into tabs to fetch their fields
             if item.is_tab_group?
               item.items.map do |tab|
-                fields << extract_fields_from_items(tab)
+                fields << extract_fields(tab)
               end
             end
 
             # Dive into sidebar to fetch their fields
             if item.is_sidebar?
-              fields << extract_fields_from_items(item)
+              fields << extract_fields(item)
             end
           end
 
@@ -108,11 +108,11 @@ module Avo
           end
 
           if item.is_row?
-            fields << extract_fields_from_items(tab)
+            fields << extract_fields(tab)
           end
 
           if item.is_main_panel?
-            fields << extract_fields_from_items(item)
+            fields << extract_fields(item)
           end
         end
 
@@ -309,18 +309,24 @@ module Avo
         end
       end
 
-      def extract_fields_from_items(thing)
-        fields = []
-
-        thing.items.each do |item|
+      # Extracts fields from a structure
+      # Structures can be panels, rows and sidebars
+      def extract_fields(structure)
+        structure.items.map do |item|
           if item.is_field?
-            fields << item
-          elsif item.is_panel? || item.is_row?
-            fields << extract_fields_from_items(item)
+            item
+          elsif extractable_structure?(item)
+            extract_fields(item)
+          else
+            nil
           end
-        end
+        end.compact
+      end
 
-        fields
+      # Extractable structures are panels, rows and sidebars
+      # Sidebars are only extractable if they are not on the index view
+      def extractable_structure?(structure)
+        structure.is_panel? || structure.is_row? || (structure.is_sidebar? && !view.index?)
       end
 
       # Standalone items are fields that don't have their own panel

data/lib/avo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-22 00:00:00.000000000 Z
+date: 2023-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord