effective_datatables 4.8.8 → 4.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9523ed0159096daf782db8331cd502b8b705667a9b6bce9b22e5e46a167cfed
-  data.tar.gz: 8e118dcc38bbfd2f2bbb47e2e24cbb76a12159e97060636c0625f714b7d8badf
+  metadata.gz: da2dfe401e2839d034033b2af1b0048cf3c6a726b87a1f6ccc4354eb71183f55
+  data.tar.gz: b6c6a44db10ce020e32bd79de4f1dc8a77106122f7725524414e0ccfa2ee4265
 SHA512:
-  metadata.gz: 75f57a4bd505a0c21f121c506dc3dad7f757af1a94e3e3677dfd5a941e6e1650411eacfd774d45ebe2e6c94e8cc67f47eabe89f4644824aa154cf05126e7621c
-  data.tar.gz: abdc9f48a7694c17313fc4a10f50987c8ecbd56e8796d1651c633c82b788ddcf94c06205797a7204fcbd49a00fb4f68bc99b6ed2884feb99d74b8a3a2d228e6e
+  metadata.gz: 75201440e6f62b181ebce2f54dbaedcffae413a42803e1b0e39a7869f8425e776d51b10b88c2625d142a89895eb6f4ab3f174715782bdb068c5958908b0e36a3
+  data.tar.gz: b9442dab7b1f1b7a1b34e39ec1b67e3241757b1978272ea051c01cf77a9ae074b1ccac33aa18cc52a84a1f735697b41c72fba970a1d39a0c1a734d40c17f125c

data/app/helpers/effective_datatables_private_helper.rb

@@ -44,7 +44,7 @@ module EffectiveDatatablesPrivateHelper
     action = { action: :new, class: ['btn', column[:btn_class].presence].compact.join(' '), 'data-remote': true }
 
     if column[:actions][:new].kind_of?(Hash) # This might be active_record_array_collection?
-      action = action.merge(column[:actions][:new])
+      action.merge!(column[:actions][:new])
 
       effective_resource = (datatable.effective_resource || datatable.fallback_effective_resource)
       klass = (column[:actions][:new][:klass] || effective_resource&.klass || datatable.collection_class)
@@ -84,7 +84,7 @@ module EffectiveDatatablesPrivateHelper
     collection = opts[:search].delete(:collection)
     value = datatable.state[:search][name]
 
-    options = opts[:search].except(:fuzzy).merge!(
+    options = opts[:search].merge!(
       name: nil,
       feedback: false,
       label: false,
@@ -92,24 +92,26 @@ module EffectiveDatatablesPrivateHelper
       data: { 'column-name': name, 'column-index': opts[:index] }
     )
 
+    options.delete(:fuzzy)
+
     case options.delete(:as)
     when :string, :text, :number
       form.text_field name, options
     when :date, :datetime
-      form.date_field name, options.reverse_merge(
+      form.date_field name, options.reverse_merge!(
         date_linked: false, prepend: false, input_js: { useStrict: true, keepInvalid: true }
       )
     when :time
-      form.time_field name, options.reverse_merge(
+      form.time_field name, options.reverse_merge!(
         date_linked: false, prepend: false, input_js: { useStrict: false, keepInvalid: true }
       )
     when :select, :boolean
-      options[:input_js] = (options[:input_js] || {}).reverse_merge(placeholder: '')
+      options[:input_js] = (options[:input_js] || {}).reverse_merge!(placeholder: '')
 
       form.select name, collection, options
     when :bulk_actions
       options[:data]['role'] = 'bulk-actions'
-      form.check_box name, options.merge(label: ' ')
+      form.check_box name, options.merge!(label: ' ')
     end
   end
 
@@ -139,7 +141,7 @@ module EffectiveDatatablesPrivateHelper
       placeholder: (opts[:label] || name.to_s.titleize),
       value: value,
       wrapper: { class: 'form-group col-auto'}
-    }.merge(opts.except(:as, :collection, :parse, :value))
+    }.merge!(opts.except(:as, :collection, :parse, :value))
 
     options[:name] = '' unless datatable._filters_form_required?
 
@@ -171,7 +173,7 @@ module EffectiveDatatablesPrivateHelper
       label: false,
       required: false,
       wrapper: { class: 'form-group col-auto'}
-    }.merge(opts.except(:checked, :value))
+    }.merge!(opts.except(:checked, :value))
 
     form.radios :scope, collection, options
   end

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

@@ -64,6 +64,7 @@ module Effective
             if state[:visible][name] == false && (name != order_name)  # Sort by invisible array column
               BLANK
             elsif opts[:compute]
+
               if array_collection?
                 dsl_tool.instance_exec(obj, obj[opts[:index]], &opts[:compute])
               else

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

@@ -98,9 +98,11 @@ module Effective
             opts[:sql_as_column] = true if (effective_resource.table && effective_resource.column(name).blank?)
           end
 
-          if opts[:sql_column].present? && AGGREGATE_SQL_FUNCTIONS.any? { |str| opts[:sql_column].to_s.start_with?(str) }
-            opts[:sql_as_column] = true
+          if opts[:sql_column].present?
+            sql_column = opts[:sql_column].to_s
+            opts[:sql_as_column] = true if AGGREGATE_SQL_FUNCTIONS.any? { |str| sql_column.start_with?(str) }
           end
+
         end
       end
 
@@ -200,7 +202,7 @@ module Effective
 
       def load_resource_belongs_tos!
         return unless active_record_collection?
-        return unless @_collection_apply_belongs_to 
+        return unless @_collection_apply_belongs_to
 
         changed = attributes.select do |attribute, value|
           attribute = attribute.to_s

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.8.8'.freeze
+  VERSION = '4.8.9'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.8.8
+  version: 4.8.9
 platform: ruby
 authors:
 - Code and Effect