effective_datatables 4.32.2 → 4.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9100f94b25b41b063bfb22badd52d44a013841a9a8777f82c46c603a9253037a
-  data.tar.gz: 4865f6a29fb6537c7c78ae86bfb3694291ac9c0f1602bae6b316ae1f740332f5
+  metadata.gz: 4fd39e83bcebfbf1f8dbe2b17d3d54027859a029171415cc474967fc86393748
+  data.tar.gz: 695f261ebd015f4caa869f8324576826a6189281e8beefcce2f7981b4787f800
 SHA512:
-  metadata.gz: 5b586704013a3f4cab49e372a7c4b2f72c61b3167ee51fd332d08d914370226388a1b84f758aa342c4dbd57396e02929ce93ed4909806df5d35e119ffcb25d10
-  data.tar.gz: f3313ae916189ab08285a3a4eda9641928c1a623bb7827c9935c85eca8eeeaad3dc6c0c93ff6e2f0602bc03e8e46f671275e74b337f3f10e5128eb19b674b79f
+  metadata.gz: e81d92cd5969c55cac79164365927833cea5468eb6c5fc9e0490637b04ee409791f6c9146702b086d48817f00cfedfd4d15447560a42cafc9910e28441e85a9c
+  data.tar.gz: ce1c67eab48ee5f3099046beaed44a9c92e2a1dfca154e1847093feef0d00ba4215e00776153190a4d924942695c5bb76e30b9aa1f94827cb499db94287011f3

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

@@ -201,9 +201,16 @@ module Effective
             # 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?
+          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 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]))
+          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: [...] }

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.32.2'.freeze
+  VERSION = '4.33.0'.freeze
 end

metadata

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