five-two-nw-olivander 0.1.2.7 → 0.1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b489861cd3f93d004b29e2d2748b070c6853b4ecceac386484857feb34fcc36
-  data.tar.gz: 8c95fc16ca20a716fe779cc3c9be95505ab6f2ef0b02d064be6dd928cf20743a
+  metadata.gz: 3f3115b1794baed9344d980ed505a3df7d1ae0cee954e4896163618a91d47f58
+  data.tar.gz: '09d31e3619bfa1d7111077c3be1c9f5c0005a1417dd041bc68aa71bf32014988'
 SHA512:
-  metadata.gz: 53ac199d454b63de8430392693c8e0bb34df97ce76401c1bcd49dfc62bb3ede1b675dc44689cc110b87e449a0b80938cb17d025662101a0225c82d37b7366da2
-  data.tar.gz: 2bb18d88fdf0ac9ae99bd344a434e7eef01b7635abe7296d59f8845bce95aefcbb58bc7f8d0accce8e8eb83f03fd7747e2919e754dc9e692f67b6f3b08651ba1
+  metadata.gz: 7e34e263e6a3b6788b7764882d65e0caa54f5ca0c99109f3908c7d3c5f42af2a7328bc35fe2a6904643b6c624b9ca1ba3fcbeee671e5dd5f8a86a8b59dc5a58d
+  data.tar.gz: 18d6f99fba59c05f75b2c1e5394496be073965270682d778111a735600303734801c2e821a95cb41c62d0207bdfd9f8b71fc874fe0dbade368224b9df6957361

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

@@ -1,7 +1,9 @@
 module Olivander
   module Resources
     class ResourceAction
-      attr_accessor :sym, :action, :verb, :confirm, :turbo_frame, :collection, :controller, :crud_action, :show_in_form, :show_in_datatable, :no_route
+      attr_accessor :sym, :action, :verb, :confirm, :turbo_frame, :collection,
+                    :controller, :crud_action, :show_in_form, :show_in_datatable,
+                    :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)
@@ -83,6 +85,7 @@ module Olivander
       included do
         class_attribute :resources, default: {}
         class_attribute :current_resource
+        class_attribute :last_path_helper
       end
 
       class_methods do
@@ -107,6 +110,13 @@ module Olivander
           build_resource_routes(mapper)
         end
 
+        def set_controller_and_helper(a)
+          last_route = Rails.application.routes.routes.last
+          a.controller = last_route.defaults[:controller]
+          a.path_helper = last_route.name.blank? ? last_path_helper : "#{last_route.name}_path"
+          self.last_path_helper = a.path_helper
+        end
+
         def build_resource_routes(mapper)
           resources.keys.each do |k|
             r = resources[k]
@@ -118,9 +128,11 @@ module Olivander
 
                   if ba.confirm
                     mapper.get ba.action, action: "confirm_#{ba.action}"
+                    set_controller_and_helper(ba)
                     mapper.post ba.action
                   else
                     mapper.send(ba.verb, ba.action)
+                    set_controller_and_helper(ba)
                   end
                 end
               end
@@ -134,9 +146,11 @@ module Olivander
                   next if ma.no_route
                   if ma.confirm
                     mapper.get ma.action, action: "confirm_#{ma.action}"
+                    set_controller_and_helper(ma)
                     mapper.post ma.action
                   else
                     mapper.send(ma.verb, ma.action)
+                    set_controller_and_helper(ma)
                   end
                 end
               end

data/app/datatables/olivander/datatable.rb

@@ -14,5 +14,29 @@ module Olivander
         link_to r.send(field), send(path, args)
       end
     end
+
+    def self.auto_datatable(klazz, link_path: nil, only: [])
+      collection do
+        klazz.all
+      end
+
+      datatable do
+        bulk_actions_col
+        klazz.new.attributes.each do |att|
+          key = att[0]
+          next if only.size.positive? && !only.include?(key)
+          sym = key.gsub('_id', '').to_sym
+          visible = !['created', 'updated', 'created_at', 'updated_at', 'deleted_at', 'current_user', 'current_action'].include?(key)
+          if link_path.present? && sym == :id
+            link_col sym, link_path, :id
+          elsif link_path.present? && sym == :name
+            link_col sym, link_path, [:id, :name]
+          else
+            col sym, visible: visible
+          end
+        end
+        actions_col
+      end
+    end
   end
 end

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

@@ -7,6 +7,7 @@
     - keys = @datatable._charts.keys
     - ks = keys.size
     - if ks.positive?
+      %br
       .row
         - @datatable._charts.keys.each do |k|
           %div{ class: "#{col_class_num('xl', ks, 3)} #{col_class_num('lg', ks, 2)} #{col_class_num('md', ks, 6)} #{col_class_num('sm', ks, 6)}"}
@@ -21,6 +22,7 @@
 
 - if @datatable
   = content_for :datatable_charts
+
 .row
   .col-12
     .card

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

@@ -1,7 +1,4 @@
-- if @context.nil?
-  - parts = datatable.class.name.split('::')
-  - parts[parts.size-1] = 'Controller'
-  - parts.join('::').constantize.new.build_context
+- route_builder = @context&.route_builder || datatable.class::ROUTE_BUILDER
 = dropdown(variation: :dropleft, btn_class: btn_class) do
-  - authorized_resource_actions(@context.route_builder, resource, for_action: action_name).select{ |x| x.show_in_datatable }.each do |a|
-    = dropdown_link_to a.sym, { controller: a.controller, action: a.action, id: resource.id }
+  - 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)

data/app/views/layouts/olivander/adminlte/_sidebar.html.haml

@@ -11,7 +11,7 @@
       .image
         %img.img-circle.elevation-2{:alt => "User Image", :src => image_path(user_image_path(nil))}/
       .info
-        %a.d-block{:href => "#"}= 'current_user'
+        = link_to current_erp_user, destroy_erp_user_session_path, method: :delete, class: 'd-block'
     / SidebarSearch Form
     .form-inline
       .input-group{"data-widget" => "sidebar-search"}

data/lib/five-two-nw-olivander.rb

@@ -5,3 +5,4 @@ require 'chartkick'
 require 'view_component'
 require 'simple_form'
 require 'olivander'
+require 'devise'

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = "0.1.2.7"
+  VERSION = "0.1.2.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.1.2.7
+  version: 0.1.2.8
 platform: ruby
 authors:
 - Eric Dennis