effective_datatables 4.20.2 → 4.20.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bfbf37b105594f8effdd8c1ca01f55e377cb3a9b011acdb200c7feef5a7e3cf
-  data.tar.gz: 8a72ea83642057838ecb2161693d2ce5f82ad194b6a47e6965df5f2dda48d902
+  metadata.gz: de9e67c1d5ddd3f19c322ea61f2bb1b50f9792e1ca6666607af4a14f11dc615d
+  data.tar.gz: ae1f07be260e375e21d4cf4520a1d55fb4c51787ea09f4f56acfc49168137f45
 SHA512:
-  metadata.gz: 7d494134ece7fd837e979d2d4e5206745c756e1d89a1e8a521fb33f897cd7a60ea329636ca2e2ec5287d2f70c1359ec0fee413a6ee04466c88cb2974ab6c805e
-  data.tar.gz: 0f55926b63825664257310ebe7de15a39b129a5a882439cf34f78fc0158b4f2bf64138f9fe3966950d9caa21e1f57a0cb3dbec8c88aa6e428d745dca167e3cfe
+  metadata.gz: 711ca1ee0f32fd3b91bcac59f294ac8d3822d364a7318ee89d68ed6a8d0de7147dab2934365abcc3e49ba1ea85142ba50f515207601e651677fc74f1cfdf5281
+  data.tar.gz: fd4a8536658314a46199c03aec85898365b992472b78e7e8592b468a25f6cc16ed914b2385f131b0e5f927963b5990a469b0a93e8e62697ec80c151e611ca7ba

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

@@ -127,9 +127,12 @@ module Effective
             else
               if values.all? { |v| v.kind_of?(ActiveRecord::Base) && v.respond_to?(name) }
                 values = values.map { |v| (v[name] if opts[:sql_as_column]) || v.public_send(name) }
+                format_column(aggregate_column(values, opts, aggregate), opts)
+              elsif values.all? { |v| (v == true || v == false) }
+                aggregate_column(values, opts, aggregate)
+              else
+                format_column(aggregate_column(values, opts, aggregate), opts)
               end
-
-              format_column(aggregate_column(values, opts, aggregate), opts)
             end || BLANK
           end.compact
         end

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

@@ -146,7 +146,7 @@ module Effective
 
           if csv
             value_to_s
-          elsif value_to_s.starts_with?('<') && value_to_s.ends_with?('>')
+          elsif value_to_s.include?('<') && value_to_s.include?('>')
             view.sanitize(value_to_s)
           else
             view.simple_format(value_to_s)
@@ -156,7 +156,7 @@ module Effective
 
           if csv
             value_to_s
-          elsif value_to_s.starts_with?('<') && value_to_s.ends_with?('>')
+          elsif value_to_s.include?('<') && value_to_s.include?('>')
             view.sanitize(value_to_s)
           else
             view.escape_once(value_to_s)

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.2'.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.2
+  version: 4.20.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-25 00:00:00.000000000 Z
+date: 2023-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails