Merge branch 'main' into feature/implicit_authorization

avo-hq · Oct 2, 2024 · f76acb6 · f76acb6
2 parents e75b923 + b49c401
commit f76acb6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/components/avo/index/resource_table_component.rb b/app/components/avo/index/resource_table_component.rb
@@ -14,7 +14,7 @@ def before_render
   prop :parent_record, _Nilable(_Any)
   prop :parent_resource, _Nilable(Avo::BaseResource)
   prop :pagy, _Nilable(Pagy)
-  prop :query, _Nilable(ActiveRecord::Relation)
+  prop :query, _Nilable(_Any)
   prop :actions, _Nilable(_Array(Avo::BaseAction))
 
   def encrypted_query

diff --git a/app/components/avo/views/resource_index_component.rb b/app/components/avo/views/resource_index_component.rb
@@ -17,7 +17,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   prop :parent_record, _Nilable(_Any)
   prop :parent_resource, _Nilable(Avo::BaseResource)
   prop :applied_filters, Hash, default: {}.freeze
-  prop :query, _Nilable(ActiveRecord::Relation), reader: :public
+  prop :query, _Nilable(_Any), reader: :public
   # This should be
   # prop :scopes, _Nilable(_Array(Avo::Advanced::Scopes::BaseScope)), reader: :public
   # However, Avo::Advanced::Scopes::BaseScope raises an error because