effective_datatables 4.34.0 → 4.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26894b39aa930851150fb6139d8207d61dd054910d78b78a88cb8d961291b10e
-  data.tar.gz: d1c9d28d703e5db73743f23ca73c147e334d81b930219f8e756f72189ba03c1c
+  metadata.gz: ce86a4ccf56b39946b075599ac4c146cab3b95f420d0f1a4eb2bca95b9b15594
+  data.tar.gz: 7b98dfd5a1996035256c8c7ee7047541b461ffce0268672b2d9327996988b252
 SHA512:
-  metadata.gz: 2bfb288465fbb24ae508957762bc62f2f9b16628460304ff0d94337726b92535ecd82115d9fe518ddda0a9569a507e6a6d91e8a19a192ec56904ae5ee39558b6
-  data.tar.gz: fb1a9edee1c2d47158ac6cf352926ef05566d36bf88a54f0ad6dca288f2b89c44a73f2733576e57b76b1e8316edf72119e535abfb4ae591545f1867ab7ada703
+  metadata.gz: c780a6949308cfd9f560ddc52be61f3822b85ddf6ca904b2b238a33a6507f59fc6cfccf4a3676c5429219950a996b3ca0f87b16d6d7b253657f00b3a7f2cd7e1
+  data.tar.gz: 0da2df1d7a30190a6211c2dec883309e041ef46ec3c8536fab3ea11bc11ebcf9738debb79bcb3ca421c320b04afd2f9251f29dc31dbccd8cbea27d8538613fdd

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

@@ -3,6 +3,7 @@ initializeDataTables = (target) ->
     datatable = $(this)
     options = datatable.data('options') || {}
     buttons_export_columns = options['buttons_export_columns'] || ':not(.col-actions)'
+    nested = datatable.data('nested')
     reorder = datatable.data('reorder')
 
     if datatable.data('inline') && datatable.closest('form').length > 0
@@ -178,6 +179,9 @@ initializeDataTables = (target) ->
     if reorder
       table.DataTable().on('row-reorder', (event, diff, edit) -> $(event.target).DataTable().reorder(event, diff, edit))
 
+    if nested
+      table.closest('.dataTables_wrapper').addClass('dataTables_wrapper_nested')
+
     table.addClass('initialized')
     table.children('thead').trigger('effective-bootstrap:initialize')
     table.children('thead').find('input[autofocus]').first().focus()

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

@@ -9,6 +9,7 @@ $(document).on 'ajax:before', '.dataTables_wrapper .col-actions', (event) ->
   $table = $(event.target).closest('table')
 
   return true if ('' + $action.data('inline')) == 'false'
+  return true if ('' + $action.data('nested-datatable-action')) == 'true'
 
   $params = $.param(
     {

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

@@ -0,0 +1,5 @@
+# Make all links for nested datatables open in new tabs
+$(document).on 'click', '.dataTables_wrapper_nested a', (event) ->
+  $link = $(event.currentTarget)
+  $link.attr('target', '_blank')
+  true

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

@@ -103,6 +103,15 @@ table.dataTable thead {
   }
 }
 
+// When Inline Expanded with Nested
+.dataTables_wrapper.effective-datatables-inline-expanded {
+  .dataTables_wrapper_nested {
+    .dt-buttons { opacity: inherit; }
+    .dataTables_entries { opacity: inherit; }
+    .dataTables_paginate { opacity: inherit; }
+  }
+}
+
 table.dataTable.dtr-inline.collapsed > tbody > tr > td.dtr-control:before,
 table.dataTable.dtr-inline.collapsed > tbody > tr > th.dtr-control:before {
   color: #0275d8;

data/app/helpers/effective_datatables_helper.rb

@@ -2,7 +2,7 @@
 
 # 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, download: nil, entries: true, filters: true, inline: false, namespace: nil, pagination: true, search: true, simple: false, short: false, sort: true)
+  def render_datatable(datatable, input_js: {}, buttons: true, charts: true, download: nil, entries: true, filters: true, inline: false, namespace: nil, nested: false, pagination: true, search: true, simple: false, short: false, sort: true)
     raise 'expected datatable to be present' unless datatable
     raise 'expected input_js to be a Hash' unless input_js.kind_of?(Hash)
 
@@ -19,6 +19,7 @@ module EffectiveDatatablesHelper
     end
 
     datatable.attributes[:inline] = true if inline
+    datatable.attributes[:nested] = true if nested
     datatable.attributes[:sortable] = false unless sort
     datatable.attributes[:searchable] = false unless search
     datatable.attributes[:downloadable] = false unless download
@@ -68,6 +69,7 @@ module EffectiveDatatablesHelper
         'inline' => inline.to_s,
         'language' => EffectiveDatatables.language(I18n.locale),
         'length-menu' => datatable_length_menu(datatable),
+        'nested' => nested.to_s,
         'options' => input_js.to_json,
         'reorder' => datatable.reorder?.to_s,
         'reorder-index' => (datatable.columns[:_reorder][:index] if datatable.reorder?).to_s,
@@ -133,4 +135,11 @@ module EffectiveDatatablesHelper
     @_inline_datatable ||= datatable
   end
 
+  def nested_datatable_link_to(title, path, options = {})
+    options[:class] ||= 'btn btn-sm btn-link'
+    options['data-remote'] = true
+    options['data-nested-datatable-action'] = true
+
+    link_to(title, path, options)
+  end
 end

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

@@ -5,7 +5,10 @@ module Effective
     module Dsl
 
       def bulk_actions(&block)
-        define_method('initialize_bulk_actions') { dsl_tool.instance_exec(&block); dsl_tool.bulk_actions_col }
+        define_method('initialize_bulk_actions') do 
+          actions = dsl_tool.instance_exec(&block)
+          dsl_tool.bulk_actions_col if actions.present?
+        end
       end
 
       def charts(&block)

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.34.0'.freeze
+  VERSION = '4.35.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.34.0
+  version: 4.35.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-29 00:00:00.000000000 Z
+date: 2025-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -118,6 +118,7 @@ files:
 - app/assets/javascripts/effective_datatables/flash.js.coffee
 - app/assets/javascripts/effective_datatables/initialize.js.coffee
 - app/assets/javascripts/effective_datatables/inline_crud.js.coffee
+- app/assets/javascripts/effective_datatables/nested.js.coffee
 - app/assets/javascripts/effective_datatables/overrides.js.coffee
 - app/assets/javascripts/effective_datatables/params.js.coffee
 - app/assets/javascripts/effective_datatables/reorder.js.coffee