effective_datatables 4.3.4 → 4.3.5

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

@@ -3,7 +3,7 @@ module Effective
     module Dsl
 
       def bulk_actions(&block)
-        define_method('initialize_bulk_actions') { dsl_tool.instance_exec(&block) }
+        define_method('initialize_bulk_actions') { dsl_tool.instance_exec(&block); dsl_tool.bulk_actions_col }
       end
 
       def charts(&block)

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

@@ -3,6 +3,11 @@ module Effective
     module Dsl
       module Datatable
         # Instance Methods inside the datatable do .. end block
+        def length(length)
+          raise 'length must be 5, 10, 25, 50, 100, 250, 500, :all' unless [5, 10, 25, 50, 100, 250, 500, :all].include?(length)
+          datatable.state[:length] ||= (length == :all ? 9999999 : length)
+        end
+
         def order(name, dir = nil)
           raise 'order direction must be :asc or :desc' unless [nil, :asc, :desc].include?(dir)
 
@@ -10,9 +15,13 @@ module Effective
           datatable.state[:order_dir] ||= dir
         end
 
-        def length(length)
-          raise 'length must be 5, 10, 25, 50, 100, 250, 500, :all' unless [5, 10, 25, 50, 100, 250, 500, :all].include?(length)
-          datatable.state[:length] ||= (length == :all ? 9999999 : length)
+        def reorder(name, dir = nil)
+          raise 'order direction must be :asc or :desc' unless [nil, :asc, :desc].include?(dir)
+
+          datatable.state[:order_name] = :_reorder
+          datatable.state[:order_dir] = dir
+
+          reorder_col(name)
         end
 
         # A col has its internal values sorted/searched before the block is run
@@ -73,8 +82,47 @@ 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)
+          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,
+            col_class: col_class,
+            format: (format if block_given?),
+            index: nil,
+            inline: (inline.nil? ? datatable.inline? : inline),
+            label: false,
+            name: :actions,
+            partial: partial,
+            partial_as: partial_as,
+            actions_partial: (actions_partial || :dropleft),
+            responsive: responsive,
+            search: false,
+            sort: false,
+            sql_column: nil,
+            th: nil,
+            th_append: nil,
+            visible: visible,
+
+            # { approve: false }. These args are passed to effective_resources render_resource_actions
+            actions: actions
+          )
+        end
+
+        def aggregate(name, label: nil, &compute)
+          datatable._aggregates[name.to_sym] = {
+            compute: (compute if block_given?),
+            label: label || name.to_s.titleize,
+            name: name.to_sym,
+          }
+        end
+
+        # Called automatically after bulk_actions do ... end
+        # Call again if you want to change the position of the bulk_actions_col
         def bulk_actions_col(col_class: nil, partial: nil, partial_as: nil, responsive: 5000)
-          raise 'You can only have one bulk actions column' if datatable.columns[:_bulk_actions].present?
+          datatable._columns.delete(:_bulk_actions) if datatable.columns[:_bulk_actions]
 
           datatable._columns[:_bulk_actions] = Effective::DatatableColumn.new(
             action: false,
@@ -97,42 +145,33 @@ 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)
-          raise 'You can only have one actions column' if datatable.columns[:_actions].present?
+        # Called automatically after reorder
+        # Call again if you want to change the position of the reorder_col
+        def reorder_col(name, col_class: nil, partial: nil, partial_as: nil, sql_column: nil, responsive: 5000)
+          datatable._columns.delete(:_reorder) if datatable.columns[:_reorder]
 
-          datatable._columns[:_actions] = Effective::DatatableColumn.new(
+          datatable._columns[:_reorder] = Effective::DatatableColumn.new(
             action: false,
-            as: :actions,
+            as: :reorder,
             compute: nil,
             col_class: col_class,
-            format: (format if block_given?),
+            format: nil,
             index: nil,
-            inline: (inline.nil? ? datatable.inline? : inline),
             label: false,
-            name: :actions,
-            partial: partial,
+            name: :reorder,
+            partial: partial || '/effective/datatables/reorder_column',
             partial_as: partial_as,
-            actions_partial: (actions_partial || :dropleft),
+            reorder: name,
             responsive: responsive,
             search: false,
-            sort: false,
-            sql_column: nil,
+            sort: true,
+            sql_column: (sql_column || name),
             th: nil,
             th_append: nil,
-            visible: visible,
-
-            # { approve: false }. These args are passed to effective_resources render_resource_actions
-            actions: actions
+            visible: false
           )
         end
 
-        def aggregate(name, label: nil, &compute)
-          datatable._aggregates[name.to_sym] = {
-            compute: (compute if block_given?),
-            label: label || name.to_s.titleize,
-            name: name.to_sym,
-          }
-        end
       end
     end
   end

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

@@ -2,6 +2,7 @@ module Effective
   module EffectiveDatatable
     module Format
       BLANK = ''.freeze
+      NONVISIBLE = '...'.freeze
       SPACER = 'EFFECTIVEDATATABLESSPACER'.freeze
       SPACER_TEMPLATE = '/effective/datatables/spacer_template'.freeze
 
@@ -12,7 +13,9 @@ module Effective
         rendered = {}
 
         columns.each do |name, opts|
-          if opts[:partial] && state[:visible][name]
+          next unless state[:visible][name]
+
+          if opts[:partial]
             locals = { datatable: self, column: columns[name] }.merge(resource_col_locals(opts))
 
             rendered[name] = (view.render(
@@ -35,13 +38,13 @@ module Effective
 
         collection.each_with_index do |row, row_index|
           columns.each do |name, opts|
-            next unless state[:visible][name]
-
             index = opts[:index]
             value = row[index]
 
             row[index] = (
-              if opts[:as] == :actions
+              if state[:visible][name] == false
+                NONVISIBLE
+              elsif opts[:as] == :actions
                 rendered[name][row_index]
               elsif opts[:format] && rendered.key?(name)
                 dsl_tool.instance_exec(value, row, rendered[name][row_index], &opts[:format])

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

@@ -108,8 +108,6 @@ module Effective
 
           opts[:col_class] = "col-#{opts[:as]} col-#{name.to_s.parameterize} #{opts[:col_class]}".strip
         end
-
-        load_resource_search!
       end
 
       def load_resource_search!

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

@@ -104,8 +104,10 @@ module Effective
       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
@@ -140,14 +142,19 @@ 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]
+            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]

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}
+= icon('move')

data/config/routes.rb

@@ -1,6 +1,7 @@
 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
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.3.4'.freeze
+  VERSION = '4.3.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.3.4
+  version: 4.3.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -103,14 +103,18 @@ files:
 - app/assets/javascripts/dataTables/jquery.dataTables.js
 - app/assets/javascripts/dataTables/responsive/dataTables.responsive.js
 - app/assets/javascripts/dataTables/responsive/responsive.bootstrap4.js
+- app/assets/javascripts/dataTables/rowReorder/dataTables.rowReorder.js
+- app/assets/javascripts/dataTables/rowReorder/rowReorder.bootstrap4.js
 - app/assets/javascripts/effective_datatables.js
 - app/assets/javascripts/effective_datatables/bulk_actions.js.coffee
 - 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
@@ -118,6 +122,7 @@ files:
 - app/assets/stylesheets/dataTables/buttons/buttons.bootstrap4.css
 - app/assets/stylesheets/dataTables/dataTables.bootstrap4.css
 - app/assets/stylesheets/dataTables/responsive/responsive.bootstrap4.css
+- app/assets/stylesheets/dataTables/rowReorder/rowReorder.bootstrap4.css
 - app/assets/stylesheets/effective_datatables.scss
 - app/assets/stylesheets/effective_datatables/_overrides.scss
 - app/controllers/effective/datatables_controller.rb
@@ -150,6 +155,7 @@ 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/_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