forest_admin_datasource_customizer 1.0.0.pre.beta.83 → 1.0.0.pre.beta.86

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdfc8bdc0309e587e2fe8c016cde89f8110854c72dfe85f16eedcedcd4fe7f6d
-  data.tar.gz: 2bdb7cdee2c1c0bcc9c439d025411dfa3b3e31d36d5af4a50912fecb1583ccfb
+  metadata.gz: 98b615fe1c829b8a99d8c2dac3bb852c09a669ae328ff353746c55f6f61c152f
+  data.tar.gz: ea82667001dfcd0e5e37b39feebce3a7a368188eaf55235312dd5a48bc92e6a1
 SHA512:
-  metadata.gz: 44041d459b8014b4e8f0c3f68e207b24a217a9104841c8e0144895d1e0eb84475ea08875222a8c8b9c076136eaa7312661c164f6fe448353ddfbf9bc90fd8756
-  data.tar.gz: 2a4f9f6eb3ce0b307c1a0d5ea7f33f7d7b8a9a889d258945070eb4c3f2eb5b0319f045bbc3e924bc673ed5a1caee73d2cf16bc2f2555dd094a6d4d745557e6e5
+  metadata.gz: be6a34cd0435042dab88b00b583ff2ef064e01562391fd10f4bbbf5799b4fe478593fbb9efdc0e248879fbbe87e34c7e21ad2ed7bfca2becc4be28e8de3647fe
+  data.tar.gz: 9e16a66fb986e7be63cf7be72969f2e79ac565cdc752e0123585a19ede2401a0346dbd523d3cbbf630597cf6feb4a401a677f563592797e6e016869b5c5e5a4b

data/lib/forest_admin_datasource_customizer/datasource_customizer.rb

@@ -1,10 +1,11 @@
 module ForestAdminDatasourceCustomizer
   class DatasourceCustomizer
-    attr_reader :stack
+    attr_reader :stack, :datasources
 
     def initialize(_db_config = {})
       @composite_datasource = ForestAdminDatasourceToolkit::Datasource.new
       @stack = Decorators::DecoratorsStack.new(@composite_datasource)
+      @datasources = []
     end
 
     def schema
@@ -46,6 +47,8 @@ module ForestAdminDatasourceCustomizer
         end
       })
 
+      @datasources << datasource
+
       self
     end
 
@@ -72,6 +75,19 @@ module ForestAdminDatasourceCustomizer
       self
     end
 
+    def get_root_datasource_by_connection(name)
+      root_datasource = @datasources.find do |datasource|
+        datasource.live_query_connections.any? { |connection_name, _connection| connection_name == name }
+      end
+
+      unless root_datasource
+        raise ForestAdminAgent::Http::Exceptions::NotFoundError,
+              "Native query connection '#{name}' is unknown."
+      end
+
+      root_datasource
+    end
+
     private
 
     def push_customization(&customization)

data/lib/forest_admin_datasource_customizer/decorators/segment/segment_collection_decorator.rb

@@ -20,39 +20,42 @@ module ForestAdminDatasourceCustomizer
         end
 
         def refine_schema(sub_schema)
-          sub_schema[:segments] = sub_schema[:segments].merge(@segments)
+          sub_schema[:segments] = sub_schema[:segments] | @segments.keys
 
           sub_schema
         end
 
-        def refine_filter(caller, filter = nil)
+        def refine_filter(_caller, filter = nil)
           return nil unless filter
 
           condition_tree = filter.condition_tree
           segment = filter.segment
-
           if segment && @segments.key?(segment)
-            definition = @segments[segment]
+            condition_tree = compute_segment(segment, filter)
+            segment = nil
+          end
 
-            result = if definition.respond_to? :call
-                       definition.call(Context::CollectionCustomizationContext.new(self, caller))
-                     else
-                       definition
-                     end
+          filter.override(condition_tree: condition_tree, segment: segment)
+        end
 
-            condition_tree_segment = if result.is_a? Nodes::ConditionTree
-                                       result
-                                     else
-                                       ConditionTreeFactory.from_plain_object(result)
-                                     end
+        def compute_segment(segment_name, filter)
+          definition = @segments[segment_name]
 
-            ConditionTreeValidator.validate(condition_tree_segment, self)
+          result = if definition.respond_to? :call
+                     definition.call(Context::CollectionCustomizationContext.new(self, caller))
+                   else
+                     definition
+                   end
 
-            condition_tree = ConditionTreeFactory.intersect([condition_tree_segment, filter.condition_tree])
-            segment = nil
-          end
+          condition_tree_segment = if result.is_a? Nodes::ConditionTree
+                                     result
+                                   else
+                                     ConditionTreeFactory.from_plain_object(result)
+                                   end
 
-          filter.override(condition_tree: condition_tree, segment: segment)
+          ConditionTreeValidator.validate(condition_tree_segment, self)
+
+          ConditionTreeFactory.intersect([condition_tree_segment, filter.condition_tree])
         end
       end
     end

data/lib/forest_admin_datasource_customizer/decorators/sort/sort_collection_decorator.rb

@@ -42,10 +42,10 @@ module ForestAdminDatasourceCustomizer
           reference_records = child_filter.page.apply(reference_records) if child_filter.page
 
           # We now have the information we need to sort by the field
-          new_filter = Filter.new(condition_tree: ConditionTree::ConditionTreeFactory.match_records(schema,
+          new_filter = Filter.new(condition_tree: ConditionTree::ConditionTreeFactory.match_records(self,
                                                                                                     reference_records))
 
-          records = child_collection.list(caller, new_filter, projection.with_pks(self))
+          records = child_collection.list(caller, new_filter, projection.clone.with_pks(self))
           records = sort_records(reference_records, records)
 
           projection.apply(records)
@@ -89,7 +89,7 @@ module ForestAdminDatasourceCustomizer
 
         def emulated?(path)
           index = path.index(':')
-          return @sorts[path] if index.nil?
+          return @sorts.key?(path) if index.nil?
 
           foreign_collection = schema[:fields][path[0, index]].foreign_collection
           association = datasource.get_collection(foreign_collection)
@@ -101,7 +101,7 @@ module ForestAdminDatasourceCustomizer
 
         def replace_or_emulate_field_sorting(name, equivalent_sort)
           FieldValidator.validate(self, name)
-          @sorts[name] =
+          @sorts[name.to_s] =
             equivalent_sort ? ForestAdminDatasourceToolkit::Components::Query::Sort.new(equivalent_sort) : nil
           mark_schema_as_dirty
         end
@@ -111,11 +111,11 @@ module ForestAdminDatasourceCustomizer
           sorted = Array.new(records.length)
 
           reference_records.each_with_index do |record, index|
-            position_by_id[Record.primary_keys(schema, record).join('|')] = index
+            position_by_id[Record.primary_keys(self, record).join('|')] = index
           end
 
           records.each do |record|
-            id = Record.primary_keys(schema, record).join('|')
+            id = Record.primary_keys(self, record).join('|')
             sorted[position_by_id[id]] = record
           end
 

data/lib/forest_admin_datasource_customizer/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceCustomizer
-  VERSION = "1.0.0-beta.83"
+  VERSION = "1.0.0-beta.86"
 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.83
+  version: 1.0.0.pre.beta.86
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-12-13 00:00:00.000000000 Z
+date: 2025-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport