forest_admin_agent 1.38.2 → 1.38.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 948a67317152cf955d6e7ff512b20b810d136ff9ab89e8ad87cbb2a09e9b80e2
-  data.tar.gz: 3984557e91f84b405857a45debf12c7ec2d39377575be0a645ad9c4c7c1de872
+  metadata.gz: 8240dc695f68ad1315a072be614a48151c0f52a0a35596500face2c12bdc3847
+  data.tar.gz: 267ec0985751c7c86e5df4c426862063bf1b5e41e06ba24d7ee14bf1a80ecf69
 SHA512:
-  metadata.gz: d051b8008198eb80152b4e542ce4c570f0e3215c46a6e9cdbe05405d395c9760fc7176318a4eb0533e1ca91443c7c3be17ac9d51176094910e6fe3230f77bf43
-  data.tar.gz: a103408031a613a2061036ca066502f72752f2138d22e526cb5706bd7b703b415297cf9aba273d3976dc1a2bf52b6ed948d9f768e6c74d2f99031d9397dbd809
+  metadata.gz: 2966283a4f8b14022cdd74a54c6e366cdfae74314cd64d77fafbb8c7c258fa860dcacafc0e1dcd842d7d590ed63884a2550aa16066696d8313d0427fa552ad3b
+  data.tar.gz: c943da4d2edf12f3e4f2b34d10ee70184befe11fe276cb246f785051cb7b7fcfb6e885459c9e5431e0351c6621db30ee6e2cab5ad93ee5c9ed3b8cf152ce63cc

data/lib/forest_admin_agent/routes/resources/list.rb

@@ -43,7 +43,7 @@ module ForestAdminAgent
               class_name: context.collection.name,
               is_collection: true,
               serializer: Serializer::ForestSerializer,
-              include: projection.relations(only_keys: true),
+              include: projection.relation_include_paths,
               meta: handle_search_decorator(args[:params]['search'], records, context.collection)
             )
           }

data/lib/forest_admin_agent/routes/resources/related/list_related.rb

@@ -53,7 +53,7 @@ module ForestAdminAgent
                 is_collection: true,
                 class_name: context.child_collection.name,
                 serializer: Serializer::ForestSerializer,
-                include: projection.relations.keys
+                include: projection.relation_include_paths
               )
             }
           end

data/lib/forest_admin_agent/routes/resources/show.rb

@@ -38,7 +38,7 @@ module ForestAdminAgent
               class_name: context.collection.name,
               is_collection: false,
               serializer: Serializer::ForestSerializer,
-              include: projection.relations(only_keys: true)
+              include: projection.relation_include_paths
             )
           }
         end

data/lib/forest_admin_agent/serializer/forest_serializer_override.rb

@@ -54,23 +54,24 @@ module ForestAdminAgent
               # Full linkage: a request for comments.author MUST automatically include comments
               # in the response.
               objects = is_collection ? object : [object]
+
+              relation = ForestAdminAgent::Facades::Container.datasource
+                                                             .get_collection(options[:class_name].gsub('::', '__'))
+                                                             .schema[:fields][attribute_name]
+              if relation.type == 'PolymorphicManyToOne'
+                relation_class_name = root_object[relation.foreign_key_type_field]
+              else
+                relation_class_name = ForestAdminAgent::Facades::Container.datasource.get_collection(relation.foreign_collection).name
+              end
+
+              related_collection_options = options.merge(class_name: relation_class_name)
+
               if child_inclusion_tree[:_include] == true
                 # Include the current level objects if the _include attribute exists.
                 # If it is not set, that indicates that this is an inner path and not a leaf and will
                 # be followed by the recursion below.
                 objects.each do |obj|
-                  relation = ForestAdminAgent::Facades::Container.datasource
-                                                                 .get_collection(options[:class_name].gsub('::', '__'))
-                                                                 .schema[:fields][attribute_name]
-                  if relation.type == 'PolymorphicManyToOne'
-                    relation_class_name = root_object[relation.foreign_key_type_field]
-                  else
-                    relation_class_name = ForestAdminAgent::Facades::Container.datasource.get_collection(relation.foreign_collection).name
-                  end
-
-                  option_relation = options.clone
-                  option_relation[:class_name] = relation_class_name
-                  obj_serializer = JSONAPI::Serializer.find_serializer(obj, option_relation)
+                  obj_serializer = JSONAPI::Serializer.find_serializer(obj, related_collection_options)
 
                   # Use keys of ['posts', '1'] for the results to enforce uniqueness.
                   # Spec: A compound document MUST NOT include more than one resource object for each
@@ -105,7 +106,7 @@ module ForestAdminAgent
 
               # For each object we just loaded, find all deeper recursive relationships.
               objects.each do |obj|
-                find_recursive_relationships(obj, child_inclusion_tree, results, options)
+                find_recursive_relationships(obj, child_inclusion_tree, results, related_collection_options)
               end
             end
             nil

data/lib/forest_admin_agent/utils/query_string_parser.rb

@@ -9,6 +9,7 @@ module ForestAdminAgent
 
       DEFAULT_ITEMS_PER_PAGE = '15'.freeze
       DEFAULT_PAGE_TO_SKIP = '1'.freeze
+      POLYMORPHIC_TARGET_WILDCARD = '*'.freeze
 
       def self.parse_condition_tree(collection, args)
         filters = begin
@@ -88,7 +89,7 @@ module ForestAdminAgent
           when 'Column'
             field_name
           when 'PolymorphicManyToOne'
-            "#{field_name}:*"
+            "#{field_name}:#{POLYMORPHIC_TARGET_WILDCARD}"
           else
             relation_fields = args.dig(:params, :fields, field_name)
 
@@ -110,18 +111,63 @@ module ForestAdminAgent
         root_field_names_with_types = root_field_names.dup
         add_polymorphic_type_fields(collection, root_field_names_with_types)
 
-        projection_fields = requested_paths.map do |path|
-          field_name, nested_path = path.split(':', 2)
-          field = get_field(collection, field_name)
+        projection_fields = requested_paths.map { |path| expand_polymorphic_leaf(collection, path) }
 
-          if field.type == 'PolymorphicManyToOne' && (nested_path.nil? || nested_path == '*')
-            "#{field_name}:*"
-          else
-            path
+        projection_fields |
+          (root_field_names_with_types - root_field_names) |
+          nested_polymorphic_linkage_fields(collection, projection_fields)
+      end
+
+      def self.expand_polymorphic_leaf(collection, path)
+        segments = path.split(':')
+        leaf_index = segments.size - 1
+
+        each_field_along_path(collection, segments) do |field, index|
+          return "#{path}:#{POLYMORPHIC_TARGET_WILDCARD}" if polymorphic_many_to_one?(field) && index == leaf_index
+        end
+
+        path
+      end
+
+      def self.nested_polymorphic_linkage_fields(collection, projection_fields)
+        projection_fields.flat_map do |path|
+          segments = path.split(':')
+
+          each_field_along_path(collection, segments).flat_map do |field, index|
+            next [] unless polymorphic_many_to_one?(field) && index.positive?
+
+            polymorphic_linkage_columns(field, segments[0...index])
           end
         end
+      end
+
+      def self.polymorphic_linkage_columns(field, relation_path)
+        [field.foreign_key_type_field, field.foreign_key].map { |column| (relation_path + [column]).join(':') }
+      end
+
+      def self.each_field_along_path(collection, segments)
+        return to_enum(:each_field_along_path, collection, segments) unless block_given?
+
+        current_collection = collection
+
+        segments.each_with_index do |segment, index|
+          field = field_along_path(current_collection, segment, root: index.zero?)
+          break if field.nil?
+
+          yield field, index
+
+          break unless field.respond_to?(:foreign_collection)
+
+          current_collection = collection.datasource.get_collection(field.foreign_collection)
+        end
+      end
+
+      def self.field_along_path(collection, segment, root:)
+        root ? get_field(collection, segment) : collection.schema[:fields][segment]
+      end
 
-        projection_fields | (root_field_names_with_types - root_field_names)
+      def self.polymorphic_many_to_one?(field)
+        field.type == 'PolymorphicManyToOne'
       end
 
       def self.get_field(collection, field_name)
@@ -135,7 +181,10 @@ module ForestAdminAgent
               'Please check if the field name is correct.'
       end
       private_class_method :add_polymorphic_type_fields, :build_projection_fields,
-                           :build_header_projection_fields, :get_field
+                           :build_header_projection_fields, :get_field,
+                           :expand_polymorphic_leaf, :nested_polymorphic_linkage_fields,
+                           :polymorphic_linkage_columns, :each_field_along_path,
+                           :field_along_path, :polymorphic_many_to_one?
 
       def self.parse_projection_with_pks(collection, args)
         parse_projection_from_request(collection, args).with_pks(collection)

data/lib/forest_admin_agent/utils/schema/schema_emitter.rb

@@ -6,7 +6,7 @@ module ForestAdminAgent
     module Schema
       class SchemaEmitter
         LIANA_NAME = "agent-ruby"
-        LIANA_VERSION = "1.38.2"
+        LIANA_VERSION = "1.38.3"
 
         def self.generate(datasource)
           datasource.collections

data/lib/forest_admin_agent/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminAgent
-  VERSION = "1.38.2"
+  VERSION = "1.38.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_agent
 version: !ruby/object:Gem::Version
-  version: 1.38.2
+  version: 1.38.3
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-08-13 00:00:00.000000000 Z
+date: 2026-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport