forest_admin_datasource_toolkit 1.44.5 → 1.45.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8326b38422a350c825c0285cff2d498ebeb44afa940f3ea351ce62cbb55c367
-  data.tar.gz: 4d8c43cdcedadb7253171e67d5b4c516df7f1d2379d566102db967ca2fb85fc1
+  metadata.gz: 10f5f2fa8864db325ce151f569c2e438775ae5c18738fa2bc3de7f54119f1b1a
+  data.tar.gz: 72c8a79a285a7457c3d8757d6ba4f99079076f8002c59ec64d0f41ac0411269c
 SHA512:
-  metadata.gz: 8b0048d34fee5deb83a2eb0a151e9c4837586e3309f846d4b8ad90a43857628f3488fc44342b58e0a822fa8e2618b01e6267fff458ef208a30558721fd2349b6
-  data.tar.gz: 285fd1c47c785df4a92c3ec61eba58605e34c569d1ff84af139de25617842d10322c576fd8639baa07d51edb913b961f24d146b3844703a604a08684fc8ec557
+  metadata.gz: 75acf62baf319e7cc728897a42fc4d1edbece85d5a64bedb6a4720a6387c7b78ae5c84ac3b4c93027d0410215f7cf45de3b4b28766e7ff28d1d41def788ea2ec
+  data.tar.gz: 81af933d91fbdc333e2f2c9249d79bee037e436becfd8fd1046b4d6b3afbfd65ceb701e860769b50b2598c047193d130f798d161fe30373841ed88885fc0d2a5

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

@@ -2,10 +2,11 @@ module ForestAdminDatasourceToolkit
   module Schema
     module Relations
       class ManyToOneSchema < RelationSchema
-        attr_accessor :foreign_key, :foreign_key_target
+        attr_accessor :foreign_key, :foreign_key_target, :is_filterable
 
-        def initialize(foreign_key:, foreign_key_target:, foreign_collection:, is_read_only: false)
+        def initialize(foreign_key:, foreign_key_target:, foreign_collection:, is_read_only: false, is_filterable: true)
           super(foreign_collection, 'ManyToOne', is_read_only: is_read_only)
+          @is_filterable = is_filterable
           @foreign_key = foreign_key
           @foreign_key_target = foreign_key_target
         end

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

@@ -2,10 +2,11 @@ module ForestAdminDatasourceToolkit
   module Schema
     module Relations
       class OneToOneSchema < RelationSchema
-        attr_accessor :origin_key, :origin_key_target
+        attr_accessor :origin_key, :origin_key_target, :is_filterable
 
-        def initialize(origin_key:, origin_key_target:, foreign_collection:, is_read_only: false)
+        def initialize(origin_key:, origin_key_target:, foreign_collection:, is_read_only: false, is_filterable: true)
           super(foreign_collection, 'OneToOne', is_read_only: is_read_only)
+          @is_filterable = is_filterable
           @origin_key = origin_key
           @origin_key_target = origin_key_target
         end

data/lib/forest_admin_datasource_toolkit/validations/condition_tree_validator.rb

@@ -32,6 +32,7 @@ module ForestAdminDatasourceToolkit
       def self.validate_leaf(leaf, collection)
         field_schema = Utils::Collection.get_field_schema(collection, leaf.field)
 
+        throw_if_relation_not_filterable(leaf, collection)
         throw_if_operator_not_allowed_with_column(leaf, field_schema)
         throw_if_value_not_allowed_with_operator(leaf, field_schema)
         throw_if_operator_not_allowed_with_column_type(leaf, field_schema)
@@ -40,13 +41,27 @@ module ForestAdminDatasourceToolkit
         nil
       end
 
+      def self.throw_if_relation_not_filterable(leaf, collection)
+        current = collection
+
+        leaf.field.split(':')[0...-1].each do |relation_name|
+          relation = current.schema[:fields][relation_name]
+
+          if relation.respond_to?(:is_filterable) && relation.is_filterable == false
+            raise Exceptions::ValidationError, "The relation '#{current.name}.#{relation_name}' is not filterable"
+          end
+
+          current = current.datasource.get_collection(relation.foreign_collection)
+        end
+      end
+
       def self.throw_if_operator_not_allowed_with_column(leaf, column_schema)
         operators = column_schema.filter_operators
         return if operators.include?(leaf.operator)
 
         raise Exceptions::ValidationError,
               "The given operator '#{leaf.operator}' is not supported by the column: '#{leaf.field}'." \
-              "#{operators.empty? ? " The allowed types are: #{operators.join(",")}" : " The column is not filterable"}"
+              "#{operators.empty? ? " The column is not filterable" : " The allowed types are: #{operators.join(",")}"}"
       end
 
       def self.throw_if_value_not_allowed_with_operator(leaf, column_schema)

data/lib/forest_admin_datasource_toolkit/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceToolkit
-  VERSION = "1.44.5"
+  VERSION = "1.45.0"
 end

metadata

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