cm-admin 1.3.6 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6181e94f36f08555c2209adfc3e17dbf1da4d551262522a3864acf5a07404e23
-  data.tar.gz: f1a409a00b8c1b91b70c1554243fdd52ea7c085658d52abd263cbd8a72e178ff
+  metadata.gz: ac0b46b59a37aa14513ffd40ca2ba413b13887638078d237f7984e57775f44a2
+  data.tar.gz: 2447f380415e9ee56eea95c349c44ad0184afa22b346a75f9ea27b68b6057e98
 SHA512:
-  metadata.gz: 6c06b41f043ac408e4c57cb71b0e939f425a39d2a1cd6e0368f2d5ed993f8c844aaa73df3d1ad67774cc4acde4956fc4f9bcee68401a6595f9f9ed00d441e40b
-  data.tar.gz: 71345aae21c3e87adb2ce4439c8526b2ac53d9227808168e530acec22b03388b79ae8b10ece5a33a1a096ce85299091acedb6b9cc2663478065611c8b47bc5cd
+  metadata.gz: a10b1b77856006ef36af25065fdf8e192609707794ec5c4d335871608404f61a617403ae5c2bf89e8e1ae5b9267837ac134fc000282db55dce098f08b881a1a7
+  data.tar.gz: 317b10e4376033e39a3d72cf5f62c60434128996847a625d9d6aadcd77c37f3c3772fe7499e2ed1cd13dabb8a41515cac08c4c117becfd604ecc94feb2fb28be

data/Gemfile.lock

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

data/lib/cm_admin/models/filter.rb

@@ -5,7 +5,7 @@ module CmAdmin
     class Filter
       include Utils::Helpers
 
-      attr_accessor :db_column_name, :filter_type, :placeholder, :collection
+      attr_accessor :db_column_name, :filter_type, :placeholder, :collection, :filter_with
 
       VALID_FILTER_TYPES = Set[:date, :multi_select, :range, :search, :single_select].freeze
 
@@ -14,6 +14,7 @@ module CmAdmin
         raise ArgumentError, "Kindly select a valid filter type like #{VALID_FILTER_TYPES.sort.to_sentence(last_word_connector: ', or ')} instead of #{filter_type} for column #{db_column_name}" unless VALID_FILTER_TYPES.include?(filter_type.to_sym)
 
         @db_column_name, @filter_type = structure_data(db_column_name, filter_type)
+        @filter_with = nil
         set_default_values
         options.each do |key, value|
           send("#{key}=", value)
@@ -52,7 +53,7 @@ module CmAdmin
         def filtered_data(filter_params, records, filters)
           if filter_params
             filter_params.each do |scope_type, scope_value|
-              scope_name = case scope_type
+              filter_method = case scope_type
                            when 'date', 'range'
                              'date_and_range'
                            when 'single_select', 'multi_select'
@@ -60,7 +61,7 @@ module CmAdmin
                            else
                              scope_type
                            end
-              records = send("cm_#{scope_name}_filter", scope_value, records, filters) if scope_value.present?
+              records = send("cm_#{filter_method}_filter", scope_value, records, filters) if scope_value.present?
             end
           end
           records
@@ -71,52 +72,63 @@ module CmAdmin
 
           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|
-              case col
-              when Symbol
-                query_variables << "#{table_name.pluralize}.#{col}"
-              when Hash
-                col.map do |key, value|
-                  value.map { |val| query_variables << "#{key.to_s.pluralize}.#{val}" }
+            if filter.filter_with.present?
+              return records.send(filter.filter_with, scope_value)
+            else
+              query_variables = []
+              filter.db_column_name.each do |col|
+                case col
+                when Symbol
+                  query_variables << "#{table_name.pluralize}.#{col}"
+                when Hash
+                  col.map do |key, value|
+                    value.map { |val| query_variables << "#{key.to_s.pluralize}.#{val}" }
+                  end
                 end
               end
-            end
-            terms = scope_value.downcase.split(/\s+/)
-            terms = terms.map { |e|
-              (e.gsub('*', '%').prepend('%') + '%').gsub(/%+/, '%')
-            }
-            sql = ''
-            query_variables.each.with_index do |column, i|
-              sql.concat("#{column} ILIKE ?")
-              sql.concat(' OR ') unless query_variables.size.eql?(i + 1)
-            end
+              terms = scope_value.downcase.split(/\s+/)
+              terms = terms.map { |e|
+                (e.gsub('*', '%').prepend('%') + '%').gsub(/%+/, '%')
+              }
+              sql = ''
+              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.left_joins(associations_hash.keys).distinct
-            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.left_joins(associations_hash.keys).distinct
+              end
 
-            records = records.where(
-              terms.map { |term|
-                sql
-              }.join(' AND '),
-              *terms.map { |e| [e] * query_variables.size }.flatten
-            )
+              records = records.where(
+                terms.map { |term|
+                  sql
+                }.join(' AND '),
+                *terms.map { |e| [e] * query_variables.size }.flatten
+              )
+              return records
+            end
           end
-          records
         end
 
         def cm_date_and_range_filter(scope_value, records, filters)
           return nil if scope_value.nil?
 
           scope_value.each do |key, value|
-            next unless value.present?
+            filters.select { |x| x if [:date, :range].include?(x.filter_type) && x.db_column_name.to_s == key.to_s }.each do |filter|
+
+              next unless value.present?
 
-            value = value.split(' to ')
-            from = value[0].presence
-            to = value[1].presence
-            records = records.where(key => from..to)
+              value = value.split(' to ')
+              from = value[0].presence
+              to = value[1].presence
+              if filter.filter_with.present?
+                records = records.send(filter.filter_with, from, to)
+              else
+                records = records.where(key => from..to)
+              end
+            end
           end
           records
         end
@@ -125,7 +137,13 @@ module CmAdmin
           return nil if scope_value.nil?
 
           scope_value.each do |key, value|
-            records = records.where(key => value) if value.present?
+            filters.select { |x| x if [:single_select, :multi_select].include?(x.filter_type) && x.db_column_name.to_s == key.to_s  }.each do |filter|
+              if filter.filter_with.present?
+                records = records.send(filter.filter_with, value) if value.present?
+              else
+                records = records.where(key => value) if value.present?
+              end
+            end
           end
           records
         end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.3.6'
+  VERSION = '1.3.7'
 end

data/lib/cm_admin/view_helpers/filter_helper.rb

@@ -33,7 +33,7 @@ module CmAdmin
               concat(content_tag(:div, class: 'list-area') do
                 filters.each do |filter|
                   concat(content_tag(:div, class: 'pointer list-item', data: {behaviour: 'filter-option', filter_type: "#{filter.filter_type}", db_column: "#{filter.db_column_name}"}) do
-                    tag.span filter.db_column_name.to_s.titleize
+                    tag.span filter.placeholder.to_s.titleize
                   end)
                 end
               end)

metadata

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