forest_admin_datasource_toolkit 1.40.1 → 1.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 190a558c8d3e6a33c4a10749196acd2d6c10e2c20cc58061d0c863f6d7c4ab14
-  data.tar.gz: 65b56b7ff4f9560b5779727ea89f6aeb17e9c0c990ffa86cc88c6b6724fbe82b
+  metadata.gz: 5c33993a66508f7b9f68405da7b79d78a56c5c128b3533ffcbace85c7e6e913c
+  data.tar.gz: 78af493051757183a3f5f3dfe49e63e22f9b3dcc39a3c9ea8faee4854dea3984
 SHA512:
-  metadata.gz: 1a57468ace6221245624375b9f64d3098e05314de614b9886d544f5e295f68495cfd3d8ae97bc1bdc77e393cd620d23b59c9986d234aeea44f5dffb8df1b5426
-  data.tar.gz: 225e7ff48cfd5ec3cde4d313114ec2490b5badb64e88b929f838240409eb59d544a02e2a1bfe16d953ef4225acf523d55ba3b4c91011f72c85e456137dae4443
+  metadata.gz: 2e2af00eb575ec1cd0acb7ab0529e2fe94da28becb96197d2727d246106a6b2d409d89e26e8e9dac418452a66e744bcfb28331b30fcbaf8f4a13a05db45043df
+  data.tar.gz: 86fe59f8a4444f3cc018e574fa258410bd179442ca453c0dfee0cc095261479fc7704f82f43854302676f81d1104cd99c5338557f1e2b304ea9472662f8d65ba

data/lib/forest_admin_datasource_toolkit/components/query/aggregation.rb

@@ -187,7 +187,7 @@ module ForestAdminDatasourceToolkit
 
             summary['Count'] += 1
             summary['Min'] = value if min.nil? || value < min
-            summary['Max'] = value if max.nil? || value < max
+            summary['Max'] = value if max.nil? || value > max
           end
 
           summary['Sum'] += value if value.is_a?(Numeric)

data/lib/forest_admin_datasource_toolkit/components/query/condition_tree/nodes/condition_tree_branch.rb

@@ -34,11 +34,15 @@ module ForestAdminDatasourceToolkit
               )
             end
 
+            # Recurses through `match`, not through `every_leaf` / `some_leaf`:
+            # those walk down to the leaves and would apply this branch's
+            # aggregator to a nested one's, reading `And(a, Or(b, c))` as
+            # `And(a, b, c)`.
             def match(record, collection, timezone)
               if @aggregator == 'And'
-                every_leaf { |condition| condition.match(record, collection, timezone) }
+                @conditions.all? { |condition| condition.match(record, collection, timezone) }
               else
-                some_leaf { |condition| condition.match(record, collection, timezone) }
+                @conditions.any? { |condition| condition.match(record, collection, timezone) }
               end
             end
 

data/lib/forest_admin_datasource_toolkit/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceToolkit
-  VERSION = "1.40.1"
+  VERSION = "1.41.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.40.1
+  version: 1.41.0
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-08-28 00:00:00.000000000 Z
+date: 2026-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport