forest_admin_datasource_customizer 1.16.6 → 1.16.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88a8eec88408a61cfe18b06d9b6a00d7f9752e1f0f7a0634d707d306ff417e51
-  data.tar.gz: 9a7367fbb6e052077120295e53d36b0ff74d2647f3ad466a3a96fa12c229c48f
+  metadata.gz: 82e278319e01d29d59e70dc15f727d82ccc9d3d48bbafa6592c33ccb11573734
+  data.tar.gz: cfaa2bfb96607e8760b136e53a05846375e3114ffe18f1fe5023ca0691911be2
 SHA512:
-  metadata.gz: cdb4c1439e10a28ad2788837b63ed37eaf88bbb27ff216aeb03a76b62b2741f66c8790d1eb7ea58223fb27fdabb235b7fd0181882037054fbe488d3ea33e9183
-  data.tar.gz: cc92ee88c407852a979233016e970bae6e7419592c19bfc25f71233ebd172d0a47d80b4269bca3a48f99454d8e720f02e5717173b670d1ae411066b08a045daa
+  metadata.gz: c1973f833993be5e828ff73df8171a32b1ac1cfc4a18c55e335b88f6955f3791482adf03c1e0ebbab457f7c7c28ba5249aeb49abd14bc7422bb2744dd487acff
+  data.tar.gz: 8b8febafd935cacff3bc44f06f555d17e23f9986d98b48998b42d2947db4805df3d64e8b93cbcd63681f7e170a62eed6af3247b8fb6aceec4148a06601313d7b

data/lib/forest_admin_datasource_customizer/decorators/binary/binary_collection_decorator.rb

@@ -68,7 +68,7 @@ module ForestAdminDatasourceCustomizer
 
         def list(caller, filter, projection)
           records = super
-          records.map! { |record| convert_record(false, record) }
+          records.map! { |record| convert_record(false, record, projection) }
 
           records
         end
@@ -126,17 +126,43 @@ module ForestAdminDatasourceCustomizer
           Utils::Schema.primary_key?(@child_collection, name) || Utils::Schema.foreign_key?(@child_collection, name)
         end
 
-        def convert_record(to_backend, record)
-          if record
-            record = record.to_h do |path, value|
-              [path, convert_value(to_backend, path, value)]
+        def convert_record(to_backend, record, projection = nil)
+          return record unless record
+
+          result = {}
+          record.each do |path, value|
+            # Skip fields that don't exist in the schema (e.g., virtual attributes)
+            prefix = path.split(':').first
+            next unless @child_collection.schema[:fields][prefix]
+
+            if projection.nil?
+              result[path] = convert_value(to_backend, path, value, nil)
+            else
+              sub_projection = extract_sub_projection(projection, path)
+              result[path] = if sub_projection
+                               convert_value(to_backend, path, value, sub_projection)
+                             else
+                               value
+                             end
             end
           end
 
-          record
+          result
+        end
+
+        def extract_sub_projection(projection, path)
+          # Check if the field is directly in the projection
+          return Projection.new([path]) if projection.include?(path)
+
+          # Check if any field in the projection starts with "path:"
+          sub_fields = projection.select { |p| p.start_with?("#{path}:") }
+          return nil if sub_fields.empty?
+
+          # Extract the sub-projection by removing the prefix
+          Projection.new(sub_fields.map { |p| p[(path.length + 1)..] })
         end
 
-        def convert_value(to_backend, path, value)
+        def convert_value(to_backend, path, value, projection = nil)
           prefix, suffix = path.split(':')
           field = @child_collection.schema[:fields][prefix]
 
@@ -151,9 +177,13 @@ module ForestAdminDatasourceCustomizer
           if field.type != 'Column'
             foreign_collection = @datasource.get_collection(field.foreign_collection)
 
-            return suffix ? foreign_collection.convert_value(to_backend, suffix,
-                                                             value) : foreign_collection.convert_record(to_backend,
-                                                                                                        value)
+            result = if suffix
+                       foreign_collection.convert_value(to_backend, suffix, value, projection)
+                     else
+                       foreign_collection.convert_record(to_backend, value, projection)
+                     end
+
+            return result
           end
 
           binary_mode = should_use_hex(path)

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

@@ -201,6 +201,9 @@ module ForestAdminDatasourceCustomizer
             field = from_child_collection[child_field] || child_field
             field_schema = schema[:fields][field]
 
+            # Skip fields that don't exist in the schema (e.g., virtual attributes)
+            next unless field_schema
+
             # Perform the mapping, recurse for relation
             if field_schema.type == 'Column' || value.nil? || field_schema.type == 'PolymorphicManyToOne' ||
                field_schema.type == 'PolymorphicOneToOne'

data/lib/forest_admin_datasource_customizer/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceCustomizer
-  VERSION = "1.16.6"
+  VERSION = "1.16.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_customizer
 version: !ruby/object:Gem::Version
-  version: 1.16.6
+  version: 1.16.7
 platform: ruby
 authors:
 - Matthieu