cm-admin 1.5.5 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7eb26a8e9dc03031afddca0a48d9bfae0ba1f11c9d66d3ae953b2e9c68966543
-  data.tar.gz: 11390399cda0596195e40de917976cf6eeffdd3eb8999304dc05dae075f5aeac
+  metadata.gz: d2683d5547505d258f1bf7c0ea82236130ec6287ead5ab3670a29d909bc7a895
+  data.tar.gz: ad8a5db9a2a05d60ba04ced18d09591c56b78dc0cf849823c9a63b296ec43454
 SHA512:
-  metadata.gz: f4f2a66dfb37c444d453a874c08537d2d769860212017cf8a10d31f807aca181c7e0dea526b6f1612cab436b112a14d15143c7e94701271e7705af4a963138e6
-  data.tar.gz: 64b05e829b61af5089d8bd1e0b182361204f1e891d209e13c47a3c1a21ba43f686be27360ed58d8177b7654ee0912acc204b9e623cbde1097497b3bcecf6c604
+  metadata.gz: 7630c3561997e736dc4a0400d2c734d3e383545f11a5173061196fc84ab12b27322ac6f3945168db80e50713158d341534573632b148c3f682314c7a32fbdc0f
+  data.tar.gz: edef5e258984bdd78e2a195ad0434df645d13a8c8c4a84254ea9689b7ede1d1aaa6b0e1fad0a2e0ed87c415e1219f4406991411e8bb7f7dfc93b66a6f672ea4a

data/Gemfile.lock

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

data/app/controllers/cm_admin/resource_controller.rb

@@ -11,11 +11,11 @@ module CmAdmin
       records = "CmAdmin::#{@model.name}Policy::Scope".constantize.new(Current.user, @model.name.constantize).resolve
       records = apply_scopes(records)
       if (['table', 'card'].include?(params[:view_type]) || [:table, :card].include?(@current_action.view_type))
-        @ar_object = filter_by(params, records, @model.filter_params(params))
+        @ar_object = filter_by(params, records, filter_params: @model.filter_params(params))
       elsif (request.xhr? && params[:view_type] == 'kanban') || @current_action.view_type == :kanban
         @ar_object = kanban_filter_by(params, records, @model.filter_params(params))
       else
-        @ar_object = filter_by(params, records, @model.filter_params(params))
+        @ar_object = filter_by(params, records, filter_params: @model.filter_params(params))
       end
       respond_to do |format|
         if request.xhr? && (params[:view_type] == 'kanban' || @current_action.view_type == :kanban)
@@ -132,7 +132,7 @@ module CmAdmin
       @current_action = @action
       if  @action.parent == 'index'
         records = apply_scopes(records)
-        @ar_object = filter_by(params, records, @model.filter_params(params))
+        @ar_object = filter_by(params, records, filter_params: @model.filter_params(params))
       else
         resource_identifier
       end
@@ -233,8 +233,10 @@ module CmAdmin
                           else
                             CmAdmin::Model.find_by(name: @reflection.klass.name)
                           end
+
       @associated_ar_object = if child_records.is_a? ActiveRecord::Relation
-                                filter_by(params, child_records, @associated_model.filter_params(params))
+
+                                filter_by(params, child_records, parent_record: @ar_object, filter_params: @associated_model.filter_params(params))
                               else
                                 child_records
                               end
@@ -248,7 +250,7 @@ module CmAdmin
       records
     end
 
-    def filter_by(params, records, filter_params={}, sort_params={})
+    def filter_by(params, records, parent_record: nil, filter_params: {}, sort_params: {})
       filtered_result = OpenStruct.new
       cm_model = @associated_model || @model
       db_columns = cm_model.ar_model&.columns&.map{|x| x.name.to_sym}
@@ -263,6 +265,9 @@ module CmAdmin
       pagy, records = pagy(final_data)
       filtered_result.data = records
       filtered_result.pagy = pagy
+      filtered_result.parent_record = parent_record
+      filtered_result.associated_model = @associated_model.name if @associated_model
+      # filtered_result.ar_model =
       # filtered_result.facets = paginate(page, raw_data.size)
       # filtered_result.sort = sort_params
       # filtered_result.facets.sort = sort_params
@@ -354,7 +359,7 @@ module CmAdmin
     end
 
     private
-    
+
     def attachment_fields(model_object)
       model_object.reflect_on_all_associations.map {|reflection|
         next if reflection.options[:polymorphic]

data/app/helpers/cm_admin/application_helper.rb

@@ -7,10 +7,22 @@ module CmAdmin
 
     # Allow if policy is not defined.
     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}?")
+      if ar_object.instance_of?(OpenStruct) && ar_object&.parent_record.present? && ar_object&.associated_model.present?
+        policy_object = ar_object.parent_record
+        associated_model = ar_object.associated_model
+
+        policy_instance = "CmAdmin::#{associated_model}Policy".constantize.new(:cm_admin, policy_object)
+
+        return true unless policy_instance.methods.include?(:"#{action_name}?")
+
+        policy_instance.send(:"#{action_name}?")
+      else
+        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
     end
 
     def action(action_name)
@@ -66,6 +78,7 @@ module CmAdmin
     end
 
     def is_show_action_available(model, ar_object)
+
       model &&
       model.available_actions.map(&:name).include?('show') &&
       has_valid_policy(ar_object, 'show')

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

@@ -4,6 +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_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 : ''
@@ -53,11 +54,11 @@
                     = show_field_value(ar_object, column)
                     - if column.field_type == :drawer
                       = render partial: column.drawer_partial, locals: { ar_object: ar_object }
-                    
+
           - if @associated_model
             == render partial: 'cm_admin/main/actions_dropdown', locals: { cm_model: @associated_model, ar_object: ar_object }
 
   .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/lib/cm_admin/model.rb

@@ -149,6 +149,6 @@ module CmAdmin
       CmAdmin.const_set "#{@name}Controller", klass
     end
 
-    
+
   end
 end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.5.5'
+  VERSION = '1.5.7'
 end

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -1,4 +1,7 @@
 require_relative 'form_field_helper'
+require 'cgi'
+require 'uri'
+
 module CmAdmin
   module ViewHelpers
     module FormHelper
@@ -123,21 +126,38 @@ module CmAdmin
       end
 
       def set_form_with_sections(resource, entities, url, method)
+        polymorphic_name, associated_id, associated_class = extract_referrer_query_params
         form_for(resource, url: url, method: method, html: { class: "cm_#{resource.class.name.downcase}_form" } ) do |form_obj|
           if params[:referrer]
             concat form_obj.text_field "referrer", class: "normal-input", hidden: true, value: params[:referrer], name: 'referrer'
           end
-          if params[:polymorphic_name].present?
-            concat form_obj.text_field params[:polymorphic_name] + '_type', class: "normal-input", hidden: true, value: params[:associated_class].classify
-            concat form_obj.text_field params[:polymorphic_name] + '_id', class: "normal-input", hidden: true, value: params[:associated_id]
-          elsif params[:associated_class] && params[:associated_id]
-            concat form_obj.text_field params[:associated_class] + '_id', class: "normal-input", hidden: true, value: params[:associated_id]
+          if params[:polymorphic_name].present? || polymorphic_name.present?
+            concat form_obj.text_field ( params[:polymorphic_name] || polymorphic_name ) + '_type', class: "normal-input", hidden: true, value: ( params[:associated_class] || associated_class ).classify
+            concat form_obj.text_field ( params[:polymorphic_name] || polymorphic_name ) + '_id', class: "normal-input", hidden: true, value: ( params[:associated_id] || associated_id )
+          elsif (params[:associated_class] && params[:associated_id] || associated_id.present? && associated_class.present? )
+            concat form_obj.text_field ( params[:associated_class] || associated_class ) + '_id', class: "normal-input", hidden: true, value: ( params[:associated_id] || associated_id )
           end
+
           concat split_form_into_section(resource, form_obj, entities)
           concat tag.br
           concat form_obj.submit 'Save', class: 'btn-cta', data: {behaviour: 'form_submit', form_class: "cm_#{form_obj.object.class.name.downcase}_form"}
         end
       end
+
+
+      def extract_referrer_query_params
+        uri = URI.parse(request.referrer)
+
+        return unless uri.query.present?
+
+        query_params = CGI.parse(uri.query)
+
+        polymorphic_name = query_params['polymorphic_name'].first
+        associated_id = query_params['associated_id'].first
+        associated_class = query_params['associated_class'].first
+
+        return polymorphic_name, associated_id, associated_class
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.7
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-28 00:00:00.000000000 Z
+date: 2024-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails
@@ -498,7 +498,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: CmAdmin is a robust gem designed to assist in creating admin panels for Rails