effective_datatables 4.18.0 → 4.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98b8b128f779a12a5f4bf7618a4c62ba9177a7c6da54b875b1fb74713a2ae1b7
-  data.tar.gz: 654dd180969300fbb4f0d9c61e0f81c47bc24e577d615585d2ca7c9194fca864
+  metadata.gz: 1f5e3d8ed9d497dea48da82cc800596e4b43500d7b85030d1fced300f846218d
+  data.tar.gz: c9b2b959192a337aa876830f1c4c9d7b5d6b8f58f89b1ca0812be995ab050e45
 SHA512:
-  metadata.gz: cec0f5d9a28e18853014d058818dd16c6c8c668269c6cc970ebd3ac17928a591cb0c2d49b6bbd962f473e6f68f69739c642f936ede01d3a79fd356e03db7ccff
-  data.tar.gz: c65bbcfaae3d8efb553bd2a548fa1b3f843ac44eefd2ed6171e488d8740eb6d368676414ee1747ed7bb4a81050b1c36e38253da5710502ad3a1780924fa67981
+  metadata.gz: 3c045b22d3482ef816c21f157c7cf2fc113f6434a8f0f01a7467f3cff494b1d3dda4dbce680166dc5298c8bb5723f4b3b49ec22679a48c06db792d0752435f67
+  data.tar.gz: 250528bb18da5a76ba3d9c1d567d56bea5e58e8093f24bb23e55c8b6821e8f58c24c60a714e245bf5312d5de069c3aaef90d061eec161facefb72765b57c65fd

data/README.md

@@ -1131,6 +1131,27 @@ Above we have `resources :things` for the 7 crud actions. And we add two more me
 
 Your datatable should now have New, Show, Edit, Approve and Reject buttons. Click them for inline functionality.
 
+## Adding an Ajax member action
+
+To render a member action with an inline datatable:
+
+- Create a "cool_things.html" template and a "_cool_things.html" partial file. Need both.
+
+- The links must be inside an `actions_col` or a `col(:thing, col_class: 'col-actions')` for the javascript to work.
+
+- The action itself just needs to be `data-remote=true`. Try `link_to('Show Cool Things', thing_cool_things_path(thing), 'data-remote': true)`
+
+Make sure the route and permissions are working:
+
+```
+resources :things do
+  get :cool_things, on: :member
+```
+
+and `can?(:cool_things, Thing)`
+
+Good luck.
+
 ## Troubleshooting Inline
 
 If things aren't working, try the following:

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

@@ -5,3 +5,91 @@ $(document).on 'click', 'a[data-apply-effective-datatables-filters]', (event) ->
   $table = $('#' + $form.attr('aria-controls'))
   $table.DataTable().draw()
 
+# Date Filters
+# This uses moment.js. Sorry.
+selectMonth = ($filter, date) ->
+  prevDate = date.clone().subtract('1', 'month').startOf('month')
+  startDate = date.clone().startOf('month')
+  endDate = date.clone().endOf('month')
+  nextDate = date.clone().add('1', 'month').startOf('month')
+
+  # Update Previous Button
+  $filter.find('[data-effective-datatables-filter-prev-month]').data('effective-datatables-filter-prev-month', prevDate.format('YYYY-MM-DD'))
+  $filter.find('[data-effective-datatables-filter-prev-month]').find('span.prev-month').text(prevDate.format('MMM'))
+
+  # Update Start and End Dates
+  $filter.find('.start-date').text(startDate.format('YYYY-MM-DD'))
+  $filter.find('.end-date').text(endDate.format('YYYY-MM-DD'))
+
+  # Update Next Button
+  $filter.find('[data-effective-datatables-filter-next-month]').data('effective-datatables-filter-next-month', nextDate.format('YYYY-MM-DD'))
+  $filter.find('[data-effective-datatables-filter-next-month]').find('span.next-month').text(nextDate.format('MMM'))
+
+  # Update hidden inputs
+  $filter.find("input[id='filters_start_date']").data('DateTimePicker').date(startDate.format('YYYY-MM-DD'))
+  $filter.find("input[id='filters_end_date']").data('DateTimePicker').date(endDate.format('YYYY-MM-DD'))
+
+  $table = $('#' + $filter.closest('.effective-datatables-filters').attr('aria-controls'))
+  $table.DataTable().draw()
+
+$(document).on 'click', 'a[data-effective-datatables-filter-next-month]', (event) ->
+  event.preventDefault()
+
+  $obj = $(event.currentTarget)
+  $filter = $obj.closest('.effective-datatables-filter')
+  date = moment($obj.data('effective-datatables-filter-next-month'))
+
+  selectMonth($filter, date)
+
+$(document).on 'click', 'a[data-effective-datatables-filter-prev-month]', (event) ->
+  event.preventDefault()
+
+  $obj = $(event.currentTarget)
+  $filter = $obj.closest('.effective-datatables-filter')
+  date = moment($obj.data('effective-datatables-filter-prev-month'))
+
+  selectMonth($filter, date)
+
+## Years
+selectYear = ($filter, date) ->
+  prevDate = date.clone().subtract('1', 'year').startOf('year')
+  startDate = date.clone().startOf('year')
+  endDate = date.clone().endOf('year')
+  nextDate = date.clone().add('1', 'year').startOf('year')
+
+  # Update Previous Button
+  $filter.find('[data-effective-datatables-filter-prev-year]').data('effective-datatables-filter-prev-year', prevDate.format('YYYY-MM-DD'))
+  $filter.find('[data-effective-datatables-filter-prev-year]').find('span.prev-year').text(prevDate.format('YYYY'))
+
+  # Update Start and End Dates
+  $filter.find('.start-date').text(startDate.format('YYYY-MM-DD'))
+  $filter.find('.end-date').text(endDate.format('YYYY-MM-DD'))
+
+  # Update Next Button
+  $filter.find('[data-effective-datatables-filter-next-year]').data('effective-datatables-filter-next-year', nextDate.format('YYYY-MM-DD'))
+  $filter.find('[data-effective-datatables-filter-next-year]').find('span.next-year').text(nextDate.format('YYYY'))
+
+  # Update hidden inputs
+  $filter.find("input[id='filters_start_date']").data('DateTimePicker').date(startDate.format('YYYY-MM-DD'))
+  $filter.find("input[id='filters_end_date']").data('DateTimePicker').date(endDate.format('YYYY-MM-DD'))
+
+  $table = $('#' + $filter.closest('.effective-datatables-filters').attr('aria-controls'))
+  $table.DataTable().draw()
+
+$(document).on 'click', 'a[data-effective-datatables-filter-next-year]', (event) ->
+  event.preventDefault()
+
+  $obj = $(event.currentTarget)
+  $filter = $obj.closest('.effective-datatables-filter')
+  date = moment($obj.data('effective-datatables-filter-next-year'))
+
+  selectYear($filter, date)
+
+$(document).on 'click', 'a[data-effective-datatables-filter-prev-year]', (event) ->
+  event.preventDefault()
+
+  $obj = $(event.currentTarget)
+  $filter = $obj.closest('.effective-datatables-filter')
+  date = moment($obj.data('effective-datatables-filter-prev-year'))
+
+  selectYear($filter, date)

data/app/controllers/effective/datatables_controller.rb

@@ -15,7 +15,7 @@ module Effective
         EffectiveDatatables.authorize!(self, :index, @datatable.collection_class)
 
         render json: @datatable.to_json
-      rescue => e
+      rescue Exception => e
         EffectiveDatatables.authorized?(self, :index, @datatable.try(:collection_class))
         render json: error_json(e)
 
@@ -84,7 +84,7 @@ module Effective
         render status: :ok, body: :ok
       rescue Effective::AccessDenied => e
         render(status: :unauthorized, body: 'Access Denied')
-      rescue => e
+      rescue Exception => e
         render(status: :error, body: 'Unexpected Error')
       end
 

data/app/models/effective/datatable_dsl_tool.rb

@@ -24,20 +24,16 @@ module Effective
         raise "#{method} block must be declared outside the datatable do ... end block"
       end
 
-      if datatable.respond_to?(method)
-        if block_given?
-          datatable.send(method, *args, **kwargs) { yield }
-        else
-          datatable.send(method, *args, **kwargs)
-        end
-      elsif view.respond_to?(method)
-        if block_given?
-          view.send(method, *args, **kwargs) { yield }
-        else
-          view.send(method, *args, **kwargs)
-        end
+      subject = datatable if datatable.respond_to?(method)
+      subject ||= view if view.respond_to?(method)
+      subject ||= Tenant.helpers if defined?(Tenant) && Tenant.helpers.respond_to?(method)
+
+      return super unless subject
+
+      if block_given?
+        subject.send(method, *args, **kwargs) { yield }
       else
-        super
+        subject.send(method, *args, **kwargs)
       end
     end
 

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

@@ -31,17 +31,45 @@
   = f.static_field :year do
     #{now.beginning_of_year.strftime('%F')} to #{now.strftime('%F')} (today)
 
+= f.show_if :date_range, :year do
+  = f.static_field :year, wrapper: { class: 'effective-datatables-filter' } do
+    - date = f.object.start_date.beginning_of_year
+
+    = link_to '#', 'data-effective-datatables-filter-prev-year': date.advance(years: -1).strftime('%F') do
+      = icon('arrow-left-circle')
+      %span.prev-year= date.advance(years: -1).strftime('%Y')
+
+    %span.start-date= f.object.start_date.strftime('%F')
+    to
+    %span.end-date= f.object.end_date.strftime('%F')
+
+    = link_to '#', 'data-effective-datatables-filter-next-year': date.advance(years: 1).strftime('%F') do
+      = icon('arrow-right-circle')
+      %span.next-year= date.advance(years: 1).strftime('%Y')
+
+    %div{style: 'display: none;'}
+      = f.date_field :start_date, name: name, autocomplete: 'off', feedback: false
+      = f.date_field :end_date, name: name, autocomplete: 'off', feedback: false
+
 = f.show_if :date_range, :month do
-  = f.static_field :month do
-    = link_to((prev_month.strftime('%b %Y') + ' ' + icon('arrow-left-circle')).html_safe, prev_month_path.sub(path, request.path))
-    #{start_date.beginning_of_month.strftime('%F')} to #{start_date.end_of_month.strftime('%F')}
-    = link_to((icon('arrow-right-circle') + ' ' + next_month.strftime('%b %Y')).html_safe, next_month_path.sub(path, request.path))
+  = f.static_field :month, wrapper: { class: 'effective-datatables-filter' } do
+    - date = f.object.start_date.beginning_of_month
 
-= f.show_if :date_range, :year do
-  = f.static_field :year do
-    = link_to((prev_year.strftime('%Y') + ' ' + icon('arrow-left-circle')).html_safe, prev_year_path.sub(path, request.path))
-    #{start_date.beginning_of_year.strftime('%F')} to #{start_date.end_of_year.strftime('%F')}
-    = link_to((icon('arrow-right-circle') + ' ' + next_year.strftime('%Y')).html_safe, next_year_path.sub(path, request.path))
+    = link_to '#', 'data-effective-datatables-filter-prev-month': date.advance(months: -1).strftime('%F') do
+      = icon('arrow-left-circle')
+      %span.prev-month= date.advance(months: -1).strftime('%b')
+
+    %span.start-date= f.object.start_date.strftime('%F')
+    to
+    %span.end-date= f.object.end_date.strftime('%F')
+
+    = link_to '#', 'data-effective-datatables-filter-next-month': date.advance(months: 1).strftime('%F') do
+      = icon('arrow-right-circle')
+      %span.next-month= date.advance(months: 1).strftime('%b')
+
+    %div{style: 'display: none;'}
+      = f.date_field :start_date, name: name, autocomplete: 'off', feedback: false
+      = f.date_field :end_date, name: name, autocomplete: 'off', feedback: false
 
 = f.show_if :date_range, :custom do
   .row

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

@@ -1,6 +1,6 @@
 .effective-datatables-filters{'aria-controls': datatable.to_param}
 
-  = effective_form_with(model: datatable.filters_form, scope: :filters, url: (datatable._form[:url] || '#'), method: datatable._form[:verb], id: nil) do |form|
+  = effective_form_with(model: datatable.filters_form, scope: :filters, url: (datatable._form[:url] || '#'), method: datatable._form[:verb], id: nil, authenticity_token: datatable._filters_form_required?) do |form|
     .form-row.align-items-center
       - if datatable._scopes.present?
         = datatable_scope_tag(form, datatable)

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.18.0'.freeze
+  VERSION = '4.19.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.18.0
+  version: 4.19.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-08 00:00:00.000000000 Z
+date: 2023-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails