effective_datatables 3.7.2 → 3.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d5eaea728195f4aa7b178d88ecf9c09766c7a1649ec83b99d2bc40f8189ce65
-  data.tar.gz: 22962b113d52aa1d0c6db01b9f818c6754c6d31c95fd78f6f7241f7549f2ac98
+  metadata.gz: 10c87c87d54529b6e4952b9abc58512f1ab9c2dc3e9f6d6e03c5ed141a388dd3
+  data.tar.gz: c2a7fd23d6f7790e6e083af1084e61f969793fe587ed9722811e6197a4516465
 SHA512:
-  metadata.gz: ca7193b812467f8ac7a82338969b92ec0e115cb0aef92bb4b7debb84c3754db82958d9dc9b54af9141fb62271ae0a58a63ffa8c01c0edef6465aefd7f5642c62
-  data.tar.gz: 340c24d9f3e9432bfd9c35fefb9873a262c1c0132c42bc21d000b38b2d7b38cfb294b5ad12a8ad7f6a0863d0395d7e19443d9f5e69805ada28451396fd4d687a
+  metadata.gz: 3bb3d7ab4f1ed0642f972bfdfd0828333b5149af4dc474fa1d9ecedb5a009ef20cd3ea2b29ab4bb71e8c7e85c7236edd4a22cce63503383acab3e40a25644407
+  data.tar.gz: 76b83708cb8b0d2cdd6f67c608a9892d473be9d0f58b29438c1d445015aedc3b2b345b027811cbb4957b1154d9a057e3ed8151bb28ae8dc7f7ad9066341c31a1

data/app/assets/javascripts/effective_datatables.js

@@ -15,6 +15,7 @@
 //= require effective_datatables/bulk_actions
 //= require effective_datatables/events
 //= require effective_datatables/filters
+//= require effective_datatables/flash
 //= require effective_datatables/reset
 //= require effective_datatables/responsive
 

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

@@ -1,50 +1,66 @@
 #### Checkbox toggling and Bulk Actions dropdown disabling
 
-$(document).on 'change', "input[data-role='bulk-actions-resource']", (event) ->
+$(document).on 'change', ".dataTables_wrapper input[data-role='bulk-action']", (event) ->
   $wrapper = $(event.currentTarget).closest('.dataTables_wrapper')
 
-  $wrapper.find("input[data-role='bulk-actions-all']").prop('checked', false)
-  toggleClosestBulkActionsButton($wrapper)
+  $wrapper.find("input[data-role='bulk-actions']").prop('checked', false)
+  toggleDropdown($wrapper)
 
-$(document).on 'change', "input[data-role='bulk-actions-all']", (event) ->
+$(document).on 'change', ".dataTables_wrapper input[data-role='bulk-actions']", (event) ->
   $wrapper = $(event.currentTarget).closest('.dataTables_wrapper')
-  $resources = $wrapper.find("input[data-role='bulk-actions-resource']")
+  $resources = $wrapper.find("input[data-role='bulk-action']")
 
   if $(event.currentTarget).is(':checked')
     $resources.prop('checked', true)
   else
     $resources.prop('checked', false)
 
-  toggleClosestBulkActionsButton($wrapper)
+  toggleDropdown($wrapper)
 
-toggleClosestBulkActionsButton = ($wrapper) ->
+toggleDropdown = ($wrapper) ->
   $bulkActions = $wrapper.children().first().find('.buttons-bulk-actions').children('button')
 
-  if $wrapper.find("input[data-role='bulk-actions-resource']:checked").length > 0
+  if $wrapper.find("input[data-role='bulk-action']:checked").length > 0
     $bulkActions.removeAttr('disabled')
   else
     $bulkActions.attr('disabled', 'disabled')
 
+restoreSelected = ($table, selected) ->
+  $bulkActions = $table.closest('.dataTables_wrapper').children().first().find('.buttons-bulk-actions').children('button')
+  present = false
+
+  if selected && selected.length > 0
+    $table.find("input[data-role='bulk-action']").each (_, input) ->
+      $input = $(input)
+
+      if selected.indexOf($input.val()) > -1
+        $input.prop('checked', true)
+        present = true
+      else
+        $input.prop('checked', false)
+
+  if present then $bulkActions.removeAttr('disabled') else $bulkActions.attr('disabled', 'disabled')
 
 #### Bulk Action link behaviour
-$(document).on 'click', '.buttons-bulk-actions a', (event) ->
+$(document).on 'click', '.dataTables_wrapper .buttons-bulk-actions a', (event) ->
   event.preventDefault() # prevent the click
 
   $bulkAction = $(event.currentTarget)  # This is a regular <a href=...> tag
   $wrapper = $bulkAction.closest('.dataTables_wrapper')
   $table = $wrapper.find('table.dataTable').first()
   $processing = $table.siblings('.dataTables_processing').first()
-  $selected = $table.find("input[data-role='bulk-actions-resource']:checked")
+  $selected = $table.find("input[data-role='bulk-action']:checked")
 
   url = $bulkAction.attr('href')
   title = $bulkAction.text()
-  token = $bulkAction.parent('li').data('authenticity-token')
+  download = $bulkAction.data('bulk-download')
+  token = $table.data('authenticity-token')
   values = $.map($selected, (input) -> input.getAttribute('value'))
-  get_link = $bulkAction.data('bulk-actions-get')
+  method = $bulkAction.data('ajax-method')
 
   return unless url && values
 
-  if get_link
+  if method == 'GET'
     if url.includes('?')
       window.location.assign(url + '&' + $.param({ids: values}))
     else
@@ -55,52 +71,36 @@ $(document).on 'click', '.buttons-bulk-actions a', (event) ->
   # Disable the Bulk Actions dropdown, so only one can be run at a time
   $bulkAction.closest('button').attr('disabled', 'disabled')
 
-  # Show Processing...
-  $processing.show().data('bulk-actions-processing', true)
+  $table.dataTable().data('bulk-actions-restore-selected-values', values)
 
-  if token # This is a file download
+  if download # This is a file download
     $.fileDownload(url,
       httpMethod: 'POST',
       data: { ids: values, authenticity_token: token }
       successCallback: ->
         success = "Successfully completed #{title} bulk action"
-        $processing.html(success)
-        $table.dataTable().data('bulk-actions-restore-selected-values', values)
+        $table.one 'draw.dt', (e) -> $(e.target).DataTable().flash(success, 'success') and restoreSelected($(e.target), values)
         $table.DataTable().draw()
       failCallback: ->
         error = "An error occured while attempting #{title} bulk action"
-        $processing.html(error)
-        alert(error)
-        $table.dataTable().data('bulk-actions-restore-selected-values', values)
+        $table.one 'draw.dt', (e) -> $(e.target).DataTable().flash(error, 'danger') and restoreSelected($(e.target), values)
         $table.DataTable().draw()
     )
   else # Normal AJAX post
-    $.post(
-      url, { ids: values }
+    $table.dataTable().data('bulk-actions-restore-selected-values', values)
+
+    $.ajax(
+      method: method,
+      url: url,
+      data: { ids: values, authenticity_token: token }
     ).done((response) ->
       success = response['message'] || "Successfully completed #{title} bulk action"
-      $processing.html(success)
+      $table.one 'draw.dt', (e) -> $(e.target).DataTable().flash(success, 'success') and restoreSelected($(e.target), values)
+
     ).fail((response) ->
       error = response['message'] || "An error occured while attempting #{title} bulk action: #{response.statusText}"
-      $processing.html(error)
-      alert(error)
+      $table.one 'draw.dt', (e) -> $(e.target).DataTable().flash(error, 'danger') and restoreSelected($(e.target), values)
+
     ).always((response) ->
-      $table.dataTable().data('bulk-actions-restore-selected-values', values)
       $table.DataTable().draw()
     )
-
-# We borrow the Processing div for our bulk action success/error messages
-# This makes sure that the message is displayed for 1500ms
-$(document).on 'processing.dt', (event, settings, visible) ->
-  return if settings.bDestroying
-
-  $processing = $(event.target).siblings('.dataTables_processing').first()
-  return unless $processing.data('bulk-actions-processing')
-
-  timeout = $processing.show().data('timeout')
-  clearTimeout(timeout) if timeout
-  $processing.data('timeout', setTimeout( =>
-      $processing.html('Processing...').hide()
-      $processing.data('bulk-actions-processing', null)
-    , 1500)
-  )

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

@@ -24,14 +24,14 @@ initializeDataTables = (target) ->
           extend: 'copy',
           exportOptions:
             format:
-              header: (str) -> $("<div>#{str}</div>").children('.search-label').first().text()
+              header: (str) -> $("<div>#{str}</div>").children('span').first().text()
             columns: buttons_export_columns
         },
         {
           extend: 'csv',
           exportOptions:
             format:
-              header: (str) -> $("<div>#{str}</div>").children('.search-label').first().text()
+              header: (str) -> $("<div>#{str}</div>").children('span').first().text()
             columns: buttons_export_columns
         },
         {
@@ -39,7 +39,7 @@ initializeDataTables = (target) ->
           footer: true,
           exportOptions:
             format:
-              header: (str) -> $("<div>#{str}</div>").children('.search-label').first().text()
+              header: (str) -> $("<div>#{str}</div>").children('span').first().text()
             columns: ':visible:not(.col-actions)'
         },
       ]
@@ -64,12 +64,23 @@ initializeDataTables = (target) ->
         params['authenticity_token'] = $table.data('authenticity-token')
 
         if $form.length > 0
-          params['scope'] = $form.find("input[id^='filters_scope']:checked").val() || ''
+          params['scope'] = $form.find("input[name='filters[scope]']:checked").val() || ''
           params['filter'] = {}
 
-          $form.find("[id^='filters_']:not(input[id^='filters_scope'])").each ->
+          $form.find("select,textarea,input:not([type=submit])").each ->
             $input = $(this)
-            params['filter'][$input.attr('id').substring(8, $input.attr('id').length)] = $input.val()
+
+            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()
 
       serverSide: true
       scrollCollapse: true

data/app/helpers/effective_datatables_private_helper.rb

@@ -148,7 +148,7 @@ module EffectiveDatatablesPrivateHelper
         input_html: input_html,
         input_js: { placeholder: placeholder }
     when :bulk_actions
-      input_html[:data]['role'] = 'bulk-actions-all'
+      input_html[:data]['role'] = 'bulk-actions'
 
       form.input name, label: false, required: false, value: nil,
         as: :boolean,

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

@@ -1,2 +1,2 @@
 - id = (resource.try(:to_param) || resource.try(:id) || resource.object_id)
-= check_box_tag 'bulk_actions_resources[]', id, false, autocomplete: 'off', id: "datatable_bulk_actions_resource_#{id}", data: { role: 'bulk-actions-resource' }, onClick: 'event.stopPropagation();'
+= check_box_tag 'bulk_actions_resources[]', id, false, autocomplete: 'off', id: "datatable_bulk_actions_resource_#{id}", data: { role: 'bulk-action' }, onClick: 'event.stopPropagation();'

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.7.2'.freeze
+  VERSION = '3.7.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.7.2
+  version: 3.7.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2019-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails