effective_datatables 4.37.1 → 4.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d505ef855ff08e13f58590a636b1d7c9564e629dc36638e2c440b6935ad62cfa
-  data.tar.gz: d87b887564d7b12f1c617b7449cc237baa3623053f41e44da30e2b9e20c53ef1
+  metadata.gz: 2cb4f5aadf82512130c0aa2284716798def7fbcbd1ce5442bca34d13892393cf
+  data.tar.gz: 6fb0fa42c091876ac52fdaddd9b94fc353825aa062a30e8f9bbb46fb18aab078
 SHA512:
-  metadata.gz: b231fcc5710c0001d73e7c27a3fe12a5fafaf596aa01b1d0b1beabd3eba096755b9cdf6a99977091c37d3b9bee70e44c3522a431892ed05a75b11888bac29d79
-  data.tar.gz: c62e21a13b203cc4397e655dbf8cdfbfcbb004432381c50e8c5008397012c5afb6c3a2990c0d4df92b07a11260de64fc0e140a8d42924c683d69ca62aae73920
+  metadata.gz: 4321d3f210de3bef8f4dceb5820c9f49ad8761273e5ba249ed56dbe8d60d430c57101edcbf28d83fe84aae2a90bcb3aa7b4f935459fbe70965bd2310ef3b201d
+  data.tar.gz: 1e5993a427b48a40bacaca8156dc93093a9609d8e8053c2ab8d8ca0147c86894b8e287c4669d1e764cf160a5c524c9b4fa2deda4ba191a03630c77c6c9a866a8

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

@@ -28,4 +28,4 @@ renderCharts = ->
 
 $ -> initializeCharts()
 $(document).on 'page:change', -> initializeCharts()
-$(document).on 'turbolinks:load', -> initializeCharts()
+$(document).on 'turbolinks:load turbo:load', -> initializeCharts()

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

@@ -204,8 +204,6 @@ $ -> initializeDataTables()
 $(document).on 'effective-datatables:initialize', (event) -> initializeDataTables(event.currentTarget)
 
 $(document).on 'page:change', -> initializeDataTables()
-$(document).on 'turbolinks:load', -> initializeDataTables()
-$(document).on 'turbolinks:render', -> initializeDataTables()
-$(document).on 'turbolinks:before-cache', -> destroyDataTables()
-$(document).on 'turbo:load', -> initializeDataTables()
-$(document).on 'turbo:before-cache', -> destroyDataTables()
+$(document).on 'turbolinks:render turbo:render', -> initializeDataTables()
+$(document).on 'turbolinks:load turbo:load', -> initializeDataTables()
+$(document).on 'turbolinks:before-cache turbo:before-cache', -> destroyDataTables()

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

@@ -13,7 +13,7 @@ $(document).on 'ajax:before', '.dataTables_wrapper .col-actions', (event) ->
 
   $params = $.param(
     {
-      _datatable_id: $table.attr('id'),
+      _datatable_id: $table.data('datatable-id'),
       _datatable_attributes: $table.data('attributes'),
       _datatable_action: true
     }
@@ -49,7 +49,9 @@ $(document).on 'ajax:success', '.dataTables_wrapper .col-actions', (event, data)
   return true if ('' + $action.data('inline')) == 'false'
 
   if data.length > 0
-    return true if data.indexOf('Turbolinks.clearCache()') == 0 && data.includes("Turbolinks.visit(")
+    turbolinks_redirect = data.indexOf('Turbolinks.clearCache()') == 0 && data.includes("Turbolinks.visit(")
+    turbo_redirect = data.indexOf('Turbo.cache.clear()') == 0 && data.includes("Turbo.visit(")
+    return true if turbolinks_redirect || turbo_redirect
     return true if data.indexOf('<html') >= 0
 
   if ($action.data('method') || 'get') == 'get'
@@ -85,7 +87,7 @@ $(document).on 'ajax:before', '.dataTables_wrapper .col-inline-form', (event) ->
 
   if $form.find('input[name=_datatable_id]').length == 0
     $('<input>').attr(
-      {type: 'hidden', name: '_datatable_id', value: $table.attr('id')}
+      {type: 'hidden', name: '_datatable_id', value: $table.data('datatable-id')}
     ).appendTo($form)
 
   if $form.find('input[name=_datatable_attributes]').length == 0
@@ -138,7 +140,7 @@ afterNew = ($action) ->
   $table.children('tbody').prepend($tr)
 
   expand($table)
-  $tr.trigger('turbolinks:load')
+  $tr.trigger('effective-bootstrap:initialize')
   $tr.hide().fadeIn()
 
 beforeEdit = ($action) ->
@@ -169,7 +171,7 @@ afterEdit = ($action) ->
   $tr.addClass('effective-datatables-inline-row')
 
   expand($table)
-  $tr.trigger('turbolinks:load')
+  $tr.trigger('effective-bootstrap:initialize')
   $tr.hide().fadeIn()
 
 # This is when one of the resource actions completes

data/app/helpers/effective_datatables_helper.rb

@@ -42,6 +42,11 @@ module EffectiveDatatablesHelper
       buttons = true; input_js[:buttons] = false
     end
 
+    datatable_id = datatable.to_param
+    @_effective_datatable_ids ||= Hash.new(0)
+    @_effective_datatable_ids[datatable_id] += 1
+    dom_id = [datatable_id, (@_effective_datatable_ids[datatable_id] if @_effective_datatable_ids[datatable_id] > 1)].compact.join('-')
+
     # Build the datatables DOM option
     input_js[:dom] ||= [
       ("<'row'<'col-sm-12 dataTables_buttons'B>>" if buttons),
@@ -53,13 +58,14 @@ module EffectiveDatatablesHelper
     ].compact.join
 
     effective_datatable_params = {
-      id: datatable.to_param,
+      id: dom_id,
       class: html_class,
       data: {
+        'datatable-id' => datatable_id,
         'all-label' => I18n.t('effective_datatables.all'),
         'attributes' => EffectiveDatatables.encrypt(datatable.attributes),
         'authenticity-token' => form_authenticity_token,
-        'buttons-html' => datatable_buttons(datatable),
+        'buttons-html' => datatable_buttons(datatable, dom_id: dom_id),
         'columns' => datatable_columns(datatable),
         'default-visibility' => datatable.default_visibility.to_json,
         'display-length' => datatable.display_length,
@@ -88,7 +94,7 @@ module EffectiveDatatablesHelper
       end
 
       if filters
-        output << render_datatable_filters(datatable)
+        output << render_datatable_filters(datatable, dom_id: dom_id)
       end
 
       output << render(partial: 'effective/datatables/datatable',

data/app/helpers/effective_datatables_private_helper.rb

@@ -25,8 +25,8 @@ module EffectiveDatatablesPrivateHelper
     ((datatable.sortable? && datatable.order_index) ? [datatable.order_index, datatable.order_direction] : false).to_json.html_safe
   end
 
-  def datatable_buttons(datatable, search: true)
-    render('/effective/datatables/buttons', datatable: datatable, search: search).gsub("'", '"').html_safe
+  def datatable_buttons(datatable, search: true, dom_id: datatable.to_param)
+    render('/effective/datatables/buttons', datatable: datatable, search: search, dom_id: dom_id).gsub("'", '"').html_safe
   end
 
   def datatable_length_menu(datatable)
@@ -47,11 +47,16 @@ module EffectiveDatatablesPrivateHelper
     btn_class = EffectiveDatatables.new_action_button_class || 'btn-sm btn-success'
     action = { action: :new, class: "btn #{btn_class}", 'data-remote': true }
 
+    # Pass actions_col(new: { label: 'New Thing' }) to override the button label on one datatable.
+    label = t('effective_datatables.new')
+
     if column[:actions][:new].kind_of?(Hash) # This might be active_record_array_collection?
-      action = action.merge(column[:actions][:new])
+      new_opts = column[:actions][:new]
+      label = new_opts[:label] if new_opts[:label].present?
+      action = action.merge(new_opts.except(:label, :klass))
 
       effective_resource = (datatable.effective_resource || datatable.fallback_effective_resource)
-      klass = (column[:actions][:new][:klass] || effective_resource&.klass || datatable.collection_class)
+      klass = (new_opts[:klass] || effective_resource&.klass || datatable.collection_class)
     elsif Array(datatable.effective_resource&.actions).include?(:new)
       effective_resource = datatable.effective_resource
       klass = effective_resource.klass
@@ -60,7 +65,7 @@ module EffectiveDatatablesPrivateHelper
     end
 
     # Will only work if permitted
-    render_resource_actions(klass, actions: { t('effective_datatables.new') => action }, effective_resource: effective_resource)
+    render_resource_actions(klass, actions: { label => action }, effective_resource: effective_resource)
   end
 
   def datatable_label_tag(datatable, name, opts)
@@ -140,16 +145,16 @@ module EffectiveDatatablesPrivateHelper
     end
   end
 
-  def render_datatable_filters(datatable)
+  def render_datatable_filters(datatable, dom_id: datatable.to_param)
     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('effective/datatables/filters', datatable: datatable)
+      render('effective/datatables/filters', datatable: datatable, dom_id: dom_id)
     else
-      render('effective/datatables/filters', datatable: datatable).gsub('<form', '<div').gsub('/form>', '/div>').html_safe
+      render('effective/datatables/filters', datatable: datatable, dom_id: dom_id).gsub('<form', '<div').gsub('/form>', '/div>').html_safe
     end
 
   end

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

@@ -1,3 +1,5 @@
+- dom_id ||= datatable.to_param
+
 - if datatable._bulk_actions.present?
   = render('/effective/datatables/bulk_actions_dropdown', datatable: datatable)
 
@@ -10,5 +12,5 @@
     %span= t('effective_datatables.reorder')
 
 - if datatable.downloadable?
-  = link_to 'download.csv', class: 'btn btn-link btn-sm buttons-download', 'aria-controls': datatable.to_param do
+  = link_to 'download.csv', class: 'btn btn-link btn-sm buttons-download', 'aria-controls': dom_id do
     %span= t('effective_datatables.download')

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

@@ -1,4 +1,5 @@
-.effective-datatables-filters{'aria-controls': datatable.to_param}
+- dom_id ||= datatable.to_param
+.effective-datatables-filters{'aria-controls': dom_id}
 
   = effective_form_with(model: datatable.filters_form, scope: :filters, url: (datatable._form[:url] || '#'), method: datatable._form[:verb], id: nil, authenticity_token: datatable._filters_form_required?) do |form|
     .form-row.align-items-center

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.37.1'.freeze
+  VERSION = '4.38.0'.freeze
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.37.1
+  version: 4.38.0
 platform: ruby
 authors:
 - Code and Effect
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -196,7 +195,6 @@ homepage: https://github.com/code-and-effect/effective_datatables
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -211,8 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key:
+rubygems_version: 4.0.17
 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