five-two-nw-olivander 0.2.0.37 → 0.2.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c981a57d42b00be64a2c6916e9407f6359be57a12286db6d107dcd53723ccb51
-  data.tar.gz: e4a4b83c85c99d775c66930ab1b3873faa16e5ba3da090e8d6ef3e97153fa1fa
+  metadata.gz: 9bd58e03477da793320172cd5573cbcf620bb80718dd0738c81fc4bb43f7ba77
+  data.tar.gz: 73051678eacddbd98c9837807cf3927aceb7f007495e6707df8ca3c86cae71b3
 SHA512:
-  metadata.gz: aa2450a62d515a7cb15f1fccacab6da0225fbdf7a52d9839f846bd2d7fc65d5420dd2257dd9847873208865454885fd13b9e6285f2e903be5ae54f8963d09ce0
-  data.tar.gz: da063e58ceefc6c15684199222f15cacd501dbc781f6d247d5bae47c5a710a7a6b4fc5d85595ac9994cb353f46d4b3caac79c6bd728120c92a89227765aba40a
+  metadata.gz: d065f3f59f8c589faaa0bf14382aeac4ad5f53c1d990f8222943dee86f6fd8e74d259bf722db00a3d138e252270fe129e5d1d1453683c8b6410daed7307eabbb
+  data.tar.gz: ac20459dab97139df83767b3cd7cbe1b49b265ce212d2e5eedcd813e8fd4e8294f9fa551d5aa33acf8eef43cfb727d0125306f7238f4e519aa52db922e207679

data/app/assets/javascripts/adminlte/datatable.fix.js

@@ -29,6 +29,9 @@
   $(document).ready(function(e) {
     return destroySelect2s();
   });
+  $(document).on('page:change', function() {
+    return destroySelect2s();
+  });
 
   // $(document).ready(function(e) {
   //   return $('.effective-datatables-filters input').click(function() {

data/app/assets/stylesheets/adminlte.css

@@ -13,6 +13,7 @@
  *= require 'adminlte/plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min'
  *= require 'adminlte/plugins/icheck-bootstrap/icheck-bootstrap.min'
  *= require 'adminlte/plugins/jqvmap/jqvmap.min'
+ *= require effective_datatables
  *= require 'adminlte/dist/css/adminlte.min'
  *= require 'adminlte/plugins/overlayScrollbars/css/OverlayScrollbars.min'
  *= require 'adminlte/plugins/daterangepicker/daterangepicker'
@@ -25,7 +26,6 @@
  *= require 'adminlte/plugins/ekko-lightbox/ekko-lightbox.css'
  *= require 'adminlte/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css'
  *= require 'adminlte/plugins/bootstrap-switch/css/bootstrap-switch.min.css'
- *= require effective_datatables
  *= require_tree .
  *= require_self
  */
@@ -47,4 +47,5 @@ ul.no-bullets {
   list-style-type: none; /* Remove bullets */
   padding: 0; /* Remove padding */
   margin: 0; /* Remove margins */
-}
+}
+table.dataTable.table-striped > tbody > tr:nth-of-type(2n+1) { background: rgba(0, 0, 0, 0.05); }

data/app/controllers/concerns/olivander/resources/route_builder.rb

@@ -14,17 +14,23 @@ module Olivander
         self.confirm = kwargs[:confirm] || false
         self.turbo_frame = kwargs[:turbo_frame]
         self.turbo = kwargs[:turbo] == true ? true : !turbo_frame.blank?
-        self.collection = kwargs[:collection] || false
-        self.crud_action = kwargs[:crud_action] || false
-        self.show_in_form = kwargs[:show_in_form] || true
-        self.show_in_datatable = kwargs[:show_in_datatable] || true
-        self.no_route = kwargs[:no_route] || false
+        self.collection = default_if_not_present(kwargs[:collection], false)
+        self.crud_action = default_if_not_present(kwargs[:crud_action], false)
+        self.show_in_form = default_if_not_present(kwargs[:show_in_form], true)
+        self.show_in_datatable = default_if_not_present(kwargs[:show_in_datatable], true)
+        self.no_route = default_if_not_present(kwargs[:no_route], false)
         self.path_helper = kwargs[:path_helper]
         self.confirm_with = kwargs[:confirm_with]
         self.primary = kwargs[:primary] || crud_action
         self.html_attributes = kwargs[:html_attributes]
       end
 
+      def default_if_not_present(value, default)
+        return value unless value.nil?
+
+        default
+      end
+
       def args_hash(options = nil)
         {}.tap do |h|
           h.merge!(method: verb) unless turbo
@@ -137,7 +143,7 @@ module Olivander
         def action(sym, **kwargs)
           raise 'Must be invoked in a resource block' unless current_resource.present?
 
-          controller ||= current_resource.model
+          kwargs[:controller] ||= current_resource.model
           current_resource.actions << ResourceAction.new(sym, **kwargs)
         end
 

data/app/datatables/olivander/datatable.rb

@@ -19,7 +19,7 @@ module Olivander
       Rails.logger.debug "initializing datatable for #{klazz}"
 
       instance = klazz.new
-      klazz_attributes = instance.attributes.collect{ |x| x[0] }
+      klazz_attributes = instance.attributes.collect { |x| x[0] }
       column_attributes = klazz_attributes
       column_attributes &&= only if only.size.positive?
       column_attributes -= except if except.size.positive?
@@ -64,7 +64,7 @@ module Olivander
         order(order_by[0], order_by[1]) if order_by.size == 2
         # bulk_actions_col if datatable._bulk_actions.size.positive?
 
-        #TODO: use columns from model here instead of attributes keys
+        # TODO: use columns from model here instead of attributes keys
         column_attributes.each do |key|
           label = field_label_for(klazz, key)
           sym = key.gsub('_id', '')
@@ -76,7 +76,7 @@ module Olivander
             col sym, visible: visible, action: :show
           elsif sym.include?('.')
             col sym, visible: visible, label: label
-          elsif klazz.columns.select{ |x| x.name == key }.first&.type == :boolean
+          elsif klazz.columns.select { |x| x.name == key }.first&.type == :boolean
             col sym, visible: visible, label: label do |c|
               val = c.send(sym)
               icon_class = val ? 'fa-check text-success' : 'fa-times text-danger'

data/lib/olivander/version.rb

@@ -2,5 +2,5 @@
 
 # needed for gem
 module Olivander
-  VERSION = '0.2.0.37'
+  VERSION = '0.2.0.38'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.2.0.37
+  version: 0.2.0.38
 platform: ruby
 authors:
 - Eric Dennis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-24 00:00:00.000000000 Z
+date: 2024-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick