forest_admin_datasource_customizer 1.0.0.pre.beta.64 → 1.0.0.pre.beta.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 327f341f4b86335d06bca3b72ba3e5b87dfe6b9546c4963b3d7bcb54fd6d3272
-  data.tar.gz: 8edc45d582e613baa6c04e4962c70dd3c194452bcebe7a59a0dd7026949bdf79
+  metadata.gz: 6ff06d84529de19b6e3d26bb2c13bf90ec9777198f3fe817ee5232bf395e1b31
+  data.tar.gz: b84c75a15e00e7865e9ed37b14cc8a8b60fd1120d9c8d712f514656b46f7abe8
 SHA512:
-  metadata.gz: '052588848567ebc4e81efd2494f115f7cd5631952d24f8fdee4155e804f4061bea465bd5ca1fde813d10c8bdbe7b1919d8d719a5550bba19018da2b21987117d'
-  data.tar.gz: 2dbd7bf87fe0841cf055f21f3244e5fbc9a56a6f12527792d9dace02540b2c1def20f84c79a22d8d458e6afd342c6bc524b14bc9cdf4f8807a3b5022b3336b3b
+  metadata.gz: b5ec8e8088d0d82a6089795dba63674e589c3ca90e226808c5c73d6d3f78dffd5ce6f3862a5699f9cbe9505eeb3d2f7ca5a744a84ed495969954e13c0743aa0d
+  data.tar.gz: 9f124ec9a5a2e75741ce5d405fb6968bda58f5c231727bb6ea99d5b6c82603426f278ad93851720cd25f98aa0a406ce575f1d2294d46e4cc0d274c06c0593b15

data/lib/forest_admin_datasource_customizer/decorators/computed/utils/flattener.rb

@@ -31,7 +31,10 @@ module ForestAdminDatasourceCustomizer
 
           def self.flatten(records, projection)
             projection.map do |field|
-              parts = field.split(':')
+              # because we don't compute computed fields over polymorphic relation (only usage of *),
+              # we decide to consider the all record as a value instead of a relation
+              parts = field.split(':').reject { |part| part == '*' }
+
               records.map do |record|
                 value = record
 
@@ -63,7 +66,7 @@ module ForestAdminDatasourceCustomizer
               records[record_index] = {}
 
               projection.each_with_index do |path, path_index|
-                parts = path.split(':').reject { |part| part == MARKER_NAME }
+                parts = path.split(':').reject { |part| [MARKER_NAME, '*'].include?(part) }
                 value = flatten[path_index][record_index]
 
                 # Ignore undefined values.

data/lib/forest_admin_datasource_customizer/decorators/publication/publication_collection_decorator.rb

@@ -70,7 +70,8 @@ module ForestAdminDatasourceCustomizer
             )
           end
 
-          if field.type == 'OneToOne' || field.type == 'OneToMany'
+          if field.type == 'OneToOne' || field.type == 'OneToMany' ||
+             field.type == 'PolymorphicOneToOne' || field.type == 'PolymorphicOneToMany'
             return (
               datasource.published?(field.foreign_collection) &&
               datasource.get_collection(field.foreign_collection).published?(field.origin_key) &&

data/lib/forest_admin_datasource_customizer/decorators/rename_field/rename_field_collection_decorator.rb

@@ -52,6 +52,8 @@ module ForestAdminDatasourceCustomizer
           fields = {}
           schema = sub_schema.dup
 
+          # we don't handle schema modification for polymorphic many to one and reverse relations because
+          # we forbid to rename foreign key and type fields on polymorphic many to one
           sub_schema[:fields].each do |old_name, old_schema|
             case old_schema.type
             when 'ManyToOne'
@@ -160,7 +162,11 @@ module ForestAdminDatasourceCustomizer
             paths = path.split(':')
             relation_name = paths[0]
             relation_schema = schema[:fields][relation_name]
-            if relation_schema.type != 'PolymorphicManyToOne'
+            if relation_schema.type == 'PolymorphicManyToOne'
+              relation_name = to_child_collection[relation_name]
+
+              return "#{relation_name}:#{paths[1]}"
+            else
               relation = datasource.get_collection(relation_schema.foreign_collection)
               child_field = to_child_collection[relation_name] || relation_name
 
@@ -188,7 +194,8 @@ module ForestAdminDatasourceCustomizer
             field_schema = schema[:fields][field]
 
             # Perform the mapping, recurse for relation
-            if field_schema.type == 'Column' || field_schema.type == 'PolymorphicManyToOne' || value.nil?
+            if field_schema.type == 'Column' || value.nil? || field_schema.type == 'PolymorphicManyToOne' ||
+               field_schema.type == 'PolymorphicOneToOne'
               record[field] = value
             else
               relation = datasource.get_collection(field_schema.foreign_collection)

data/lib/forest_admin_datasource_customizer/decorators/search/search_collection_decorator.rb

@@ -104,7 +104,7 @@ module ForestAdminDatasourceCustomizer
           collection.schema[:fields].each do |name, field|
             fields.push([name, field]) if field.type == 'Column'
 
-            if field.type == 'PolymorphicManyToOne'
+            if field.type == 'PolymorphicManyToOne' && extended
               ForestAdminAgent::Facades::Container.logger.log(
                 'Debug',
                 "We're not searching through #{self.name}.#{name} because it's a polymorphic relation. " \

data/lib/forest_admin_datasource_customizer/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceCustomizer
-  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_customizer
 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