forest_admin_datasource_toolkit 1.13.4 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b67c52dca2273ac1d0ac79fbd5afc1de901b0ee9bd69f97810796358c14c303d
-  data.tar.gz: 37c176c78e94070a4f0eaba728c0b257364839beed0b873965c713bc4c5c8341
+  metadata.gz: 6f0442b4f60efa1772ca6ea224ce5af2137ce0c59aca42a8c68b571bda10cd9c
+  data.tar.gz: cc83253fa699a7423af947e194b91a510d1772e19450ff02c001cf6d8f7334da
 SHA512:
-  metadata.gz: 01d6e4d7213d22dee58fa3931df14d9bac7f7a2cdac54fb4bc9454127390ad2b2645db7009861056c48519bc07f4f5d57dc656887bed6d215423e984ae921959
-  data.tar.gz: e29db840ff87e5bd5edb6720b7db3d9e2282c666233fc552295b48cd76e48be490767bd71ee26b5b83d0a8ba7b022fbe0c33d062c05f5033a6fc4106b7400757
+  metadata.gz: aae976cc55a84863c2277b30934a9c302821be6638e1c1cdacfe4a46c37e79e1208b03a1f4cf90dd6a681258d4ff22525c89688d50701e139ee9b1eff060d110
+  data.tar.gz: b5a59884fece3213995da019302b59c6a2702abd73b46c0afa48c0697ff04c16f6511ef5716b424ab12b55695b9b8fcf6309c9d29362a7cfafe95ecb5632c14c

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

@@ -89,12 +89,15 @@ module ForestAdminDatasourceToolkit
             )
           else
             through_collection = collection.datasource.get_collection(relation.through_collection)
-            through_tree = ConditionTreeFactory.intersect(
-              [
-                Nodes::ConditionTreeLeaf.new(relation.origin_key, Operators::EQUAL, origin_value),
-                Nodes::ConditionTreeLeaf.new(relation.foreign_key, Operators::PRESENT)
-              ]
-            )
+            conditions = [
+              Nodes::ConditionTreeLeaf.new(relation.origin_key, Operators::EQUAL, origin_value),
+              Nodes::ConditionTreeLeaf.new(relation.foreign_key, Operators::PRESENT)
+            ]
+
+            # add polymorphic type condition if the through association is polymorphic
+            add_polymorphic_condition(conditions, relation)
+
+            through_tree = ConditionTreeFactory.intersect(conditions)
             records = through_collection.list(
               caller,
               Filter.new(condition_tree: through_tree),
@@ -141,12 +144,16 @@ module ForestAdminDatasourceToolkit
           if foreign_relation && base_foreign_filter.nestable?
             foreign_key = collection.datasource.get_collection(relation.through_collection).schema[:fields][relation.foreign_key]
             base_through_filter = base_foreign_filter.nest(foreign_relation)
-            condition_tree = ConditionTreeFactory.intersect(
-              [
-                Nodes::ConditionTreeLeaf.new(relation.origin_key, Operators::EQUAL, origin_value),
-                base_through_filter.condition_tree
-              ]
-            )
+
+            conditions = [
+              Nodes::ConditionTreeLeaf.new(relation.origin_key, Operators::EQUAL, origin_value),
+              base_through_filter.condition_tree
+            ]
+
+            # add polymorphic type condition if the through association is polymorphic
+            add_polymorphic_condition(conditions, relation)
+
+            condition_tree = ConditionTreeFactory.intersect(conditions)
 
             if foreign_key.type == 'Column' && foreign_key.filter_operators.include?(Operators::PRESENT)
               present = Nodes::ConditionTreeLeaf.new(relation.foreign_key, Operators::PRESENT)
@@ -165,20 +172,33 @@ module ForestAdminDatasourceToolkit
             Projection.new([relation.foreign_key_target])
           )
 
-          Filter.new(
-            condition_tree: ConditionTreeFactory.intersect(
-              [
-                # only children of parent
-                Nodes::ConditionTreeLeaf.new(relation.origin_key, Operators::EQUAL, origin_value),
+          conditions = [
+            # only children of parent
+            Nodes::ConditionTreeLeaf.new(relation.origin_key, Operators::EQUAL, origin_value),
 
-                # only the children which match the conditions in baseForeignFilter
-                Nodes::ConditionTreeLeaf.new(
-                  relation.foreign_key,
-                  Operators::IN,
-                  records.map { |r| r[relation.foreign_key_target] }
-                )
-              ]
+            # only the children which match the conditions in baseForeignFilter
+            Nodes::ConditionTreeLeaf.new(
+              relation.foreign_key,
+              Operators::IN,
+              records.map { |r| r[relation.foreign_key_target] }
             )
+          ]
+
+          # add polymorphic type condition if the through association is polymorphic
+          add_polymorphic_condition(conditions, relation)
+
+          Filter.new(condition_tree: ConditionTreeFactory.intersect(conditions))
+        end
+
+        def self.add_polymorphic_condition(conditions, relation)
+          return conditions unless relation.respond_to?(:origin_type_field) &&
+                                   relation.origin_type_field &&
+                                   relation.origin_type_value
+
+          conditions << Nodes::ConditionTreeLeaf.new(
+            relation.origin_type_field,
+            Operators::EQUAL,
+            relation.origin_type_value
           )
         end
       end

data/lib/forest_admin_datasource_toolkit/schema/relations/many_to_many_schema.rb

@@ -2,7 +2,8 @@ module ForestAdminDatasourceToolkit
   module Schema
     module Relations
       class ManyToManySchema < RelationSchema
-        attr_accessor :origin_key, :through_collection, :foreign_key, :origin_key_target, :foreign_key_target
+        attr_accessor :origin_key, :through_collection, :foreign_key, :origin_key_target, :foreign_key_target,
+                      :origin_type_field, :origin_type_value
 
         def initialize(
           origin_key:,
@@ -10,7 +11,9 @@ module ForestAdminDatasourceToolkit
           foreign_key:,
           foreign_key_target:,
           foreign_collection:,
-          through_collection:
+          through_collection:,
+          origin_type_field: nil,
+          origin_type_value: nil
         )
           super(foreign_collection, 'ManyToMany')
           @origin_key = origin_key
@@ -18,6 +21,8 @@ module ForestAdminDatasourceToolkit
           @through_collection = through_collection
           @foreign_key = foreign_key
           @foreign_key_target = foreign_key_target
+          @origin_type_field = origin_type_field
+          @origin_type_value = origin_type_value
         end
       end
     end

data/lib/forest_admin_datasource_toolkit/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceToolkit
-  VERSION = "1.13.4"
+  VERSION = "1.14.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.13.4
+  version: 1.14.1
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-06 00:00:00.000000000 Z
+date: 2025-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport