cm-admin 0.8.6 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47fc71a05e69092828694cc38ea2722580571bff16dfd6a9e52a59fd1177820f
-  data.tar.gz: 547bbce4e9127b0c411a9a869cdb0621ce3dcd191d24846e64bdec0415403d26
+  metadata.gz: 1b0716af97418b0a394649987f80dc9ccffa7ebe3476f53c71be4ffee7d3121f
+  data.tar.gz: c920089946afedbe268496bd0a8cb05d44dd950aad3c5b5dd7eb296180700871
 SHA512:
-  metadata.gz: 13a83281f4010e9f7921089047e5c7ca60577ce61587413f2475cb0747b801bfdc9beb03744f8595a94743ad15a187b48f80547be5a8bd8b5217c40595551532
-  data.tar.gz: 8ac891bb57c06f67ede8e325196a693a78c79ef4b7a19d0f2ba72e53ce65f0273e7872916ce7fbe0883dad8c959b2c11ee6195962a81f9c098210e24ca61eb67
+  metadata.gz: e7e2cea04419473813adb4d3d5500bf6fb3e5a897aaf0572387c9a42bff4207e1a7539b4314e1d6bea138b76708788018f9c30ac3132e685da992f0b649e4a6a
+  data.tar.gz: 95cda0809b447a0cce7cc4b20ffce7308a74ec8feac2b91e0b63ac02060472abe2fb360e8c44a525a3609be956ce18d7adb232b64a730911b93ce59951e19e33

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (0.8.6)
+    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/app/views/cm_admin/main/_associated_table.html.slim

@@ -3,7 +3,7 @@
     - if @associated_model.filters.present? && @action.partial.nil?
       .index-page__filters
         == render partial: 'cm_admin/main/filters', locals: { filters: @associated_model.filters }
-    p.table-top__total-count = "#{@associated_ar_object.pagy.count} #{@action.child_records.to_s.gsub('_', ' ')} found"
+    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')
         - association = @ar_object.class.reflect_on_all_associations.select{|x| x.name == @associated_model.name.tableize.to_sym }.first

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

@@ -1,6 +1,6 @@
 .admin-table-index
   .table-top
-    p.table-top__total-count = "#{@ar_object.pagy.count} #{@model.ar_model.table_name} found"
+    p.table-top__total-count = "#{humanized_ar_collection_count(@ar_object.pagy.count, @model.ar_model.table_name)}"
     // .table-top__column-action
     //  button.secondary-btn.column-btn data-bs-target="#columnActionModal" data-bs-toggle="modal"
     //    span

data/lib/cm-admin.rb

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

data/lib/cm_admin/models/filter.rb

@@ -19,7 +19,7 @@ module CmAdmin
 
         case filter_type
         when :search
-          db_column_name = (Array.new << db_column_name).flatten.map(&:to_sym)
+          db_column_name = (Array.new << db_column_name).flatten.map{|x| x.class.eql?(Hash) ? x : x.to_sym}
         else
           db_column_name = db_column_name.is_a?(Array) ? db_column_name[0].to_sym : db_column_name.to_sym
         end
@@ -47,23 +47,37 @@ module CmAdmin
         def cm_search_filter(scope_value, records, filters)
           return nil if scope_value.blank?
           table_name = records.table_name
-
           filters.select{|x| x if x.filter_type.eql?(:search)}.each do |filter|
+            query_variables = []
+            filter.db_column_name.each do |col|
+              if col.is_a?(Symbol)
+                query_variables << "#{table_name.pluralize}.#{col}"
+              elsif col.is_a?(Hash)
+                col.map do |key, value|
+                  value.map {|val| query_variables << "#{key.to_s.pluralize}.#{val}" }
+                end
+              end
+            end
             terms = scope_value.downcase.split(/\s+/)
             terms = terms.map { |e|
               (e.gsub('*', '%').prepend('%') + '%').gsub(/%+/, '%')
             }
             sql = ""
-            filter.db_column_name.each.with_index do |column, i|
-              sql.concat("#{table_name}.#{column} ILIKE ?")
-              sql.concat(' OR ') unless filter.db_column_name.size.eql?(i+1)
+            query_variables.each.with_index do |column, i|
+              sql.concat("#{column} ILIKE ?")
+              sql.concat(' OR ') unless query_variables.size.eql?(i+1)
+            end
+
+            if filter.db_column_name.map{|x| x.is_a?(Hash)}.include?(true)
+              associations_hash = filter.db_column_name.select{|x| x if x.is_a?(Hash)}.last
+              records = records.joins(associations_hash.keys)
             end
 
             records = records.where(
               terms.map { |term|
                 sql
               }.join(' AND '),
-              *terms.map { |e| [e] * filter.db_column_name.size }.flatten
+              *terms.map { |e| [e] * query_variables.size }.flatten
             )
           end
           records

data/lib/cm_admin/version.rb

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

data/lib/cm_admin/view_helpers.rb

@@ -72,5 +72,10 @@ module CmAdmin
         concat " #{column_path.to_s.gsub('/', '_').humanize}"
       end
     end
+
+    def humanized_ar_collection_count(count, model_name)
+      table_name = count == 1 ? model_name.singularize : model_name.pluralize
+      return "#{count} #{table_name.humanize.downcase} found"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  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