forest_admin_datasource_active_record 1.11.3 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14a1244eea8c61889076f8080b0c4b84986404873cc5143c4f67a26f24f6748b
-  data.tar.gz: afc0ea714e88ee255f5db4abbd0d9e6992d731cbf9322c1d9898b2ed66c909f2
+  metadata.gz: a40c0defe6cd599ebaa87e949a6336ecb4d52889746fa3ab51fa0bb39be4deb8
+  data.tar.gz: 0c42a3bf00e84e2a58d95873aed32297bc199f4de1598b1b6e0287ef6aadfb7c
 SHA512:
-  metadata.gz: 220a57a087138167c92afb5f895e7b53c444c5fc7c86a0229341309ce7e8c2caab0c6040c9addf0f2300b113a28fa50388dde5250276c285813c7e839824e77a
-  data.tar.gz: b8f4c58ad1a604160ed28ed13962332a2318be66b95c075c441fc9c09afafe625a260778a2e4561cc117a4f5f8eede63861e155fede29736ddf78c6d7531b2e3
+  metadata.gz: d9892935ebfced8847e155b0ef0a1c7e145c3ac98ebc0ebf0690e3a1431b63cccfde1cb0269250aa91366c1ed5e85edaa72cd50a7fe06a90984d043b919a9a97
+  data.tar.gz: a6eec620c99261ec541373e612ea8b211588a7680915153446604d1a8765146c0bfd1fbb41494e65ced27d7f921ea603774797d6df6ea16c918c40537e72f786

data/lib/forest_admin_datasource_active_record/utils/active_record_serializer.rb

@@ -12,24 +12,42 @@ module ForestAdminDatasourceActiveRecord
 
         hash.merge! object.attributes
 
-        if with_associations
-          each_association_collection(object, projection) do |association_name, item|
-            hash[association_name] = hash_object(
-              item,
-              projection.relations[association_name],
-              with_associations: projection.relations.key?(association_name)
-            )
-          end
-        end
+        serialize_associations(object, projection, hash) if with_associations
 
         hash
       end
 
-      def each_association_collection(object, projection)
+      def serialize_associations(object, projection, hash)
         one_associations = %i[has_one belongs_to]
+        many_associations = %i[has_many has_and_belongs_to_many]
+
+        # Handle one-to-one and many-to-one associations
         object.class.reflect_on_all_associations
               .filter { |a| one_associations.include?(a.macro) && projection.relations.key?(a.name.to_s) }
-              .each { |association| yield(association.name.to_s, object.send(association.name.to_s)) }
+              .each do |association|
+                association_name = association.name.to_s
+                hash[association_name] = hash_object(
+                  object.send(association_name),
+                  projection.relations[association_name],
+                  with_associations: projection.relations.key?(association_name)
+                )
+              end
+
+        # Handle one-to-many and many-to-many associations
+        object.class.reflect_on_all_associations
+              .filter { |a| many_associations.include?(a.macro) && projection.relations.key?(a.name.to_s) }
+              .each do |association|
+                association_name = association.name.to_s
+                collection = object.send(association_name)
+                # Serialize the collection as an array
+                hash[association_name] = collection.map do |item|
+                  hash_object(
+                    item,
+                    projection.relations[association_name],
+                    with_associations: projection.relations.key?(association_name)
+                  )
+                end
+              end
       end
     end
   end

data/lib/forest_admin_datasource_active_record/utils/query.rb

@@ -179,14 +179,16 @@ module ForestAdminDatasourceActiveRecord
         end
 
         one_to_one_relations = %w[OneToOne PolymorphicOneToOne]
+        many_to_one_relations = %w[ManyToOne PolymorphicManyToOne]
+
         projection.relations.each do |relation_name, sub_projection|
           relation_schema = collection.schema[:fields][relation_name]
           if collection.model.table_name == @collection.model.table_name
-            @select << if one_to_one_relations.include?(relation_schema.type)
-                         "#{collection.model.table_name}.#{relation_schema.origin_key_target}"
-                       else
-                         "#{collection.model.table_name}.#{relation_schema.foreign_key}"
-                       end
+            if one_to_one_relations.include?(relation_schema.type)
+              @select << "#{collection.model.table_name}.#{relation_schema.origin_key_target}"
+            elsif many_to_one_relations.include?(relation_schema.type)
+              @select << "#{collection.model.table_name}.#{relation_schema.foreign_key}"
+            end
           end
 
           next if relation_schema.type == 'PolymorphicManyToOne'

data/lib/forest_admin_datasource_active_record/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceActiveRecord
-  VERSION = "1.11.3"
+  VERSION = "1.12.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_active_record
 version: !ruby/object:Gem::Version
-  version: 1.11.3
+  version: 1.12.0
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-10-22 00:00:00.000000000 Z
+date: 2025-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord