five-two-nw-olivander 0.1.2.12 → 0.1.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95371b71e1db9de5a935b1ecf9834a1b802a5a71c8960bd876a0c6e22ed849e5
-  data.tar.gz: f336a7acda0c1918f4a4a7d0dfdd672e4bdf6d68464172046b49539a27b573ef
+  metadata.gz: 3fafc0f233f53a5a60c3be296bc128cbbb3700959f82b05cf41029ac144c6a89
+  data.tar.gz: d6a987479ebe1d30a5f4671a0ca6ede3912f852e1c9cb2e549053802dc42340e
 SHA512:
-  metadata.gz: 6eaa2e44f71c887a9879f76a8516c509b27579ae6e5597fcccdca9f92947ef6ecf14b18a0386e19f6cb04732c7ad05b19b5d1f65464937e56deb7b3037f42967
-  data.tar.gz: a5123ae21498c52619c763866f930b40465efb1387010a71d92abdb7dea67d7664725f530d4d46e4adb6b86fd9ae0342a0f996a64bfcbcbd1612c8479105707b
+  metadata.gz: 2aafa57f69b573299d2857fa04ebe05db1407c0c83c1657c54afbe6eda6e164caf670909e53e30362b2e952d666648126a97b463f50ecd116d9384d7c48c9993
+  data.tar.gz: 8b3d2b995b2afa004fc2bb2fe313a1aabf448d638ddd45d5ff24fe33bf04674b6be97afe1b67c636fd612a478e6ed75190daddd9b42271fc8e0f64e29d691831

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

@@ -20,6 +20,8 @@ module Olivander
     def authorized_resource_actions(route_builder, resource, for_action: :show)
       plural_name = resource.is_a?(Class) ? resource.table_name : resource.class.table_name
       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/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = "0.1.2.12"
+  VERSION = "0.1.2.13"
 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.13
 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