forest_admin_datasource_customizer 1.39.1 → 1.39.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0b2718b2eec46a5342ad0299179e3688bdeeede265ba24197b82bbc5b99a67d
-  data.tar.gz: dbaf7dc8f8ddd9e71dbf5f103e24f1c630da61e7f83f9ba8761a58b8506e009c
+  metadata.gz: 78d96df2b8c9a17830a1e489d8fd05780fd0f320c791bbfbec87c697d2fb25d3
+  data.tar.gz: f6c904ab8d5fba6fc0cc736fd0ab632cf6398272121a1e1e5c5f70616828bc66
 SHA512:
-  metadata.gz: a4f52a1fef9cf0c855d13e8dd068d69776ec47bab8a28e81713301b1ddade24d87186a955e847db617946bb91fcae64ff7d44629d08a67e369a96f79fb5165e2
-  data.tar.gz: 9b54eaa42e1e87c6b8a046e78b6fb7887ee230a33467fae44abd4a277f78046dd22f3033e5e79e68a786a79ac4422b122997b59543d4e170d24c6efe02bb832f
+  metadata.gz: 8d624eb012a899bbc077fd0b577ecf2a60d66bc4d2b4b9dc8fc319cfaf76fe4f1244505a12e4b177feccdb2502952ba442c611c9a3405291f4fda64dcdec10c0
+  data.tar.gz: 64a764eaabecfd51708fa405f7dc9ce88cf6e4e3b74a76d2b4a8c6d152bb6783322597ab4594195f4c5f0b6e6a2afe5525405f3cf469765f6cf84c5697919a6c

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

@@ -56,8 +56,43 @@ module ForestAdminDatasourceCustomizer
           filter
         end
 
+        # Answers against +@child_collection+, which is what the search actually reads: a field
+        # hidden by the publication or renaming layers above is still searched.
+        #
+        # The term is run through the same +build_condition+ selection +refine_filter+ applies, so a
+        # field the search cannot match — a number column for a word, a uuid column for anything
+        # else — is left out rather than reported as reached.
+        #
+        # +nil+ whenever this layer does not choose the fields — a replacer is installed, or the
+        # child collection searches natively — because then no enumeration made here is true.
+        def searched_fields(search, extended)
+          return nil unless enumerable_search?
+          return [] if insignificant_search?(search)
+
+          get_fields(extended).filter_map do |path, schema|
+            searched_field(path) if build_condition(path, schema, search)
+          end
+        end
+
         private
 
+        def enumerable_search?
+          @replacer.nil? && !@child_collection.schema[:searchable]
+        end
+
+        def insignificant_search?(search)
+          search.nil? || search.strip.empty?
+        end
+
+        def searched_field(path)
+          {
+            path: path,
+            collections: ForestAdminDatasourceToolkit::Utils::FieldPath.leaf_collection_names(
+              @child_collection, path
+            )
+          }
+        end
+
         def default_replacer(search, extended)
           searchable_fields = get_fields(extended)
 

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

@@ -51,15 +51,19 @@ module ForestAdminDatasourceCustomizer
           projection.apply(records)
         end
 
+        # `@sorts` holds nil as the value of an emulated field, so membership is
+        # read with `key?`, the way `emulated?` reads it. The ColumnSchema objects
+        # belong to the collection below, so each is copied before the flag is
+        # written.
         def refine_schema(child_schema)
-          child_schema[:fields].each do |name, schema|
-            if schema.type == 'Column'
-              schema.is_sortable = true if @sorts[name].nil?
-              child_schema[:fields][name] = schema
-            end
+          schema = child_schema.dup
+          schema[:fields] = child_schema[:fields].to_h do |name, field|
+            next [name, field] unless field.type == 'Column' && @sorts.key?(name)
+
+            [name, field.dup.tap { |column| column.is_sortable = true }]
           end
 
-          child_schema
+          schema
         end
 
         def rewrite_plain_sort_clause(clause)

data/lib/forest_admin_datasource_customizer/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceCustomizer
-  VERSION = "1.39.1"
+  VERSION = "1.39.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_customizer
 version: !ruby/object:Gem::Version
-  version: 1.39.1
+  version: 1.39.3
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-08-20 00:00:00.000000000 Z
+date: 2026-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport