effective_datatables 4.35.0 → 4.35.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce86a4ccf56b39946b075599ac4c146cab3b95f420d0f1a4eb2bca95b9b15594
-  data.tar.gz: 7b98dfd5a1996035256c8c7ee7047541b461ffce0268672b2d9327996988b252
+  metadata.gz: 8c0318b305009b42544b46dc2defe192f91cd2c255b4b9efa2b5b81776e87d9d
+  data.tar.gz: 7bde6317bccfcca632296079b547ef3f51df570ae09e704b484022ec543c9b27
 SHA512:
-  metadata.gz: c780a6949308cfd9f560ddc52be61f3822b85ddf6ca904b2b238a33a6507f59fc6cfccf4a3676c5429219950a996b3ca0f87b16d6d7b253657f00b3a7f2cd7e1
-  data.tar.gz: 0da2df1d7a30190a6211c2dec883309e041ef46ec3c8536fab3ea11bc11ebcf9738debb79bcb3ca421c320b04afd2f9251f29dc31dbccd8cbea27d8538613fdd
+  metadata.gz: 6a9c44fccacd5453f60e120a318c21b4af9599682ba9fc4f5c163f978b5b6a828e0ad091f38ca7a71a7650445d5aa6c796ebf0d2fb5a904b0433265f21395878
+  data.tar.gz: a72b8e0f01ebb92b0f57a9b1cb21ae9a0d958c9e0ebdad6bf1b5dd9227a1122f23bf3728ed44f8e8d2367355cee7d9f09d361a4f03093bdffe6d2afb48ed4b8c

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

@@ -9,7 +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'
+  return true if ('' + $action.data('nested-datatable')) == 'true'
 
   $params = $.param(
     {
@@ -157,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)
@@ -201,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/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; }
   }
 }
 
@@ -184,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%;
@@ -321,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

@@ -138,7 +138,7 @@ module EffectiveDatatablesHelper
   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
+    options['data-nested-datatable'] = true
 
     link_to(title, path, options)
   end

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

@@ -118,8 +118,13 @@ module Effective
           raise("please use actions_col instead of col(#{name}, as: :actions)")
         when :boolean
           label = view.t("effective_datatables.boolean_#{value}")
-          color = value ? EffectiveDatatables.format_true : EffectiveDatatables.format_false
-          color.present? ? view.badge(label, color) : label
+
+          if csv
+            label.to_s
+          else
+            color = value ? EffectiveDatatables.format_true : EffectiveDatatables.format_false
+            color.present? ? view.badge(label, color) : label
+          end
         when :currency
           view.number_to_currency(value)
         when :date

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.35.0'.freeze
+  VERSION = '4.35.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.35.0
+  version: 4.35.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-06 00:00:00.000000000 Z
+date: 2025-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails