effective_datatables 4.34.0 → 4.35.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26894b39aa930851150fb6139d8207d61dd054910d78b78a88cb8d961291b10e
-  data.tar.gz: d1c9d28d703e5db73743f23ca73c147e334d81b930219f8e756f72189ba03c1c
+  metadata.gz: 58ba852489ca6c3a824b03443eaeadde149e051212055e2bd62a1d8b59972f26
+  data.tar.gz: a112f67a6cc67a2d082f9f19ebd70b8dc8ef6b8537851cb1508782159d7598c4
 SHA512:
-  metadata.gz: 2bfb288465fbb24ae508957762bc62f2f9b16628460304ff0d94337726b92535ecd82115d9fe518ddda0a9569a507e6a6d91e8a19a192ec56904ae5ee39558b6
-  data.tar.gz: fb1a9edee1c2d47158ac6cf352926ef05566d36bf88a54f0ad6dca288f2b89c44a73f2733576e57b76b1e8316edf72119e535abfb4ae591545f1867ab7ada703
+  metadata.gz: d46724dd25b495e4ccb796e688ddb9e0ea2c341d00755486419b1fa37efd2700b96a0becc6e0725e49354cec4eedae86295d13ffa168fa2ec7b806b92b05f4dd
+  data.tar.gz: a75f57a5ce59fd95997b5a550787e330019c286ff5ce9bb8782e2120b3312568c0f3eff47e0629df011a4a273f4cfb7006d059a1678be452f4c4d18ee1e72779

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')) == 'true'
 
   $params = $.param(
     {
@@ -156,7 +157,12 @@ afterEdit = ($action) ->
   $tr = $action.closest('tr')
   $table = $tr.closest('table')
 
-  html = buildRow($tr.children('td').length, EffectiveForm.remote_form_payload)
+  nestedDatatableAction = $tr.find('a[data-nested-datatable]')
+
+  html = if nestedDatatableAction.length > 0
+    buildNestedDatatableRow($tr.children('td').length, EffectiveForm.remote_form_payload, nestedDatatableAction.attr('title'))
+  else 
+    buildRow($tr.children('td').length, EffectiveForm.remote_form_payload)
 
   $tr.data('inline-form-original-html', $tr.children().detach())
   $tr.html(html)
@@ -200,6 +206,12 @@ buildRow = (length, payload) ->
     "<a href='#' class='btn btn-sm btn-outline-primary' title='Cancel' data-role='inline-form-cancel'>Cancel</a>" +
   "</td>"
 
+buildNestedDatatableRow = (length, payload, title) ->
+  "<td class='col-inline-form' colspan='#{length-1}'><div class='nested-datatable-container-parent'><div class='nested-datatable-container'><div class='nested-datatable-title'>#{title || ''}</div>#{payload}</div></div></td>" +
+  "<td class='col-actions col-actions-inline-form'>" +
+    "<a href='#' class='btn btn-sm btn-outline-primary' title='Cancel' data-role='inline-form-cancel'>Cancel</a>" +
+  "</td>"
+
 expand = ($table) ->
   $wrapper = $table.closest('.dataTables_wrapper').addClass('effective-datatables-inline-expanded')
   $table.on 'draw.dt', (event) ->

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

@@ -72,7 +72,7 @@ table.dataTable > thead .sorting_desc {
 table.dataTable thead {
   th.col-actions {
     text-align: right;
-    span { display: block; height: 1.25em; }
+    span { display: block; }
   }
 }
 
@@ -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;
@@ -175,6 +184,10 @@ table.dataTable > thead {
   p { margin-bottom: 0; }
 }
 
+.form-group.datatables-filters-present {
+  margin-top: 1.75em;
+}
+
 // Processing div
 div.dataTables_wrapper div.dataTables_processing {
   margin: -26px 25% 0px 25%;
@@ -312,3 +325,14 @@ div.dt-button-collection .dt-button-active:after {
   right: auto;
   left: 0.5rem;
 }
+
+// Nested Datatables
+.nested-datatable-container-parent {
+  padding-left: 0.25em;
+  padding-right: 0.25em;
+  container-type: inline-size;
+}
+
+.nested-datatable-container {
+  width: 100%;
+}

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'] = 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/app/views/effective/datatables/_filters.html.haml

@@ -11,7 +11,7 @@
         - else
           = datatable_filter_tag(form, datatable, name, opts)
 
-      .form-group.col-auto
+      .form-group.col-auto{class: (datatable._filters.present? ? 'datatables-filters-present' : 'datatables-filters-blank')}
         - if datatable._filters_form_required?
           = form.save t('effective_datatables.apply'), 'data-disable-with': t('effective_datatables.applying'), class: 'btn btn-sm btn-secondary'
         - else

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.34.0'.freeze
+  VERSION = '4.35.1'.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.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-29 00:00:00.000000000 Z
+date: 2025-05-07 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