forest_admin_datasource_toolkit 1.12.4 → 1.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0c26b03f2c81650ec4dde5be6cc32fe4c42e35b329aa84fb2e1f6db869fb238
-  data.tar.gz: e635d2ebf0227a3fd019fe60f86cb96ebdf08802268ba66dea79845e0eb7462c
+  metadata.gz: 108cdfbbd48ef7a4282c02bdc539fb1e2f4f3bde6c187bc57f3c55409aeb7573
+  data.tar.gz: 2fa545b164621f558255d286d2d76684b8fcd489292fec67680b6ba521931da5
 SHA512:
-  metadata.gz: 18f899be39c5192d5777a875461f8cba102c47998a8858f07b5cd434bd624233a0bfdd67c09d0671970abe4a8d3ecbb72c58b242245c71ea9f16f04d4d447ca1
-  data.tar.gz: 8531fb5f73029638b79c8088855e41cc0a4a6b4e0c259e8b0ae8f92e40388b32cc262c54152ab318d1167a5b17908cef206bf23940f62e9037286c0fdbbf8b49
+  metadata.gz: 3c1aeff54b92dc0ddf9869f6427372df4c20a29372f4506e416a303945d63873a9cddca8ab05d35b9e6d2ef9ca301054b803748c1fa851aba3f95a2a74c04b02
+  data.tar.gz: b1380d47b4b0d68e50a9a4a8f5223a769e50128950c5e5b5f0d9056f71cccbe9a8b6481139a34e2a640533298e95d9c4b18e00891df425406c4c93ae1e676bf6

data/lib/forest_admin_datasource_toolkit/components/query/condition_tree/condition_tree_factory.rb

@@ -28,7 +28,15 @@ module ForestAdminDatasourceToolkit
               end
             end
 
-            match_fields(primary_key_names, ids)
+            normalized_ids = ids.map do |id|
+              if id.is_a?(Hash)
+                primary_key_names.map { |pk_name| id[pk_name] }
+              else
+                id
+              end
+            end
+
+            match_fields(primary_key_names, normalized_ids)
           end
 
           def self.intersect(trees = nil)

data/lib/forest_admin_datasource_toolkit/utils/collection.rb

@@ -78,18 +78,18 @@ module ForestAdminDatasourceToolkit
         )
       end
 
-      def self.get_value(collection, caller, id, field)
-        if id.is_a? Array
+      def self.get_value(collection, caller, primary_key_values, field)
+        if primary_key_values.is_a? Array
           index = Schema.primary_keys(collection).index(field)
 
-          return id[index] if index
+          return primary_key_values[index] if index
         elsif Schema.primary_keys(collection).include?(field)
-          return id[field]
+          return primary_key_values[field]
         end
 
         records = collection.list(
           caller,
-          ForestAdminDatasourceToolkit::Components::Query::Filter.new(condition_tree: ConditionTree::ConditionTreeFactory.match_ids(collection, [id])),
+          ForestAdminDatasourceToolkit::Components::Query::Filter.new(condition_tree: ConditionTree::ConditionTreeFactory.match_ids(collection, [primary_key_values])),
           Projection.new([field])
         )
 
@@ -130,7 +130,7 @@ module ForestAdminDatasourceToolkit
         nil
       end
 
-      def self.list_relation(collection, id, relation_name, caller, foreign_filter, projection)
+      def self.list_relation(collection, primary_key_values, relation_name, caller, foreign_filter, projection)
         relation = collection.schema[:fields][relation_name]
         foreign_collection = collection.datasource.get_collection(relation.foreign_collection)
 
@@ -141,7 +141,7 @@ module ForestAdminDatasourceToolkit
             through_collection = collection.datasource.get_collection(relation.through_collection)
             records = through_collection.list(
               caller,
-              FilterFactory.make_through_filter(collection, id, relation_name, caller, foreign_filter),
+              FilterFactory.make_through_filter(collection, primary_key_values, relation_name, caller, foreign_filter),
               projection.nest(prefix: foreign_relation)
             )
 
@@ -151,12 +151,12 @@ module ForestAdminDatasourceToolkit
 
         foreign_collection.list(
           caller,
-          FilterFactory.make_foreign_filter(collection, id, relation_name, caller, foreign_filter),
+          FilterFactory.make_foreign_filter(collection, primary_key_values, relation_name, caller, foreign_filter),
           projection
         )
       end
 
-      def self.aggregate_relation(collection, id, relation_name, caller, foreign_filter, aggregation, limit = nil)
+      def self.aggregate_relation(collection, primary_key_values, relation_name, caller, foreign_filter, aggregation, limit = nil)
         relation = collection.schema[:fields][relation_name]
         foreign_collection = collection.datasource.get_collection(relation.foreign_collection)
 
@@ -167,7 +167,7 @@ module ForestAdminDatasourceToolkit
 
             return through_collection.aggregate(
               caller,
-              FilterFactory.make_through_filter(collection, id, relation_name, caller, foreign_filter),
+              FilterFactory.make_through_filter(collection, primary_key_values, relation_name, caller, foreign_filter),
               aggregation,
               limit
             )
@@ -176,7 +176,7 @@ module ForestAdminDatasourceToolkit
 
         foreign_collection.aggregate(
           caller,
-          FilterFactory.make_foreign_filter(collection, id, relation_name, caller, foreign_filter),
+          FilterFactory.make_foreign_filter(collection, primary_key_values, relation_name, caller, foreign_filter),
           aggregation,
           limit
         )

data/lib/forest_admin_datasource_toolkit/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceToolkit
-  VERSION = "1.12.4"
+  VERSION = "1.12.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.12.4
+  version: 1.12.6
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-10-24 00:00:00.000000000 Z
+date: 2025-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport