cm-admin 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d8b59bb29b63e28e9f7477b9dd9dda0b2fead59924bf27bae4a6a524310a99f
-  data.tar.gz: 31ad3672cf1f5811e0db81ea7937728b07c4cec6471e3bebb027559c78d08266
+  metadata.gz: 4d3ee61a20da53d4f971707c68d72d47665c39a59eebdd554d13b96254cf666c
+  data.tar.gz: 9c2e4b2fb2ca38f03a8f799c69d3f966088211b10909d1a19ca437e5437dc93c
 SHA512:
-  metadata.gz: b0952b765aef635678377f3a6bdb7bdd973aa4bd9cd57be2a52522240fce40dac39f55138b04c0f25c220fc9a1f1848704184456cedc3e76742f7aad1b436c7f
-  data.tar.gz: f37b2418e744562c062ac520ef51b3deda72718c41d4459598fe89ea9b59a1dfaa76971b04f2cd4a41395e04ba6e3017bba7e4cedc8a22e3c25bb499d90e2f92
+  metadata.gz: 6b0b6889ee66cb8b6cc230d015356478dba9ccd348003334ddb315bdc34d2071033a91c65c196c92207fb01f8551377043effd3117dac910118bfcd71b20523b
+  data.tar.gz: 64600259cd7a8e671a5393f7a0058182303f99c8cc80c2fe0fa41441c8a1a7ce7c2124658bec77b3cf26cdfc602a9945a0f9b77279c15bfb3f28a923608c8637

data/Gemfile.lock

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

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

@@ -15,7 +15,7 @@
             tr
               - nested_field.fields.each do |field|
                 td data-field-type="#{field.field_type}"
-                  = record.send(field.field_name)
+                  = show_field_value(record, field)  
 - else
   - associated_records.each do |record|
     .card.mb-3  data-table-name="#{nested_field.field_name}"

data/lib/cm_admin/models/dsl_method.rb

@@ -142,7 +142,7 @@ module CmAdmin
         @available_actions << bulk_action
       end
 
-      def filter(db_column_name, filter_type, options={})
+      def filter(db_column_name, filter_type, options = {})
         @filters << CmAdmin::Models::Filter.new(db_column_name: db_column_name, filter_type: filter_type, options: options)
       end
 

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, :scope_name
 
       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)
+        @scope_name = 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,40 +72,44 @@ 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.scope_name.present?
+              return records.send(filter.scope_name, 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)
@@ -123,7 +128,6 @@ module CmAdmin
 
         def cm_dropdown_filter(scope_value, records, filters)
           return nil if scope_value.nil?
-
           scope_value.each do |key, value|
             records = records.where(key => value) if value.present?
           end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.3.4'
+  VERSION = '1.3.5'
 end

metadata

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