effective_datatables 4.20.3 → 4.20.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b290520f84f92726953ea0aef6cfa1e5c8d6acdafbc1701f6fb542357d077010
-  data.tar.gz: 9f7a715b57a9edf9dc31b806bdc85287e505a3e7766957599f555073ea43e71e
+  metadata.gz: de9e67c1d5ddd3f19c322ea61f2bb1b50f9792e1ca6666607af4a14f11dc615d
+  data.tar.gz: ae1f07be260e375e21d4cf4520a1d55fb4c51787ea09f4f56acfc49168137f45
 SHA512:
-  metadata.gz: d8a92d42e7b7f79761f5ad4efec357071bf5f844797883139e248177a059f9b108d62080f7d45db5e3ffbbcbf7aee4383621462bcd6e14f75ffffcffcf0ff145
-  data.tar.gz: e2315412cb5e63b24d5d554dfddfa69e99895ba7c30ee015d829eadfd6908e36d976cb6cb5e4151afbc7adf75ce7b54653e43e8d5c7a109796cf51364912ae87
+  metadata.gz: 711ca1ee0f32fd3b91bcac59f294ac8d3822d364a7318ee89d68ed6a8d0de7147dab2934365abcc3e49ba1ea85142ba50f515207601e651677fc74f1cfdf5281
+  data.tar.gz: fd4a8536658314a46199c03aec85898365b992472b78e7e8592b468a25f6cc16ed914b2385f131b0e5f927963b5990a469b0a93e8e62697ec80c151e611ca7ba

data/app/models/effective/effective_datatable/resource.rb

@@ -158,6 +158,8 @@ module Effective
 
       def load_resource_search!
         columns.each do |name, opts|
+          # Normalize the given opts[:search] into a Hash
+          # Take special note of the opts[:search] as we need to collapse it when an ActiveRecord::Relation
           case opts[:search]
           when false
             opts[:search] = { as: :null }; next
@@ -171,6 +173,7 @@ module Effective
             raise "column #{name} unexpected search value"
           end
 
+          # Now lets deal with the opts[:search] hash itself
           search = opts[:search]
 
           # Parameterize collection
@@ -189,11 +192,17 @@ module Effective
           search_resource = [opts[:resource], effective_resource, fallback_effective_resource].compact
           search_resource = search_resource.find { |res| res.klass.present? } || search_resource.first
 
-          if array_collection? && opts[:resource].present?
-            search.reverse_merge!(search_resource.search_form_field(name, collection.first[opts[:index]]))
+          # Assign search collections from effective_resources
+          if search[:as] == :string
+            # Nothing to do. We're just a string search.
           elsif search[:as] == :select && search[:collection].kind_of?(Array)
-            # Nothing to do
-          elsif search[:as] != :string
+            # Nothing to do. We already loaded the custom parameterized collection above.
+          elsif array_collection? && opts[:resource].present?
+            # Assigns { as: :select, collection: [...] }
+            search.reverse_merge!(search_resource.search_form_field(name, collection.first[opts[:index]]))
+          else
+            # Load the defaults from effective_resources
+            # Assigns { as: :string } or { as: :select, collection: [...] }
             search.reverse_merge!(search_resource.search_form_field(name, opts[:as]))
           end
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.20.3'.freeze
+  VERSION = '4.20.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.20.3
+  version: 4.20.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-08 00:00:00.000000000 Z
+date: 2023-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails