effective_datatables 4.10.0 → 4.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 173cdec1d403c8203a7f3d3701104a76d7fd8fb04843c4989180b351b5096264
-  data.tar.gz: 70da4dcc029e6f7ac2a2f0d7f896734c4036eea227dfd5ecb6354f1efa59f531
+  metadata.gz: c52636b5c1ed7d99254c4a3ffeac60a3e85edb190ca2321783f75ad6a5824298
+  data.tar.gz: 6c7681d656c2903bb55601b0168bf9973c17dee21f0118030dcb534e83d3ade7
 SHA512:
-  metadata.gz: 474ead17fcde2196a4bdf06cdfa02c9d23e1dc4345126d79bcdf4fa3aa9785a358cce6d54a062862f17ec33c618a908db703a1eaa94e847a87df42dfe738b816
-  data.tar.gz: 55570bbe0d91f0bcdb24d818368a3a4dce9be6ffc0d7a99327121d8204df62a56b6eecc61a1bbbb6bb89b1feff5e4ea6d293497bb571ffff640331f14076d8b2
+  metadata.gz: 1e792d9737426b30211fd7e0810f8021d404149be1b47587c49799fa0090e41529a52a2736d07a7a8b593d8d325d325f00f2613372c40eb7cf08ee7759f553a7
+  data.tar.gz: 21da5721c55fe36fe9c232cc045e8b6f1ba72a13d7f275e03ed1dc8c7eac952f4d13cbcf9b4b081ddc05b70e508cc6ecf61d35259e17f1c65089d956b9457c52

data/README.md

@@ -605,6 +605,12 @@ Any `data-remote` actions will be hijacked and performed as inline ajax by datat
 
 If you'd like to opt-out of this behavior, use `actions_col(inline: false)` or add `data-inline: false` to your action link.
 
+If the automatic actions_col aren't being displayed, try setting the namespace directly when calling the table
+
+```
+MyApp::UsersTable.new(namespace: :my_app)
+```
+
 ## length
 
 Sets the default number of rows per page. Valid lengths are `5`, `10`, `25`, `50`, `100`, `250`, `500`, `:all`

data/app/controllers/effective/datatables_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'csv'
 
 module Effective

data/app/helpers/effective_datatables_controller_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # These are expected to be called by a developer.  They are part of the datatables DSL.
 module EffectiveDatatablesControllerHelper
 

data/app/helpers/effective_datatables_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # 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, sort: true)
@@ -60,6 +62,7 @@ module EffectiveDatatablesHelper
         'inline' => inline.to_s,
         'language' => EffectiveDatatables.language(I18n.locale),
         'options' => input_js.to_json,
+        'reorder' => datatable.reorder?.to_s,
         'reorder-index' => (datatable.columns[:_reorder][:index] if datatable.reorder?).to_s,
         'simple' => simple.to_s,
         'spinner' => icon('spinner'), # effective_bootstrap

data/app/helpers/effective_datatables_private_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # These aren't expected to be called by a developer. They are internal methods.
 module EffectiveDatatablesPrivateHelper
 
@@ -33,7 +35,7 @@ module EffectiveDatatablesPrivateHelper
     action = { action: :new, class: ['btn', column[:btn_class].presence].compact.join(' '), 'data-remote': true }
 
     if column[:actions][:new].kind_of?(Hash) # This might be active_record_array_collection?
-      action.merge!(column[:actions][:new])
+      actions = action.merge(column[:actions][:new])
 
       effective_resource = (datatable.effective_resource || datatable.fallback_effective_resource)
       klass = (column[:actions][:new][:klass] || effective_resource&.klass || datatable.collection_class)
@@ -67,13 +69,13 @@ module EffectiveDatatablesPrivateHelper
     return if opts[:search] == false
 
     # Build the search
-    @_effective_datatables_form_builder || effective_form_with(scope: :datatable_search, url: '#') { |f| @_effective_datatables_form_builder = f }
+    @_effective_datatables_form_builder || effective_form_with(scope: 'datatable_search', url: '#') { |f| @_effective_datatables_form_builder = f }
     form = @_effective_datatables_form_builder
 
     collection = opts[:search].delete(:collection)
     value = datatable.state[:search][name]
 
-    options = opts[:search].merge!(
+    options = opts[:search].merge(
       name: nil,
       feedback: false,
       label: false,
@@ -87,20 +89,20 @@ module EffectiveDatatablesPrivateHelper
     when :string, :text, :number
       form.text_field name, options
     when :date, :datetime
-      form.date_field name, options.reverse_merge!(
+      form.date_field name, options.reverse_merge(
         date_linked: false, prepend: false, input_js: { useStrict: true, keepInvalid: true }
       )
     when :time
-      form.time_field name, options.reverse_merge!(
+      form.time_field name, options.reverse_merge(
         date_linked: false, prepend: false, input_js: { useStrict: false, keepInvalid: true }
       )
     when :select, :boolean
-      options[:input_js] = (options[:input_js] || {}).reverse_merge!(placeholder: '')
+      options[:input_js] = (options[:input_js] || {}).reverse_merge(placeholder: '')
 
       form.select name, collection, options
     when :bulk_actions
       options[:data]['role'] = 'bulk-actions'
-      form.check_box name, options.merge!(label: ' ')
+      form.check_box name, options.merge(label: ' ')
     end
   end
 
@@ -130,7 +132,7 @@ module EffectiveDatatablesPrivateHelper
       placeholder: (opts[:label] || name.to_s.titleize),
       value: value,
       wrapper: { class: 'form-group col-auto'}
-    }.merge!(opts.except(:as, :collection, :parse, :value))
+    }.merge(opts.except(:as, :collection, :parse, :value))
 
     options[:name] = '' unless datatable._filters_form_required?
 
@@ -162,7 +164,7 @@ module EffectiveDatatablesPrivateHelper
       label: false,
       required: false,
       wrapper: { class: 'form-group col-auto'}
-    }.merge!(opts.except(:checked, :value))
+    }.merge(opts.except(:checked, :value))
 
     form.radios :scope, collection, options
   end

data/app/models/effective/datatable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   class Datatable
     attr_reader :attributes # Anything that we initialize our table with. That's it. Can't be changed by state.
@@ -40,7 +42,7 @@ module Effective
     def initialize(view = nil, attributes = nil)
       (attributes = view; view = nil) if view.kind_of?(Hash)
 
-      @attributes = (attributes || {})
+      @attributes = initial_attributes(attributes)
       @state = initial_state
 
       @_aggregates = {}

data/app/models/effective/datatable_column.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # In practice this is just a regular hash with the aggregate, format, search, sort do syntax that saves a block
 module Effective
   class DatatableColumn

data/app/models/effective/datatable_column_tool.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   class DatatableColumnTool
     attr_reader :datatable

data/app/models/effective/datatable_dsl_tool.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
 
   class DatatableDslTool

data/app/models/effective/datatable_value_tool.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   # The collection is an Array of Arrays
   class DatatableValueTool

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Attributes
@@ -15,6 +17,24 @@ module Effective
         @attributes[:namespace] ||= view.controller_path.split('/')[0...-1].join('/')
       end
 
+      # Polymorphic shorthand attributes.
+      # If you pass resource: User(1), it sets resource_id: 1, resource_type: 'User'
+      def initial_attributes(attributes)
+        return {} if attributes.blank?
+
+        resources = attributes.select { |k, v| v.kind_of?(ActiveRecord::Base) }
+        return attributes if resources.blank?
+
+        retval = attributes.except(*resources.keys)
+
+        resources.each do |k, resource|
+          retval["#{k}_id".to_sym] = resource.id
+          retval["#{k}_type".to_sym] = resource.class.name
+        end
+
+        retval
+      end
+
     end
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Collection
@@ -34,7 +36,7 @@ module Effective
         raise 'No collection defined. Please add a collection with collection do ... end' if collection.nil?
 
         @collection_class = (collection.respond_to?(:klass) ? collection.klass : self.class)
-        
+
         @active_record_collection = (collection.ancestors.include?(ActiveRecord::Base) rescue false)
         @active_record_array_collection = collection.kind_of?(Array) && collection.present? && collection.first.kind_of?(ActiveRecord::Base)
         @array_collection = collection.kind_of?(Array) && (collection.blank? || collection.first.kind_of?(Array))

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Compute

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Cookie

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'csv'
 
 module Effective

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Dsl

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Dsl

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Dsl

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Dsl

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Dsl
@@ -11,11 +13,11 @@ module Effective
       end
 
       def collection(apply_belongs_to: true, apply_scope: true, &block)
-        define_method('initialize_collection') { 
+        define_method('initialize_collection') {
           self._collection_apply_belongs_to = apply_belongs_to
           self._collection_apply_scope = apply_scope
-          
-          self._collection = dsl_tool.instance_exec(&block) 
+
+          self._collection = dsl_tool.instance_exec(&block)
         }
       end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Format
@@ -93,6 +95,10 @@ module Effective
           return value if value.kind_of?(String)
         end
 
+        if value.kind_of?(Array) && column[:as] == :string
+          return value.map { |v| view.content_tag(:div, format_column(v, column, csv: csv), class: 'col-resource_item') }.join.html_safe
+        end
+
         case column[:as]
         when :actions
           raise("please use actions_col instead of col(#{name}, as: :actions)")

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Hooks

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Params

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Resource

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module State
@@ -98,7 +100,7 @@ module Effective
           load_cookie_state! if cookie.present? && cookie[:params] == cookie_state_params
           load_filter_params!
         end
-        
+
         fill_empty_filters!
       end
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.10.0'.freeze
+  VERSION = '4.10.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.10.0
+  version: 4.10.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2022-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails