effective_datatables 4.3.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49919375fe69c29a7aa70962ac8e4971dd247ee6
-  data.tar.gz: 40c8d03b6074458adfa7bed07aeff8cf1e3b1730
+  metadata.gz: f26102e385bdb4b061e3ba0b6a92ce1c975a62f3
+  data.tar.gz: 906ce6f0160143978795ef3a5e5dfb662312e0e8
 SHA512:
-  metadata.gz: 8692777bd2e49c6d073454a139d0f5aa7c3505a5724133ce41c0980ffe74851acbbe1f655546ba31ace7511a470cf3a6cee7c478f1ff8aedd19d4a9af40bd08f
-  data.tar.gz: e390a4f4e4b05da8a27757f13609198b738909ac2f9d90110cfc4a470df99aae997a2da70376725c9e449a737d1f490a755a1ad669c8b48de72281ece97165d4
+  metadata.gz: 100b6dc5e3d8cad0b06462bc40cc73088e9ed265a3aad8f228141ce63183cdf6ccf7162eed530dad67b4390e6286a429e20410ad3fa977b677c6bdc2e0ddcdc1
+  data.tar.gz: 199448f57486dede9c8dabd426c0182564a454461f77b60d6b104b2b82e1c89ec740c7cae02e285949d02164262c1103d493d521fa3ba1dd079d9a5752c501eb

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

@@ -168,7 +168,7 @@ initializeDataTables = ->
 
 destroyDataTables = ->
   $('.effective-datatables-inline-expanded').removeClass('effective-datatables-inline-expanded')
-  $('table.effective-datatable').each -> $(this).DataTable().turboDestroy()
+  $('table.effective-datatable').each -> try $(this).removeClass('initialized').DataTable().destroy()
 
 $ -> initializeDataTables()
 $(document).on 'page:change', -> initializeDataTables()

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

@@ -2,8 +2,12 @@
 # This works with EffectiveForm.remote_form which is part of the effective_bootstrap gem.
 
 # About to do a resource action, or fetch a partial. Show loading.
-$(document).on 'ajax:beforeSend', '.dataTables_wrapper', (e) ->
+$(document).on 'ajax:beforeSend', '.dataTables_wrapper', (e, xhr, settings) ->
   $action = $(e.target)
+  $table = $(e.target).closest('table')
+
+  $params =  $.param({_datatable_id: $table.attr('id'), _datatable_cookie: $table.data('cookie') })
+  settings.url += (if settings.url.indexOf('?') == -1 then '?' else '&') + $params
 
   if $action.closest('.effective-datatables-inline-row').length > 0
     # Nothing. This is a save action from within the inline form.

data/app/controllers/effective/datatables_controller.rb

@@ -5,7 +5,7 @@ module Effective
     # This will respond to both a GET and a POST
     def show
       begin
-        @datatable = find_datatable(params[:id]).try(:new) || raise('unable to find datatable')
+        @datatable = EffectiveDatatables.find(params[:id])
         @datatable.view = view_context
 
         EffectiveDatatables.authorize!(self, :index, @datatable.collection_class)
@@ -23,11 +23,6 @@ module Effective
 
     private
 
-    def find_datatable(id)
-      id = id.to_s.gsub(/-\d+\z/, '').gsub('-', '/')
-      id.classify.safe_constantize || id.classify.pluralize.safe_constantize
-    end
-
     def error_json(e)
       {
         data: [],

data/app/helpers/effective_datatables_helper.rb

@@ -1,9 +1,12 @@
 # These are expected to be called by a developer.  They are part of the datatables DSL.
 module EffectiveDatatablesHelper
 
-  def render_datatable(datatable, input_js: {}, buttons: true, charts: true, filters: true, simple: false)
+  def render_datatable(datatable, input_js: {}, buttons: true, charts: true, filters: true, simple: false, inline: false)
     raise 'expected datatable to be present' unless datatable
 
+    datatable.attributes[:simple] = true if simple
+    datatable.attributes[:inline] = true if inline
+
     datatable.view ||= self
 
     unless EffectiveDatatables.authorized?(controller, :index, datatable.collection_class)
@@ -13,7 +16,6 @@ module EffectiveDatatablesHelper
     charts = charts && datatable._charts.present?
     filters = filters && (datatable._scopes.present? || datatable._filters.present?)
 
-    datatable.attributes[:simple] = true if simple
     input_js[:buttons] = false if simple || !buttons
 
     effective_datatable_params = {
@@ -27,6 +29,7 @@ module EffectiveDatatablesHelper
         'display-order' => [datatable.order_index, datatable.order_direction].to_json().html_safe,
         'display-records' => datatable.to_json[:recordsFiltered],
         'display-start' => datatable.display_start,
+        'inline' => datatable.inline?.to_s,
         'options' => (input_js || {}).to_json.html_safe,
         'reset' => datatable_reset(datatable),
         'simple' => datatable.simple?.to_s,
@@ -59,6 +62,10 @@ module EffectiveDatatablesHelper
     end
   end
 
+  def render_inline_datatable(datatable)
+    render_datatable(datatable, inline: true)
+  end
+
   def render_simple_datatable(datatable)
     raise 'expected datatable to be present' unless datatable
 
@@ -79,39 +86,20 @@ module EffectiveDatatablesHelper
     )
   end
 
-  def render_datatable_filters(datatable)
-    raise 'expected datatable to be present' unless datatable
-
-    datatable.view ||= self
-    return unless datatable._scopes.present? || datatable._filters.present?
-
-    if datatable._filters_form_required?
-      render partial: 'effective/datatables/filters', locals: { datatable: datatable }
-    else
-      render(partial: 'effective/datatables/filters', locals: { datatable: datatable }).gsub('<form', '<div').gsub('/form>', '/div>').html_safe
-    end
-
-  end
-
-  def render_datatable_charts(datatable)
-    raise 'expected datatable to be present' unless datatable
-
-    datatable.view ||= self
-    return unless datatable._charts.present?
-
-    datatable._charts.map { |name, _| render_datatable_chart(datatable, name) }.join.html_safe
+  def inline_datatable?
+    params[:_datatable_id].present?
   end
 
-  def render_datatable_chart(datatable, name)
-    raise 'expected datatable to be present' unless datatable
+  def inline_datatable
+    return nil unless inline_datatable?
+    return @_inline_datatable if @_inline_datatable
 
-    datatable.view ||= self
-    return unless datatable._charts[name].present?
+    datatable = EffectiveDatatables.find(params[:_datatable_id])
+    datatable.view = self
 
-    chart = datatable._charts[name]
-    chart_data = datatable.to_json[:charts][name][:data]
+    EffectiveDatatables.authorize!(self, :index, datatable.collection_class)
 
-    render partial: chart[:partial], locals: { datatable: datatable, chart: chart, chart_data: chart_data }
+    @_inline_datatable ||= datatable
   end
 
 end

data/app/helpers/effective_datatables_private_helper.rb

@@ -30,7 +30,7 @@ module EffectiveDatatablesPrivateHelper
   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
+      render_resource_actions(datatable.resource.klass, actions: actions, effective_resource: datatable.resource) # Will only work if permitted
     end
   end
 
@@ -74,6 +74,20 @@ module EffectiveDatatablesPrivateHelper
     end
   end
 
+  def render_datatable_filters(datatable)
+    raise 'expected datatable to be present' unless datatable
+
+    datatable.view ||= self
+    return unless datatable._scopes.present? || datatable._filters.present?
+
+    if datatable._filters_form_required?
+      render partial: 'effective/datatables/filters', locals: { datatable: datatable }
+    else
+      render(partial: 'effective/datatables/filters', locals: { datatable: datatable }).gsub('<form', '<div').gsub('/form>', '/div>').html_safe
+    end
+
+  end
+
   def datatable_filter_tag(form, datatable, name, opts)
     placeholder = opts.delete(:label)
 
@@ -106,4 +120,25 @@ module EffectiveDatatablesPrivateHelper
     end
   end
 
+  def render_datatable_charts(datatable)
+    raise 'expected datatable to be present' unless datatable
+
+    datatable.view ||= self
+    return unless datatable._charts.present?
+
+    datatable._charts.map { |name, _| render_datatable_chart(datatable, name) }.join.html_safe
+  end
+
+  def render_datatable_chart(datatable, name)
+    raise 'expected datatable to be present' unless datatable
+
+    datatable.view ||= self
+    return unless datatable._charts[name].present?
+
+    chart = datatable._charts[name]
+    chart_data = datatable.to_json[:charts][name][:data]
+
+    render partial: chart[:partial], locals: { datatable: datatable, chart: chart, chart_data: chart_data }
+  end
+
 end

data/app/models/effective/datatable.rb

@@ -124,6 +124,11 @@ module Effective
       attributes[:simple] == true
     end
 
+    # Inline crud
+    def inline?
+      attributes[:inline] == true
+    end
+
     # Whether the filters must be rendered as a <form> or we can keep the normal <div> behaviour
     def _filters_form_required?
       _form[:verb].present?

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

@@ -10,14 +10,14 @@ module Effective
       end
 
       def load_attributes!
-        if datatables_ajax_request?
+        if datatables_ajax_request? || datatables_inline_request?
           raise 'expected cookie to be present' unless cookie
           raise 'expected attributes cookie to be present' unless cookie[:attributes]
 
           @attributes = cookie.delete(:attributes)
         end
 
-        unless datatables_ajax_request?
+        unless datatables_ajax_request? || datatables_inline_request?
           @attributes[:_n] ||= view.controller_path.split('/')[0...-1].join('/').presence
         end
       end

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

@@ -8,7 +8,15 @@ module Effective
       end
 
       def cookie_key
-        @cookie_key ||= (datatables_ajax_request? ? view.params[:cookie] : cookie_param)
+        @cookie_key ||= (
+          if datatables_ajax_request?
+            view.params[:cookie]
+          elsif datatables_inline_request?
+            view.params[:_datatable_cookie]
+          else
+            cookie_param
+          end
+        )
       end
 
       # All possible dt cookie keys.  Used to make sure the datatable has a cookie set for this session.

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

@@ -97,7 +97,7 @@ module Effective
           )
         end
 
-        def actions_col(col_class: nil, inline: false, partial: nil, partial_as: nil, actions_partial: nil, responsive: 5000, visible: true, **actions, &format)
+        def actions_col(col_class: nil, inline: nil, 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,7 +107,7 @@ module Effective
             col_class: col_class,
             format: (format if block_given?),
             index: nil,
-            inline: inline,
+            inline: (inline.nil? ? datatable.inline? : inline),
             label: false,
             name: :actions,
             partial: partial,

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

@@ -11,6 +11,13 @@ module Effective
           (view && view.params[:draw] && view.params[:columns] && cookie_keys.include?(view.params[:cookie])) == true
       end
 
+      def datatables_inline_request?
+        return @_datatables_inline_request unless @_datatables_inline_request.nil?
+
+        @_datatables_inline_request =
+          (view && view.params[:_datatable_cookie] && cookie_keys.include?(view.params[:_datatable_cookie])) == true
+      end
+
       def params
         return {} unless view.present?
         @params ||= {}.tap do |params|

data/lib/effective_datatables.rb

@@ -32,4 +32,11 @@ module EffectiveDatatables
     raise Effective::AccessDenied.new('Access Denied', action, resource) unless authorized?(controller, action, resource)
   end
 
+  def self.find(id)
+    id = id.to_s.gsub(/-\d+\z/, '').gsub('-', '/')
+    klass = (id.classify.safe_constantize || id.classify.pluralize.safe_constantize)
+
+    klass.try(:new) || raise('unable to find datatable')
+  end
+
 end

data/lib/effective_datatables/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.3.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-12 00:00:00.000000000 Z
+date: 2018-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails