cm-admin 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47fc71a05e69092828694cc38ea2722580571bff16dfd6a9e52a59fd1177820f
-  data.tar.gz: 547bbce4e9127b0c411a9a869cdb0621ce3dcd191d24846e64bdec0415403d26
+  metadata.gz: 7c6cf3d2c260e9964ab1aa9865d14af11fe287e49b6216ae260ae575567c0e89
+  data.tar.gz: 495df145a9060198ca69bfd1eaeea836b6bba24287a804e69d100fab5d36cbd1
 SHA512:
-  metadata.gz: 13a83281f4010e9f7921089047e5c7ca60577ce61587413f2475cb0747b801bfdc9beb03744f8595a94743ad15a187b48f80547be5a8bd8b5217c40595551532
-  data.tar.gz: 8ac891bb57c06f67ede8e325196a693a78c79ef4b7a19d0f2ba72e53ce65f0273e7872916ce7fbe0883dad8c959b2c11ee6195962a81f9c098210e24ca61eb67
+  metadata.gz: 03b3e0f445067d05f32313a7c4e519545ee6396eca549e75719de294380df8be3be2d5e95c6dfcf262d563eb5db4cd8e3ebabcae753075a4b61f69a6957c5c1d
+  data.tar.gz: 498e3dfb9d3580fa69bfaf959df282567590cbdee12d2ad3bc65fcbb7f7101c70fd9d7d5aba2e78ea6a09547afe0fc4161dd478495110bcfe8efe3887e0d7040

data/Gemfile.lock

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

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/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.7"
 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.7
 platform: ruby
 authors:
 - sajinmp