effective_datatables 4.3.6 → 4.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cdb353b5057246c492c440966e1de63df4b70b7
-  data.tar.gz: 98cacf4aadcf11b4e831b00afabff3177a3e8559
+  metadata.gz: 4642aa5881ff3eb183f287db8c42b61c5ec18a3d
+  data.tar.gz: ac20c253b356faf06abba201e3f705b81d64e5e4
 SHA512:
-  metadata.gz: 3ae86ea4a56ef6818ba3d450edd70e0ee86206a36ce99adee3947ce5951fb63c1e353c11d80077cd1beb4b15b0900e8d97fb477a720bce9114fbbda443da84d7
-  data.tar.gz: d948ae33fc177a660554876724ffd9ae94d5b418428c3b9cef2bbe22465661740e5c490b12a29670851b0757fcc54aed54fef9722b1cf7f899f8cddb5b8e0915
+  metadata.gz: 309b3348a5507dd365dd6349b472301c29ca39ffd1cf77e516d031ed7a4c0c7a52b6fffe3cece2e59525acd1e412956cb26f645d13994287a2c898f7416fd573
+  data.tar.gz: 4b79372f60d9a26baeae025a63a84f2318d600adacc73b48525a463f21a6cc7b44bb7f066fdf53b6da7c11e36ee4ea8899a9458fcc407b966465a454d474d585

data/README.md

@@ -454,7 +454,7 @@ These settings are loosely based on the regular datatypes, with some custom effe
 - `:currency` expects the underlying datatype to be a Float.
 - `:duration` expects the underlying datatype to be an Integer representing the number of minutes. 120 == 2 hours
 - `:email` expects the underlying datatype to be a String
-- `:percentage` expects the underlying datatype to be an Integer or a Float. 75 == 0.75 == 75%
+- `:percent` expects the underlying datatype to be an Integer * 1000. 50000 == 50%. 50125 == 50.125%.
 - `:price` expects the underlying datatype to be an Integer representing the number of cents. 5000 == $50.00
 - `:resource` can be used for an Array based collection which includes an ActiveRecord object
 

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

@@ -3,7 +3,6 @@ initializeDataTables = ->
     datatable = $(this)
     options = datatable.data('options') || {}
     buttons_export_columns = options['buttons_export_columns'] || ':not(.col-actions)'
-    simple = ('' + datatable.data('simple') == 'true')
     reorder = datatable.data('reorder')
 
     if options['buttons'] == false
@@ -49,7 +48,6 @@ initializeDataTables = ->
       deferLoading: [datatable.data('display-records'), datatable.data('total-records')]
       deferRender: true
       displayStart: datatable.data('display-start')
-      dom: "<'row'<'col-sm-12 dataTables_buttons'B>><'row'<'col-sm-12'tr>><'row'<'col-sm-6 dataTables_entries'il><'col-sm-6'p>>"
       iDisplayLength: datatable.data('display-length')
       language: { 'lengthMenu': '&nbsp;with _MENU_ per page'}
       lengthMenu: [[5, 10, 25, 50, 100, 250, 500, 9999999], ['5', '10', '25', '50', '100', '250', '500', 'All']]
@@ -161,10 +159,6 @@ initializeDataTables = ->
       table = $input.closest('table.dataTable')
       table.DataTable().column("#{$input.data('column-name')}:name").search($input.val()).draw()
 
-    if simple
-      init_options['dom'] = "<'row'<'col-sm-12'tr>>" # Just show the table
-      datatable.addClass('simple')
-
     if reorder
       init_options['rowReorder'] = { selector: 'td.col-_reorder', snapX: true, dataSrc: datatable.data('reorder-index') }
 

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

@@ -36,7 +36,7 @@ $(document).on 'ajax:success', '.dataTables_wrapper .col-actions', (event) ->
   true
 
 # The inline form has been submitted successfully
-$(document).on '.dataTables_wrapper .col-inline-form effective-form:success', (event, flash) ->
+$(document).on 'effective-form:success', '.dataTables_wrapper .col-inline-form', (event, flash) ->
   $action = $(event.target)
 
   $tr = $action.closest('tr')
@@ -120,7 +120,7 @@ afterAction = ($action) ->
 buildRow = (length, payload) ->
   "<td class='col-inline-form' colspan='#{length-1}'><div class='container'>#{payload}</div></td>" +
   "<td class='col-actions col-actions-inline-form'>" +
-    "<a href='#' class='btn btn-outline-primary' title='Cancel' data-role='inline-form-cancel'>Cancel</a>" +
+    "<a href='#' class='btn btn-sm btn-outline-primary' title='Cancel' data-role='inline-form-cancel'>Cancel</a>" +
   "</td>"
 
 expand = ($table) ->

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

@@ -139,12 +139,17 @@ div.dataTables_wrapper div.dataTables_processing {
 }
 
 // Simple styles
-table.dataTable.simple > thead {
+table.dataTable.hide-sort > thead {
   .sorting { background-image: none; cursor: default; }
   .sorting_asc { background-image: none; cursor: default; }
   .sorting_desc { background-image: none; cursor: default; }
+}
 
+table.dataTable.hide-search > thead {
   .form-group { display: none; }
+}
+
+table.dataTable.hide-buttons {
   .col-bulk_actions { display: none; }
 }
 

data/app/helpers/effective_datatables_helper.rb

@@ -1,11 +1,15 @@
 # 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, filters: true, simple: false, inline: false)
+  def render_datatable(datatable, input_js: {}, buttons: true, charts: true, entries: true, filters: true, inline: false, pagination: true, search: true, simple: false, sort: true)
     raise 'expected datatable to be present' unless datatable
 
-    datatable.attributes[:simple] = true if simple
+    if simple
+      buttons = charts = entries = filters = pagination = search = sort = false
+    end
+
     datatable.attributes[:inline] = true if inline
+    datatable.attributes[:sortable] = false unless sort
 
     datatable.view ||= self
 
@@ -16,11 +20,25 @@ module EffectiveDatatablesHelper
     charts = charts && datatable._charts.present?
     filters = filters && (datatable._scopes.present? || datatable._filters.present?)
 
-    input_js[:buttons] = false if simple || !buttons
+    html_class = ['effective-datatable', datatable.html_class, ('hide-sort' unless sort), ('hide-search' unless search), ('hide-buttons' unless buttons)].compact.join(' ')
+
+    if datatable.reorder? && !buttons
+      buttons = true; input_js[:buttons] = false
+    end
+
+    # Build the datatables DOM option
+    input_js[:dom] ||= [
+      ("<'row'<'col-sm-12 dataTables_buttons'B>>" if buttons),
+      "<'row'<'col-sm-12'tr>>",
+      ("<'row'" if entries || pagination),
+      ("<'col-sm-6 dataTables_entries'il>" if entries),
+      ("<'col-sm-6'p>" if pagination),
+      (">" if entries || pagination)
+    ].compact.join
 
     effective_datatable_params = {
       id: datatable.to_param,
-      class: ('effective-datatable ' + Array(datatable.table_html_class).join(' ')),
+      class: html_class,
       data: {
         'bulk-actions' => datatable_bulk_actions(datatable),
         'columns' => datatable_columns(datatable),
@@ -29,19 +47,19 @@ module EffectiveDatatablesHelper
         'display-order' => datatable_display_order(datatable),
         'display-records' => datatable.to_json[:recordsFiltered],
         'display-start' => datatable.display_start,
-        'inline' => datatable.inline?.to_s,
+        'inline' => inline.to_s,
         'options' => (input_js || {}).to_json.html_safe,
-        'reset' => datatable_reset(datatable),
+        'reset' => (datatable_reset(datatable) if search),
         'reorder' => datatable_reorder(datatable),
         'reorder-index' => (datatable.columns[:_reorder][:index] if datatable.reorder?).to_s,
-        'simple' => datatable.simple?.to_s,
+        'simple' => simple.to_s,
         'spinner' => icon('spinner'), # effective_bootstrap
         'source' => effective_datatables.datatable_path(datatable, {format: 'json'}),
         'total-records' => datatable.to_json[:recordsTotal]
       }
     }
 
-    if (charts || filters) && !simple
+    if (charts || filters)
       output = ''.html_safe
 
       if charts
@@ -69,23 +87,7 @@ module EffectiveDatatablesHelper
   end
 
   def render_simple_datatable(datatable)
-    raise 'expected datatable to be present' unless datatable
-
-    datatable.view ||= self
-
-    unless EffectiveDatatables.authorized?(controller, :index, datatable.collection_class)
-      return content_tag(:p, "You are not authorized to view this datatable. (cannot :index, #{datatable.collection_class})")
-    end
-
-    effective_datatable_params = {
-      id: datatable.to_param,
-      class: ('effective-datatable simple ' + Array(datatable.table_html_class).join(' ')),
-      data: {}
-    }
-
-    render(partial: 'effective/datatables/datatable',
-      locals: { datatable: datatable, effective_datatable_params: effective_datatable_params }
-    )
+    render_datatable(datatable, simple: true)
   end
 
   def inline_datatable?

data/app/helpers/effective_datatables_private_helper.rb

@@ -40,7 +40,7 @@ module EffectiveDatatablesPrivateHelper
 
   def datatable_new_resource_button(datatable, name, column)
     if column[:inline] && column[:actions][:new] != false
-      actions = {'New' => { action: :new, class: 'btn btn-outline-primary', 'data-remote': true } }
+      actions = {'New' => { action: :new, class: ['btn', column[:btn_class].presence].compact.join(' '), 'data-remote': true } }
       render_resource_actions(datatable.resource.klass, actions: actions, effective_resource: datatable.resource) # Will only work if permitted
     end
   end

data/app/models/effective/datatable.rb

@@ -122,24 +122,18 @@ module Effective
       )
     end
 
-    # When simple only a table will be rendered with
-    # no sorting, no filtering, no export buttons, no pagination, no per page, no colReorder
-    # default sorting only, default visibility only, all records returned, and responsive enabled
-    def simple?
-      attributes[:simple] == true
-    end
-
     # Inline crud
     def inline?
       attributes[:inline] == true
     end
 
+    # Reordering
     def reorder?
       columns.key?(:_reorder)
     end
 
     def sortable?
-      !simple? && !reorder?
+      !reorder? && attributes[:sortable] != false
     end
 
     # Whether the filters must be rendered as a <form> or we can keep the normal <div> behaviour
@@ -147,8 +141,8 @@ module Effective
       _form[:verb].present?
     end
 
-    def table_html_class
-      attributes[:class] || EffectiveDatatables.html_class
+    def html_class
+      Array(attributes[:class] || EffectiveDatatables.html_class).join(' ').presence
     end
 
     def to_param

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

@@ -132,7 +132,7 @@ module Effective
 
         case aggregate[:name]
         when :total
-          if [:percentage].include?(column[:as])
+          if [:percent].include?(column[:as])
             BLANK
           elsif values.all? { |value| value.kind_of?(Numeric) }
             values.sum

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

@@ -82,13 +82,14 @@ module Effective
           )
         end
 
-        def actions_col(col_class: nil, inline: nil, partial: nil, partial_as: nil, actions_partial: nil, responsive: 5000, visible: true, **actions, &format)
+        def actions_col(btn_class: nil, col_class: nil, inline: nil, partial: nil, partial_as: nil, actions_partial: nil, responsive: 5000, visible: true, **actions, &format)
           raise 'You can only have one actions column' if datatable.columns[:_actions].present?
 
           datatable._columns[:_actions] = Effective::DatatableColumn.new(
             action: false,
             as: :actions,
             compute: nil,
+            btn_class: (btn_class || 'btn-sm btn-outline-primary'),
             col_class: col_class,
             format: (format if block_given?),
             index: nil,

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

@@ -29,7 +29,7 @@ module Effective
           elsif opts[:as] == :actions # This is actions_col and actions_col do .. end, but not actions_col partial: 'something'
             resources = collection.map { |row| row[opts[:index]] }
             locals = { datatable: self, column: opts, spacer_template: SPACER_TEMPLATE }
-            atts = { actions: actions_col_actions(opts), effective_resource: resource, locals: locals, partial: opts[:actions_partial] }.merge(opts[:actions])
+            atts = { actions: actions_col_actions(opts), effective_resource: resource, locals: locals, partial: opts[:actions_partial], btn_class: opts[:btn_class] }.merge(opts[:actions])
 
             rendered[name] = (view.render_resource_actions(resources, atts, &opts[:format]) || '').split(SPACER)
           end
@@ -97,10 +97,10 @@ module Effective
           view.mail_to(value)
         when :integer
           value
-        when :percentage
+        when :percent
           case value
-          when Integer    ; "#{value}%"
-          when Numeric    ; view.number_to_percentage(value * 100, precision: 2)
+          when Integer    ; view.number_to_percentage(value / 1000.0, precision: 3).gsub('.000%', '%')
+          when Numeric    ; view.number_to_percentage(value, precision: 3).gsub('.000%', '%')
           end
         when :price
           case value
@@ -127,22 +127,20 @@ module Effective
       def resource_col_locals(opts)
         return {} unless (resource = opts[:resource]).present?
 
+        polymorphic = (opts[:as] == :belongs_to_polymorphic)
+
         locals = { name: opts[:name], effective_resource: resource, show_action: false, edit_action: false }
 
         case opts[:action]
         when :edit
-          locals[:edit_action] = (resource.routes[:edit] && EffectiveDatatables.authorized?(view.controller, :edit, resource.klass))
+          locals[:edit_action] = (resource.routes[:edit].present? || polymorphic)
         when :show
-          locals[:show_action] = (resource.routes[:show] && EffectiveDatatables.authorized?(view.controller, :show, resource.klass))
+          locals[:show_action] = (resource.routes[:show].present? || polymorphic)
         when false
-          # Nothing
+          # Nothing. Already false.
         else
-          # Fallback to defaults - check edit then show
-          if resource.routes[:edit] && EffectiveDatatables.authorized?(view.controller, :edit, resource.klass)
-            locals[:edit_action] = true
-          elsif resource.routes[:show] && EffectiveDatatables.authorized?(view.controller, :show, resource.klass)
-            locals[:show_action] = true
-          end
+          locals[:edit_action] = (resource.routes[:edit].present? || polymorphic)
+          locals[:show_action] = (resource.routes[:show].present? || polymorphic)
         end
 
         locals

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

@@ -140,7 +140,7 @@ module Effective
 
           search[:value] ||= search.delete(:selected) if search.key?(:selected)
 
-          search[:as] ||= :select if (search.key?(:collection) && opts[:as] != :belongs_to_polymorphic)
+          search[:as] ||= :select if search.key?(:collection)
 
           search[:fuzzy] = true unless search.key?(:fuzzy)
 
@@ -149,6 +149,11 @@ module Effective
           elsif search[:as] != :string
             search.reverse_merge!(resource.search_form_field(name, opts[:as]))
           end
+
+          # Assign default include_null
+          if search[:as] == :select && !search.key?(:include_null)
+            search[:include_null] = true
+          end
         end
       end
 
@@ -160,10 +165,19 @@ module Effective
           next unless attribute.ends_with?('_id')
 
           associated = attribute.gsub(/_id\z/, '').to_sym  # Replace last _id
-          next unless columns[associated] && columns[associated][:as] == :belongs_to
 
-          @_collection = @_collection.where(attribute => value)
-          columns.delete(associated)
+          next unless columns[associated]
+
+          if columns[associated][:as] == :belongs_to
+            @_collection = @_collection.where(attribute => value)
+            columns.delete(associated)
+          elsif columns[associated][:as] == :belongs_to_polymorphic
+            associated_type = attributes["#{associated}_type".to_sym] || raise("Expected #{associated}_type attribute to be present when #{associated}_id is present on a polymorphic belongs to")
+
+            @_collection = @_collection.where(attribute => value).where("#{associated}_type" => associated_type)
+            columns.delete(associated)
+          end
+
         end.present?
 
         load_columns! if changed

data/app/views/effective/datatables/_resource_column.html.haml

@@ -1,8 +1,8 @@
 - Array(datatable.array_collection? ? resource : resource.send(name)).each do |resource|
   .col-resource_item
-    - if show_action
-      = link_to resource.to_s, effective_resource.action_path(:show, resource), title: resource.to_s
-    - elsif edit_action
+    - if edit_action && EffectiveDatatables.authorized?(controller, :edit, resource)
       = link_to resource.to_s, effective_resource.action_path(:edit, resource), title: resource.to_s
+    - elsif show_action && EffectiveDatatables.authorized?(controller, :show, resource)
+      = link_to resource.to_s, effective_resource.action_path(:show, resource), title: resource.to_s
     - else
       = resource.to_s.html_safe

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.3.6'.freeze
+  VERSION = '4.3.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.3.6
+  version: 4.3.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails