forest_admin_datasource_toolkit 1.0.0.pre.beta.32 → 1.0.0.pre.beta.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f865bef547fbeaff014ef335c04a88cf63fd37bb6064b09973aab82042a5e42
-  data.tar.gz: 690380cc8bb555950b7c9149a1fa3c314b387a3d8fe36c4bd38a36225277d59b
+  metadata.gz: f2c552cdfa3f4daaaf894b5dd8bec3ede99c92391fb2f81348cc7fd88f4abf03
+  data.tar.gz: a67f14e7e72ea5f5540426f04180ae64506a25c38d512d8a99a8a988ad4b4497
 SHA512:
-  metadata.gz: b91235272e0de2880cb403a47d73c048a687e10262614d9093743a5cf10788d79ea83538e883246aaa4dcb9d16e9cf675f3ffbc778239a97803dcd68c6a8a77e
-  data.tar.gz: 1e9cbe19df7596855bae67fc3415c7b2c8698367ab5b66f8c81c4756edbefb3a23151dca38754244dd54c8d370b637f27151a46b058912fe93246d60dee2c13e
+  metadata.gz: 5bbf306c5f0c39d289f61bb0530244f2eae932f27a8c2aa10052f163871026ecf032547937e2a3a754c32059d15f8944f63f30764210bffe00659ef49a9a5557
+  data.tar.gz: 6975afc24895674edc7e43c27e68c64855050468a84f54a3bb20bfffe99652988b5bc5d5a03b7c9932df485dd2b96d840b97a491a3fc661eb3bac6b4e626967a

data/lib/forest_admin_datasource_toolkit/components/query/aggregation.rb

@@ -23,10 +23,10 @@ module ForestAdminDatasourceToolkit
 
         def projection
           aggregate_fields = []
-          aggregate_fields << field if field
+          aggregate_fields << field.to_s if field
 
           groups.each do |group|
-            aggregate_fields << group[:field]
+            aggregate_fields << group[:field].to_s
           end
 
           Projection.new(aggregate_fields)
@@ -132,7 +132,7 @@ module ForestAdminDatasourceToolkit
           group = {}
 
           groups.each do |value|
-            group_value = record[value[:field]]
+            group_value = ForestAdminDatasourceToolkit::Utils::Record.field_value(record, value[:field])
             group[value[:field]] = apply_date_operation(group_value, value[:operation], timezone)
           end
 

data/lib/forest_admin_datasource_toolkit/components/query/condition_tree/nodes/condition_tree_leaf.rb

@@ -61,7 +61,8 @@ module ForestAdminDatasourceToolkit
 
             def match(record, collection, timezone)
               field_value = Record.field_value(record, @field)
