effective_datatables 4.7.19 → 4.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 618838ca90e9046e4cbd0bb0e7d7a5e73f00b07e58733a81ac07a0a7976524da
-  data.tar.gz: 8e1c0545b02af85a0c4270f4ab70c1ac1e81b1d3b7ff9438f7562a42e71e661b
+  metadata.gz: feffe8acf84566b07ea4c44e130b42b0870287978d1f009af25e1d81da8131db
+  data.tar.gz: 223d61e7e3ab0cea75eae0a10660a009cd4894dfb1d256d18fd1fc37f1c164c7
 SHA512:
-  metadata.gz: 9a33841f4c1923cfea7b9b28c767df80ca6454c5fe6174a7169ba902a3df3eb60c6437381a9b8b130ef6769f3276f4d35d83744eade5201ec164b819dd7f909e
-  data.tar.gz: 40f39a4bdc1f0cb9b078be9332c60ece434b85cd31932604592f811c92b12cffd0944bfc1cb397bdc80ef41f1f307de929337e61438e4fe3e6c9a6e5ead4fc5e
+  metadata.gz: 505cb075ee12d78a3617eb3f81a8a6c62b31ddf1d443370a3348b5f9c46f1f24ff89fae59ceba428c74c5ecb2afc6da1f16e45b1ad1bb00c1d69b7c3fa118fa1
+  data.tar.gz: 21330062f4a3f3dd010a272166cb5a8113eeb6e65a6ad8ff1a89ad831f7252bfa37cdd1273097e800cffc2f496f83b00ad832dfa2e5a99890136a4237bb3a0c5

data/README.md

@@ -879,6 +879,10 @@ Create a [Google Chart](https://developers.google.com/chart/interactive/docs/qui
 
 No javascript required. Just use the `chart do ... end` block and return an Array of Arrays.
 
+The first collection, `collection` is the raw results as returned from the `collection do` block.
+
+The second collection, `searched_collection` is the results after the table's search columns have been applied, but irregardless of pagination.
+
 ```ruby
 charts do
   chart :breakfast, 'BarChart' do |collection|
@@ -894,6 +898,18 @@ charts do
       [date.strftime('%F'), posts.length]
     end
   end
+
+  chart :posts_per_user, 'ColumnChart' do |collection, searched_collection|
+    measured_posts = if search.present?
+      ["Posts with #{search.map { |k, v| k.to_s + ' ' + v.to_s }.join(',')}", searched_collection.length]
+    else
+      ['All Posts', collection.length]
+    end
+
+    [['Posts', 'Count'], measured_posts] +
+    searched_collection.group_by(&:user).map { |user, posts| [user.last_name, posts.length] }
+  end
+
 end
 ```
 

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

@@ -131,7 +131,7 @@ initializeDataTables = (target) ->
       if typeof(google) != 'undefined' && typeof(google.visualization) != 'undefined'
         $.each charts, (name, data) =>
           $(".effective-datatables-chart[data-name='#{name}']").each (_, obj) =>
-            chart = new google.visualization[data['type']](obj)
+            chart = new google.visualization[data['as']](obj)
             chart.draw(google.visualization.arrayToDataTable(data['data']), data['options'])
 
     # Appends the search html, stored in the column definitions, into each column header
@@ -169,7 +169,15 @@ initializeDataTables = (target) ->
       return if $input.is(':invalid')
 
       table = $input.closest('table.dataTable')
-      table.DataTable().column("#{$input.data('column-name')}:name").search($input.val()).draw()
+
+      value = $input.val()
+
+      if value.startsWith('"') && value.endsWith('"')
+        value = value.substring(1, value.length-1)
+      else
+        value = $.trim(value)
+
+      table.DataTable().column("#{$input.data('column-name')}:name").search(value).draw()
 
     if reorder
       init_options['rowReorder'] = { selector: 'td.col-_reorder', snapX: true, dataSrc: datatable.data('reorder-index') }

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/javascripts/vendor/jquery.delayedChange.js

@@ -18,7 +18,6 @@
         clearTimeout(timer);
         timer = setTimeout(function() {
           var newVal = element.val();
-          newVal = $.trim(newVal);
           if (element.delayedChange.oldVal != newVal) {
             element.delayedChange.oldVal = newVal;
             o.onChange.call(this, element);

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/compute.rb

@@ -36,6 +36,9 @@ module Effective
         # Apply value ordering
         col = value_tool.order(col)
 
+        # Charts too
+        @charts_data = chart(collection, col) if _charts.present?
+
         # Apply pagination
         col = col.kind_of?(Array) ? value_tool.paginate(col) : column_tool.paginate(col)
 
@@ -48,9 +51,6 @@ module Effective
         # Compute aggregate data
         @aggregates_data = aggregate(col) if _aggregates.present?
 
-        # Charts too
-        @charts_data = chart(col) if _charts.present?
-
         # Format all results
         format(col)
 
@@ -161,11 +161,11 @@ module Effective
         end || BLANK
       end
 
-      def chart(collection)
+      def chart(collection, searched_collection)
         _charts.inject({}) do |retval, (name, chart)|
           retval[name] = {
             as: chart[:as],
-            data: dsl_tool.instance_exec(collection, &chart[:compute]),
+            data: dsl_tool.instance_exec(collection, searched_collection, &chart[:compute]),
             name: chart[:name],
             options: chart[:options]
           }

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

@@ -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/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.19'.freeze
+  VERSION = '4.8.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.7.19
+  version: 4.8.2
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-06-19 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