effective_datatables 4.20.3 → 4.20.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b290520f84f92726953ea0aef6cfa1e5c8d6acdafbc1701f6fb542357d077010
-  data.tar.gz: 9f7a715b57a9edf9dc31b806bdc85287e505a3e7766957599f555073ea43e71e
+  metadata.gz: efe60765e3b15e6c05007e9bba964cb70d52e411ff5fe8eb7899c7289317c24d
+  data.tar.gz: ec684a2e94cb1955f657fe86f412302ac5ff44795e3f6f06217f22240cd27e33
 SHA512:
-  metadata.gz: d8a92d42e7b7f79761f5ad4efec357071bf5f844797883139e248177a059f9b108d62080f7d45db5e3ffbbcbf7aee4383621462bcd6e14f75ffffcffcf0ff145
-  data.tar.gz: e2315412cb5e63b24d5d554dfddfa69e99895ba7c30ee015d829eadfd6908e36d976cb6cb5e4151afbc7adf75ce7b54653e43e8d5c7a109796cf51364912ae87
+  metadata.gz: bf3517b19749fa82ff16a57cee12b778b88693e2519830e438af3f18752e771ed519fadd586c72d6cd155084fc9fd358a5e3fa4939a7c9c4a023db8348957619
+  data.tar.gz: db6d03253ce56d049b95992f382c41c4ea7f9d44f5e1919243430ec40eb3b927f1365960641eb1ac30343ad557c1842cd9267d6ca738af12610a9c2bad90bbf6

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,10 +173,13 @@ module Effective
             raise "column #{name} unexpected search value"
           end
 
+          # Now lets deal with the opts[:search] hash itself
           search = opts[:search]
 
           # Parameterize collection
-          if search[:collection].kind_of?(ActiveRecord::Relation)
+          if attributes[:searchable] == false
+            # Nothing to do
+          elsif search[:collection].kind_of?(ActiveRecord::Relation)
             search[:collection] = search[:collection].map { |obj| [obj.to_s, obj.id] }
           elsif search[:collection].kind_of?(Array) && search[:collection].first.kind_of?(ActiveRecord::Base)
             search[:collection] = search[:collection].map { |obj| [obj.to_s, obj.id] }
@@ -189,11 +194,19 @@ 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]]))
-          elsif search[:as] == :select && search[:collection].kind_of?(Array)
+          # Assign search collections from effective_resources
+          if attributes[:searchable] == false
             # Nothing to do
-          elsif search[:as] != :string
+          elsif search[:as] == :string
+            # Nothing to do. We're just a string search.
+          elsif search[:as] == :select && search[:collection].kind_of?(Array)
+            # 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.5'.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.5
 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