effective_datatables 4.2.0 → 4.3.0

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

@@ -0,0 +1,40 @@
+$.extend(true, $.fn.dataTable.Buttons.defaults, {
+  dom: {
+    button: {
+      className: 'btn btn-link btn-sm'
+    }
+  }
+});
+
+# DataTable is the API
+# dataTable is the object fnStuff
+
+flash = (message) ->
+  @context[0].oFeatures.bProcessing = false
+
+  message ||= 'Processing...'
+
+  $processing = $(@table().node()).siblings('.dataTables_processing')
+  $processing.html(message).show()
+
+  timeout = $processing.data('timeout')
+  clearTimeout(timeout) if timeout
+
+  $processing.html(message).data('timeout', setTimeout( =>
+      $processing.html('Processing...').hide()
+      @context[0].oFeatures.bProcessing = true
+    , 1500)
+  )
+
+  return @
+
+turboDestroy = ->
+  @iterator('table', (settings) ->
+    $(window).off('.DT-' + settings.sInstance)
+
+    index = $.inArray(settings, $.fn.DataTable.settings)
+    $.fn.DataTable.settings.splice(index, 1) if index > -1
+  )
+
+$.fn.DataTable.Api.register('flash()', flash);
+$.fn.DataTable.Api.register('turboDestroy()', turboDestroy);

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

@@ -1,4 +1,4 @@
-$(document).on 'click', 'a.buttons-reset-search', (event) ->
+$(document).on 'click', '.dataTables_wrapper a.buttons-reset-search', (event) ->
   event.preventDefault() # prevent the click
 
   $table = $(event.currentTarget).closest('.dataTables_wrapper').find('table.dataTable').first()

data/app/assets/stylesheets/dataTables/dataTables.bootstrap4.css

@@ -4,6 +4,7 @@ table.dataTable {
   margin-bottom: 6px !important;
   max-width: none !important;
   border-collapse: separate !important;
+  border-spacing: 0;
 }
 table.dataTable td,
 table.dataTable th {
@@ -25,7 +26,7 @@ div.dataTables_wrapper div.dataTables_length label {
   white-space: nowrap;
 }
 div.dataTables_wrapper div.dataTables_length select {
-  width: 75px;
+  width: auto;
   display: inline-block;
 }
 div.dataTables_wrapper div.dataTables_filter {
@@ -132,6 +133,9 @@ div.dataTables_scrollBody table {
   margin-top: 0 !important;
   margin-bottom: 0 !important;
 }
+div.dataTables_scrollBody table thead .sorting:before,
+div.dataTables_scrollBody table thead .sorting_asc:before,
+div.dataTables_scrollBody table thead .sorting_desc:before,
 div.dataTables_scrollBody table thead .sorting:after,
 div.dataTables_scrollBody table thead .sorting_asc:after,
 div.dataTables_scrollBody table thead .sorting_desc:after {

data/app/assets/stylesheets/effective_datatables/_overrides.scss

@@ -19,6 +19,38 @@ table.dataTable thead .sorting_desc:after,
 table.dataTable thead .sorting_asc_disabled:after,
 table.dataTable thead .sorting_desc_disabled:after { content: ''; }
 
+table.dataTable > thead {
+  th.col-actions {
+    text-align: right;
+
+    span { display: block; height: 1.25em; }
+  }
+}
+
+.dataTables_wrapper {
+  table.dataTable {
+    tr.effective-datatables-inline-row { visibility: collapse; }  // Turbolinks destroy fix
+  }
+}
+
+// When Inline Expanded
+.dataTables_wrapper.effective-datatables-inline-expanded {
+  .dt-buttons { opacity: 0.4; }
+  .dataTables_entries { opacity: 0.4; }
+  .dataTables_paginate { opacity: 0.4; }
+
+  table.dataTable {
+    tr { opacity: 0.4; }
+
+    tr.effective-datatables-inline-row {
+      visibility: visible;
+      opacity: 1.0;
+
+      &:hover { background-color: inherit; }
+    }
+  }
+}
+
 table.dataTable > thead th {
   vertical-align: top;
   background-repeat: no-repeat;
@@ -78,6 +110,18 @@ table.dataTable > thead {
   }
 }
 
+// Processing div
+div.dataTables_wrapper div.dataTables_processing {
+  position: absolute;
+  top: 1em;
+  left: 50%;
+  width: 300px;
+  margin-left: -150px;
+  margin-top: -26px;
+  text-align: center;
+  padding: 1em;
+}
+
 // Simple styles
 table.dataTable.simple > thead {
   .sorting { background-image: none; cursor: default; }
@@ -93,6 +137,7 @@ table.dataTable.simple > thead {
   div.dataTables_wrapper div.dataTables_entries { text-align: center; }
 }
 
+// Showing x to y of z entries with 25 per page
 .dataTables_wrapper .dataTables_entries {
   color: #909090;
   font-size: 12px;
@@ -148,5 +193,6 @@ table.dataTable {
   td {
     p { margin-bottom: 0em; }
   }
-
 }
+
+

data/app/helpers/effective_datatables_helper.rb

@@ -30,6 +30,7 @@ module EffectiveDatatablesHelper
         'options' => (input_js || {}).to_json.html_safe,
         'reset' => datatable_reset(datatable),
         'simple' => datatable.simple?.to_s,
+        'spinner' => icon('spinner'), # effective_bootstrap
         'source' => effective_datatables.datatable_path(datatable, {format: 'json'}),
         'total-records' => datatable.to_json[:recordsTotal]
       }

data/app/helpers/effective_datatables_private_helper.rb

@@ -27,7 +27,16 @@ module EffectiveDatatablesPrivateHelper
     link_to(content_tag(:span, 'Reset'), '#', class: 'btn btn-link btn-sm buttons-reset-search')
   end
 
+  def datatable_new_resource_button(datatable, name, column)
+    if column[:inline] && column[:actions][:new] != false
+      actions = {'New' => { action: :new, class: 'btn btn-outline-primary', 'data-remote': true } }
+      render_resource_actions(datatable.resource.klass, actions: actions) # Will only work if permitted
+    end
+  end
+
   def datatable_search_tag(datatable, name, opts)
+    return datatable_new_resource_button(datatable, name, opts) if name == :_actions
+
     return if opts[:search] == false
 
     # Build the search
@@ -60,7 +69,7 @@ module EffectiveDatatablesPrivateHelper
       options[:input_js] = (options[:input_js] || {}).reverse_merge(placeholder: '')
       form.select name, collection, options
     when :bulk_actions
-      options[:data]['role'] = 'bulk-actions-all'
+      options[:data]['role'] = 'bulk-actions'
       form.check_box name, options.merge(custom: false)
     end
   end

data/app/models/effective/effective_datatable/dsl/bulk_actions.rb

@@ -8,7 +8,7 @@ module Effective
         end
 
         def bulk_download(*args)
-          datatable._bulk_actions.push(link_to_bulk_action(*args.merge('data-authenticity-token' => form_authenticity_token)))
+          datatable._bulk_actions.push(link_to_bulk_action(*args.merge('data-authenticity-token' => form_authenticity_token, 'data-method' => :post)))
         end
 
         def bulk_action_divider
@@ -22,30 +22,19 @@ module Effective
         private
 
         # We can't let any data-method be applied to the link, or jquery_ujs does the wrong thing with it
-        def link_to_bulk_action(*args)
-          args.map! do |arg|
-            if arg.kind_of?(Hash)
-              data_method = (
-                arg.delete(:'data-method') ||
-                arg.delete('data-method') ||
-                (arg[:data] || {}).delete('method') ||
-                (arg[:data] || {}).delete(:method)
-              )
-
-              # But if the data-method was :get, we add bulk-actions-get-link = true
-              if data_method.to_s == 'get'
-                arg[:data].present? ? arg[:data]['bulk-actions-get'] = true : arg['data-bulk-actions-get'] = true
-              end
-
-              arg[:class] = [arg[:class], 'dropdown-item'].compact.join(' ')
-            end
-
-            arg
+        def link_to_bulk_action(body, url, opts = {})
+
+          # Transform data: { ... } hash into 'data-' keys
+          if (data = opts.delete(:data))
+            data.each { |k, v| opts["data-#{k}"] ||= v }
           end
 
-          args << { class: 'dropdown-item' } if args.none? { |arg| arg.kind_of?(Hash) }
+          verbs = {'DELETE' => 'DELETE', 'GET' => 'GET'}
+          opts['data-ajax-method'] = verbs[opts.delete('data-method').to_s.upcase] || 'POST'
+
+          opts[:class] = [opts[:class], 'dropdown-item'].compact.join(' ')
 
-          link_to(*args)
+          link_to(body, url, opts)
         end
 
       end

data/app/models/effective/effective_datatable/dsl/datatable.rb

@@ -97,7 +97,7 @@ module Effective
           )
         end
 
-        def actions_col(col_class: nil, partial: nil, partial_as: nil, actions_partial: nil, responsive: 5000, visible: true, **actions, &format)
+        def actions_col(col_class: nil, inline: false, partial: nil, partial_as: nil, actions_partial: nil, responsive: 5000, visible: true, **actions, &format)
           raise 'You can only have one actions column' if datatable.columns[:_actions].present?
 
           datatable._columns[:_actions] = Effective::DatatableColumn.new(
@@ -107,6 +107,7 @@ module Effective
             col_class: col_class,
             format: (format if block_given?),
             index: nil,
+            inline: inline,
             label: false,
             name: :actions,
             partial: partial,

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

@@ -24,10 +24,9 @@ module Effective
               spacer_template: SPACER_TEMPLATE
             ) || '').split(SPACER)
           elsif opts[:as] == :actions # This is actions_col and actions_col do .. end, but not actions_col partial: 'something'
-            locals = { datatable: self, column: columns[name], spacer_template: SPACER_TEMPLATE }
-
             resources = collection.map { |row| row[opts[:index]] }
-            atts = opts[:actions].merge(effective_resource: resource, locals: locals, partial: opts[:actions_partial])
+            locals = { datatable: self, column: opts, spacer_template: SPACER_TEMPLATE }
+            atts = { actions: actions_col_actions(opts), effective_resource: resource, locals: locals, partial: opts[:actions_partial] }.merge(opts[:actions])
 
             rendered[name] = (view.render_resource_actions(resources, atts, &opts[:format]) || '').split(SPACER)
           end
@@ -67,7 +66,9 @@ module Effective
 
         case column[:as]
         when :actions
-          view.render_resource_actions(value, **column[:actions].merge(effective_resource: resource, partial: column[:actions_partial]))
+          atts = { actions: actions_col_actions(column), effective_resource: resource, partial: column[:actions_partial] }.merge(column[:actions])
+
+          (view.render_resource_actions(value, atts) || '')
         when :boolean
           case value
           when true   ; 'Yes'
@@ -110,6 +111,16 @@ module Effective
         end
       end
 
+      # Takes all default resource actions
+      # Applies data-remote to anything that's data-method post or delete
+      def actions_col_actions(column)
+        if column[:inline]
+          resource.resource_actions.transform_values { |opts| opts['data-remote'] = true; opts }
+        else
+          resource.resource_actions.transform_values { |opts| opts['data-remote'] = true if opts['data-method']; opts }
+        end
+      end
+
       def resource_col_locals(opts)
         return {} unless (resource = opts[:resource]).present?
 

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' }

data/config/effective_datatables.rb

@@ -28,19 +28,6 @@ EffectiveDatatables.setup do |config|
   # Default class used on the <table> tag
   config.html_class = 'table table-hover'
 
-  # When using the actions_column DSL method, apply the following behavior
-  # Valid values for each action are:
-  # true - display this action if authorized?(:show, Post)
-  # false - do not display this action
-  #
-  # You can override these defaults on a per-table basis
-  # by calling `actions_column(show: false, edit: true, destroy: false)`
-  config.actions_column = {
-    show: true,
-    edit: true,
-    destroy: true
-  }
-
   # Log search/sort information to the console
   config.debug = true
 

data/lib/effective_datatables.rb

@@ -9,7 +9,6 @@ module EffectiveDatatables
   mattr_accessor :default_length
   mattr_accessor :html_class
 
-  mattr_accessor :actions_column # A Hash
   mattr_accessor :debug
 
   def self.setup

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.2.0'.freeze
+  VERSION = '4.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-03 00:00:00.000000000 Z
+date: 2018-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,7 +109,8 @@ files:
 - app/assets/javascripts/effective_datatables/events.js.coffee
 - app/assets/javascripts/effective_datatables/filters.js.coffee
 - app/assets/javascripts/effective_datatables/initialize.js.coffee
-- app/assets/javascripts/effective_datatables/overrides.js
+- app/assets/javascripts/effective_datatables/inline_crud.js.coffee
+- app/assets/javascripts/effective_datatables/overrides.js.coffee
 - app/assets/javascripts/effective_datatables/reset.js.coffee
 - app/assets/javascripts/effective_datatables/responsive.js.coffee
 - app/assets/javascripts/vendor/jquery.delayedChange.js
@@ -144,7 +145,6 @@ 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/_actions_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
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Uniquely powerful server-side searching, sorting and filtering of any ActiveRecord

data/app/assets/javascripts/effective_datatables/overrides.js

@@ -1,12 +0,0 @@
-$.extend(true, $.fn.dataTable.Buttons.defaults, {
-  dom: {
-    button: {
-      className: 'btn btn-link btn-sm'
-    }
-  }
-});
-
-/* Default class modification */
-$.extend($.fn.dataTable.ext.classes, {
-  sWrapper: 'dataTables_wrapper dt-bootstrap4', // Remove container-fluid
-});

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

@@ -1 +0,0 @@
-= render_resource_actions(resource, **actions_col_locals)