-              column_type = Utils::Collection.get_field_schema(collection, @field).column_type
+              column_type = ForestAdminDatasourceToolkit::Utils::Collection.get_field_schema(collection,
+                                                                                             @field).column_type
 
               supported = [
                 Operators::IN,
@@ -81,7 +82,7 @@ module ForestAdminDatasourceToolkit
 
               case @operator
               when Operators::IN
-                Array(@value).include?(field_value)
+                @value.include?(field_value)
               when Operators::EQUAL
                 field_value == @value
               when Operators::LESS_THAN

data/lib/forest_admin_datasource_toolkit/components/query/filter_factory.rb

@@ -105,8 +105,8 @@ module ForestAdminDatasourceToolkit
 
         def self.make_through_filter(collection, id, relation_name, caller, base_foreign_filter)
           relation = collection.schema[:fields][relation_name]
-          origin_value = Utils::Collection.get_value(collection, caller, id, relation.origin_key_target)
-          foreign_relation = Utils::Collection.get_through_target(collection, relation_name)
+          origin_value = ForestAdminDatasourceToolkit::Utils::Collection.get_value(collection, caller, id, relation.origin_key_target)
+          foreign_relation =  ForestAdminDatasourceToolkit::Utils::Collection.get_through_target(collection, relation_name)
 
           # Optimization for many to many when there is not search/segment (saves one query)
           if foreign_relation && base_foreign_filter.nestable?

data/lib/forest_admin_datasource_toolkit/components/query/projection.rb

@@ -27,9 +27,10 @@ module ForestAdminDatasourceToolkit
           each_with_object({}) do |path, memo|
             next unless path.include?(':')
 
-            split_path = path.split(':')
-            relation = split_path[0]
-            memo[relation] = Projection.new([split_path[1]].union(memo[relation] || []))
+            original_path = path.split(':')
+            relation = original_path.shift
+
+            memo[relation] = Projection.new([original_path.join(':')].union(memo[relation] || []))
           end
         end
 
@@ -47,10 +48,12 @@ module ForestAdminDatasourceToolkit
         def replace(...)
           Projection.new(
             map(...)
-            .reduce(Projection.new) do |memo, path|
-              return memo.union([path]) if path.is_a?(String)
-
-              memo.union(path)
+              .reduce(Projection.new) do |memo, path|
+              if path.is_a?(String)
+                memo.union([path])
+              else
+                memo.union(path)
+              end
             end
           )
         end
@@ -58,6 +61,27 @@ module ForestAdminDatasourceToolkit
         def equals(other)
           length == other.length && all? { |field| other.include?(field) }
         end
+
+        def apply(records)
+          records.map { |record| re_project(record) }
+        end
+
+        def re_project(record)
+          result = nil
+
+          if record
+            record = HashHelper.convert_keys(record, :to_s)
+            result = {}
+            columns.each { |column| result[column.to_s] = record[column.to_s] }
+            relations.each { |relation, projection| result[relation] = projection.re_project(record[relation]) }
+          end
+
+          result
+        end
+
+        def union(other_arrays)
+          Projection.new(other_arrays.to_a.union(self))
+        end
       end
     end
   end

data/lib/forest_admin_datasource_toolkit/components/query/sort.rb

@@ -0,0 +1,68 @@
+module ForestAdminDatasourceToolkit
+  module Components
+    module Query
+      class Sort < Array
+        def projection
+          Projection.new(map { |clause| clause[:field] })
+        end
+
+        def replace_clauses(...)
+          Sort.new(
+            map(...)
+            .reduce(Sort.new) do |memo, clause|
+              if clause.is_a?(Array) || clause.is_a?(self.class)
+                memo.union(clause)
+              else
+                memo.union([clause])
+              end
+            end
+          )
+        end
+
+        def nest(prefix)
+          if prefix&.length
+            self.class.new(map do |ob|
+                             { field: "#{prefix}:#{ob[:field]}", ascending: ob[:ascending] }
+                           end)
+          else
+            self
+          end
+        end
+
+        def inverse
+          self.class.new(map { |ob| { field: ob[:field], ascending: !ob[:ascending] } })
+        end
+
+        def unnest
+          prefix = first[:field].split(':')[0]
+          raise 'Cannot unnest sort.' unless all? { |ob| ob[:field].start_with?(prefix) }
+
+          self.class.new(map do |ob|
+                           { field: ob[:field][prefix.length + 1, ob[:field].length - prefix.length - 1],
+                             ascending: ob[:ascending] }
+                         end)
+        end
+
+        def apply(records)
+          records.sort do |a, b|
+            comparison = 0
+            (0..length - 1).each do |i|
+              field = self[i][:field]
+              ascending = self[i][:ascending]
+              break unless comparison.zero?
+
+              value_on_a = ForestAdminDatasourceToolkit::Utils::Record.field_value(a, field)
+              value_on_b = ForestAdminDatasourceToolkit::Utils::Record.field_value(b, field)
+
+              comparison = value_on_a <=> value_on_b
+              comparison = 1 if comparison.nil?
+              comparison *= -1 unless ascending
+            end
+
+            comparison
+          end
+        end
+      end
+    end
+  end
+end

data/lib/forest_admin_datasource_toolkit/components/query/sort_utils/sort_factory.rb

@@ -0,0 +1,16 @@
+module ForestAdminDatasourceToolkit
+  module Components
+    module Query
+      module SortUtils
+        class SortFactory
+          def self.by_primary_keys(collection)
+            ForestAdminDatasourceToolkit::Components::Query::Sort.new(
+              ForestAdminDatasourceToolkit::Utils::Schema.primary_keys(collection)
+                                                         .map { |pk| { field: pk, ascending: true } }
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/forest_admin_datasource_toolkit/validations/sort_validator.rb

@@ -0,0 +1,15 @@
+module ForestAdminDatasourceToolkit
+  module Validations
+    class SortValidator
+      def self.validate(collection, sort)
+        sort&.each do |s|
+          FieldValidator.validate(collection, s[:field])
+          unless s[:ascending].is_a?(TrueClass) || s[:ascending].is_a?(FalseClass)
+            raise ForestAdminDatasourceToolkit::Exceptions::ValidationError,
+                  "Invalid sort_utils.ascending value: #{s[:ascending]}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/forest_admin_datasource_toolkit/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceToolkit
-  VERSION = "1.0.0-beta.32"
+  VERSION = "1.0.0-beta.33"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.32
+  version: 1.0.0.pre.beta.33
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-01 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -83,6 +83,8 @@ files:
 - lib/forest_admin_datasource_toolkit/components/query/page.rb
 - lib/forest_admin_datasource_toolkit/components/query/projection.rb
 - lib/forest_admin_datasource_toolkit/components/query/projection_factory.rb
+- lib/forest_admin_datasource_toolkit/components/query/sort.rb
+- lib/forest_admin_datasource_toolkit/components/query/sort_utils/sort_factory.rb
 - lib/forest_admin_datasource_toolkit/datasource.rb
 - lib/forest_admin_datasource_toolkit/decorators/collection_decorator.rb
 - lib/forest_admin_datasource_toolkit/decorators/datasource_decorator.rb
@@ -104,6 +106,7 @@ files:
 - lib/forest_admin_datasource_toolkit/validations/field_validator.rb
 - lib/forest_admin_datasource_toolkit/validations/projection_validator.rb
 - lib/forest_admin_datasource_toolkit/validations/rules.rb
+- lib/forest_admin_datasource_toolkit/validations/sort_validator.rb
 - lib/forest_admin_datasource_toolkit/validations/type_getter.rb
 - lib/forest_admin_datasource_toolkit/version.rb
 - sig/forest_admin_datasource_toolkit.rbs