effective_datatables 4.32.3 → 4.33.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a698faa322e964f9e59f527c958bbcba3b67af487e89656f057514169eabd222
-  data.tar.gz: '085d9a598ed1f4a4cf40762a890a18bb24ec4e7af73f4bb2f64a242fe34880c5'
+  metadata.gz: 4cd8c154865bcef7dda9eb32691cab1b3b6d7e304b8ddff6813fa2df1394da5f
+  data.tar.gz: ab4471b5df4f1fabadfa418f1cb8f9b5a5846895653fd76fa9a03e9b8bcdd0dd
 SHA512:
-  metadata.gz: b35b553118ec141057f13edb66b7e0d87b1afca3ab7df3e8ebed8c785fcbd06233cffa859b418aad9afb111b87aa73e86afc08041a1bc14aa09b341693551c68
-  data.tar.gz: 3fc70e65b0e53942b8a9cc4270e16bd5f7a22bbec0cd49a204a402f3bf955fe5bd278d5bf405000e8d23a8d062916540b6e5006605d14fce345cf9b0bbaa43c5
+  metadata.gz: 8b9a8106584a864a1a11c315c07f0cc473847f7292fb07b21d1f915fda0aadaea1a64fb242fdd8f511bb2a931796be841c571c4967dcd846e829df06eaee3533
+  data.tar.gz: 05a640da917ab52ead1f88e91868152e20949143a975000ad838986b38dfdea67fa1087de69329f6aef7951090a729daa8019608fde69ade3ae360194fa445d8

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

@@ -160,9 +160,12 @@ module Effective
         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
+
+          if opts[:search] == false || attributes[:searchable] == false
             opts[:search] = { as: :null }; next
+          end
+
+          case opts[:search]
           when Symbol
             opts[:search] = { as: opts[:search] }
           when Array, ActiveRecord::Relation
@@ -176,10 +179,12 @@ module Effective
           # Now lets deal with the opts[:search] hash itself
           search = opts[:search]
 
+          # Adjust based on shorthand search: :select syntax
+          search[:as] ||= :select if search.key?(:collection)
+          search[:value] ||= search.delete(:selected) if search.key?(:selected)
+
           # Parameterize collection
-          if attributes[:searchable] == false
-            # Nothing to do
-          elsif search[:collection].kind_of?(ActiveRecord::Relation)
+          if 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] }
@@ -187,29 +192,28 @@ module Effective
             search[:collection] = search[:collection]
           end
 
-          search[:as] ||= :select if search.key?(:collection)
-          search[:value] ||= search.delete(:selected) if search.key?(:selected)
-
           # Merge with defaults
           search_resource = [opts[:resource], effective_resource, fallback_effective_resource].compact
           search_resource = search_resource.find { |res| res.klass.present? } || search_resource.first
 
-          # Assign search collections from effective_resources
-          if attributes[:searchable] == false
-            # Nothing to do
-          elsif search[:as] == :string
+          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. We already loaded the custom parameterized collection above.
-          elsif opts[:visible] && array_collection? && opts[:resource].present?
+          elsif search[:as] == :select && search[:collection].blank? && array_collection? && opts[:resource].present?
             # Assigns { as: :select, collection: [...] }
             search.reverse_merge!(search_resource.search_form_field(name, collection.first[opts[:index]]))
-          elsif opts[:visible]
+          elsif search[:as] == :select && search[:collection].blank?
             # Load the defaults from effective_resources
             # Assigns { as: :string } or { as: :select, collection: [...] }
             search.reverse_merge!(search_resource.search_form_field(name, opts[:as]))
-          else
+          elsif [:belongs_to, :belongs_to_polymorphic, :has_and_belongs_to_many, :has_many, :has_one].include?(opts[:as])
+            # Do not eager load the collection. Treat this as a string search.
             search.reverse_merge!({ as: :string })
+          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
 
           # Assign default search operation

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.32.3'.freeze
+  VERSION = '4.33.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.32.3
+  version: 4.33.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-22 00:00:00.000000000 Z
+date: 2025-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails