five-two-nw-olivander 0.1.2.11 → 0.1.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 646461db1504efbb35c466f41a39995598c41af6379f0c4e774604df8fe06751
-  data.tar.gz: 87e8135af0ceb0082d12413cd37b81aab648140ab485f5fb3ed2b0a208061c43
+  metadata.gz: 3fafc0f233f53a5a60c3be296bc128cbbb3700959f82b05cf41029ac144c6a89
+  data.tar.gz: d6a987479ebe1d30a5f4671a0ca6ede3912f852e1c9cb2e549053802dc42340e
 SHA512:
-  metadata.gz: 8d531d6cca6f76ee6fc63b5cff0cee413b65b2af44f2e61c4a49875e5b513303b7be40ffed8f9580c54a59934d5196bc64cf5bf947490912f42e36354cb88e11
-  data.tar.gz: b010327c42b8b6d5fe4b54d8d7b5e8a327922bb31c0ab3fef168033dec98a654b9a46a91a15ff2d3221f67798172494c9d626a879d067f617bc77a0c7c196eca
+  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,31 +15,29 @@ 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.select{ |x| x[0] }
+      attributes = klazz.new.attributes.collect{ |x| x[0] }
       attributes &&= only if only.size.positive?
       attributes -= except if except.size.positive?
 
       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
-        puts 'and also too'
+        order(order_by[0], order_by[1]) if order_by.size == 2
         bulk_actions_col
         attributes.each do |key|
-          puts "handling key: #{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.11"
+  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.11
+  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