five-two-nw-olivander 0.2.0.36 → 0.2.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20a2a1f0d91b619aa91cb6e5670939246a5471a40a1fdcc772934f11de447c7c
-  data.tar.gz: 010f45ad72e71c350fbbcf73385fe2b39b47458e613a7da714dfd9dd378a367d
+  metadata.gz: 9bd58e03477da793320172cd5573cbcf620bb80718dd0738c81fc4bb43f7ba77
+  data.tar.gz: 73051678eacddbd98c9837807cf3927aceb7f007495e6707df8ca3c86cae71b3
 SHA512:
-  metadata.gz: 7175c69a12f98b0b31e6525b87b8e51a2fe9a8c3a02b577617acfc741b184edcdd1323d896fe5317278a238ae71c97905e4f0a49270efdfa6ce837f6acd4ed14
-  data.tar.gz: 2fb042867661f164131bcdd36ebc74e8f7ed62e2711b20b2b0ee9f5c1290f85db9947ca8f745ca1cf1d3048bb4b901418c15337b014f9ce80564a8bd66a574af
+  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

@@ -3,39 +3,47 @@ module Olivander
     class ResourceAction
       attr_accessor :sym, :action, :verb, :confirm, :turbo_frame, :collection,
                     :controller, :crud_action, :show_in_form, :show_in_datatable,
-                    :no_route, :path_helper, :confirm_with, :primary
+                    :no_route, :path_helper, :confirm_with, :primary,
+                    :turbo, :html_attributes
 
-      def initialize(sym, action: nil, controller: nil, verb: :get, confirm: false,
-                     turbo_frame: nil, collection: false, crud_action: false,
-                     show_in_form: true, show_in_datatable: true, no_route: false,
-                     path_helper: nil, confirm_with: nil, primary: nil)
+      def initialize(sym, **kwargs)
         self.sym = sym
-        self.action = action || sym
-        self.controller = controller
-        self.verb = verb
-        self.confirm = confirm
-        self.turbo_frame = turbo_frame
-        self.collection = collection
-        self.crud_action = crud_action
-        self.show_in_form = show_in_form
-        self.show_in_datatable = show_in_datatable
-        self.no_route = no_route
-        self.path_helper = path_helper
-        self.confirm_with = confirm_with
-        self.primary = primary || crud_action
+        self.action = kwargs[:action] || sym
+        self.controller = kwargs[:controller]
+        self.verb = kwargs[:verb] || :get
+        self.confirm = kwargs[:confirm] || false
+        self.turbo_frame = kwargs[:turbo_frame]
+        self.turbo = kwargs[:turbo] == true ? true : !turbo_frame.blank?
+        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) if turbo_frame.blank?
+          h.merge!(method: verb) unless turbo
           h.merge!(data: data_hash)
+          h.merge!(html_attributes) if html_attributes
           h.merge!(options) if options.present?
         end
       end
 
       def data_hash
         {}.tap do |h|
-          h.merge!(turbo: true, turbo_method: verb, turbo_frame: turbo_frame) if turbo_frame.present?
+          h.merge!(turbo: true, turbo_method: verb) if turbo
+          h.merge!(turbo_frame: turbo_frame) if turbo_frame.present?
 
           message = confirmation_message
           h.merge!(confirm_key => message) unless message.blank?
@@ -43,7 +51,7 @@ module Olivander
       end
 
       def confirm_key
-        turbo_frame.present? ? :turbo_confirm : :confirm
+        turbo ? :turbo_confirm : :confirm
       end
 
       def confirmation_message
@@ -63,7 +71,9 @@ module Olivander
         self.actions = []
         %i[index new create edit show update destroy].each do |ca|
           next unless crud_actions.include?(ca)
-          actions << ResourceAction.new(ca, controller: model, verb: resolve_crud_action_verb(ca), collection: resolve_crud_action_collection(ca), crud_action: true)
+
+          actions << ResourceAction.new(ca, controller: model, verb: resolve_crud_action_verb(ca),
+                                            collection: resolve_crud_action_collection(ca), crud_action: true)
         end
       end
 
@@ -85,29 +95,29 @@ module Olivander
       end
 
       def crud_actions
-        actions.select{ |x| x.crud_action }
+        actions.select { |x| x.crud_action }
       end
 
       def member_actions
-        actions.select{ |x| !x.collection }
+        actions.select { |x| !x.collection }
       end
 
       def collection_actions
-        actions.select{ |x| x.collection }
+        actions.select { |x| x.collection }
       end
 
       def datatable_bulk_actions
-        collection_actions.select{ |x| x.show_in_datatable && !x.crud_action }
+        collection_actions.select { |x| x.show_in_datatable && !x.crud_action }
       end
 
       def unpersisted_crud_actions
         allowed = %i[index new]
-        crud_actions.select{ |x| allowed.include?(x.sym) }
+        crud_actions.select { |x| allowed.include?(x.sym) }
       end
 
       def persisted_crud_actions
         allowed = %i[show edit destroy]
-        crud_actions.select{ |x| allowed.include?(x.sym) }
+        crud_actions.select { |x| allowed.include?(x.sym) }
       end
     end
 
@@ -123,25 +133,18 @@ module Olivander
       end
 
       class_methods do
-        def resource(model, only: DEFAULT_CRUD_ACTIONS, except: [], namespaces: [], &block)
+        def resource(model, only: DEFAULT_CRUD_ACTIONS, except: [], namespaces: [])
           self.current_resource = RoutedResource.new(model, namespaces, DEFAULT_CRUD_ACTIONS & (only - except))
           yield if block_given?
           resources[model] = current_resource
           self.current_resource = nil
         end
 
-        def action(sym, verb: :get, confirm: false, turbo_frame: nil, collection: false, show_in_datatable: true,
-                   show_in_form: true, no_route: false, controller: nil, action: nil, path_helper: nil,
-                   confirm_with: nil, primary: nil
-                  )
+        def action(sym, **kwargs)
           raise 'Must be invoked in a resource block' unless current_resource.present?
 
-          controller ||= current_resource.model
-          current_resource.actions << ResourceAction.new(
-            sym, action: action, controller: controller, verb: verb, confirm: confirm, turbo_frame: turbo_frame, collection: collection,
-            show_in_datatable: show_in_datatable, show_in_form: show_in_form, no_route: no_route, path_helper: path_helper,
-            confirm_with: confirm_with, primary: primary
-          )
+          kwargs[:controller] ||= current_resource.model
+          current_resource.actions << ResourceAction.new(sym, **kwargs)
         end
 
         def build_routes(mapper)
@@ -185,13 +188,16 @@ module Olivander
                 end
               end
 
-              mapper.new do
-                mapper.get :new
-              end if r.collection_actions.select{ |x| x.action == :new }.size.positive?
+              if r.collection_actions.select { |x| x.action == :new }.size.positive?
+                mapper.new do
+                  mapper.get :new
+                end
+              end
 
               mapper.member do
                 r.member_actions.each do |ma|
                   next if ma.no_route
+
                   if ma.confirm
                     mapper.get ma.action, action: "confirm_#{ma.action}"
                     set_controller_and_helper(ma)

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.36'
+  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.36
+  version: 0.2.0.38
 platform: ruby
 authors:
 - Eric Dennis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-23 00:00:00.000000000 Z
+date: 2024-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick