avo 2.18.1 → 2.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7079bc6f71897afdcc083d49d88255d5a3e903e130a9c054e069976dc9038bc0
-  data.tar.gz: c618bf337578ddc521f6be2c92eb1c1bfc76f4e7956c5f4a7393e31326f49f02
+  metadata.gz: 032f3c926677645e9939a30205693425f4c44c4db874d7e30849c600e13be8a1
+  data.tar.gz: 110d46843bf447a9e1a1215e3d4e17e4c8bf64ca4f88889d72a504c6b9cef06e
 SHA512:
-  metadata.gz: 7b32f335e16778be0647bd74c1579f5842d01b74c836655040d165e64bcb5325a7f23b43bb01a31f455af6f58ae3ecac968cb301e8737d4d36734f2ea1d88dcd
-  data.tar.gz: c9a37f010a3b138f64f7f10d31b077a94f06d48539bffb635f6b6e0d35d2d56b76d2b25cd34e31e189fbf72911a91b52910bb341391a13edff6b6c79cac3c48f
+  metadata.gz: feed3402af12295a712d16f45ced2248c6fcb0663cdad1d4e3b160f9d706e26322ce2966f64f1f6d0fe622f13f2019be8b12d8c16afa7f009ddefe175fd0a7f5
+  data.tar.gz: 28c50de8194d7c649b2c629c988511f1470b00dbaa5d7a60013f743959fecff0b7e97e5c5383548552e412bdea05b9224910c38d681ddbefea25116ade529145

data/Gemfile

@@ -21,7 +21,7 @@ gem 'cssbundling-rails'
 # Dependencies for dummy_app
 #
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-# gem "rails", "~> 6.1.0"
+gem "rails", "~> 6.1.0"
 
 # Use postgresql as the database for Active Record
 gem "pg", ">= 0.18", "< 2.0"
@@ -102,14 +102,12 @@ group :test do
   gem "launchy", require: false
 
   gem "test-prof"
-
-  gem "sprockets-rails"
 end
 
 gem "rubocop"
 gem "rubocop-shopify", require: false
 
-gem "zeitwerk", "~> 2.3"
+gem "zeitwerk"
 
 gem "httparty"
 
@@ -123,8 +121,6 @@ gem "appraisal"
 
 gem 'meta-tags'
 
-gem 'breadcrumbs_on_rails'
-
 gem 'manifester'
 
 # Search
@@ -160,6 +156,8 @@ gem "chartkick"
 
 # Avo file filed requires this gem
 gem "activestorage"
+# Required by Avo
+gem "sprockets-rails"
 
 # Avo file filed requires this gem
 # Use Active Storage variant

data/Gemfile.lock

@@ -1,12 +1,11 @@
 PATH
   remote: .
   specs:
-    avo (2.18.1)
+    avo (2.20.0)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)
       addressable
-      breadcrumbs_on_rails
       docile
       dry-initializer
       httparty
@@ -15,7 +14,7 @@ PATH
       pagy
       turbo-rails
       view_component
-      zeitwerk
+      zeitwerk (>= 2.6.2)
 
 GEM
   remote: https://rubygems.org/
@@ -88,8 +87,8 @@ GEM
       activerecord (>= 6.0, < 7.1)
     acts_as_list (1.0.4)
       activerecord (>= 4.2)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     annotate (3.2.0)
       activerecord (>= 3.2, < 8.0)
       rake (>= 10.4, < 14.0)
@@ -100,22 +99,22 @@ GEM
     ast (2.4.2)
     awesome_print (1.9.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.551.0)
-    aws-sdk-core (3.125.5)
+    aws-partitions (1.621.0)
+    aws-sdk-core (3.134.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.53.0)
-      aws-sdk-core (~> 3, >= 3.125.0)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.58.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.111.3)
-      aws-sdk-core (~> 3, >= 3.125.0)
+    aws-sdk-s3 (1.114.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.5.1)
       aws-eventstream (~> 1, >= 1.0.2)
-    bcrypt (3.1.16)
+    bcrypt (3.1.18)
     better_html (2.0.1)
       actionview (>= 6.0)
       activesupport (>= 6.0)
@@ -127,11 +126,9 @@ GEM
     bootsnap (1.13.0)
       msgpack (~> 1.2)
     brakeman (5.3.1)
-    breadcrumbs_on_rails (4.1.0)
-      railties (>= 5.0)
     builder (3.2.4)
     bump (0.10.0)
-    bundler-integrity (1.0.7)
+    bundler-integrity (1.0.9)
     byebug (11.1.3)
     capybara (3.36.0)
       addressable
@@ -150,7 +147,7 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    cssbundling-rails (1.0.0)
+    cssbundling-rails (1.1.1)
       railties (>= 6.0.0)
     database_cleaner (2.0.1)
       database_cleaner-active_record (~> 2.0.0)
@@ -167,20 +164,20 @@ GEM
     diff-lcs (1.5.0)
     digest (3.1.0)
     docile (1.4.0)
-    dotenv (2.7.6)
-    dotenv-rails (2.7.6)
-      dotenv (= 2.7.6)
+    dotenv (2.8.1)
+    dotenv-rails (2.8.1)
+      dotenv (= 2.8.1)
       railties (>= 3.2)
     dry-initializer (3.1.1)
     erb-formatter (0.3.0)
     erubi (1.11.0)
-    factory_bot (6.2.0)
+    factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faker (2.19.0)
-      i18n (>= 1.6, < 2)
+    faker (2.22.0)
+      i18n (>= 1.8.11, < 2)
     ffi (1.15.5)
     friendly_id (5.4.2)
       activerecord (>= 4.0.0)
@@ -190,16 +187,16 @@ GEM
     gem-release (2.2.2)
     globalid (1.0.0)
       activesupport (>= 5.0)
-    groupdate (5.2.4)
-      activesupport (>= 5)
+    groupdate (6.1.0)
+      activesupport (>= 5.2)
     hashdiff (1.0.1)
     highline (2.0.3)
     hightop (0.3.0)
       activesupport (>= 5.2)
-    hotwire-livereload (1.1.0)
+    hotwire-livereload (1.2.2)
       listen (>= 3.0.0)
       rails (>= 6.0.0)
-    htmlbeautifier (1.4.1)
+    htmlbeautifier (1.4.2)
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
@@ -222,12 +219,12 @@ GEM
     inline_svg (1.8.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
-    io-wait (0.2.1)
     iso (0.4.0)
       i18n
     jmespath (1.6.1)
-    jsbundling-rails (1.0.0)
+    jsbundling-rails (1.0.3)
       railties (>= 6.0.0)
+    json (2.6.2)
     launchy (2.5.0)
       addressable (~> 2.7)
     listen (3.7.1)
@@ -243,7 +240,7 @@ GEM
       zeitwerk
     marcel (1.0.2)
     matrix (0.4.2)
-    meta-tags (2.16.0)
+    meta-tags (2.17.0)
       actionpack (>= 3.2.0, < 7.1)
     method_source (1.0.0)
     mime-types (3.4.1)
@@ -253,10 +250,9 @@ GEM
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
     minitest (5.16.3)
-    msgpack (1.6.0)
+    msgpack (1.5.6)
     multi_xml (0.6.0)
-    net-protocol (0.1.2)
-      io-wait
+    net-protocol (0.1.3)
       timeout
     net-smtp (0.3.1)
       digest
@@ -271,12 +267,12 @@ GEM
     orm_adapter (0.5.0)
     pagy (5.10.1)
       activesupport
-    parallel (1.21.0)
-    parser (3.1.0.0)
+    parallel (1.22.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
-    pg (1.3.1)
-    public_suffix (4.0.6)
-    puma (5.6.4)
+    pg (1.4.3)
+    public_suffix (5.0.0)
+    puma (5.6.5)
       nio4r (~> 2.0)
     pundit (2.2.0)
       activesupport (>= 3.0.0)
@@ -319,27 +315,27 @@ GEM
       thor (~> 1.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    ransack (2.5.0)
-      activerecord (>= 5.2.4)
-      activesupport (>= 5.2.4)
+    ransack (3.2.1)
+      activerecord (>= 6.1.5)
+      activesupport (>= 6.1.5)
       i18n
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    redis (4.6.0)
-    regexp_parser (2.2.0)
+    redis (4.8.0)
+    regexp_parser (2.5.0)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
     rexml (3.2.5)
-    rspec-core (3.10.2)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.2)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.3)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
+      rspec-support (~> 3.11.0)
     rspec-rails (4.0.2)
       actionpack (>= 4.2)
       activesupport (>= 4.2)
@@ -348,33 +344,35 @@ GEM
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.10.3)
-    rubocop (1.25.0)
+    rspec-support (3.11.0)
+    rubocop (1.35.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.1)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.13.2)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.14.3)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-shopify (2.5.0)
-      rubocop (~> 1.25)
+    rubocop-shopify (2.9.0)
+      rubocop (~> 1.33)
     ruby-debug-ide (0.7.3)
       rake (>= 0.8.1)
     ruby-progressbar (1.11.0)
     ruby-vips (2.1.4)
       ffi (~> 1.12)
     rubyzip (2.3.2)
-    selenium-webdriver (4.1.0)
+    selenium-webdriver (4.5.0)
       childprocess (>= 0.5, < 5.0)
       rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2)
+      rubyzip (>= 1.2.2, < 3.0)
+      websocket (~> 1.0)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -383,7 +381,7 @@ GEM
       rexml
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
+    simplecov_json_formatter (0.1.4)
     sixarm_ruby_unaccent (1.2.0)
     smart_properties (1.17.0)
     spring (4.0.0)
@@ -396,22 +394,22 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    standard (1.7.0)
-      rubocop (= 1.25.0)
-      rubocop-performance (= 1.13.2)
+    standard (1.16.0)
+      rubocop (= 1.35.0)
+      rubocop-performance (= 1.14.3)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    test-prof (1.0.7)
+    test-prof (1.0.10)
     thor (1.2.1)
-    timeout (0.2.0)
+    timeout (0.3.0)
     turbo-rails (1.3.2)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
       railties (>= 6.0.0)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
-    view_component (2.74.1)
+    unicode-display_width (2.2.0)
+    view_component (2.77.0)
       activesupport (>= 5.0.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -422,20 +420,21 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webdrivers (5.0.0)
+    webdrivers (5.2.0)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (~> 4.0)
-    webmock (3.14.0)
+    webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    websocket (1.2.9)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.2)
 
 PLATFORMS
   ruby
@@ -455,7 +454,6 @@ DEPENDENCIES
   aws-sdk-s3
   bootsnap (>= 1.4.2)
   brakeman
-  breadcrumbs_on_rails
   bump
   bundler-integrity (~> 1.0)
   byebug
@@ -489,6 +487,7 @@ DEPENDENCIES
   pg (>= 0.18, < 2.0)
   puma (~> 5.6.4)
   pundit
+  rails (~> 6.1.0)
   rails-controller-testing
   ransack
   redis (~> 4.0)
@@ -508,7 +507,7 @@ DEPENDENCIES
   web-console (>= 3.3.0)
   webdrivers
   webmock
-  zeitwerk (~> 2.3)
+  zeitwerk
 
 BUNDLED WITH
-   2.3.23
+   2.3.24

data/app/components/avo/actions_component.html.erb

@@ -11,7 +11,7 @@
     icon_class: 'transform rotate-90',
     'data-action': "click->toggle-panel#togglePanel",
     'data-actions-dropdown-button': @resource.model_key do %>
-    <%= t 'avo.actions' %>
+    <%= label %>
   <% end %>
   <div
     class="absolute flex inset-auto xl:right-0 top-full bg-white w-full sm:w-auto sm:min-w-[300px] mt-2 z-40 shadow-modal rounded overflow-hidden hidden"

data/app/components/avo/actions_component.rb

@@ -2,14 +2,16 @@
 
 class Avo::ActionsComponent < ViewComponent::Base
   include Avo::ApplicationHelper
+  attr_reader :label
 
-  def initialize(actions: [], resource: nil, view: nil, exclude: [], style: :outline, color: :primary)
+  def initialize(actions: [], resource: nil, view: nil, exclude: [], style: :outline, color: :primary, label: nil)
     @actions = actions || []
     @resource = resource
     @view = view
     @exclude = exclude
     @color = color
     @style = style
+    @label = label || t("avo.actions")
   end
 
   def render?
@@ -17,9 +19,7 @@ class Avo::ActionsComponent < ViewComponent::Base
   end
 
   def actions
-    @actions.select do |action|
-      !action.class.in?(@exclude)
-    end
+    @actions.reject { |action| action.class.in?(@exclude) }
   end
 
   # When running an action for one record we should do it on a special path.

data/app/components/avo/base_component.rb

@@ -43,4 +43,21 @@ class Avo::BaseComponent < ViewComponent::Base
   rescue
     nil
   end
+
+  def parent_or_child_resource
+    return @resource unless link_to_child_resource_is_enabled?
+    return @resource if @resource.model.class.base_class == @resource.model.class
+
+    ::Avo::App.get_resource_by_model_name(@resource.model.class).dup || @resource
+  end
+
+  def link_to_child_resource_is_enabled?
+    return field_linked_to_child_resource? if @parent_resource
+
+    @resource.link_to_child_resource
+  end
+
+  def field_linked_to_child_resource?
+    field.present? && field.respond_to?(:link_to_child_resource) && field.link_to_child_resource
+  end
 end

data/app/components/avo/card_component.html.erb

@@ -1,18 +1,18 @@
 <div class="relative flex-1 flex flex-col justify-between h-full"
   data-controller="dashboard-card"
   data-dashboard-card-target="card"
-  data-refresh-every="<%= @card.refresh_every %>"
-  data-card-id="<%= @card.id %>"
-  data-card-index="<%= @card.index %>">
-  <% if @card.class.display_header %>
+  data-refresh-every="<%= card.refresh_every %>"
+  data-card-id="<%= card.id %>"
+  data-card-index="<%= card.index %>">
+  <% if card.class.display_header %>
     <div class="px-4 pt-4">
       <div class="flex justify-between items-center min-h-6">
         <div class="text-base font-bold text-gray-700 leading-none">
-          <%= @card.label %>
+          <%= card.label %>
         </div>
         <div data-controller="select">
-          <% if @card.type.in?([:metric, :chartkick, :partial]) && @card.ranges.present? %>
-            <%= select_tag "#{@card.id}_#{@card.index}_range", options_for_select(@card.ranges, @card.range),
+          <% if card.type.in?([:metric, :chartkick, :partial]) && card.ranges.present? %>
+            <%= select_tag "#{card.id}_#{card.index}_range", options_for_select(card.ranges, card.range),
               class: 'appearance-none inline-flex bg-blue-gray-100 disabled:bg-blue-gray-300 disabled:cursor-not-allowed focus:bg-white text-sm text-blue-gray-700 disabled:text-blue-gray-700 leading-none rounded-md py-px px-2 leading-tight border outline-none outline w-24',
               data: {
                 target: 'select',
@@ -24,18 +24,18 @@
       </div>
     </div>
   <% end %>
-  <% if @card.type == :chartkick %>
-    <%= render 'chartkick_card', card: @card %>
-  <% elsif @card.type === :partial %>
-    <%= render @card.class.partial %>
-  <% elsif @card.type === :metric %>
+  <% if card.type == :chartkick %>
+    <%= render 'chartkick_card', card: card %>
+  <% elsif card.type === :partial %>
+    <%= render card.class.partial %>
+  <% elsif card.type === :metric %>
     <div class="flex-1 flex px-4 pb-4">
-      <%= render 'metric_card', card: @card %>
+      <%= render 'metric_card', card: card %>
     </div>
   <% end %>
-  <% if @card.description.present? %>
+  <% if card.description.present? %>
     <%= content_tag :div, class: "absolute inset-auto bottom-0 right-0 mb-4 mr-4",
-      title: @card.description,
+      title: card.description,
       data: {
         target: 'card-description',
         tippy: 'tooltip',

data/app/components/avo/card_component.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Avo::CardComponent < ViewComponent::Base
+  attr_reader :card
+
   def initialize(card: nil)
     @card = card
 
@@ -8,16 +10,16 @@ class Avo::CardComponent < ViewComponent::Base
   end
 
   def render?
-    !@card.nil?
+    card.present?
   end
 
   # Initializing the card byt running the query method.
   # We'll still keep the query block around for compatibility reasons.
   def init_card
-    if @card.respond_to? :query
-      @card.query
-    elsif @card.query_block.present?
-      @card.compute_result
+    if card.respond_to? :query
+      card.query
+    elsif card.query_block.present?
+      card.compute_result
     end
   end
 end

data/app/components/avo/field_wrapper_component.rb

@@ -61,7 +61,13 @@ class Avo::FieldWrapperComponent < ViewComponent::Base
   end
 
   def help
-    @help || @field.help
+    help_value = @help || @field.help
+
+    if help_value.respond_to?(:call)
+      return Avo::Hosts::ResourceViewRecordHost.new(block: help_value, record: record, resource: resource, view: view).handle
+    end
+
+    help_value
   end
 
   def record

data/app/components/avo/fields/has_one_field/show_component.rb

@@ -38,10 +38,9 @@ class Avo::Fields::HasOneField::ShowComponent < Avo::Fields::ShowComponent
   def create_path
     args = {
       via_relation: @resource.singular_model_key,
-      via_relation_class: @resource.name,
+      via_relation_class: @resource.model_class.to_s,
       via_resource_id: @resource.model.id
     }
-
     helpers.new_resource_path(resource: @field.target_resource, **args)
   end
 end

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

@@ -1,18 +1,19 @@
 # frozen_string_literal: true
 
-class Avo::Fields::IndexComponent < ViewComponent::Base
+class Avo::Fields::IndexComponent < Avo::BaseComponent
   include Avo::ResourcesHelper
 
   attr_reader :parent_resource
   attr_reader :view
 
-  def initialize(field: nil, resource: nil, index: 0, parent_model: nil, parent_resource: nil)
+  def initialize(field: nil, resource: nil, reflection: nil, index: 0, parent_model: nil, parent_resource: nil)
     @field = field
     @resource = resource
     @index = index
     @parent_model = parent_model
     @parent_resource = parent_resource
     @view = :index
+    @reflection = reflection
   end
 
   def resource_view_path
@@ -25,7 +26,7 @@ class Avo::Fields::IndexComponent < ViewComponent::Base
       }
     end
 
-    helpers.resource_view_path(model: @resource.model, resource: @resource, **args)
+    helpers.resource_view_path(model: @resource.model, resource: parent_or_child_resource, **args)
   end
 
   def field_wrapper_args

data/app/components/avo/fields/select_field/edit_component.html.erb

@@ -1,5 +1,5 @@
 <%= field_wrapper **field_wrapper_args do %>
-  <%= @form.select @field.id, @field.options_for_select, {
+  <%= @form.select @field.id, options_for_select(@field.options_for_select, selected: @field.value), {
       include_blank: @field.include_blank
     },
     aria: {

data/app/components/avo/filters_component.html.erb

@@ -21,7 +21,7 @@
         <%= render partial: filter.class.template, locals: {filter: filter} %>
       <% end %>
       <div class="p-4 border-gray-300 border-t">
-        <% if params[:filters].present? %>
+        <% if @applied_filters.present? %>
           <%= a_link reset_path, data: {turbo_frame: params[:turbo_frame]}, color: :gray, size: :sm, class: 'w-full justify-center' do %>
             <%= t('avo.reset_filters') %>
           <% end %>

data/app/components/avo/filters_component.rb

@@ -17,9 +17,9 @@ class Avo::FiltersComponent < ViewComponent::Base
   def reset_path
     # If come from a association page
     if @parent_model.present?
-      helpers.related_resources_path(@parent_model, @parent_model, filters: nil, keep_query_params: true)
+      helpers.related_resources_path(@parent_model, @parent_model, filters: nil, reset_filter: true, keep_query_params: true)
     else
-      helpers.resources_path(resource: @resource, filters: nil, keep_query_params: true)
+      helpers.resources_path(resource: @resource, filters: nil, reset_filter: true, keep_query_params: true)
     end
   end
 end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Avo::Index::GridItemComponent < ViewComponent::Base
+class Avo::Index::GridItemComponent < Avo::BaseComponent
   include Avo::ResourcesHelper
 
   attr_reader :parent_resource
@@ -37,6 +37,6 @@ class Avo::Index::GridItemComponent < ViewComponent::Base
       }
     end
 
-    helpers.resource_view_path(model: @resource.model, resource: @resource, **args)
+    helpers.resource_view_path(model: @resource.model, resource: parent_or_child_resource, **args)
   end
 end