forest_admin_datasource_toolkit 1.0.0.pre.beta.64 → 1.0.0.pre.beta.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05b86e9f739a36be76766d3d56f0162ee04809942091078fa60948603fadc428
-  data.tar.gz: 51256c9a0118701bd433c4ed2a83c6e41655db9ee0edfcbc58cc9ccf0242e5cb
+  metadata.gz: fd5e11bf75b0839e35d3f44e6502e76785c5b4d376cb94d128d877d49030e365
+  data.tar.gz: ff66ca88263adb91efbb6a2f254893f4274a779ba062bc865ec06b9756790f84
 SHA512:
-  metadata.gz: a3db9f7c20db3ce087aa8fc693e4a1b30007f88c1e4bcb813e4e75962218b7b59ee9c55d14661182d1ec8e59b04faf90fe7bc1b4fc28279c05e950df2a63e89f
-  data.tar.gz: fd2cb508b67f6f39ba14ef798fea7a8d640e793e917bd83745e09dbfd169a6045c24136e301a98c86d27cd8b15b088bbabe23666128e7f175806a0d4510cea7b
+  metadata.gz: 1229b9e6453ecc3ad4ace3869c252a01a2fd19227c0b603369de3a3e6e834990a8357a0c20ca32d733baa7b79b2f9ceb3a1cdc47d03a5e5299b1d9cd43e213b7
+  data.tar.gz: cd6dab546b51a50ee21a7ae62d15cbeab11075625e9e1e7d146ff55a6592877557faf67705aca60884277255fb766d0cf06fadc0435219f6adbcb4eb5e6ef94f

data/lib/forest_admin_datasource_toolkit/utils/collection.rb

@@ -14,6 +14,8 @@ module ForestAdminDatasourceToolkit
         inverse = foreign_collection.schema[:fields].select do |_name, field|
           if polymorphic_relations.include?(relation_field.type)
             field.is_a?(PolymorphicManyToOneSchema) &&
+              field.foreign_key_type_field == relation_field.origin_type_field &&
+              field.foreign_key == relation_field.origin_key &&
               field.foreign_collections.include?(collection.name)
           else
             field.is_a?(RelationSchema) &&

data/lib/forest_admin_datasource_toolkit/validations/field_validator.rb

@@ -22,19 +22,26 @@ module ForestAdminDatasourceToolkit
             end
           end
         else
-          prefix = field[0, dot_index]
+          prefix, suffix = field.split(':')
           schema = collection.schema[:fields][prefix]
 
           raise Exceptions::ValidationError, "Relation not found: '#{collection.name}.#{prefix}'" if schema.nil?
 
-          if schema.type != 'ManyToOne' && schema.type != 'OneToOne'
+          if schema.type == 'PolymorphicManyToOne' && suffix != '*'
+            raise Exceptions::ValidationError, "Unexpected nested field #{suffix} under generic relation: #{collection.name}.#{prefix}"
+          end
+
+          if schema.type != 'ManyToOne' && schema.type != 'OneToOne' && schema.type != 'PolymorphicManyToOne' &&
+             schema.type != 'PolymorphicOneToOne'
             raise Exceptions::ValidationError,
-                  "Unexpected field type: '#{collection.name}.#{prefix}' (found '#{schema.type}' expected 'ManyToOne' or 'OneToOne')"
+                  "Unexpected field type: '#{collection.name}.#{prefix}' (found '#{schema.type}')"
           end
 
-          suffix = field[dot_index + 1, field.length - dot_index - 1]
-          association = collection.datasource.get_collection(schema.foreign_collection)
-          validate(association, suffix, values)
+          if schema.type != 'PolymorphicManyToOne'
+            suffix = field[dot_index + 1, field.length - dot_index - 1]
+            association = collection.datasource.get_collection(schema.foreign_collection)
+            validate(association, suffix, values)
+          end
         end
       end
 

data/lib/forest_admin_datasource_toolkit/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceToolkit
-  VERSION = "1.0.0-beta.64"
+  VERSION = "1.0.0-beta.65"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.64
+  version: 1.0.0.pre.beta.65
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-21 00:00:00.000000000 Z
+date: 2024-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport