forest_admin_datasource_customizer 1.19.2 → 1.19.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f43fa61b5aaac9ad0976882fc55385429a8f0eee4b9df3160005fe277721a50b
-  data.tar.gz: 1f239c9af95d7b504151e5ef4eb2a36159e46e5e9355b62a7971c373a1450ccd
+  metadata.gz: e85433ad43ff5fea2fef19a0ee2e0466c1840f32b6730199c440097e02a40c1b
+  data.tar.gz: 2126dcae42daf440a3bf80177706673a02e362ec144dd3fb7e7ed01795af12de
 SHA512:
-  metadata.gz: e489bb7ef6d7c5ca2cfa934a6a7ac6b1bcfe57f5b1b700b4a6f1616889afcf6bd4226cfe21d7ad1a3f4478e44a6385636bf85b681667c1edc47a08c425c3cb77
-  data.tar.gz: 3b931f864f32c42cbf44b60e6540b87e08051b0e7e24c98edc955533b0477c16944aab7fc03d742c9ad0f788ce8c591b72a22f6fbe6af1410d0bfe058cf6160a
+  metadata.gz: 1670e87d7814a2470c2be888767fee6f7aed9101d90d10ef690d753cfda4e655fe62a415f9b0dd3ee6bc916eca400502d7929b4997b3a24fab337de096dabba1
+  data.tar.gz: 1deba10f8312f1f2cad3ec54c96cf1cf2c986ba2e8f524b048c137abef8eb3d9f72ccc545c0d46030209b688d2abd3122678fa9e8de6405c4e718bccbe26de52

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

@@ -17,16 +17,22 @@ module ForestAdminDatasourceCustomizer
 
           MARKER_NAME = '__null_marker'.freeze
           def self.with_null_marker(projection)
+            seen = Set.new(projection)
             new_projection = Projection.new(projection)
+
             projection.each do |path|
               parts = path.split(':')
 
               parts.slice(1, parts.size).each_with_index do |_item, index|
-                new_projection << "#{parts.slice(0, index + 1).join(":")}:#{MARKER_NAME}"
+                marker = "#{parts.slice(0, index + 1).join(":")}:#{MARKER_NAME}"
+                next if seen.include?(marker)
+
+                seen << marker
+                new_projection << marker
               end
             end
 
-            new_projection.uniq
+            new_projection
           end
 
           def self.flatten(records, projection)

data/lib/forest_admin_datasource_customizer/decorators/relation/relation_collection_decorator.rb

@@ -240,31 +240,37 @@ module ForestAdminDatasourceCustomizer
 
         def re_project_relation_in_place(caller, records, name, projection)
           field_schema = schema[:fields][name]
-
           return if field_schema.type == 'PolymorphicManyToOne'
 
-          association = datasource.get_collection(field_schema.foreign_collection)
-
           if !@relations[name]
+            association = datasource.get_collection(field_schema.foreign_collection)
             association.re_project_in_place(caller, records.filter_map { |r| r[name] }, projection)
           elsif field_schema.type == 'ManyToOne'
-            ids = records.filter_map { |record| record[field_schema.foreign_key] }.uniq
-            sub_filter = Filter.new(condition_tree: ConditionTreeLeaf.new(field_schema.foreign_key_target, 'In', ids))
-            sub_records = association.list(caller, sub_filter, projection.union([field_schema.foreign_key_target]))
-
-            records.each do |record|
-              record[name] = sub_records.find { |sr| sr[field_schema.foreign_key_target] == record[field_schema.foreign_key] }
-            end
+            assign_many_to_one_records(caller, records, name, field_schema, projection)
           elsif ['OneToOne', 'OneToMany'].include?(field_schema.type)
-            ids = records.filter_map { |record| record[field_schema.origin_key_target] }.uniq
-            sub_filter = Filter.new(condition_tree: ConditionTreeLeaf.new(field_schema.origin_key, 'In', ids))
-            sub_records = association.list(caller, sub_filter, projection.union([field_schema.origin_key]))
-
-            records.each do |record|
-              record[name] = sub_records.find { |sr| sr[field_schema.origin_key] == record[field_schema.origin_key_target] }
-            end
+            assign_to_one_or_many_records(caller, records, name, field_schema, projection)
           end
         end
+
+        def assign_many_to_one_records(caller, records, name, field_schema, projection)
+          association = datasource.get_collection(field_schema.foreign_collection)
+          ids = records.each_with_object(Set.new) { |record, set| set << record[field_schema.foreign_key] }.delete(nil).to_a
+          sub_filter = Filter.new(condition_tree: ConditionTreeLeaf.new(field_schema.foreign_key_target, 'In', ids))
+          sub_records = association.list(caller, sub_filter, projection.union([field_schema.foreign_key_target]))
+          sub_records_by_key = sub_records.to_h { |sr| [sr[field_schema.foreign_key_target], sr] }
+
+          records.each { |record| record[name] = sub_records_by_key[record[field_schema.foreign_key]] }
+        end
+
+        def assign_to_one_or_many_records(caller, records, name, field_schema, projection)
+          association = datasource.get_collection(field_schema.foreign_collection)
+          ids = records.each_with_object(Set.new) { |record, set| set << record[field_schema.origin_key_target] }.delete(nil).to_a
+          sub_filter = Filter.new(condition_tree: ConditionTreeLeaf.new(field_schema.origin_key, 'In', ids))
+          sub_records = association.list(caller, sub_filter, projection.union([field_schema.origin_key]))
+          sub_records_by_key = sub_records.to_h { |sr| [sr[field_schema.origin_key], sr] }
+
+          records.each { |record| record[name] = sub_records_by_key[record[field_schema.origin_key_target]] }
+        end
       end
     end
   end

data/lib/forest_admin_datasource_customizer/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceCustomizer
-  VERSION = "1.19.2"
+  VERSION = "1.19.3"
 end

metadata

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