forest_admin_datasource_active_record 1.0.0.pre.beta.62 → 1.0.0.pre.beta.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 768aba915cd8fc48929a8bdc08fdf81dd735aa9b6d8d7f2a7f2ecb4c99c4e854
-  data.tar.gz: 32a0e8e3b7468dd6ec2244ea1b59da6383af8f36f48b4c5d7025094550612eca
+  metadata.gz: 045e8d60b23ab5557ab023f14464326e8350d433ea7aa41b8e5c67c5708dae42
+  data.tar.gz: 9c551753c265dfa3877c9ec45ed8e4177c89461c6dc958ca9fa0b7ceb14e4354
 SHA512:
-  metadata.gz: 7cea2e22bccfce7e48423cce3656b9457cea8882721bb6f39dc6ca44b7edc8fefcb9f0b8bde0226f33fa3ae5dcaae0b5d23113eeb92e6ef9e71793d70c427fb1
-  data.tar.gz: 7a015c989b6183d4a97c8d95f1f614b7a6fa58d64e2a498072e246218e6398040e22ec7098bc260ee8cc045119adf8155a64063cad007ad5f0c8ee93869979e6
+  metadata.gz: 2a3db924169e5a4682516416239c99b8c6dcda963fbb6aadd14395153b9fc0d5dc94c69f8526bfa5b0bc90fec13f35874f355354814b7e462b866f777ebc79a9
+  data.tar.gz: ac8b1c91e3c2a9e1463d9d5ebae3965ecc1f1370df65213a76b4af6779156cda0bb169bbe0f5e6f9c50dda85cc9708879088de6f6b544fe425c10bfcb697624f

data/lib/forest_admin_datasource_active_record/parser/relation.rb

@@ -3,10 +3,11 @@ module ForestAdminDatasourceActiveRecord
     module Relation
       def associations(model, support_polymorphic_relations: false)
         model.reflect_on_all_associations.select do |association|
+          is_valid_association = !get_class(association).nil? && !active_type?(get_class(association))
           if support_polymorphic_relations
-            polymorphic?(association) ? true : !active_type?(association.klass)
+            polymorphic?(association) ? true : is_valid_association
           else
-            !polymorphic?(association) && !active_type?(association.klass)
+            !polymorphic?(association) && is_valid_association
           end
         end
       end
@@ -16,6 +17,12 @@ module ForestAdminDatasourceActiveRecord
           association.inverse_of&.polymorphic?
       end
 
+      def get_class(association)
+        association.klass
+      rescue StandardError
+        nil
+      end
+
       # NOTICE: Ignores ActiveType::Object association during introspection and interactions.
       #         See the gem documentation: https://github.com/makandra/active_type
       def active_type?(model)

data/lib/forest_admin_datasource_active_record/utils/query.rb

@@ -3,9 +3,11 @@ module ForestAdminDatasourceActiveRecord
     class Query
       include ForestAdminDatasourceToolkit::Components::Query::ConditionTree
 
+      attr_reader :query
+
       def initialize(collection, projection, filter)
         @collection = collection
-        @query = @collection.model
+        @query = @collection.model.unscoped
         @projection = projection
         @filter = filter
         @arel_table = @collection.model.arel_table

data/lib/forest_admin_datasource_active_record/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceActiveRecord
-  VERSION = "1.0.0-beta.62"
+  VERSION = "1.0.0-beta.64"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_active_record
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.62
+  version: 1.0.0.pre.beta.64
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-19 00:00:00.000000000 Z
+date: 2024-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord