cm-admin 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c6cf3d2c260e9964ab1aa9865d14af11fe287e49b6216ae260ae575567c0e89
-  data.tar.gz: 495df145a9060198ca69bfd1eaeea836b6bba24287a804e69d100fab5d36cbd1
+  metadata.gz: 1b0716af97418b0a394649987f80dc9ccffa7ebe3476f53c71be4ffee7d3121f
+  data.tar.gz: c920089946afedbe268496bd0a8cb05d44dd950aad3c5b5dd7eb296180700871
 SHA512:
-  metadata.gz: 03b3e0f445067d05f32313a7c4e519545ee6396eca549e75719de294380df8be3be2d5e95c6dfcf262d563eb5db4cd8e3ebabcae753075a4b61f69a6957c5c1d
-  data.tar.gz: 498e3dfb9d3580fa69bfaf959df282567590cbdee12d2ad3bc65fcbb7f7101c70fd9d7d5aba2e78ea6a09547afe0fc4161dd478495110bcfe8efe3887e0d7040
+  metadata.gz: e7e2cea04419473813adb4d3d5500bf6fb3e5a897aaf0572387c9a42bff4207e1a7539b4314e1d6bea138b76708788018f9c30ac3132e685da992f0b649e4a6a
+  data.tar.gz: 95cda0809b447a0cce7cc4b20ffce7308a74ec8feac2b91e0b63ac02060472abe2fb360e8c44a525a3609be956ce18d7adb232b64a730911b93ce59951e19e33

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (0.8.7)
+    cm-admin (0.8.8)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)
@@ -38,7 +38,7 @@ GEM
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
     builder (3.2.4)
-    caxlsx (3.2.0)
+    caxlsx (3.3.0)
       htmlentities (~> 4.3, >= 4.3.4)
       marcel (~> 1.0)
       nokogiri (~> 1.10, >= 1.10.4)
@@ -69,7 +69,7 @@ GEM
     method_source (1.0.0)
     mini_portile2 (2.8.0)
     minitest (5.16.2)
-    nokogiri (1.13.8)
+    nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     pagy (4.11.0)
@@ -146,7 +146,7 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    zeitwerk (2.6.1)
+    zeitwerk (2.6.4)
 
 PLATFORMS
   ruby

data/app/assets/stylesheets/cm_admin/base/scaffold.scss

@@ -72,7 +72,7 @@ a {
   position: sticky;
   top: 0;
   background-color: #fff;
-  z-index: 1;
+  z-index: 4;
 }
 
 .scrollable {

data/app/assets/stylesheets/cm_admin/base/table.scss

@@ -6,7 +6,6 @@
     overflow: auto;
 
     .sticky-container {
-      z-index: 4;
       .cm-filters-v2 {
         padding: 16px 24px 36px 24px;
       }

data/app/controllers/cm_admin/resource_controller.rb

@@ -153,22 +153,25 @@ module CmAdmin
     end
 
     def custom_controller_action(action_name, params)
-      current_action = CmAdmin::Models::Action.find_by(@model, name: action_name.to_s)
-      if current_action
-        @current_action = current_action
-        @ar_object = @model.ar_model.name.classify.constantize.find(params[:id])
-        if @current_action.child_records
-          child_records = @ar_object.send(@current_action.child_records)
-          @associated_model = CmAdmin::Model.find_by(name: @model.ar_model.reflect_on_association(@current_action.child_records).klass.name)
-          if child_records.is_a? ActiveRecord::Relation
-            @associated_ar_object = filter_by(params, child_records, @associated_model.filter_params(params))
-          else
-            @associated_ar_object = child_records
-          end
-          return @ar_object, @associated_model, @associated_ar_object
-        end
-        return @ar_object
-      end
+      @current_action = CmAdmin::Models::Action.find_by(@model, name: action_name.to_s)
+      return unless @current_action
+
+      @ar_object = @model.ar_model.name.classify.constantize.find(params[:id])
+      return @ar_object unless @current_action.child_records
+
+      child_records = @ar_object.send(@current_action.child_records)
+      @reflection = @model.ar_model.reflect_on_association(@current_action.child_records)
+      @associated_model = if @reflection.klass.column_names.include?('type')
+                            CmAdmin::Model.find_by(name: @reflection.plural_name.classify)
+                          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))
+                              else
+                                child_records
+                              end
+      return @ar_object, @associated_model, @associated_ar_object
     end
 
     def filter_by(params, records, filter_params={}, sort_params={})
@@ -176,7 +179,7 @@ module CmAdmin
       sort_column = "created_at"
       sort_direction = %w[asc desc].include?(sort_params[:sort_direction]) ? sort_params[:sort_direction] : "asc"
       sort_params = {sort_column: sort_column, sort_direction: sort_direction}
-      
+
       records = "CmAdmin::#{@model.name}Policy::Scope".constantize.new(Current.user, @model.name.constantize).resolve if records.nil?
       records = records.order("#{@current_action.sort_column} #{@current_action.sort_direction}")
       final_data = CmAdmin::Models::Filter.filtered_data(filter_params, records, @associated_model ? @associated_model.filters : @model.filters)

data/lib/cm-admin.rb

@@ -0,0 +1 @@
+require 'cm_admin'

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = "0.8.7"
+  VERSION = "0.8.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-22 00:00:00.000000000 Z
+date: 2022-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails
@@ -231,6 +231,7 @@ files:
 - config/webpack/test.js
 - config/webpacker.yml
 - lib/.DS_Store
+- lib/cm-admin.rb
 - lib/cm_admin.rb
 - lib/cm_admin/configuration.rb
 - lib/cm_admin/constants.rb
@@ -316,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: This is an admin panel gem