effective_datatables 4.7.21 → 4.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 284930f6f95c88e0866c44be8ebf6f8377b45047bdc3e053ce69e02132ed2cff
-  data.tar.gz: 07d299627c82e28f81cc35fccdf1529fbd9c63b099a4469e596d8941c87ab8a4
+  metadata.gz: 53f857de2d8388bada0837e3eca598ab75e45cba907bde7b43c01a13c2037cb1
+  data.tar.gz: '0488a5bf9fafd8a54833615f6d7610d22567d97c5e1b0d13cd2476e24706d08b'
 SHA512:
-  metadata.gz: 76dea3b42df8d0c9b94405f6a4f882281c0bdc0684b5ed0472ecfb5c5e82b16d990b17dc62f210c48c93f3efa03630fe1caf8e2f1f36baf6953ebe8d31c453f0
-  data.tar.gz: b9578ba204f634e184d77ba6dfec92bb770d353c6946dfc27391b4190c1936f242b7200b40d50cde5a7bce522559d5b1d07ca4da9d0be57e987ad816aeafb82b
+  metadata.gz: 740d034417e5aa04860b12a308f4e495b3856c4b86a67443f6ec2e18900a55be58c6edb7235d8ef66981bb827f05ecab29d3f691765b5dee43f5312804644adf
+  data.tar.gz: 91712a50aff213013867fd46bbdedc717e0c95fef1748d2d9076bfdd5930ce14a3fff1d158f0feed409c8431fb16b317fae1c34b21accd855546dc089c9dbb0d

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

@@ -5,6 +5,9 @@ initializeDataTables = (target) ->
     buttons_export_columns = options['buttons_export_columns'] || ':not(.col-actions)'
     reorder = datatable.data('reorder')
 
+    if datatable.data('inline') && datatable.closest('form').length > 0
+      console.error('inline datatable cannot work inside a form')
+
     if options['buttons'] == false
       options['buttons'] = []
 

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/assets/stylesheets/dataTables/dataTables.bootstrap4.scss

@@ -162,9 +162,7 @@ div.dataTables_scrollFoot > .dataTables_scrollFootInner > table {
     text-align: center;
   }
 }
-table.dataTable.table-sm > thead > tr > th {
-  padding-right: 20px;
-}
+
 table.dataTable.table-sm .sorting:before,
 table.dataTable.table-sm .sorting_asc:before,
 table.dataTable.table-sm .sorting_desc:before {

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/helpers/effective_datatables_private_helper.rb

@@ -149,6 +149,8 @@ module EffectiveDatatablesPrivateHelper
     elsif as == :boolean
       collection ||= [true, false].map { |value| [t("effective_datatables.boolean_#{value}"), value] }
       form.public_send(:select, name, collection, options) # boolean
+    elsif as == :string
+      form.public_send(:text_field, name, options)
     elsif form.respond_to?(as)
       form.public_send(as, name, options) # check_box, text_area
     else

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/dsl/filters.rb

@@ -20,7 +20,7 @@ module Effective
             elsif value != nil
               Effective::Attribute.new(value).type
             end
-          ) || :text
+          ) || :string
 
           datatable._filters[name.to_sym] = {
             value: value,

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

@@ -4,7 +4,7 @@ module Effective
       AGGREGATE_SQL_FUNCTIONS = ['ARRAY_AGG(', 'AVG(', 'COUNT(', 'MAX(', 'MIN(', 'STRING_AGG(', 'SUM(']
 
       def admin_namespace?
-        controller_namespace == 'admin'
+        [:admin, 'admin'].include?(controller_namespace)
       end
 
       def controller_namespace
@@ -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}",
@@ -194,6 +200,7 @@ module Effective
 
       def load_resource_belongs_tos!
         return unless active_record_collection?
+        return unless @_collection_apply_belongs_to 
 
         changed = attributes.select do |attribute, value|
           attribute = attribute.to_s
@@ -204,7 +211,7 @@ module Effective
           next unless columns[associated]
 
           if columns[associated][:as] == :belongs_to
-            if @_collection_apply_belongs_to && !@_collection.where_values_hash.include?(attribute)
+            unless @_collection.where_values_hash.include?(attribute)
               @_collection = @_collection.where(attribute => value)
             end
 
@@ -212,10 +219,8 @@ module Effective
           elsif columns[associated][:as] == :belongs_to_polymorphic
             associated_type = attributes["#{associated}_type".to_sym] || raise("Expected #{associated}_type attribute to be present when #{associated}_id is present on a polymorphic belongs to")
 
-            if @_collection_apply_belongs_to
-              if !@_collection.where_values_hash.include?(attribute) && !@_collection.where_values_hash.include?("#{associated}_type")
-                @_collection = @_collection.where(attribute => value).where("#{associated}_type" => associated_type)
-              end
+            unless @_collection.where_values_hash.include?(attribute) || @_collection.where_values_hash.include?("#{associated}_type")
+              @_collection = @_collection.where(attribute => value).where("#{associated}_type" => associated_type)
             end
 
             columns.delete(associated)

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

@@ -198,7 +198,7 @@ module Effective
       def parse_filter_value(filter, value)
         return filter[:parse].call(value) if filter[:parse]
         return nil if value.blank? && !filter[:required]
-        Effective::Attribute.new(filter[:value]).parse(value, name: filter[:name])
+        Effective::Attribute.new(filter[:as] || filter[:value] || :string).parse(value, name: filter[:name])
       end
 
       def cookie_state_params

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, target: '_blank')

data/config/effective_datatables.rb

@@ -35,7 +35,7 @@ EffectiveDatatables.setup do |config|
   config.save_state = true
 
   # Configure the _effective_dt cookie.
-  config.cookie_max_size = 2000       # String size. Final byte size is about 1.5 times bigger, after rails signs it
+  config.cookie_max_size = 1500       # String size. Final byte size is about 1.5 times bigger, after rails signs it
   config.cookie_domain = :all         # Should usually be :all
   config.cookie_tld_length = nil      # Leave nil to autodetect, or set to probably 2
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.7.21'.freeze
+  VERSION = '4.8.4'.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.4
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-07-15 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
@@ -177,7 +178,7 @@ homepage: https://github.com/code-and-effect/effective_datatables
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -192,8 +193,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.2
+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