five-two-nw-olivander 0.1.2.12 → 0.1.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95371b71e1db9de5a935b1ecf9834a1b802a5a71c8960bd876a0c6e22ed849e5
-  data.tar.gz: f336a7acda0c1918f4a4a7d0dfdd672e4bdf6d68464172046b49539a27b573ef
+  metadata.gz: '05099f9c49667c865027fd2291a2c87caa0b4067d1a5a42bf486717f02076980'
+  data.tar.gz: 7846c476cf57f4a5016208c8776c8dc77fd676a3ddfa8396560f16273e396602
 SHA512:
-  metadata.gz: 6eaa2e44f71c887a9879f76a8516c509b27579ae6e5597fcccdca9f92947ef6ecf14b18a0386e19f6cb04732c7ad05b19b5d1f65464937e56deb7b3037f42967
-  data.tar.gz: a5123ae21498c52619c763866f930b40465efb1387010a71d92abdb7dea67d7664725f530d4d46e4adb6b86fd9ae0342a0f996a64bfcbcbd1612c8479105707b
+  metadata.gz: 89997456c2a356285ff8d4b5574ca4efe865773a627962620052533be21e7bd086807ae8472c9af2ba5a7e8a4baedfc425d0e55ac9733c7ccdccf516e5251d3b
+  data.tar.gz: '028cb6fa2eda1c411230cc227fe6eaa252885ce88bea190095fe6c5cd80b46379d4bf880b1f6e03d6e9122171ea8bfd6697b0a98dc3ec1467fe2a55b4c52efa7'

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

@@ -6,7 +6,7 @@ module Olivander
                     :no_route, :path_helper
 
       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)
+                     show_in_form: true, show_in_datatable: true, no_route: false, path_helper: nil)
         self.sym = sym
         self.action = action || sym
         self.controller = controller
@@ -18,6 +18,7 @@ module Olivander
         self.show_in_form = show_in_form
         self.show_in_datatable = show_in_datatable
         self.no_route = no_route
+        self.path_helper = path_helper
       end
     end
 
@@ -96,13 +97,14 @@ module Olivander
           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)
+        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)
           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
+            show_in_datatable: show_in_datatable, show_in_form: show_in_form, no_route: no_route, path_helper: path_helper
           )
         end
 

data/app/datatables/olivander/datatable.rb

@@ -1,7 +1,7 @@
 module Olivander
   class Datatable < Effective::Datatable
-    def link_col(field, path, path_args)
-      dsl_tool.col(field) do |r|
+    def link_col(field, path, path_args, visible: true)
+      dsl_tool.col(field, visible: visible) do |r|
         args = [].tap do |arr|
           if path_args.is_a? Array
             path_args.each do |arg|
@@ -15,7 +15,7 @@ module Olivander
       end
     end
 
-    def self.auto_datatable(klazz, link_path: nil, only: [], except: [], hide: [], show: [])
+    def self.auto_datatable(klazz, collection: nil, link_path: nil, only: [], except: [], hide: [], show: [], order_by: [])
       Rails.logger.debug "initializing datatable for #{klazz}"
 
       attributes = klazz.new.attributes.collect{ |x| x[0] }
@@ -25,18 +25,19 @@ module Olivander
       default_hidden = %w[id created updated created_at updated_at deleted_at current_user current_action]
 
       collection do
-        klazz.all
+        collection.nil? ? klazz.all : collection
       end
 
       datatable do
+        order(order_by[0], order_by[1]) if order_by.size == 2
         bulk_actions_col
         attributes.each do |key|
           sym = key.gsub('_id', '').to_sym
           visible = show.include?(key) || !(default_hidden.include?(key) || hide.include?(key))
           if link_path.present? && sym == :id
-            link_col sym, link_path, :id
+            link_col sym, link_path, :id, visible: visible
           elsif link_path.present? && sym == :name
-            link_col sym, link_path, %i[id name]
+            link_col sym, link_path, %i[id name], visible: visible
           else
             col sym, visible: visible
           end

data/app/helpers/olivander/application_helper.rb

@@ -18,8 +18,11 @@ module Olivander
     end
 
     def authorized_resource_actions(route_builder, resource, for_action: :show)
-      plural_name = resource.is_a?(Class) ? resource.table_name : resource.class.table_name
+      raw_name = resource.is_a?(Class) ? resource.name : resource.class.name
+      plural_name = raw_name.demodulize.underscore.pluralize
       routed_resource = route_builder.resources[plural_name.to_sym]
+      return [] if routed_resource.nil?
+
       actions = resource.is_a?(Class) ?
         (routed_resource.unpersisted_crud_actions | routed_resource.collection_actions.select{ |x| !x.crud_action }) : 
         (resource.persisted? ? (routed_resource.persisted_crud_actions | routed_resource.member_actions.select{ |x| !x.crud_action }): [])

data/app/views/application/index.html.haml

@@ -20,7 +20,6 @@
               .card-body
                 = render_datatable_chart(@datatable, k)
 
-- if @datatable
   = content_for :datatable_charts
 
 .row
@@ -46,3 +45,7 @@
           %p or include Effective::CrudController in your controller
       -# .card-footer
 
+- begin
+  = render partial: 'index_additional'
+- rescue ActionView::MissingTemplate
+  - Rails.logger.debug "did not find additional index partial"

data/app/views/effective/resource/_actions_dropleft.html.haml

@@ -1,4 +1,5 @@
 - route_builder = @context&.route_builder || datatable.class::ROUTE_BUILDER
 = dropdown(variation: :dropleft, btn_class: btn_class) do
   - authorized_resource_actions(route_builder, resource, for_action: action_name).select{ |x| x.show_in_datatable }.each do |a|
-    = dropdown_link_to a.sym, send(a.path_helper, resource.id)
+    - path = a.path_helper.is_a?(Proc) ? a.path_helper.call(resource) : send(a.path_helper, resource.id)
+    = dropdown_link_to a.sym, path

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = "0.1.2.12"
+  VERSION = "0.1.2.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.1.2.12
+  version: 0.1.2.14
 platform: ruby
 authors:
 - Eric Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-06 00:00:00.000000000 Z
+date: 2023-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick
@@ -189,7 +189,6 @@ files:
 - app/controllers/concerns/olivander/resources/route_builder.rb
 - app/controllers/olivander/application_controller.rb
 - app/datatables/olivander/datatable.rb
-- app/datatables/test_datatable.rb
 - app/helpers/olivander/application_helper.rb
 - app/jobs/olivander/application_job.rb
 - app/mailers/olivander/application_mailer.rb

data/app/datatables/test_datatable.rb

@@ -1,15 +0,0 @@
-class TestDatatable < Effective::Datatable
-  datatable do
-    col :id
-    col :name
-    col :description
-  end
-
-  collection do
-    [
-      [1, 'doo'],
-      [2, 'doo'],
-      [3, 'doo'],
-    ]
-  end
-end