cm-admin 1.3.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e81bb0ae8315860549d0c446bd231a8a4d03f7ec71d43e0bc3dae928d24a052
-  data.tar.gz: 879a1484880f42892d1dd7dc1cab06aa3c54d69f908f9b9ca88c87fb2dddef5e
+  metadata.gz: 1f06e165a6b468dde8b09746a40a195df154f4639626a12b4c2f856d4184abdf
+  data.tar.gz: 41e071501c0d1aed8bf7f1bd2ac301cc41bb6e06502abde2c39f5d3fd21e6dd5
 SHA512:
-  metadata.gz: 41529999b8a9d3d59cd3f9832f5dbc5e9a7c53229b20307610251a3e3a8f1b4b187fd3fdd961c772bda56e499f4684a71be0c2456d4babb9fb14caaff723beb6
-  data.tar.gz: e2412a8f6502af1d1adc2b7b122c49da5518f6dfedd3a54b580efed363cb2392568d695d13653c9235644cdb7d75a0dc75edf3f43513510cf85ae35cb2f52a04
+  metadata.gz: fe73add42f92fc5f392cb17d16c37f5a9b6185d439ded6a51ffaff0ee5409d80074d2e5c76e0fbfdf9479a088fcfb9999079573e9ca8ff1c2a57d1216d0c5d38
+  data.tar.gz: a321b63a0f573d01f203045b6f89f1fc45407722c919cc164f4646ff284fdd33a3dcfc0b2e3f27c8cb00cb1e81e62c6cdfc1dfb61563e4db2234ca4632a22efe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (1.3.1)
+    cm-admin (1.3.3)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)

data/app/controllers/cm_admin/resource_controller.rb

@@ -172,7 +172,7 @@ module CmAdmin
 
     def resource_identifier
       @ar_object, @associated_model, @associated_ar_object = custom_controller_action(action_name, params.permit!) if !@ar_object.present? && params[:id].present?
-      authorize controller_name.classify.constantize, policy_class: "CmAdmin::#{controller_name.classify}Policy".constantize if defined? "CmAdmin::#{controller_name.classify}Policy".constantize
+      authorize @ar_object, policy_class: "CmAdmin::#{controller_name.classify}Policy".constantize if defined? "CmAdmin::#{controller_name.classify}Policy".constantize
       aar_model = request.url.split('/')[-2].classify.constantize  if params[:aar_id]
       @associated_ar_object = aar_model.find(params[:aar_id]) if params[:aar_id]
       nested_fields = get_nested_table_fields(@model.available_fields[:new])

data/app/helpers/cm_admin/application_helper.rb

@@ -6,9 +6,11 @@ module CmAdmin
     end
 
     # Allow if policy is not defined.
-    def has_valid_policy(model_name, action_name)
-      return true unless policy([:cm_admin, model_name.classify.constantize]).methods.include?(:"#{action_name}?")
-      policy([:cm_admin, model_name.classify.constantize]).send(:"#{action_name}?")
+    def has_valid_policy(ar_object, action_name)
+      policy_object = ar_object.instance_of?(OpenStruct) ? @model.name.classify.constantize : ar_object
+      return true unless policy([:cm_admin, policy_object]).methods.include?(:"#{action_name}?")
+      
+      policy([:cm_admin, policy_object]).send(:"#{action_name}?")
     end
 
     def action(action_name)
@@ -63,14 +65,14 @@ module CmAdmin
       end
     end
 
-    def is_show_action_available(model)
+    def is_show_action_available(model, ar_object)
       model &&
       model.available_actions.map(&:name).include?('show') &&
-      has_valid_policy(model.name, 'show')
+      has_valid_policy(ar_object, 'show')
     end
 
-    def actions_filter(model, action_type)
-      model.available_actions.select { |action| action.action_type == action_type && has_valid_policy(model.name, action.name) }
+    def actions_filter(model, ar_object, action_type)
+      model.available_actions.select { |action| action.action_type == action_type && has_valid_policy(ar_object, action.name) }
     end
   end
 end

data/app/views/cm_admin/main/_actions_dropdown.html.slim

@@ -1,6 +1,6 @@
-- edit_action = available_actions(cm_model, 'edit')
-- destroy_action = available_actions(cm_model, 'destroy')
-- custom_actions = available_actions(cm_model, 'custom_actions')
+- edit_action = available_actions(cm_model, ar_object, 'edit')
+- destroy_action = available_actions(cm_model, ar_object, 'destroy')
+- custom_actions = available_actions(cm_model, ar_object, 'custom_actions')
 - current_model = @associated_model || @model
 - if custom_actions.any? || edit_action.present? || destroy_action.present?
   td.row-action-cell

data/app/views/cm_admin/main/_associated_table.html.slim

@@ -4,7 +4,7 @@
       == render partial: 'cm_admin/main/filters', locals: { filters: @associated_model.filters }
   p.table-top__total-count = "#{humanized_ar_collection_count(@associated_ar_object.pagy.count, @action.child_records.to_s)}"
   .table-top__column-action
-    - if @associated_model && @associated_model.available_actions.map(&:name).include?('new') && has_valid_policy(@associated_model.name, 'new')
+    - if @associated_model && @associated_model.available_actions.map(&:name).include?('new') && has_valid_policy(@associated_ar_object, 'new')
       - association = @ar_object.class.reflect_on_all_associations.select{|x| x.name == @associated_model.name.tableize.to_sym }.first
       - polymorphic_name = (association && association.inverse_of && association.inverse_of.options[:polymorphic]) ? association.inverse_of.name : ''
       a href="#{CmAdmin::Engine.mount_path}/#{@associated_model.name.tableize}/new?associated_id=#{@ar_object.id}&associated_class=#{@ar_object.class.name.underscore}&polymorphic_name=#{polymorphic_name}&referrer=#{request.path}"
@@ -20,7 +20,7 @@
 - elsif flash[:notice].present?
   .alert.alert-success
     = flash[:notice].html_safe
-- bulk_actions = actions_filter(@associated_model, :bulk_action)
+- bulk_actions = actions_filter(@associated_model, @associated_ar_object, :bulk_action)
 - if bulk_actions.present?
   .table-top.hidden data-section="bulk-action"
     - bulk_actions.each do |action|
@@ -47,7 +47,7 @@
             - if column.display_if.call(Current.user) && column.viewable
               td class="text-ellipsis"
                 span class="#{column.field_type.to_s} #{column.cm_css_class} "
-                  - if index == 0 && is_show_action_available(@associated_model)
+                  - if index == 0 && is_show_action_available(@associated_model, ar_object)
                     a href="#{CmAdmin::Engine.mount_path}/#{@associated_model.name.tableize}/#{ar_object.id}" = show_field_value(ar_object, column)
                   - else
                     = show_field_value(ar_object, column)
@@ -60,4 +60,4 @@
   .pagination-bar
     p.count-text.m-0 Showing #{@associated_ar_object.pagy.from} to #{@associated_ar_object.pagy.to} out of #{@associated_ar_object.pagy.count}
     == render partial: 'cm_admin/main/cm_pagy_nav', locals: { pagy: @associated_ar_object.pagy }
-= render partial: 'cm_admin/main/member_custom_action_modal', locals: { cm_model: @associated_model, ar_collection: @associated_ar_object }
+/ = render partial: 'cm_admin/main/member_custom_action_modal', locals: { cm_model: @associated_model, ar_collection: @associated_ar_object }

data/app/views/cm_admin/main/_card.html.slim

@@ -20,7 +20,7 @@
   .alert.alert-success
     = flash[:notice].html_safe
 
-- bulk_actions = actions_filter(@model, :bulk_action)
+- bulk_actions = actions_filter(@model, @ar_object, :bulk_action)
 - if bulk_actions.present?
   .table-top.hidden data-section="bulk-action"
     - bulk_actions.each do |action|
@@ -38,7 +38,7 @@
             .card-body
               - @model.available_fields[:index].each_with_index do |column, index|
                 - if column.display_if.call(Current.user) && column.viewable
-                  - if index == 0 && is_show_action_available(@model) && !([:link, :custom, :attachment, :drawer, :image].include?(column.field_type))
+                  - if index == 0 && is_show_action_available(@model, ar_object) && !([:link, :custom, :attachment, :drawer, :image].include?(column.field_type))
                     h6.card-title
                       | Coffee table
                     .card-subtitle

data/app/views/cm_admin/main/_member_custom_action_modal.html.slim

@@ -1,4 +1,4 @@
-- custom_actions = available_actions(cm_model, 'custom_actions')
+- custom_actions = available_actions(cm_model, ar_object, 'custom_actions')
 - custom_actions_modals = custom_actions.select{ |act| act if act.display_type.eql?(:modal) }
 - ar_collection.data.each do |ar_object|
   - if custom_actions_modals.any?

data/app/views/cm_admin/main/_table.html.slim

@@ -19,7 +19,7 @@
   .alert.alert-success
     = flash[:notice].html_safe
 
-- bulk_actions = actions_filter(@model, :bulk_action)
+- bulk_actions = actions_filter(@model, @ar_object, :bulk_action)
 - if bulk_actions.present?
   .table-top.hidden data-section="bulk-action"
     - bulk_actions.each do |action|
@@ -44,7 +44,7 @@
           - @model.available_fields[:index].each_with_index do |column, index|
             - if column.display_if.call(Current.user) && column.viewable
               td.text-ellipsis data-field-type="#{column.field_type || 'string'}"
-                - if index == 0 && is_show_action_available(@model) && !([:link, :custom, :attachment, :drawer, :image].include?(column.field_type))
+                - if index == 0 && is_show_action_available(@model, ar_object) && !([:link, :custom, :attachment, :drawer, :image].include?(column.field_type))
                   = link_to ar_object.send(column.field_name), cm_admin.send("#{ar_object.model_name.singular}_show_path", ar_object.id)
                 - else
                   = show_field_value(ar_object, column)

data/app/views/cm_admin/main/_top_navbar.html.slim

@@ -8,7 +8,7 @@
       p.mb-0.text-body-secondary = @model.current_action.page_description
   .entity-header__actions
     - if @model.current_action.name == 'index'
-      - if has_valid_policy(@model.name, :exportable)
+      - if has_valid_policy(@ar_object, :exportable)
         .export-container
           .dropdown
             button.btn-secondary.dropdown-toggle data-bs-toggle='dropdown'
@@ -18,10 +18,10 @@
               li
                 .popup-option.pointer data-bs-toggle='modal' data-bs-target='#exportmodal'
                   span Export
-      - if @model.importer && has_valid_policy(@model.name, :importable)
+      - if @model.importer && has_valid_policy(@ar_object, :importable)
         = link_to 'Import', cm_admin.send(:"#{@model.name.underscore}_import_path"), class: 'btn-primary ms-2'
       - new_action = @model.available_actions.select{|act| act if act.action_type.eql?(:default) && act.name.eql?('new')}
-      - if new_action.any? && policy([:cm_admin, @model.name.classify.constantize]).new?
+      - if new_action.any? && has_valid_policy(@ar_object, 'new')
         = link_to 'Add', cm_admin.send(:"#{@model.name.underscore}_new_path"), class: 'btn-primary ms-2'
       - @model.available_actions.select{|act| act if act.route_type == 'collection'}.each do |custom_action|
         = custom_action_items(custom_action, 'index')
@@ -30,8 +30,8 @@
         = custom_action_items(custom_action, 'show')
 
       - edit_action = @model.available_actions.select{|act| act if act.action_type.eql?(:default) && act.name.eql?('edit')}
-      - destroy_action = available_actions(@model, 'destroy')
-      - if edit_action.any? && policy([:cm_admin, @model.name.classify.constantize]).edit?
+      - destroy_action = available_actions(@model, @ar_object, 'destroy')
+      - if edit_action.any? && has_valid_policy(@ar_object, 'edit')
         = link_to cm_admin.send(:"#{@model.name.underscore}_edit_path", @ar_object), class: 'btn-primary ms-2' do
           span
             i.fa.fa-edit

data/app/views/layouts/_custom_action_modals.html.slim

@@ -1,6 +1,6 @@
 - custom_action_with_modals = @model.available_actions.select{ |act| act if act.display_type == :modal && act.action_type == :custom }
 - bulk_action_with_modals = @model.available_actions.select{ |act| act if act.display_type == :modal && act.action_type == :bulk_action }
-- destroy_action = available_actions(@model, 'destroy')
+- destroy_action = available_actions(@model, @ar_object, 'destroy')
 - if @associated_model
   - custom_action_with_modals += @associated_model.available_actions.select{ |act| act if act.display_type == :modal }
 - if @current_action&.name == 'index'

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.3.1'
+  VERSION = '1.3.3'
 end

data/lib/cm_admin/view_helpers/action_dropdown_helper.rb

@@ -1,19 +1,19 @@
 module CmAdmin
   module ViewHelpers
     module ActionDropdownHelper
-      def available_actions(cm_model, action_type)
+      def available_actions(cm_model, ar_object, action_type)
         if action_type.eql?('custom_actions')
           cm_model.available_actions.select {
             |act| act if act.route_type.eql?('member') &&
                          [:button, :modal].include?(act.display_type) &&
                          act.name.present? &&
-                         has_valid_policy(cm_model.name, act.name)
+                         has_valid_policy(ar_object, act.name)
           }
         else
           cm_model.available_actions.select {
             |act| act if act.action_type.eql?(:default) &&
                          act.name.eql?(action_type)
-          } if has_valid_policy(cm_model.name, action_type)
+          } if has_valid_policy(ar_object, action_type)
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.3
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-01 00:00:00.000000000 Z
+date: 2023-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails