effective_datatables 3.6.3 → 3.7.0

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

@@ -55,7 +55,6 @@ module Effective
       # This is called first. Our initial state is set.
       def initial_state
         {
-          attributes: {},
           filter: {},
           length: nil,
           order_name: nil,
@@ -89,23 +88,27 @@ module Effective
 
       def load_state!
         if datatables_ajax_request?
+          load_cookie! # but not state.
           load_filter_params!
           load_ajax_state!
-        elsif cookie.present? && cookie[:params] == params.length && EffectiveDatatables.save_state
-          load_cookie_state!
+        elsif datatables_inline_request?
+          load_filter_params!
         else
-          # Nothing to do for default state
+          load_cookie!
+          load_cookie_state! if cookie.present? && cookie[:params] == cookie_state_params
+          load_filter_params!
         end
 
-        load_filter_params! unless datatables_ajax_request?
         fill_empty_filters!
       end
 
       def load_ajax_state!
         state[:length] = params[:length].to_i
 
-        state[:order_dir] = (params[:order]['0'][:dir] == 'desc' ? :desc : :asc)
-        state[:order_index] = params[:order]['0'][:column].to_i
+        if params[:order]
+          state[:order_dir] = (params[:order]['0'][:dir] == 'desc' ? :desc : :asc)
+          state[:order_index] = params[:order]['0'][:column].to_i
+        end
 
         state[:scope] = _scopes.keys.find { |name| params[:scope] == name.to_s }
         state[:start] = params[:start].to_i
@@ -130,7 +133,7 @@ module Effective
           state[:filter][name] = parse_filter_value(_filters[name], value)
         end
 
-        state[:params] = cookie[:params]
+        state[:params] = cookie[:params] if cookie.present?
       end
 
       def load_cookie_state!
@@ -140,14 +143,21 @@ module Effective
       def load_columns!
         state[:length] ||= EffectiveDatatables.default_length
 
-        if columns.present?
-          columns.each_with_index { |(_, column), index| column[:index] = index }
+        (columns || {}).each_with_index { |(_, column), index| column[:index] = index }
 
-          if order_index.present?
-            state[:order_name] = columns.keys[order_index]
-          end
+        if columns.present?
+          state[:order_name] = (
+            if columns.key?(:_reorder)
+              :_reorder
+            elsif order_index.present?
+              columns.keys[order_index]
+            elsif state[:order_name].present?
+              state[:order_name]
+            else
+              columns.find { |name, opts| opts[:sort] }.first
+            end
+          )
 
-          state[:order_name] ||= columns.find { |name, opts| opts[:sort] }.first
           raise "order column :#{order_name} must exist as a col or val" unless columns[order_name]
 
           state[:order_index] = columns[order_name][:index]
@@ -176,7 +186,7 @@ module Effective
 
         unless datatables_ajax_request?
           search_params.each { |name, value| state[:search][name] = value }
-          state[:params] = params.length
+          state[:params] = cookie_state_params
         end
 
         state[:visible].delete_if { |name, _| columns.key?(name) == false }
@@ -187,9 +197,14 @@ module Effective
       # When we parse an incoming filter term for this filter.
       def parse_filter_value(filter, value)
         return filter[:parse].call(value) if filter[:parse]
+        return nil if value.blank? && !filter[:required]
         Effective::Attribute.new(filter[:value]).parse(value, name: filter[:name])
       end
 
+      def cookie_state_params
+        params.hash.abs.to_s.last(12)
+      end
+
     end
   end
 end

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

@@ -1,10 +1,8 @@
 .btn-group.buttons-bulk-actions
-  %button.btn.btn-default.dropdown-toggle{'type' => 'button', 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false, 'disabled' => 'disabled'}
+  %button.btn.btn-link.btn-sm.dropdown-toggle{'type': 'button', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false, 'disabled': 'disabled'}
     Bulk Actions
-    %span.caret
-  %ul.dropdown-menu
+  .dropdown-menu
     - if datatable._bulk_actions.present?
       = datatable._bulk_actions.join.html_safe
     - else
-      %li
-        %a{href: '#'} No bulk actions
+      %a.dropdown-item{href: '#'} No bulk actions

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

@@ -3,18 +3,16 @@
     - if datatable.columns.any? { |_, opts| opts[:th].present? } == false
       %tr
         - datatable.columns.each do |name, opts|
-          %th= opts[:label] || name
+          %th{title: opts[:label].presence}= opts[:label]
     - else
       - max_depth = datatable.columns.map { |_, opts| opts[:th].try(:[], :depth) || 0 }.max
       - [*0..max_depth].each do |depth|
         %tr
           - columns = datatable.columns.select { |_, opts| (opts[:th].try(:[], :depth) || 0) == depth }
           - columns.each do |name, opts|
-            %th{(opts[:th] || {}).merge(title: (opts[:label] || name))}
-              = opts[:label] || name
+            %th{(opts[:th] || {}).merge(title: opts[:label].presence)}= opts[:label]
             - (opts[:th_append] || []).each do |faux_col|
-              %th{(faux_col[:th] || {}).merge(title: faux_col[:label])}
-                = faux_col[:label]
+              %th{(faux_col[:th] || {}).merge(title: faux_col[:label].presence)}= faux_col[:label]
 
   %tbody
     - datatable.to_json[:data].each do |row|

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

@@ -1,37 +1,17 @@
 .effective-datatables-filters{'aria-controls': datatable.to_param}
   = simple_form_for :filters, url: (datatable._form[:url] || '#'), method: datatable._form[:verb], html: { class: 'form-inline' } do |form|
-
     - if datatable._scopes.present?
       .effective-datatables-filters-scopes
-        = form.input :scope, label: false, required: false, checked: datatable.state[:scope],
-          as: (defined?(EffectiveFormInputs) ? :effective_radio_buttons : :radio_buttons),
-          collection: datatable._scopes.map { |name, opts| [opts[:label], name] },
-          buttons: true,
-          wrapper_html: {class: 'btn-group-sm'}
+        = datatable_scope_tag(form, datatable)
 
     - if datatable._filters.present?
       .effective-datatables-filters-inputs
         - datatable._filters.each do |name, opts|
-          = form.input name,
-            label: opts[:label],
-            required: opts[:input_html].delete(:required),
-            value: datatable.state[:filter][name],
-            selected: datatable.state[:filter][name],
-            as: opts[:as],
-            collection: opts[:input_html].delete(:collection),
-            multiple: opts[:input_html].delete(:multiple),
-            include_blank: opts[:input_html].delete(:include_blank),
-            group_method: opts[:input_html].delete(:group_method),
-            group_label_method: opts[:input_html].delete(:group_label_method),
-            value_method: opts[:input_html].delete(:value_method),
-            label_method: opts[:input_html].delete(:label_method),
-            input_html: (({name: ''} unless datatable._filters_form_required?) || {}).merge(opts[:input_html]),
-            input_js: ({ placeholder: ''} if opts[:as] == :effective_select),
-            wrapper_html: {class: 'form-group-sm'}
+          = datatable_filter_tag(form, datatable, name, opts)
 
     - if datatable._scopes.present? || datatable._filters.present?
       .effective-datatables-filters-btn
         - if datatable._filters_form_required?
-          = form.button :submit, 'Apply', 'data-disable-with': 'Applying...'
+          = form.button :submit, t('effective_datatables.apply'), 'data-disable-with': t('effective_datatables.applying')
         - else
-          = link_to 'Apply', '#', class: 'btn btn-primary btn-sm btn-effective-datatables-filters', 'data-apply-effective-datatables-filters': true
+          = link_to t('effective_datatables.apply'), '#', class: 'btn btn-primary btn-sm btn-effective-datatables-filters', 'data-apply-effective-datatables-filters': true

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

@@ -0,0 +1,5 @@
+- id = (resource.try(:to_param) || resource.try(:id) || resource.object_id)
+- value = resource.send(column[:reorder])
+
+%input{type: 'hidden', value: value, 'data-reorder-resource': id}
+= glypicon('move')

data/app/views/effective/style_guide/_effective_datatables.html.haml

@@ -0,0 +1 @@
+= render_datatable(EffectiveStyleGuideDatatable.new)

data/config/effective_datatables.rb

@@ -26,30 +26,17 @@ EffectiveDatatables.setup do |config|
   config.default_length = 25
 
   # Default class used on the <table> tag
-  config.html_class = 'table table-bordered table-striped'
-
-  # If a user has previously visited this page and is returning, use the cookie to restore last session
-  # Irregardless of this setting, effective_datatables still uses a cookie to function
-  config.save_state = true
-
-  # When using the actions_column DSL method, apply the following behavior
-  # Valid values for each action are:
-  # true - display this action if authorized?(:show, Post)
-  # false - do not display this action
-  # :authorize - display this action if authorized?(:show, Post<3>)  (every instance is checked)
-  #
-  # You can override these defaults on a per-table basis
-  # by calling `actions_column(show: false, edit: true, destroy: :authorize)`
-  config.actions_column = {
-    show: true,
-    edit: true,
-    destroy: true,
-  }
+  config.html_class = 'table table-hover'
 
   # Log search/sort information to the console
   config.debug = true
 
-  # String size. Final byte size is about 1.5 times bigger, after rails signs it
-  config.max_cookie_size = 2000
+  # Use a cookie to save and restore state from previous page visits.
+  config.save_state = true
+
+  # Configure the _effective_dt cookie.
+  config.cookie_max_size = 2000       # String size. Final byte size is about 1.5 times bigger, after rails signs it
+  config.cookie_domain = :all         # Should usually be :all
+  config.cookie_tld_length = nil      # Leave nil to autodetect, or set to probably 2
 
 end

data/config/locales/en.yml

@@ -0,0 +1,12 @@
+---
+en:
+  effective_datatables:
+    apply: Apply
+    reset: Reset
+    reorder: Reorder
+    new: New
+    actions: Actions
+    bulk_actions: Bulk Actions
+    applying: Applying...
+    boolean_true: 'Yes'
+    boolean_false: 'No'

data/config/locales/es.yml

@@ -0,0 +1,12 @@
+---
+es:
+  effective_datatables:
+    apply: Filtrar
+    reset: Reiniciar
+    reorder: Reordenar
+    new: Nuevo
+    actions: Acciones
+    bulk_actions: Acciones en masa
+    applying: Filtrando...
+    boolean_true: 'Sí'
+    boolean_false: 'No'

data/config/locales/nl.yml

@@ -0,0 +1,12 @@
+---
+nl:
+  effective_datatables:
+    apply: Toepassen
+    reset: Reset
+    reorder: Opnieuw ordenen
+    new: Nieuwe
+    actions: Acties
+    bulk_actions: Bulkacties
+    applying: Toepassen...
+    boolean_true: 'Ja'
+    boolean_false: 'Nee'

data/config/routes.rb

@@ -1,9 +1,10 @@
-Rails.application.routes.draw do
-  mount EffectiveDatatables::Engine => '/', :as => 'effective_datatables'
-end
-
 EffectiveDatatables::Engine.routes.draw do
   scope :module => 'effective' do
     match 'datatables/:id(.:format)', to: 'datatables#show', via: [:get, :post], as: :datatable
+    match 'datatables/:id/reorder(.:format)', to: 'datatables#reorder', via: [:post], as: :reorder_datatable
   end
 end
+
+Rails.application.routes.draw do
+  mount EffectiveDatatables::Engine => '/', :as => 'effective_datatables'
+end

data/lib/effective_datatables.rb

@@ -4,16 +4,23 @@ require 'effective_datatables/engine'
 require 'effective_datatables/version'
 
 module EffectiveDatatables
+  AVAILABLE_LOCALES = %w(en es nl)
+
   mattr_accessor :authorization_method
 
   mattr_accessor :default_length
   mattr_accessor :html_class
   mattr_accessor :save_state
-  mattr_accessor :max_cookie_size
 
-  mattr_accessor :actions_column # A Hash
+  mattr_accessor :cookie_max_size
+  mattr_accessor :cookie_domain
+  mattr_accessor :cookie_tld_length
+
   mattr_accessor :debug
 
+  alias_method :max_cookie_size, :cookie_max_size
+  alias_method :max_cookie_size=, :cookie_max_size=
+
   def self.setup
     yield self
   end
@@ -35,4 +42,44 @@ module EffectiveDatatables
     raise Effective::AccessDenied.new('Access Denied', action, resource) unless authorized?(controller, action, resource)
   end
 
+  def self.find(id, attributes = nil)
+    id = id.to_s.gsub(/-\d+\z/, '').gsub('-', '/')
+    klass = (id.classify.safe_constantize || id.classify.pluralize.safe_constantize)
+    attributes = decrypt(attributes) || {}
+
+    klass.try(:new, **attributes) || raise('unable to find datatable')
+  end
+
+  # Locale is coming from view. I think it can be dynamic.
+  # We currently support: en, es, nl
+  def self.language(locale)
+    @_languages ||= {}
+
+    locale = :en unless AVAILABLE_LOCALES.include?(locale.to_s)
+
+    @_languages[locale] ||= begin
+      path = Gem::Specification.find_by_name('effective_datatables').gem_dir + "/app/assets/javascripts/dataTables/locales/#{locale}.lang"
+      JSON.parse(File.read(path)).to_json
+    end
+  end
+
+  def self.encrypt(attributes)
+    payload = message_encrypter.encrypt_and_sign(attributes)
+  end
+
+  def self.decrypt(payload)
+    return unless payload.present?
+    return payload if payload.kind_of?(Hash)
+
+    attributes = message_encrypter.decrypt_and_verify(payload)
+
+    raise 'invalid decoded inline payload' unless attributes.kind_of?(Hash)
+
+    attributes
+  end
+
+  def self.message_encrypter
+    ActiveSupport::MessageEncryptor.new(Rails.application.secret_key_base.to_s.first(32))
+  end
+
 end

data/lib/effective_datatables/engine.rb

@@ -6,7 +6,10 @@ module EffectiveDatatables
 
     # Include Helpers to base application
     initializer 'effective_datatables.action_controller' do |app|
-      ActiveSupport.on_load :action_controller do
+      ActiveSupport.on_load :action_controller_base do
+        helper EffectiveDatatablesHelper
+        helper EffectiveDatatablesPrivateHelper
+
         ActionController::Base.send :include, ::EffectiveDatatablesControllerHelper
       end
     end
@@ -15,6 +18,5 @@ module EffectiveDatatables
     initializer 'effective_datatables.defaults', before: :load_config_initializers do |app|
       eval File.read("#{config.root}/config/effective_datatables.rb")
     end
-
   end
 end

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.6.3'.freeze
+  VERSION = '3.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.6.3
+  version: 3.7.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-07 00:00:00.000000000 Z
+date: 2019-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +101,9 @@ files:
 - app/assets/javascripts/dataTables/buttons/dataTables.buttons.js
 - app/assets/javascripts/dataTables/dataTables.bootstrap.js
 - app/assets/javascripts/dataTables/jquery.dataTables.js
+- app/assets/javascripts/dataTables/locales/en.lang
+- app/assets/javascripts/dataTables/locales/es.lang
+- app/assets/javascripts/dataTables/locales/nl.lang
 - app/assets/javascripts/dataTables/responsive/dataTables.responsive.js
 - app/assets/javascripts/dataTables/responsive/responsive.bootstrap.js
 - app/assets/javascripts/effective_datatables.js
@@ -108,7 +111,11 @@ files:
 - app/assets/javascripts/effective_datatables/charts.js.coffee
 - app/assets/javascripts/effective_datatables/events.js.coffee
 - app/assets/javascripts/effective_datatables/filters.js.coffee
+- 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/overrides.js.coffee
+- app/assets/javascripts/effective_datatables/reorder.js.coffee
 - app/assets/javascripts/effective_datatables/reset.js.coffee
 - app/assets/javascripts/effective_datatables/responsive.js.coffee
 - app/assets/javascripts/vendor/jquery.delayedChange.js
@@ -120,6 +127,7 @@ files:
 - app/assets/stylesheets/effective_datatables/_filters.scss
 - app/assets/stylesheets/effective_datatables/_overrides.scss
 - app/controllers/effective/datatables_controller.rb
+- app/datatables/effective_style_guide_datatable.rb
 - app/helpers/effective_datatables_controller_helper.rb
 - app/helpers/effective_datatables_helper.rb
 - app/helpers/effective_datatables_private_helper.rb
@@ -149,11 +157,15 @@ files:
 - app/views/effective/datatables/_chart.html.haml
 - app/views/effective/datatables/_datatable.html.haml
 - app/views/effective/datatables/_filters.html.haml
-- app/views/effective/datatables/_reset.html.haml
+- app/views/effective/datatables/_reorder_column.html.haml
 - app/views/effective/datatables/_resource_column.html.haml
 - app/views/effective/datatables/_spacer_template.html
 - app/views/effective/datatables/index.html.haml
+- app/views/effective/style_guide/_effective_datatables.html.haml
 - config/effective_datatables.rb
+- config/locales/en.yml
+- config/locales/es.yml
+- config/locales/nl.yml
 - config/routes.rb
 - lib/effective_datatables.rb
 - lib/effective_datatables/engine.rb