effective_datatables 4.16.1 → 4.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d8cb374a927e0b1b432de1382f2362c0cc58bf59c8994d64c252410f3325638
-  data.tar.gz: da5f8129b039dcba1c39debf8ba3b42c066af7756b0bc01b090976ac1e2515a5
+  metadata.gz: 5fa644f48b7deb7204d3d7c6486dcdc90801075f580b721a9ae14ada37b38fae
+  data.tar.gz: 93915b2419ba86c9783e6e7dc227a7fdd131eafe43e7534c7dd862df66fd6977
 SHA512:
-  metadata.gz: '0881e3297eae8931da681f92ef24eb3e6759dfd4a4773d92d636f66a6647428061d898d3865066cbecba17ba33d6f1452ad7cf040f92d46cc64cbf990c899fc8'
-  data.tar.gz: d6f262f5c55a68051533f0347c7b3fd2964e9b1db5550f11d6b70f6ddf7bae9b687c1413c636d357c9483f0f09de28bd3462a1d4425e406eb5db468e4d37361c
+  metadata.gz: b92b2429d730b12d36d47c0ad01f0ee347d2e985a14c99d8d15c7d524ff80660762b50b84455ba4cf35e80e3ac36425d37311021227995ceec95f26310829e21
+  data.tar.gz: 6362c1329baebcedccb025f3e1ad7eae2fb1f30475f9013cd5840e515e26bcca16fedf9df6a5f212e11528e83bb2a15a3a8834f53c180e5ca5081e94e4e0af95

data/app/assets/javascripts/dataTables/buttons/buttons.colVis.js

@@ -62,9 +62,15 @@ $.extend( DataTable.ext.buttons, {
 				columns: idx,
 				columnText: conf.columnText
 			};
-		} ).toArray();
+		})
 
-		return columns;
+    var sorted = columns.sort(function (a, b) {
+      var a = dt.settings()[0].aoColumns[a.columns].sTitle;
+      var b = dt.settings()[0].aoColumns[b.columns].sTitle;
+      return a.localeCompare(b)
+    }).toArray();
+
+    return sorted;
 	},
 
 	// Single button to toggle column visibility

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

@@ -24,7 +24,7 @@ module Effective
         if active_record_collection?
           collection_class.human_attribute_name(name)
         else
-          (name.to_s.split('.').last || '')
+          (name.to_s.split('.').last.titleize|| '')
         end
       end
 
@@ -32,8 +32,17 @@ module Effective
         CSV.generate do |csv|
           csv << csv_header()
 
-          collection.find_in_batches do |resources|
-            resources = arrayize(resources, csv: true)
+          if active_record_collection?
+            collection.find_in_batches do |resources|
+              resources = arrayize(resources, csv: true)
+              format(resources, csv: true)
+              finalize(resources)
+
+              resources.each { |resource| csv << resource }
+            end
+          else
+            resources = collection
+
             format(resources, csv: true)
             finalize(resources)
 

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

@@ -10,20 +10,20 @@ module Effective
         return @_datatables_ajax_request unless @_datatables_ajax_request.nil?
         return unless view.respond_to?(:params)
 
-        @_datatables_ajax_request = (view.params.key?(:draw) && view.params.key?(:columns))
+        @_datatables_ajax_request = view.params.present? && (view.params.key?(:draw) && view.params.key?(:columns))
       end
 
       def datatables_inline_request?
         return @_datatables_inline_request unless @_datatables_inline_request.nil?
         return unless view.respond_to?(:params)
 
-        @_datatables_inline_request = (view.params[:_datatable_id].to_s.split('-')[0...-1] == to_param.split('-')[0...-1])
+        @_datatables_inline_request = view.params.present? && (view.params[:_datatable_id].to_s.split('-')[0...-1] == to_param.split('-')[0...-1])
       end
 
       def params
         return {} unless view.present?
         return view.rendered_params if view.respond_to?(:rendered_params)
-        return {} unless view.respond_to?(:request)
+        return {} unless view.respond_to?(:request) && view.request.present?
 
         @params ||= {}.tap do |params|
           Rack::Utils.parse_query(URI(view.request.referer.presence || '/').query).each { |k, v| params[k.to_sym] = v }

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.16.1'.freeze
+  VERSION = '4.17.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.16.1
+  version: 4.17.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-10 00:00:00.000000000 Z
+date: 2023-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails