forest_admin_datasource_customizer 1.24.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b54cb38619eae9483b9adccb3eae427291437b3cc66afa11fa20cedbd597fe5
-  data.tar.gz: 6affb1315de6da3baf01329124f6072476170a0555521265962b8edeeda7ac31
+  metadata.gz: 99861571fab21e188babeeae7244a3106510e8aee39a9bc3713d30f262df97d2
+  data.tar.gz: 6af3a7eb53f5d7b79aae3bd87c5f8925c9be6d259bb8f67c6b7a4d43e54f528a
 SHA512:
-  metadata.gz: 702ebc6894f7e26b356908ead2fc435e8896353b0f13ea8f875bf615849194fe669a3153470e8cc33c6c591c007fd1e943ce4549b87011af01486f660312c601
-  data.tar.gz: d9055e70afb29c141898e28c5f8fa317dd33769760a8c2acf3dd8f646d284ad3b43e9df20c2bd956d67b73a2f99ae97753fda5269e3067cf370f516eb24d28cd
+  metadata.gz: 300ac4146409e2cb043abf8d40b60c67190a16c18e250c7878a8bcdcf5290d57c175389f91f57f431422c0947b1941f5c7d67750a02326f447712369f9d7326f
+  data.tar.gz: ea5cc31eb428bce00bdcd0826919fb50d4372afde061438a800332d8cd3ed8ed3930e0a432599c84e3ef9b9a4c2a97f92b879350e1866a9b5523d0a0936e5adb

data/forest_admin_datasource_customizer.gemspec

@@ -35,11 +35,8 @@ admin work on any Ruby application."
 
   spec.add_dependency "activesupport", ">= 6.1"
   spec.add_dependency "base64"
-  spec.add_dependency "benchmark"
   spec.add_dependency "bigdecimal"
-  spec.add_dependency "cgi"
   spec.add_dependency "csv"
-  spec.add_dependency "logger"
   spec.add_dependency 'marcel', '~> 1.0', '>= 1.0.4'
   spec.add_dependency "mutex_m"
   spec.add_dependency "ostruct"

data/lib/forest_admin_datasource_customizer/composite_datasource.rb

@@ -1,7 +1,5 @@
 module ForestAdminDatasourceCustomizer
   class CompositeDatasource
-    attr_reader :datasources
-
     def initialize
       @datasources = []
     end
@@ -54,9 +52,10 @@ module ForestAdminDatasourceCustomizer
     end
 
     def add_data_source(datasource)
-      existing_names = collections.keys
-      datasource.collections.each_key do |name|
-        raise ArgumentError, "Collection '#{name}' already exists" if existing_names.include?(name)
+      existing_names = collections.map { |c| c.respond_to?(:name) ? c.name : c.to_s }
+      datasource.collections.each do |c|
+        new_name = c.respond_to?(:name) ? c.name : c.to_s
+        raise ArgumentError, "Collection '#{new_name}' already exists" if existing_names.include?(new_name)
       end
 
       existing_charts = schema[:charts]

data/lib/forest_admin_datasource_customizer/datasource_customizer.rb

@@ -1,7 +1,7 @@
 module ForestAdminDatasourceCustomizer
   class DatasourceCustomizer
     include DSL::DatasourceHelpers
-    attr_reader :stack, :composite_datasource
+    attr_reader :stack, :datasources
 
     def initialize(_db_config = {})
       @composite_datasource = ForestAdminDatasourceCustomizer::CompositeDatasource.new

data/lib/forest_admin_datasource_customizer/decorators/action/context/action_context.rb

@@ -61,7 +61,6 @@ module ForestAdminDatasourceCustomizer
           alias get_record_ids record_ids
           alias get_composite_record_ids composite_record_ids
           alias has_field_changed field_changed?
-          alias form_value get_form_value
         end
       end
     end

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

@@ -17,22 +17,16 @@ 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|
-                marker = "#{parts.slice(0, index + 1).join(":")}:#{MARKER_NAME}"
-                next if seen.include?(marker)
-
-                seen << marker
-                new_projection << marker
+                new_projection << "#{parts.slice(0, index + 1).join(":")}:#{MARKER_NAME}"
               end
             end
 
-            new_projection
+            new_projection.uniq
           end
 
           def self.flatten(records, projection)

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

@@ -240,36 +240,30 @@ 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'
-            assign_many_to_one_records(caller, records, name, field_schema, projection)
-          elsif ['OneToOne', 'OneToMany'].include?(field_schema.type)
-            assign_to_one_or_many_records(caller, records, name, field_schema, projection)
-          end
-        end
+            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]))
 
-        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 do |record|
+              record[name] = sub_records.find { |sr| sr[field_schema.foreign_key_target] == record[field_schema.foreign_key] }
+            end
+          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 { |record| record[name] = sub_records_by_key[record[field_schema.origin_key_target]] }
+            records.each do |record|
+              record[name] = sub_records.find { |sr| sr[field_schema.origin_key] == record[field_schema.origin_key_target] }
+            end
+          end
         end
       end
     end

data/lib/forest_admin_datasource_customizer/decorators/rename_collection/rename_collection_datasource_decorator.rb

@@ -47,6 +47,9 @@ module ForestAdminDatasourceCustomizer
         end
 
         def rename_collection(current_name, new_name)
+          # Check collection exists
+          collection = get_collection(current_name)
+
           return unless current_name != new_name
 
           # Check new name is not already used
@@ -61,6 +64,17 @@ module ForestAdminDatasourceCustomizer
                   "Cannot rename a collection twice: #{@to_child_name[current_name]}->#{current_name}->#{new_name}"
           end
 
+          polymorphic_relations = %w[PolymorphicOneToOne PolymorphicOneToMany]
+          collection.schema[:fields].each do |field_name, field_schema|
+            next unless polymorphic_relations.include?(field_schema.type)
+
+            reverse_relation_name = Utils::Collection.get_inverse_relation(get_collection(current_name), field_name)
+
+            raise Exceptions::ForestException,
+                  "Cannot rename collection #{current_name} because it's a target of a polymorphic relation " \
+                  "'#{field_schema.foreign_collection}.#{reverse_relation_name}'"
+          end
+
           @from_child_name[current_name] = new_name
           @to_child_name[new_name] = current_name
 

data/lib/forest_admin_datasource_customizer/decorators/rename_collection/rename_collection_decorator.rb

@@ -9,46 +9,21 @@ module ForestAdminDatasourceCustomizer
           datasource.get_collection_name(super)
         end
 
-        def list(caller, filter = nil, projection = nil)
-          refined_filter = refine_filter(caller, filter)
-          records = @child_collection.list(caller, refined_filter, projection)
-
-          transform_records_polymorphic_values(records)
-        end
-
-        def create(caller, data)
-          transformed_data = transform_data_polymorphic_values(data)
-          result = @child_collection.create(caller, transformed_data)
-
-          transform_record_polymorphic_values(result)
-        end
-
-        def update(caller, filter, patch)
-          refined_filter = refine_filter(caller, filter)
-          transformed_patch = transform_data_polymorphic_values(patch)
-
-          @child_collection.update(caller, refined_filter, transformed_patch)
-        end
-
-        def refine_filter(_caller, filter)
-          return filter unless filter&.condition_tree
-
-          type_fields = polymorphic_type_fields
+        def refine_schema(sub_schema)
+          fields = {}
 
-          transformed_tree = filter.condition_tree.replace_leafs do |leaf|
-            if type_fields.include?(leaf.field)
-              transformed_value = transform_polymorphic_value(leaf.value)
-              if transformed_value == leaf.value
-                leaf
-              else
-                leaf.override(value: transformed_value)
+          sub_schema[:fields].each do |name, old_schema|
+            if old_schema.type != 'Column' && old_schema.type != 'PolymorphicManyToOne'
+              old_schema.foreign_collection = datasource.get_collection_name(old_schema.foreign_collection)
+              if old_schema.type == 'ManyToMany'
+                old_schema.through_collection = datasource.get_collection_name(old_schema.through_collection)
               end
-            else
-              leaf
             end
+
+            fields[name] = old_schema
           end
 
-          filter.override(condition_tree: transformed_tree)
+          sub_schema
         end
 
         # rubocop:disable Lint/UselessMethodDefinition
@@ -56,128 +31,6 @@ module ForestAdminDatasourceCustomizer
           super
         end
         # rubocop:enable Lint/UselessMethodDefinition
-
-        private
-
-        def polymorphic_type_fields
-          type_fields = []
-          child_schema = @child_collection.schema
-          return type_fields unless child_schema && child_schema[:fields]
-
-          child_schema[:fields].each_value do |field_schema|
-            case field_schema.type
-            when 'PolymorphicManyToOne'
-              type_fields << field_schema.foreign_key_type_field
-            end
-          end
-          type_fields
-        end
-
-        def transform_data_polymorphic_values(data)
-          return data unless data
-
-          type_fields = polymorphic_type_fields
-          transformed_data = data.dup
-
-          type_fields.each do |type_field|
-            next unless transformed_data.key?(type_field)
-
-            original_value = transformed_data[type_field]
-            transformed_value = reverse_collection_name(original_value)
-            transformed_data[type_field] = transformed_value if transformed_value != original_value
-          end
-
-          transformed_data
-        end
-
-        def transform_polymorphic_value(value)
-          return value unless value
-
-          # Handle both single values and arrays (for IN/NOT_IN operators)
-          if value.is_a?(Array)
-            value.map { |v| reverse_collection_name(v) }
-          else
-            reverse_collection_name(value)
-          end
-        end
-
-        # convert new collection name back to old name for db queries
-        def reverse_collection_name(collection_name)
-          to_child_name = datasource.instance_variable_get(:@to_child_name)
-          to_child_name[collection_name] || collection_name
-        end
-
-        # convert old collection name to new name for returned data
-        def forward_collection_name(collection_name)
-          from_child_name = datasource.instance_variable_get(:@from_child_name)
-          from_child_name[collection_name] || collection_name
-        end
-
-        def transform_records_polymorphic_values(records)
-          return records unless records.is_a?(Array)
-
-          type_fields = polymorphic_type_fields
-          return records if type_fields.empty?
-
-          records.map do |record|
-            transform_record_polymorphic_values(record)
-          end
-        end
-
-        def transform_record_polymorphic_values(record)
-          return record unless record.is_a?(Hash)
-
-          type_fields = polymorphic_type_fields
-          return record if type_fields.empty?
-
-          transformed_record = record.dup
-
-          type_fields.each do |type_field|
-            next unless transformed_record.key?(type_field)
-
-            old_value = transformed_record[type_field]
-            new_value = forward_collection_name(old_value)
-            transformed_record[type_field] = new_value if new_value != old_value
-          end
-
-          transformed_record
-        end
-
-        protected
-
-        def refine_schema(sub_schema)
-          current_collection_name = @child_collection.name
-
-          sub_schema[:fields].each_value do |old_schema|
-            case old_schema.type
-            when 'PolymorphicOneToOne', 'PolymorphicOneToMany'
-              refine_polymorphic_one_schema(old_schema, current_collection_name)
-            when 'PolymorphicManyToOne'
-              refine_polymorphic_many_schema(old_schema)
-            when 'ManyToOne', 'OneToMany', 'OneToOne'
-              old_schema.foreign_collection = datasource.get_collection_name(old_schema.foreign_collection)
-            when 'ManyToMany'
-              old_schema.foreign_collection = datasource.get_collection_name(old_schema.foreign_collection)
-              old_schema.through_collection = datasource.get_collection_name(old_schema.through_collection)
-            end
-          end
-
-          sub_schema
-        end
-
-        def refine_polymorphic_one_schema(schema, current_collection_name)
-          if schema.origin_type_value == current_collection_name
-            schema.origin_type_value = datasource.get_collection_name(current_collection_name)
-          end
-          schema.foreign_collection = datasource.get_collection_name(schema.foreign_collection)
-        end
-
-        def refine_polymorphic_many_schema(schema)
-          schema.foreign_collections = schema.foreign_collections.map { |fc| datasource.get_collection_name(fc) }
-          schema.foreign_key_targets = schema.foreign_key_targets.transform_keys do |key|
-            datasource.get_collection_name(key)
-          end
-        end
       end
     end
   end

data/lib/forest_admin_datasource_customizer/dsl/builders/form_builder.rb

@@ -20,9 +20,8 @@ module ForestAdminDatasourceCustomizer
     #   form do
     #     field :amount, type: :number, required: true
     #     field :reason, type: :string,
-    #       # You can use either form_value (DSL-style) or get_form_value (legacy)
-    #       required: ->(ctx) { ctx.form_value(:amount).to_i > 1000 },
-    #       if_condition: ->(ctx) { ctx.form_value(:amount).to_i > 500 }
+    #       required: ->(ctx) { ctx.get_form_value('amount').to_i > 1000 },
+    #       if_condition: ->(ctx) { ctx.get_form_value('amount').to_i > 500 }
     #   end
     class FormBuilder
       attr_reader :fields

data/lib/forest_admin_datasource_customizer/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceCustomizer
-  VERSION = "1.24.1"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_customizer
 version: !ruby/object:Gem::Version
-  version: 1.24.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-02-10 00:00:00.000000000 Z
+date: 2025-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -39,20 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: benchmark
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
@@ -67,20 +53,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: cgi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: csv
   requirement: !ruby/object:Gem::Requirement
@@ -95,20 +67,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: logger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: marcel
   requirement: !ruby/object:Gem::Requirement