forest_admin_datasource_toolkit 1.12.5 → 1.12.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d0914991ed2cf3e5449363d6eb47405a6ca3903f8fb48b26a6add92c7eeb8a2
-  data.tar.gz: 642d7a1f7dc91806236de93ecb8a66276070a93db65018b1425fd9238289b7a5
+  metadata.gz: 44923207269f5d54e53a81a9cb33c5a67efeec2eb627bc445c8d94e6f4f88544
+  data.tar.gz: 6af63f885bc642506cb48d19386bc45c73d7bf9a86b57dc4bdef7405457a6341
 SHA512:
-  metadata.gz: 692bacdec05bdf3e0591319945cce1133f762d3956cc7b7adf21e3881af53e101a52d8044b7c4b55234c00f2871cea82e9858e41db9029fddb93fbb1e73cf872
-  data.tar.gz: 4d480817a3ba453b3aab16c8280e9937cce495a989c47f842cb28cf5f5f5ed67172826435b2c46399305c70f6b3ffc206bce42e0c29624431022dc59733c444a
+  metadata.gz: c92a96a249e4376ab96e017988b76fadd69d0104e70fd96de38a4f1dbf8db68eec012c2c39685b2f3e1429feb412c542842443500d00e333ef701217b754b209
+  data.tar.gz: 4ba87bf6bf46e0a0e0f2cfdc4bd354dc2a0aaa7c0d42b31d8da463eb7c93f53188d754a851039e016adb63a4c7ff89af5488873eab79f4c54f1e8221fad7bd72

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/validations/type_getter.rb

@@ -51,6 +51,8 @@ module ForestAdminDatasourceToolkit
 
           return PrimitiveTypes::POINT if point?(value, type_context)
 
+          return PrimitiveTypes::NUMBER if type_context == PrimitiveTypes::NUMBER && number?(value)
+
           PrimitiveTypes::STRING
         end
 

data/lib/forest_admin_datasource_toolkit/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceToolkit
-  VERSION = "1.12.5"
+  VERSION = "1.12.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.12.5
+  version: 1.12.7
 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