effective_datatables 3.7.1 → 3.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '00897fdaee946020e3da4d940ed071dd6d22b2309143466600196e353e66fda8'
-  data.tar.gz: dc8eaf4b4d4719a3a209d79bc1aa498774bba00b897a26c21f777d3c0194ce4d
+  metadata.gz: 173590e66ff34a72a7aaed989391a718e25eaca196fae4981f295bf4a73a6bf0
+  data.tar.gz: 8330bb5487288950f107f6dc79dedde2b2298e77c059d98bdf4d7f095ca8c353
 SHA512:
-  metadata.gz: d3235fbe734ed95f5cf7cc531ac6449986bac368a1b28227b1192b48bfa42f87980adc29b02a3d72d78d3a85a8ea920f5419d028f105f8de327233c5a4eadcf4
-  data.tar.gz: 90e7bc6cb4bcd6b7e59ed05a3b6bc81f781de74c1775b3fe204c7327918bf0192fdda12129710f0e343ee350f54758cbd2e3b6633ae6e5174ee40261d8ad6208
+  metadata.gz: 242e5bf78a1f1aef37f3864e76d8cf90e98141a84ff4408b9fb5fed72a51115c15a5d19ca1fa79a692401ff6abc29d1f40dae4d781f217add15509f09217c810
+  data.tar.gz: 569226fd1c6c32e498efc9ee7728a070f971d54ee10ef353777712a7ccf891337d2061cbceec3366a5d627daa84841eb8a70bea3a81ee32a2e1fdc9c03809576

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
@@ -145,6 +156,7 @@ initializeDataTables = (target) ->
 
         $input.parent().on 'click', (event) -> false # Dont order columns when you click inside the input
         $input.parent().on 'mousedown', (event) -> event.stopPropagation() # Dont order columns when you click inside the input
+        $input.parent().on 'keypress', (event) -> event.stopPropagation() # Don't order columns when you type inside the input
 
         if $input.is('select')
           $input.on 'change', (event) -> dataTableSearch($(event.currentTarget))

data/app/helpers/effective_datatables_private_helper.rb

@@ -48,8 +48,8 @@ module EffectiveDatatablesPrivateHelper
       action = 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)
-    elsif Array(datatable.effective_resource&.actions).include?(:new)
+      klass = (column[:actions][:new][:klass] || effective_resource.try(:klass) || datatable.collection_class)
+    elsif Array(datatable.effective_resource.try(:actions)).include?(:new)
       effective_resource = datatable.effective_resource
       klass = effective_resource.klass
     else
@@ -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,
@@ -176,15 +176,15 @@ module EffectiveDatatablesPrivateHelper
     collection = opts[:collection]
     input_html = opts[:input_html] || {}
 
-    form.input name,
+    attributes = {
       value: value,
       selected: value,
       as: as,
       collection: collection,
       label: opts[:label],
-      required: input_html.delete(:required),
-      multiple: input_html.delete(:multiple),
-      include_blank: input_html.delete(:include_blank),
+      required: input_html.delete(:required) || opts[:required],
+      multiple: input_html.delete(:multiple) || opts[:multiple],
+      include_blank: input_html.delete(:include_blank) || opts[:include_blank],
       group_method: input_html.delete(:group_method),
       group_label_method: input_html.delete(:group_label_method),
       value_method: input_html.delete(:value_method),
@@ -192,6 +192,9 @@ module EffectiveDatatablesPrivateHelper
       input_html: (({name: ''} unless datatable._filters_form_required?) || {}).merge(input_html),
       input_js: ({ placeholder: ''} if as == :effective_select),
       wrapper_html: {class: 'form-group-sm'}
+    }.compact
+
+    form.input name, **attributes
   end
 
   def datatable_scope_tag(form, datatable, opts = {})

data/app/models/effective/datatable_value_tool.rb

@@ -94,10 +94,10 @@ module Effective
 
         case column[:as]
         when :boolean
-          if fuzzy
-            term ? (obj == true) : (obj != true)
+          if term
+            ['Yes', 'yes', true, 'true', '1'].include?(value)
           else
-            obj == term
+            ['No', 'no', false, 'false', '0'].include?(value)
           end
         when :datetime, :date
           end_at = (

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

@@ -88,9 +88,9 @@ module Effective
         when :currency
           view.number_to_currency(value)
         when :date
-          (value.strftime('%F') rescue BLANK)
+          value.respond_to?(:strftime) ? value.strftime(EffectiveDatatables.format_date) : BLANK
         when :datetime
-          (value.strftime('%F %H:%M') rescue BLANK)
+          value.respond_to?(:strftime) ? value.strftime(EffectiveDatatables.format_datetime) : BLANK
         when :decimal
           value
         when :duration
@@ -116,7 +116,7 @@ module Effective
           when Numeric    ; view.number_to_currency(value)
           end
         when :time
-          (value.strftime('%H:%M') rescue BLANK)
+          value.respond_to?(:strftime) ? value.strftime(EffectiveDatatables.format_time) : BLANK
         else
           value.to_s
         end
@@ -126,7 +126,7 @@ module Effective
       # Applies data-remote to anything that's data-method post or delete
       # Merges in any extra attributes when passed as a Hash
       def actions_col_actions(column)
-        resource_actions = (effective_resource&.resource_actions || fallback_effective_resource.fallback_resource_actions)
+        resource_actions = (effective_resource.try(:resource_actions) || fallback_effective_resource.fallback_resource_actions)
 
         actions = if column[:inline]
           resource_actions.transform_values { |opts| opts['data-remote'] = true; opts }
@@ -139,7 +139,7 @@ module Effective
           column[:actions].each do |action, opts|
             next unless opts.kind_of?(Hash)
 
-            existing = actions.find { |_, v| v[:action] == action }&.first
+            existing = actions.find { |_, v| v[:action] == action }.try(:first)
             next unless existing.present?
 
             actions[existing]['data-remote'] = opts[:remote] if opts.key?(:remote)

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/config/effective_datatables.rb

@@ -39,4 +39,8 @@ EffectiveDatatables.setup do |config|
   config.cookie_domain = :all         # Should usually be :all
   config.cookie_tld_length = nil      # Leave nil to autodetect, or set to probably 2
 
+  # Date formatting
+  config.format_datetime = '%F %H:%M'
+  config.format_date = '%F'
+  config.format_time = '%H:%M'
 end

data/lib/effective_datatables.rb

@@ -16,6 +16,10 @@ module EffectiveDatatables
   mattr_accessor :cookie_domain
   mattr_accessor :cookie_tld_length
 
+  mattr_accessor :format_datetime
+  mattr_accessor :format_date
+  mattr_accessor :format_time
+
   mattr_accessor :debug
 
   alias_method :max_cookie_size, :cookie_max_size

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.7.1'.freeze
+  VERSION = '3.7.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.7.7
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-17 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -176,7 +176,7 @@ homepage: https://github.com/code-and-effect/effective_datatables
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -191,8 +191,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Uniquely powerful server-side searching, sorting and filtering of any ActiveRecord
   or Array collection as well as post-rendered content displayed as a frontend jQuery