effective_datatables 4.26.0 → 4.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6af5d5e2542f1b4b587ad472f4be837fe81cf57cad38edf272986ba358710ae
-  data.tar.gz: ada5f3e65dd9c40eedf6acda70db0e5955dc0b693fb1604392a1fbd5e7e98bba
+  metadata.gz: 87b7b506996cfe6ae06c7f798073c5d33fb77b338dccb923d562c154cd5eb649
+  data.tar.gz: a1c244dadeb7888540e1506dd6bd15603451759550115acbdaa05d4a9cb23bda
 SHA512:
-  metadata.gz: 6833350b97bb37061602f756c291b7fb30af237b0895952f6ac41ac4e4b565e03d7ce1ab5503e1ef4adc2fca3574edb325b81d5d3a9818515be2b039f3d580f0
-  data.tar.gz: '0859ffbe2c11c23c58d2743d76bd99f23af3c67d28f3b888ab3ecd9f68e0a9b9c181b37ad7e93b406e7bde949c04566dd4b7d0bf7b1a183cb6fb0df7e13dbb22'
+  metadata.gz: a69c9330ed0bcd594326a0b0634a0d502e0697299e8b673c38356e0d319090380728fd18f29470ab69d20f7aaf11e236636e1a3d616e226f48c3aa39bb12110f
+  data.tar.gz: 5411671b623970f7fc9d5162cc8e72a97757734e57fde615f2a53ac6aa27460010e91a1283692cc53031de59692057041b46b970b1093a24a9b277aab9e10b95

data/app/assets/javascripts/effective_datatables/download.js.coffee

@@ -5,6 +5,13 @@ $(document).on 'click', '.dataTables_wrapper a.buttons-download', (event) ->
   url = $table.data('source').replace('.json', '/download.csv')
   attributes = 'attributes=' + encodeURIComponent($table.data('attributes'))
 
-  $button.attr('href', url + '?' + attributes)
+  # Parse filters and flatten
+  filterParams = $table.DataTable().getFilterParams() || {}
+  params = filterParams['filter'] || {}
+  params['scope'] = filterParams['scope'] if filterParams['scope']
+
+  filters = '&' + $.param(params)
+
+  $button.attr('href', url + '?' + attributes + filters)
 
   setTimeout (=> $button.attr('href', 'download.csv')), 0

data/app/assets/javascripts/effective_datatables/initialize.js.coffee

@@ -15,36 +15,38 @@ initializeDataTables = (target) ->
       ajax: { url: datatable.data('source'), type: 'POST' }
       autoWidth: false
       buttons: [
-        {
-          extend: 'colvis',
-          postfixButtons: [
-            { extend: 'colvisGroup', text: 'Show all', show: ':hidden', className: 'buttons-colvisGroup-first'},
-            { extend: 'colvisGroup', text: 'Show none', hide: ':visible' },
-            { extend: 'colvisGroup', text: 'Show default', hide: ':not(.colvis-default)', show: '.colvis-default' }
-          ]
-        },
-        {
-          extend: 'copy',
-          exportOptions:
-            format:
-              header: (str) -> $("<div>#{str}</div>").children('span').first().text()
-            columns: buttons_export_columns
-        },
         {
           extend: 'csv',
+          text: 'Snapshot',
           exportOptions:
             format:
               header: (str) -> $("<div>#{str}</div>").children('span').first().text()
             columns: buttons_export_columns
         },
         {
-          extend: 'print',
-          footer: true,
-          exportOptions:
-            format:
-              header: (str) -> $("<div>#{str}</div>").children('span').first().text()
-            columns: ':visible:not(.col-actions)'
-        },
+          extend: 'colvis',
+          postfixButtons: [
+            { extend: 'colvisGroup', text: 'Show all', show: ':hidden', className: 'buttons-colvisGroup-first'},
+            { extend: 'colvisGroup', text: 'Show none', hide: ':visible' },
+            { extend: 'colvisGroup', text: 'Show default', hide: ':not(.colvis-default)', show: '.colvis-default' }
+          ]
+        }
+        # {
+        #   extend: 'copy',
+        #   exportOptions:
+        #     format:
+        #       header: (str) -> $("<div>#{str}</div>").children('span').first().text()
+        #     columns: buttons_export_columns
+        # },
+
+        # {
+        #   extend: 'print',
+        #   footer: true,
+        #   exportOptions:
+        #     format:
+        #       header: (str) -> $("<div>#{str}</div>").children('span').first().text()
+        #     columns: ':visible:not(.col-actions)'
+        # },
       ]
       columns: datatable.data('columns')
       deferLoading: [datatable.data('display-records'), datatable.data('total-records')]
@@ -61,29 +63,13 @@ initializeDataTables = (target) ->
         api.columns().flatten().each (index) => params['columns'][index]['visible'] = api.column(index).visible()
 
         $table = $(api.table().node())
-        $form = $(".effective-datatables-filters[aria-controls='#{$table.attr('id')}']").first()
-
         params['attributes'] = $table.data('attributes')
         params['authenticity_token'] = $table.data('authenticity-token')
 
-        if $form.length > 0
-          params['scope'] = $form.find("input[name='filters[scope]']:checked").val() || ''
-          params['filter'] = {}
-
-          $form.find("select,textarea,input:enabled:not([type=submit])").each ->
-            $input = $(this)
-
-            if ['utf8', 'authenticity_token', 'filters[scope]'].includes($input.attr('name'))
-              # Skipped
-            else if $input.attr('type') == 'radio'
-              name = $input.attr('name')
-              filter_name = name.replace('filters[', '').substring(0, name.length-9)
-
-              params['filter'][filter_name] = $form.find("input[name='#{name}']:checked").val()
-
-            else if $input.attr('id')
-              filter_name = $input.attr('id').replace('filters_', '')
-              params['filter'][filter_name] = $input.val()
+        filterParams = api.getFilterParams()
+        params['scope'] = filterParams['scope'] if filterParams['scope']
+        params['filter'] = filterParams['filter'] if filterParams['filter']
+        params
 
       serverSide: true
       scrollCollapse: true

data/app/assets/javascripts/effective_datatables/params.js.coffee

@@ -0,0 +1,29 @@
+getFilterParams = ->
+  table_id = @table().node().id
+  $form = $(".effective-datatables-filters[aria-controls='#{table_id}']").first()
+
+  # Parse Filter & Scope Params
+  params = {}
+
+  if $form.length > 0
+    params['scope'] = $form.find("input[name='filters[scope]']:checked").val() || ''
+    params['filter'] = {}
+
+    $form.find("select,textarea,input:enabled:not([type=submit])").each ->
+      $input = $(this)
+
+      if ['utf8', 'authenticity_token', 'filters[scope]'].includes($input.attr('name'))
+        # Skipped
+      else if $input.attr('type') == 'radio'
+        name = $input.attr('name')
+        filter_name = name.replace('filters[', '').substring(0, name.length-9)
+
+        params['filter'][filter_name] = $form.find("input[name='#{name}']:checked").val()
+
+      else if $input.attr('id')
+        filter_name = $input.attr('id').replace('filters_', '')
+        params['filter'][filter_name] = $input.val()
+
+  params
+
+$.fn.DataTable.Api.register('getFilterParams()', getFilterParams)

data/app/assets/stylesheets/effective_datatables/_overrides.bootstrap4.scss

@@ -170,6 +170,11 @@ table.dataTable > thead {
   }
 }
 
+// Filters
+.effective-datatables-filter { 
+  p { margin-bottom: 0; }
+}
+
 // Processing div
 div.dataTables_wrapper div.dataTables_processing {
   margin: -26px 25% 0px 25%;

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

@@ -51,12 +51,20 @@ module Effective
         end
       end
 
+      def csv_collection
+        value = if active_record_collection? && @_collection_apply_scope
+          column_tool.scope(collection)
+        else
+          collection
+        end
+      end
+
       def csv_stream
         EffectiveResources.with_resource_enumerator do |lines|
           lines << CSV.generate_line(csv_header)
 
           if active_record_collection?
-            collection.find_in_batches do |resources|
+            csv_collection().find_in_batches do |resources|
               resources = arrayize(resources, csv: true)
               format(resources, csv: true)
               finalize(resources)
@@ -64,7 +72,7 @@ module Effective
               resources.each { |resource| lines << CSV.generate_line(resource) }
             end
           else
-            resources = collection
+            resources = csv_collection()
 
             format(resources, csv: true)
             finalize(resources)

data/app/views/effective/datatables/_filter_date_range.html.haml

@@ -33,15 +33,15 @@
 
 = f.show_if :date_range, :year do
   = f.static_field :year, wrapper: { class: 'effective-datatables-filter' } do
-    - date = f.object.start_date.beginning_of_year
+    - date = start_date.beginning_of_year
 
     = link_to '#', 'data-effective-datatables-filter-prev-year': date.advance(years: -1).strftime('%F') do
       = icon('arrow-left-circle')
       %span.prev-year= date.advance(years: -1).strftime('%Y')
 
-    %span.start-date= f.object.start_date.strftime('%F')
+    %span.start-date= start_date.strftime('%F')
     to
-    %span.end-date= f.object.end_date.strftime('%F')
+    %span.end-date= end_date.strftime('%F')
 
     = link_to '#', 'data-effective-datatables-filter-next-year': date.advance(years: 1).strftime('%F') do
       = icon('arrow-right-circle')
@@ -53,15 +53,15 @@
 
 = f.show_if :date_range, :month do
   = f.static_field :month, wrapper: { class: 'effective-datatables-filter' } do
-    - date = f.object.start_date.beginning_of_month
+    - date = start_date.beginning_of_month
 
     = link_to '#', 'data-effective-datatables-filter-prev-month': date.advance(months: -1).strftime('%F') do
       = icon('arrow-left-circle')
       %span.prev-month= date.advance(months: -1).strftime('%b')
 
-    %span.start-date= f.object.start_date.strftime('%F')
+    %span.start-date= start_date.strftime('%F')
     to
-    %span.end-date= f.object.end_date.strftime('%F')
+    %span.end-date= end_date.strftime('%F')
 
     = link_to '#', 'data-effective-datatables-filter-next-month': date.advance(months: 1).strftime('%F') do
       = icon('arrow-right-circle')

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.26.0'.freeze
+  VERSION = '4.27.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.26.0
+  version: 4.27.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-12 00:00:00.000000000 Z
+date: 2024-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -119,6 +119,7 @@ files:
 - app/assets/javascripts/effective_datatables/initialize.js.coffee
 - app/assets/javascripts/effective_datatables/inline_crud.js.coffee
 - app/assets/javascripts/effective_datatables/overrides.js.coffee
+- app/assets/javascripts/effective_datatables/params.js.coffee
 - app/assets/javascripts/effective_datatables/reorder.js.coffee
 - app/assets/javascripts/effective_datatables/reset.js.coffee
 - app/assets/javascripts/effective_datatables/responsive.js.coffee