five-two-nw-olivander 0.1.2.35 → 0.1.2.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21de4f9aa55c8f41410166a668b724d89d0f7800adef266b6c6ded9b3d52a665
-  data.tar.gz: d4de2dfa99389c5df48c39cd8854f9ea3cb0a855f0ea11dfdb1e0cf5f9991e7d
+  metadata.gz: bd2984fed303415434608a19eadfc7da16727e43434b67119ca9732797ad24c7
+  data.tar.gz: b3c3ad917a5069422bef3b3ee6de9fd7654c5b6b6687af5edce67c49daee2866
 SHA512:
-  metadata.gz: c9e38f0a1c8fd0802f26b47fa0d889e354f57baa56bfb62cd1b07b29e670112410dd23eb1b55765ecaedfbe15a50a5b1927ee67ca40826c6b57773a7d28bdf3f
-  data.tar.gz: 90e0d42e5a80bfc5a2dac29ac6f26e8091dc697daa3868646422b343ee5dee495455933960504e77b777e12d20ff298a2fb4cba8c6f7870a16f25b96f752eb08
+  metadata.gz: f07b08a5271fd1d723a615718a85199e490c0c20e81ed8d6fcd34005730256b5f0e5a2983424c01443c306b5a9bbec70c951e2dc43930ff31ee564eee24ff6e3
+  data.tar.gz: bafbc5827b23d23748b8ef259cff09b7febf0e8b5d6c7920bace1ca8315c150bddd821468355252b29fa3b87faa6c1f720617ea2a08b388d9fc6461e0651151e

data/app/components/olivander/components/table_portlet_component.rb

@@ -21,6 +21,7 @@ module Olivander
       class TableComponent < ViewComponent::Base
         with_collection_parameter :item
         delegate :can?, :cannot?, to: :helpers
+        delegate :user_image_path, to: :helpers
 
         def initialize(item:, item_iteration:, builder:, headers:)
           super

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

@@ -23,10 +23,11 @@ module Olivander
     end
 
     class RoutedResource
-      attr_accessor :model, :actions
+      attr_accessor :model, :namespaces, :actions
 
-      def initialize(model, crud_actions)
+      def initialize(model, namespaces, crud_actions)
         self.model = model
+        self.namespaces = namespaces
         self.actions = []
         %i[index new create edit show update destroy].each do |ca|
           next unless crud_actions.include?(ca)
@@ -90,8 +91,8 @@ module Olivander
       end
 
       class_methods do
-        def resource(model, only: DEFAULT_CRUD_ACTIONS, except: [], &block)
-          self.current_resource = RoutedResource.new(model, DEFAULT_CRUD_ACTIONS & (only - except))
+        def resource(model, only: DEFAULT_CRUD_ACTIONS, except: [], namespaces: [], &block)
+          self.current_resource = RoutedResource.new(model, namespaces, DEFAULT_CRUD_ACTIONS & (only - except))
           yield if block_given?
           resources[model] = current_resource
           self.current_resource = nil
@@ -109,9 +110,7 @@ module Olivander
         end
 
         def build_routes(mapper)
-          Rails.logger.info "building routes..."
-          build_resource_routes(mapper)
-          Rails.logger.info "...routes built"
+          build_resources_routes(mapper)
         end
 
         def set_controller_and_helper(a)
@@ -121,10 +120,19 @@ module Olivander
           self.last_path_helper = a.path_helper
         end
 
-        def build_resource_routes(mapper)
+        def build_resources_routes(mapper)
           resources.keys.each do |k|
-            before_routes = Rails.application.routes.named_routes.helper_names
             r = resources[k]
+            build_resource_route(mapper, r, r.namespaces)
+          end
+        end
+
+        def build_resource_route(mapper, r, namespaces)
+          if namespaces.size.positive?
+            mapper.namespace namespaces.first do
+              build_resource_route(mapper, r, r.namespaces.last(r.namespaces.size - 1))
+            end
+          else
             mapper.resources r.model, only: [] do
               mapper.collection do
                 r.collection_actions.each do |ba|
@@ -160,10 +168,6 @@ module Olivander
                 end
               end
             end
-            after_routes = Rails.application.routes.named_routes.helper_names
-            net_routes = after_routes - before_routes
-            # Rails.logger.info "added these route helpers:\n#{net_routes}"
-            # binding.pry if k == :projects
           end
         end
       end

data/app/datatables/olivander/datatable.rb

@@ -15,7 +15,7 @@ module Olivander
       end
     end
 
-    def self.auto_datatable(klazz, collection: nil, link_path: nil, only: [], except: [], hide: [], show: [], order_by: [])
+    def self.auto_datatable(klazz, collection: nil, link_path: nil, only: [], except: [], hide: [], show: [], order_by: [], scopes: [])
       Rails.logger.debug "initializing datatable for #{klazz}"
 
       klazz_attributes = klazz.new.attributes.collect{ |x| x[0] }
@@ -27,6 +27,12 @@ module Olivander
 
       default_hidden = %w[id created updated created_at updated_at deleted_at current_user current_action]
 
+      filters do
+        scopes.each do |s|
+          scope s
+        end
+      end
+
       collection do
         dc = collection.nil? ? klazz.all : collection
 

data/app/helpers/olivander/application_helper.rb

@@ -45,7 +45,8 @@ module Olivander
     end
 
     def resource_form_action_label(resource, action)
-      return I18n.t("activerecord.actions.#{resource}.#{action}") if I18n.exists?("activerecord.actions.#{resource}.#{action}")
+      key = resource.class.name.underscore
+      return I18n.t("activerecord.actions.#{key}.#{action}") if I18n.exists?("activerecord.actions.#{key}.#{action}")
       return I18n.t("activerecord.actions.#{action}") if I18n.exists?("activerecord.actions.#{action}")
 
       action.to_s.titleize

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

@@ -2,4 +2,5 @@
 = 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|
     - path = a.path_helper.is_a?(Proc) ? a.path_helper.call(resource) : send(a.path_helper, resource.id)
-    = dropdown_link_to resource_form_action_label(resource, a.sym), path
+    - data = a.turbo_frame.present? ? { turbo: true, turbo_frame: a.turbo_frame } : {}
+    = dropdown_link_to resource_form_action_label(resource, a.sym), path, data: data

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = '0.1.2.35'.freeze
+  VERSION = '0.1.2.37'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.1.2.35
+  version: 0.1.2.37
 platform: ruby
 authors:
 - Eric Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-15 00:00:00.000000000 Z
+date: 2023-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick