forest_admin_datasource_customizer 1.0.0.pre.beta.59 → 1.0.0.pre.beta.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a160e0769fe4734ac04080ed73d361950fe0c6472b176b4d740c3fcf8629f4c
-  data.tar.gz: b780957f6e918f2e3087c13f2238e16d588424330b87936d4c28f25fc808da53
+  metadata.gz: 01a3e9d078567da75ac00fbce2df8722f362800ac0e67108691755f8ea3908ea
+  data.tar.gz: b7fb6555dcefb5e78f6fceba1afaca3459d73f52692be6492d6992a9875c3de8
 SHA512:
-  metadata.gz: 712302bdd282a8b93b9a60dbdae302de284cf88d20d1fad01e80686d22030e4b4a023e686e7ad5362afa11f46bb052471156a4e0d3add5a0cc5f5150b3fa5e34
-  data.tar.gz: 4f36d52a349d605feac5d44e1b118dfd7a3306083f7e9bfbb2a797a1335097691763a96a3531ba22aa7f3f4a3501211012938a33e00afd66126e260c69a57509
+  metadata.gz: abfb2618846aebd32cacb55c85a074786e59e72596baefded111a7e1a801622ee9d5b7bc1ab19c3c74018a19e692fb600c9fa47043b146efb1c4fc438cff3b82
+  data.tar.gz: ee3c04a82b7b8cc35ee009a935b26f06e014bfb95b6d34b8e82263c3433ba665619d59ad9795020c9399cd83d538758cef97aad01725f7a5701cffb1b0def061

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

@@ -19,28 +19,36 @@ module ForestAdminDatasourceCustomizer
             return if paths.include?(new_path)
 
             computed = collection.get_computed(new_path)
-            nested_dependencies = Projection.new(computed.dependencies)
-                                            .nest(prefix: new_path.include?(':') ? new_path.split(':')[0] : nil)
+            computed_dependencies = Flattener.with_null_marker(computed.dependencies)
+            nested_dependencies = Projection.new(computed_dependencies)
+                                            .nest(
+                                              prefix: if new_path.include?(':')
+                                                        new_path.slice(0, new_path.rindex(':'))
+                                                      end
+                                            )
 
             nested_dependencies.each do |path|
               queue_field(ctx, collection, path, paths, flatten)
             end
 
             dependency_values = nested_dependencies.map { |path| flatten[paths.index(path)] }
+
             paths.push(new_path)
 
-            flatten << compute_field(ctx, computed, computed.dependencies, dependency_values)
+            flatten << compute_field(ctx, computed, computed_dependencies, dependency_values)
           end
 
           def self.compute_from_records(ctx, collection, records_projection, desired_projection, records)
-            paths = records_projection.clone
+            paths = Flattener.with_null_marker(records_projection)
             flatten = Flattener.flatten(records, paths)
 
             desired_projection.each do |path|
               queue_field(ctx, collection, path, paths, flatten)
             end
 
-            Flattener.un_flatten(desired_projection.map { |path| flatten[paths.index(path)] }, desired_projection)
+            final_projection = Flattener.with_null_marker(desired_projection)
+
+            Flattener.un_flatten(final_projection.map { |path| flatten[paths.index(path)] }, final_projection)
           end
 
           def self.transform_unique_values(inputs, callback)

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

@@ -3,9 +3,55 @@ module ForestAdminDatasourceCustomizer
     module Computed
       module Utils
         class Flattener
+          include ForestAdminDatasourceToolkit::Components::Query
+
+          class Undefined
+            def key?(_key)
+              false
+            end
+
+            def dig(*_keys)
+              self
+            end
+          end
+
+          MARKER_NAME = '__null_marker'.freeze
+          def self.with_null_marker(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}"
+              end
+            end
+
+            new_projection.uniq
+          end
+
           def self.flatten(records, projection)
             projection.map do |field|
-              records.map { |record| ForestAdminDatasourceToolkit::Utils::Record.field_value(record, field) }
+              parts = field.split(':')
+              records.map do |record|
+                value = record
+
+                parts.slice(0, parts.size - 1).each_with_index do |_item, index|
+                  value = if value&.key?(parts[index])
+                            value[parts[index]]
+                          else
+                            Undefined.new
+                          end
+                end
+
+                # for markers, the value tells us which fields are null so that we can set them.
+                if parts[parts.length - 1] == MARKER_NAME
+                  value.nil? ? nil : Undefined.new
+                elsif value&.key?(parts[parts.length - 1])
+                  value[parts[parts.length - 1]]
+                else
+                  Undefined.new
+                end
+              end
             end
           end
 
@@ -17,11 +63,11 @@ module ForestAdminDatasourceCustomizer
               records[record_index] = {}
 
               projection.each_with_index do |path, path_index|
-                parts = path.split(':').reject { |part| part.nil? || part.empty? }
+                parts = path.split(':').reject { |part| part == MARKER_NAME }
                 value = flatten[path_index][record_index]
 
                 # Ignore undefined values.
-                next if value.nil?
+                next if value.is_a? Undefined
 
                 # Set all others (including null)
                 record = records[record_index]

data/lib/forest_admin_datasource_customizer/decorators/search/search_collection_decorator.rb

@@ -20,7 +20,7 @@ module ForestAdminDatasourceCustomizer
 
         def refine_filter(caller, filter)
           # Search string is not significant
-          return filter.override({ search: nil }) if !filter || !filter.search || filter.search.strip&.length&.zero?
+          return filter.override({ search: nil }) if !filter || !filter.search || filter.search.strip&.empty?
 
           # Implement search ourselves
           if @replacer || !@child_collection.schema[:searchable]

data/lib/forest_admin_datasource_customizer/version.rb

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