forest_admin_datasource_customizer 1.0.0.pre.beta.82 → 1.0.0.pre.beta.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 299499a2210846eb377245a543896dcec7714ae5dc55f8958e0434275f0b23f0
-  data.tar.gz: f26199d80505c75939bf4d08c075e87be41d8e63be6073b17a3b96c764190c8b
+  metadata.gz: c72efdb33fb2fc538bbf3bd8082ddbf5620fb082ad6254d89f0c3822d68358ef
+  data.tar.gz: bcd0f24e6d8abd66cbd7fedf4516f23971c0784f86bafdba289ebb39a2451703
 SHA512:
-  metadata.gz: 37e9e714ac9926534566252e6fc5cf0e7237e7772e99ceb43cf1474b3a546a3d313d4d984b311ca853bf5933bdaed7ec463f0c19bde7ed52de466f9a9586872e
-  data.tar.gz: fe78f7fedb32dc6376479c5c9bf4f67f4b7641ffbc7be4033ee3e3cefc105aa04af520e94f572a74084a545168f824e7f550cd7a4cafedbbb61dc136ddb08aaf
+  metadata.gz: 1e0f37284e0df57b62fe6b81fa6bb5df4541218d0a345eaab5ffe39ae2f3d87cfd622be13fbadbbcb7d9819b76264a87bec1b695140df6d451a027ee7650e664
+  data.tar.gz: 8a53ba29e8b032bdb7c644c427292ae86827ef81d97ef0d419fc2b57d42eadd8e8ffe76eb76887b4f4ae8b54a80e206f820b0319acc2ca647ce50bffefd225fe

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

@@ -25,34 +25,37 @@ module ForestAdminDatasourceCustomizer
           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.82"
+  VERSION = "1.0.0-beta.85"
 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.82
+  version: 1.0.0.pre.beta.85
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-12-04 00:00:00.000000000 Z
+date: 2024-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport