effective_datatables 4.7.21 → 4.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 284930f6f95c88e0866c44be8ebf6f8377b45047bdc3e053ce69e02132ed2cff
-  data.tar.gz: 07d299627c82e28f81cc35fccdf1529fbd9c63b099a4469e596d8941c87ab8a4
+  metadata.gz: c5a9a4233ee452020c92387b3bb140eac9df58bd52548c55a2eb41881c731f67
+  data.tar.gz: f738131e50148095ea9c1cee3b0f68911d4b2a4f1815b7d5aa6445ec4d849a49
 SHA512:
-  metadata.gz: 76dea3b42df8d0c9b94405f6a4f882281c0bdc0684b5ed0472ecfb5c5e82b16d990b17dc62f210c48c93f3efa03630fe1caf8e2f1f36baf6953ebe8d31c453f0
-  data.tar.gz: b9578ba204f634e184d77ba6dfec92bb770d353c6946dfc27391b4190c1936f242b7200b40d50cde5a7bce522559d5b1d07ca4da9d0be57e987ad816aeafb82b
+  metadata.gz: 2279b8c6b0f72dc5427a2d0cc876ee83021806a3152d325edcccbaf8532dd65de27c1a8275320a306568790a60965d6235ee585e4bba41c1337148568df62d51
+  data.tar.gz: a7e514c7caf226a633fbd5d6098df1241b38336343fc9d6927f3bab07419d56300c06c4cecab752ed4a43819f9f6946c820cff5af7e0b25c317922a06625155e

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

@@ -1,11 +1,32 @@
 $(document).on 'click', '.dataTables_wrapper a.buttons-reset-search', (event) ->
   event.preventDefault() # prevent the click
 
+  # Reset the HTML
   $table = $(event.currentTarget).closest('.dataTables_wrapper').find('table.dataTable').first()
   $thead = $table.children('thead').first()
 
-  $thead.find('input').val('').removeAttr('checked').removeAttr('selected')
+  # Reset all inputs
   $thead.find('select').val('').trigger('change.select2')
 
-  $table.DataTable().search('').columns().search('').draw()
+  $inputs = $thead.find('input')
+  $inputs.val('').removeAttr('checked').removeAttr('selected')
+
+  # Reset delayedChange
+  $.each $inputs, (input) =>
+    $input = $(input)
+    if ($input.delayedChange.oldVal)
+      $input.delayedChange.oldVal = undefined
+
+  # Reset the datatable
+  datatable = $table.DataTable()
+
+  # Reset search
+  datatable.search('').columns().search('')
+
+  # Reset to default visibility
+  $.each $table.data('default-visibility'), (index, visible) =>
+    datatable.column(index).visible(visible, false)
+
+  # Don't pass up the click
+  false
 

data/app/helpers/effective_datatables_helper.rb

@@ -44,6 +44,7 @@ module EffectiveDatatablesHelper
         'authenticity-token' => form_authenticity_token,
         'bulk-actions' => datatable_bulk_actions(datatable),
         'columns' => datatable_columns(datatable),
+        'default-visibility' => datatable.default_visibility.to_json,
         'display-length' => datatable.display_length,
         'display-order' => datatable_display_order(datatable),
         'display-records' => datatable.to_json[:recordsFiltered],

data/app/models/effective/datatable.rb

@@ -33,7 +33,7 @@ module Effective
     include Effective::EffectiveDatatable::Resource
     include Effective::EffectiveDatatable::State
 
-    def initialize(view = nil, attributes = nil) 
+    def initialize(view = nil, attributes = nil)
       (attributes = view; view = nil) if view.kind_of?(Hash)
 
       @attributes = (attributes || {})
@@ -49,6 +49,7 @@ module Effective
 
       raise 'expected a hash of arguments' unless @attributes.kind_of?(Hash)
       raise 'collection is defined as a method. Please use the collection do ... end syntax.' unless collection.nil?
+
       self.view = view if view
     end
 
@@ -170,6 +171,10 @@ module Effective
       @fallback_effective_resource ||= Effective::Resource.new('', namespace: controller_namespace)
     end
 
+    def default_visibility
+      columns.values.inject({}) { |h, col| h[col[:index]] = col[:visible]; h }
+    end
+
     private
 
     def column_tool

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

@@ -91,6 +91,8 @@ module Effective
             opts[:sql_column] = :effective_addresses
           when :effective_roles
             opts[:sql_column] = :effective_roles
+          when :active_storage
+            opts[:sql_column] = :active_storage
           when :string  # This is the fallback
             # Anything that doesn't belong to the model or the sql table, we assume is a SELECT SUM|AVG|RANK() as fancy
             opts[:sql_as_column] = true if (effective_resource.table && effective_resource.column(name).blank?)
@@ -137,6 +139,10 @@ module Effective
             opts[:partial] ||= '/effective/datatables/resource_column'
           end
 
+          if opts[:as] == :active_storage
+            opts[:partial] ||= '/effective/datatables/active_storage_column'
+          end
+
           opts[:col_class] = [
             "col-#{opts[:as]}",
             "col-#{name.to_s.parameterize}",

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

@@ -0,0 +1,4 @@
+- Array(resource.public_send(column[:name])).each do |file|
+  .col-resource_item
+    - title = [file.content_type, number_to_human_size(file.byte_size)].map(&:presence).compact
+    = link_to(file.filename, url_for(file), title: title)

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.7.21'.freeze
+  VERSION = '4.8.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.7.21
+  version: 4.8.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -153,6 +153,7 @@ files:
 - app/models/effective/effective_datatable/params.rb
 - app/models/effective/effective_datatable/resource.rb
 - app/models/effective/effective_datatable/state.rb
+- app/views/effective/datatables/_active_storage_column.html.haml
 - app/views/effective/datatables/_bulk_actions_column.html.haml
 - app/views/effective/datatables/_bulk_actions_dropdown.html.haml
 - app/views/effective/datatables/_chart.html.haml