effective_datatables 4.30.2 → 4.31.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ec07c03e5278144171de22592740123dbc4db6999d5a9e39c2d06c665e661f2
-  data.tar.gz: c446501978993cca11e309326b466afb9f14afe8cd41d92243099c26bfb3a0cc
+  metadata.gz: 890644cd1a399947c8b3deb2d12880367b1b225dd6ff41400bf50fa6aaa01b75
+  data.tar.gz: dcb2353768e455e880798aac5929413166fe1a756872c0e984bab73706bf064b
 SHA512:
-  metadata.gz: 549c5d46a0f4c624ed98d6cc7c986e50f1567a2617c08fc39f81eb76dda49446908d23c5d9ae40bd7e4ab6c56950a369c63f8730b8992be315bc76295c87124c
-  data.tar.gz: 1a1aba3d33d2160a78fb6f93755a352dbb5eb73dcadc5a83363f5b7ce21cc0ddaaa18fa497e472e538b2a9a1afa78c165c794f664b54bae193d4ce2433880bf6
+  metadata.gz: 625aad5dfc3f4e5615e7d6294c17548bb9ae40698311a180635566c290bed3d8ef7a86f13fe2bc526fb77f71a515f1376daaed39cb4ad7804ba3e0f0ea7d38e8
+  data.tar.gz: 751a5b50f64124797862d8b194fac5662f939dcd3b2aacf4e707d781ae10477754aa08774494eb8a426ec3944ccd789cdbc30b248a911b7c4eedbfaff4ca2c54

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

@@ -6,7 +6,10 @@ getFilterParams = ->
   params = {}
 
   if $form.length > 0
-    params['scope'] = $form.find("input[name='filters[scope]']:checked").val() || ''
+    params['scope'] = $form.find("input[name='filters[scope]']:checked").val()
+    params['scope'] ||= $form.find("input[name='filters[scope]']:not([type='hidden'])").first().val()
+    params['scope'] ||= 'effective_datatables_empty_scope'
+
     params['filter'] = {}
 
     $form.find("select,textarea,input:enabled:not([type=submit])").each ->

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

@@ -77,20 +77,23 @@ module Effective
             )
 
             if csv && (opts[:format] || opts[:partial]) && !formatted.frozen?
+              html_content = formatted.include?('<') && formatted.include?('>')
+
+              formatted.gsub!("&nbsp;", ' ')
               formatted.gsub!("<br>\n", ' ')
               formatted.gsub!("<br> ", ' ')
               formatted.gsub!("<br>", ' ')
               formatted.gsub!("<br/>", ' ')
               formatted.gsub!("<br />", ' ')
-              formatted.gsub!("\n\n", ' ')
-              formatted.gsub!("\n", ' ') unless formatted.include?('<')
-
-              if formatted.include?('<')
-                formatted.gsub!("\n", '') 
-                formatted.gsub!("<div class='col-resource_item'>", ' ')
+              formatted.gsub!("\n", ' ')
 
+              if html_content
+                formatted.gsub!(/<span[^>]*\bclass=["']?badge\b[^>]*>.*?<\/span>/, '') # strip badges
+                formatted.gsub!('</div>', "</div>\n") if formatted.include?('col-resource_item')
                 formatted = view.strip_tags(formatted).strip
               end
+
+              formatted.gsub!('  ', ' ')
             end
 
             row[index] = formatted
@@ -130,7 +133,7 @@ module Effective
         when :duration
           view.number_to_duration(value)
         when :effective_addresses
-          csv ? value.to_html.gsub('<br>', "\n") : value.to_html
+          csv ? value.to_html.gsub('<br>', '').gsub("&nbsp;", ' ') : value.to_html
         when :effective_obfuscation
           value.to_s
         when :effective_roles
@@ -139,7 +142,7 @@ module Effective
           csv ? value : view.mail_to(value)
         when :integer
           value.to_s
-        when :percent
+        when :percent, :percentage
           case value
           when Integer    ; view.number_to_percentage(value / 1000.0, precision: 3).gsub('.000%', '%')
           when Numeric    ; view.number_to_percentage(value, precision: 3).gsub('.000%', '%')

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

@@ -73,7 +73,11 @@ module Effective
 
       def load_filters!
         state[:filter] = _filters.inject({}) { |h, (name, opts)| h[name] = opts[:value]; h }
-        state[:scope] = _scopes.find { |_, opts| opts[:default] }.try(:first) || _scopes.keys.first
+        state[:scope] = initial_scope()
+      end
+
+      def initial_scope
+        _scopes.find { |_, opts| opts[:default] }.try(:first) || _scopes.keys.first
       end
 
       def load_filter_params!
@@ -112,7 +116,7 @@ module Effective
           state[:order_index] = params[:order]['0'][:column].to_i
         end
 
-        state[:scope] = _scopes.keys.find { |name| params[:scope] == name.to_s }
+        state[:scope] = _scopes.keys.find { |name| params[:scope] == name.to_s } || initial_scope()
         state[:start] = params[:start].to_i
 
         state[:search] = {}

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.30.2'.freeze
+  VERSION = '4.31.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.30.2
+  version: 4.31.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-13 00:00:00.000000000 Z
+date: 2025-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails