cm-admin 1.1.7 → 1.1.9

data/app/assets/stylesheets/cm_admin/dependency/jquery-jgrowl.min.css

@@ -0,0 +1 @@
+.jGrowl{z-index:9999;color:#fff;font-size:12px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;position:fixed}.jGrowl.top-left{left:0;top:0}.jGrowl.top-right{right:0;top:0}.jGrowl.bottom-left{left:0;bottom:0}.jGrowl.bottom-right{right:0;bottom:0}.jGrowl.center{top:0;width:50%;left:25%}.jGrowl.center .jGrowl-closer,.jGrowl.center .jGrowl-notification{margin-left:auto;margin-right:auto}.jGrowl-notification{background-color:#000;opacity:.9;zoom:1;width:250px;padding:10px;margin:10px;text-align:left;display:none;border-radius:5px;min-height:40px}.jGrowl-notification .ui-state-highlight,.jGrowl-notification .ui-widget-content .ui-state-highlight,.jGrowl-notification .ui-widget-header .ui-state-highlight{border:1px solid #000;background:#000;color:#fff}.jGrowl-notification .jGrowl-header{font-weight:700;font-size:.85em}.jGrowl-notification .jGrowl-close{background-color:transparent;color:inherit;border:none;z-index:99;float:right;font-weight:700;font-size:1em;cursor:pointer}.jGrowl-closer{background-color:#000;opacity:.9;zoom:1;width:250px;padding:10px;margin:10px;text-align:left;display:none;border-radius:5px;padding-top:4px;padding-bottom:4px;cursor:pointer;font-size:.9em;font-weight:700;text-align:center}.jGrowl-closer .ui-state-highlight,.jGrowl-closer .ui-widget-content .ui-state-highlight,.jGrowl-closer .ui-widget-header .ui-state-highlight{border:1px solid #000;background:#000;color:#fff}@media print{.jGrowl{display:none}}

data/app/assets/stylesheets/cm_admin/helpers/_variable.scss

@@ -1,54 +1,55 @@
 /* ==== Color Variables ==== */
 
 /* Brand Color */
-$brand-color: #6554E0;
+$brand-color: #6554e0;
+$brand-hover-color: #e6e4fa;
 
 /* Semantic Color */
-$informative-clr: #2F80ED;
-$error-clr: #F83636;
-$warning-clr: #FFC845;
-$positive-clr: #30C39E;
-$disabled-clr: #9CA7AE;
+$informative-clr: #2f80ed;
+$error-clr: #f83636;
+$warning-clr: #ffc845;
+$positive-clr: #30c39e;
+$disabled-clr: #9ca7ae;
 
 /* Blue Colors */
-$blue-regular-clr: #2F80ED;
-$blue-light-clr: #CDE1FB;
-$blue-lightest-clr: #EEF5FE;
+$blue-regular-clr: #2f80ed;
+$blue-light-clr: #cde1fb;
+$blue-lightest-clr: #eef5fe;
 
 /* Red Colors */
-$red-regular-clr: #F83636;
-$red-light-clr: #FDCFCF;
-$red-lightest-clr: #FEEFEF;
+$red-regular-clr: #f83636;
+$red-light-clr: #fdcfcf;
+$red-lightest-clr: #feefef;
 
 /* Yellow Colors */
-$yellow-regular-clr: #FFC845;
-$yellow-light-clr: #FFEFC7;
-$yellow-lightest-clr: #FFF8E9;
+$yellow-regular-clr: #ffc845;
+$yellow-light-clr: #ffefc7;
+$yellow-lightest-clr: #fff8e9;
 
 /* Green Colors */
-$green-regular-clr: #30C39E;
-$green-light-clr: #C1EDE2;
-$green-lightest-clr: #EEFAF7;
+$green-regular-clr: #30c39e;
+$green-light-clr: #c1ede2;
+$green-lightest-clr: #eefaf7;
 
 /* Grey Colors */
-$grey-regular-clr: #C7CED5;
-$grey-light-clr: #D9DEE3;
-$grey-lighter-clr: #F3F4F6;
-$grey-lightest-clr: #F8F9FA;
+$grey-regular-clr: #c7ced5;
+$grey-light-clr: #d9dee3;
+$grey-lighter-clr: #f3f4f6;
+$grey-lightest-clr: #f8f9fa;
 $grey-dark-clr: #828282;
 
 /* Ink Colors */
-$ink-regular-clr: #1D2129;
-$ink-light-clr: #3B4352;
-$ink-lighter-clr: #6B7586;
-$ink-lightest-clr: #9CA7AE;
+$ink-regular-clr: #1d2129;
+$ink-light-clr: #3b4352;
+$ink-lighter-clr: #6b7586;
+$ink-lightest-clr: #9ca7ae;
 
 /* Text Colors */
-$primary-text-clr: #1D2129;
-$subdued-text-clr: #D9DEE3;
+$primary-text-clr: #1d2129;
+$subdued-text-clr: #d9dee3;
 
 /* Common Colors */
-$white: #FFFFFF;
+$white: #ffffff;
 $black: #000000;
 
 // Gradient Colors
@@ -56,7 +57,7 @@ $gradient-one: linear-gradient(270deg, $grey-lighter-clr 81.75%, rgba(243, 244,
 $cta-hover-gradient: linear-gradient(0deg, rgba(0, 0, 0, 0.24), rgba(0, 0, 0, 0.24)), $brand-color;
 
 /* Typography */
-$primary-font: 'Open Sans', sans-serif;
+$primary-font: "Open Sans", sans-serif;
 $font-size: (
   24: 24px,
   18: 18px,

data/app/assets/stylesheets/cm_admin/pages/import_page.scss

@@ -25,7 +25,7 @@
       line-height: 22px;
       margin-bottom: 0;
     }
-  }   
+  }
   &__body {
     padding: 16px 24px;
     .body-title {
@@ -63,9 +63,6 @@
 
     .actions-wrapper {
       margin-top: 32px;
-      button {
-        padding: 5px 10px;
-      }
     }
 
     //form UI
@@ -90,7 +87,7 @@
           margin-bottom: 16px;
           text-transform: uppercase;
         }
-        .steps-wrapper  {
+        .steps-wrapper {
           .steps-title {
             @include font($size: size(16), $weight: bold);
             font-family: $primary-font;
@@ -116,10 +113,6 @@
           }
         }
       }
-      .import-btn {
-        padding: 5px 10px;
-      }
     }
-   
   }
-}
+}

data/app/controllers/cm_admin/resource_controller.rb

@@ -137,15 +137,19 @@ module CmAdmin
             data = @action.parent == "index" ? @ar_object.data : @ar_object
             format.html { render @action.partial }
           else
-            response_object = @action.code_block.call(@response_object)
-            if response_object.class == Hash
-              format.json { render json: response_object }
-            elsif response_object.errors.empty?
-              redirect_url = @model.current_action.redirection_url || @action.redirection_url || request.referrer || "/cm_admin/#{@model.ar_model.table_name}/#{@response_object.id}"
-              format.html { redirect_to redirect_url, notice: "#{@action.name.titleize} is successful" }
-            else
-              error_messages = response_object.errors.full_messages.map{|error_message| "<li>#{error_message}</li>"}.join
-              format.html { redirect_to request.referrer, alert: "<b>#{@action.name.titleize} is unsuccessful</b><br /><ul>#{error_messages}</ul>" }
+            begin
+              response_object = @action.code_block.call(@response_object)
+              if response_object.class == Hash
+                format.json { render json: response_object }
+              elsif response_object.errors.empty?
+                redirect_url = @model.current_action.redirection_url || @action.redirection_url || request.referrer || "/cm_admin/#{@model.ar_model.table_name}/#{@response_object.id}"
+                format.html { redirect_to redirect_url, notice: "#{@action.name.titleize} is successful" }
+              else
+                error_messages = response_object.errors.full_messages.map{|error_message| "<li>#{error_message}</li>"}.join
+                format.html { redirect_to request.referrer, alert: "<b>#{@action.name.titleize} is unsuccessful</b><br /><ul>#{error_messages}</ul>" }
+              end
+            rescue => exception
+              format.html { redirect_to request.referrer, alert: "<b>#{@action.name.titleize} is unsuccessful</b><br /><p>#{exception.message}</p>" }
             end
           end
         end

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

@@ -5,11 +5,9 @@
 - if custom_actions.any? || edit_action.present? || destroy_action.present?
   td.row-action-cell
     .row-action-tool
-      button.secondary-btn.tool-btn
+      button.btn-ghost.dropdown-toggle
         span
           i.fa.fa-bars.bolder
-        span
-          i.fa.fa-angle-down
       .popup-card.table-export-popup.hidden
         - if edit_action.present?
           = link_to cm_admin.send("#{current_model.name.underscore}_edit_path", ar_object.id) do

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

@@ -8,7 +8,7 @@
       - association = @ar_object.class.reflect_on_all_associations.select{|x| x.name == @associated_model.name.tableize.to_sym }.first
       - polymorphic_name = (association && association.inverse_of && association.inverse_of.options[:polymorphic]) ? association.inverse_of.name : ''
       a href="#{CmAdmin::Engine.mount_path}/#{@associated_model.name.tableize}/new?associated_id=#{@ar_object.id}&associated_class=#{@ar_object.class.name.underscore}&polymorphic_name=#{polymorphic_name}&referrer=#{request.path}"
-        button.secondary-btn.column-btn Add
+        button.btn-secondary Add
     / button.secondary-btn.column-btn data-target="#columnActionModal" data-toggle="modal" type="button"
     /   span
     /     i.fa.fa-columns.bolder

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

@@ -15,7 +15,8 @@
         | Chapter 1
       .field-remove-action
         - if @reflections.select {|x| x if x.name == assoc_name}.first.macro == :has_many
-          = link_to_remove_association "", f, class: 'fa fa-trash ghost-btn accordion-delete-btn'
+          .accordion-delete-btn
+            = link_to_remove_association "", f, class: 'fa fa-trash btn-ghost'
     div.accordion-collapse.collapse.show[aria-labelledby="headingOne" id="#{assoc_name}-#{f.object.id}"]
       .accordion-body
         - fields.each do |field|

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

@@ -7,4 +7,4 @@
         = render partial: '/cm_admin/main/nested_fields', locals: { f: record, assoc_name: assoc_name, section: section }
     - if @reflections.select {|x| x if x.name == assoc_name}.first.macro == :has_many
       .links
-        = link_to_add_association "+ Add #{assoc_name.to_s.titleize}", f, table_name, partial: '/cm_admin/main/nested_fields', render_options:  {locals: { assoc_name: assoc_name, section: section }}, class: 'd-inline-block secondary-btn mt-2'
+        = link_to_add_association "+ Add #{assoc_name.to_s.titleize}", f, table_name, partial: '/cm_admin/main/nested_fields', render_options:  {locals: { assoc_name: assoc_name, section: section }}, class: 'd-inline-block btn-secondary mt-2'

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

@@ -1,4 +1,4 @@
-ul.nav.nav-pills
+ul.tabs
   - @model.available_tabs.each do |nav_item|
     - if nav_item.display_if.call(@ar_object)
       - if nav_item.custom_action.empty? || (nav_item.custom_action.present? && policy([:cm_admin, @model.name.classify.constantize]).send(:"#{nav_item.custom_action}?"))

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

@@ -1,33 +1,27 @@
-.cm-navbar
-  .cm-navbar__lhs
+.entity-header
+  .entity-header__info
     - if cm_admin.method_defined?(:"#{@model.name.underscore}_index_path") && (@model.current_action.name == 'show' || @model.current_action.layout_type.present?)
-      .bread-crumb-area
-        .breadcrumb-text
-          = link_to "#{@model.name.titleize.pluralize} /", cm_admin.send(:"#{@model.name.underscore}_index_path")
-    .nav-title-area
-      p.title-text = action_title
-      p.title-sub-text = action_description
-  .cm-navbar__rhs
+      .breadcrumb
+        = link_to "#{@model.name.titleize.pluralize} /", cm_admin.send(:"#{@model.name.underscore}_index_path"), class: 'text-reset'
+    h4 = action_title
+    p.mb-0.text-body-secondary = action_description
+  .entity-header__actions
     - if @model.current_action.name == 'index'
       - if has_valid_policy(@model.name, :exportable)
         .export-container
           .dropdown
-            button.secondary-btn data-bs-toggle='dropdown'
-              span
+            button.btn-secondary.dropdown-toggle data-bs-toggle='dropdown'
                 i.fa.fa-arrow-down
-              span
                 | Export
-              span
-                i.fa.fa-angle-down
             ul.dropdown-menu.export-popup
               li
                 .popup-option.pointer data-bs-toggle='modal' data-bs-target='#exportmodal'
                   span Export
       - if @model.importer && has_valid_policy(@model.name, :importable)
-        = link_to 'Import', cm_admin.send(:"#{@model.name.underscore}_import_path"), class: 'primary-btn ml-2'
+        = link_to 'Import', cm_admin.send(:"#{@model.name.underscore}_import_path"), class: 'btn-primary ml-2'
       - new_action = @model.available_actions.select{|act| act if act.action_type.eql?(:default) && act.name.eql?('new')}
       - if new_action.any? && policy([:cm_admin, @model.name.classify.constantize]).new?
-        = link_to 'Add', cm_admin.send(:"#{@model.name.underscore}_new_path"), class: 'primary-btn ml-2'
+        = link_to 'Add', cm_admin.send(:"#{@model.name.underscore}_new_path"), class: 'btn-primary ml-2'
       - @model.available_actions.select{|act| act if act.route_type == 'collection'}.each do |custom_action|
         = custom_action_items(custom_action, 'index')
     - elsif @model.current_action.name == 'show'
@@ -36,4 +30,4 @@
 
       - edit_action = @model.available_actions.select{|act| act if act.action_type.eql?(:default) && act.name.eql?('edit')}
       - if edit_action.any? && policy([:cm_admin, @model.name.classify.constantize]).edit?
-        = link_to "Edit #{@model.name.titleize.pluralize}", cm_admin.send(:"#{@model.name.underscore}_edit_path", @ar_object), class: 'primary-btn ml-2'
+        = link_to "Edit #{@model.name.titleize.pluralize}", cm_admin.send(:"#{@model.name.underscore}_edit_path", @ar_object), class: 'btn-primary ml-2'

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

@@ -1,8 +1,7 @@
 .show-page.cm-page-container
-  .show-page__tabs.sticky-container.page-top-bar
-    .cm-tabs-bar
-      == render 'cm_admin/main/top_navbar'
-      == render 'cm_admin/main/tabs'
+  .show-page__header.sticky-container.page-top-bar
+    == render 'cm_admin/main/top_navbar'
+    == render 'cm_admin/main/tabs'
   .show-page__inner.scrollable
     .history-box
       - @ar_object.action_trails.each do |at|

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

@@ -12,7 +12,7 @@
         p.success-msg Your file has been uploaded and it will be processed soon.
         / p.success-msg-info An email will be sent once the process is completed. If there are any problems with the import, we'll let you know through an email.
       .actions-wrapper
-        a.secondary-btn href="#{cm_admin.send(:"#{@model.name.underscore}_import_path")}" Import new data
+        a.btn-secondary href="#{cm_admin.send(:"#{@model.name.underscore}_import_path")}" Import new data
         / button.cta-btn.ml-2 Back to Page_Name
     - else
       = simple_form_for(FileImport.new, url: "/admin/#{@model.ar_model.table_name}/import", method: :post, html: { class: "csv-import-form" }) do |f|
@@ -32,4 +32,4 @@
                 li Add your data on the file without changing the format
                 li Save the file as a csv
                 li Upload the file in the field above
-        = f.button :submit, class: "cta-btn import-btn", value: 'Import data'
+        = f.button :submit, class: "btn-cta", value: 'Import data'

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

@@ -16,4 +16,4 @@
                 - @ar_object.errors.full_messages.each do |error_message|
                   li = error_message
 
-      = generate_form(@ar_object.class.name.constantize.new, @model)
+      = generate_form(@ar_object, @model)

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

@@ -1,8 +1,7 @@
 .show-page.cm-page-container
-  .show-page__tabs.sticky-container.page-top-bar
-    .cm-tabs-bar
-      == render 'cm_admin/main/top_navbar'
-      == render 'cm_admin/main/tabs'
+  .show-page__header.sticky-container.page-top-bar
+    == render 'cm_admin/main/top_navbar'
+    == render 'cm_admin/main/tabs'
   .show-page__inner.scrollable
     - if @action.partial
       == render @action.partial

data/app/views/layouts/_cm_flash_message.html.slim

@@ -1,9 +1,9 @@
 - if flash[:notice].present?
   javascript:
-    $.jGrowl("#{flash[:notice]}", {theme: 'notice'})
+    $.jGrowl("#{flash[:notice]}", { theme: 'notice' })
 - elsif flash[:success].present?
   javascript:
-    $.jGrowl("#{flash[:success]}", {theme: 'success'})
+    $.jGrowl("#{flash[:success]}", { theme: 'success' })
 - elsif flash[:alert].present?
   javascript:
-    $.jGrowl("#{flash[:alert].html_safe}", {theme: 'error'})
+    $.jGrowl("#{flash[:alert].html_safe}", { theme: 'error' })

data/app/views/layouts/_quick_links.html.slim

@@ -19,7 +19,7 @@
             span.move-arrow
               i.fa.fa-long-arrow-down
             span Select
-          button.text-btn.enter-btn
+          p.enter-text
             | ENTER
-          button.text-btn.open-btn
+          p.open-text
             | open

data/app/views/layouts/cm_admin.html.slim

@@ -25,22 +25,20 @@ html
       .panel-area
         - if defined?(@action) && (@action&.layout_type.to_s == 'cm_association_show' || @action.parent == "show")
           .show-page.cm-page-container
-            .show-page__tabs.sticky-container.page-top-bar
-              .cm-tabs-bar
-                == render 'cm_admin/main/top_navbar'
-                == render 'cm_admin/main/tabs'
+            .show-page__header.sticky-container.page-top-bar
+              == render 'cm_admin/main/top_navbar'
+              == render 'cm_admin/main/tabs'
             .show-page__inner.scrollable
               = yield
         - elsif defined?(@action) && (@action&.layout_type.to_s == 'cm_association_index' || @action.parent == "index")
           .show-page.cm-page-container
-            .show-page__tabs.sticky-container.page-top-bar
-              .cm-tabs-bar
-                == render 'cm_admin/main/top_navbar'
-                - if @ar_object.model_name
-                  == render 'cm_admin/main/tabs'
-                - if @associated_model && @associated_model.filters.present?
-                  .filters-bar
-                    == render partial: 'cm_admin/main/filters', locals: { filters: @associated_model.filters }
+            .show-page__header.sticky-container.page-top-bar
+              == render 'cm_admin/main/top_navbar'
+              - if @ar_object.model_name
+                == render 'cm_admin/main/tabs'
+              - if @associated_model && @associated_model.filters.present?
+                .filters-bar
+                  == render partial: 'cm_admin/main/filters', locals: { filters: @associated_model.filters }
             = yield
         - else
           = yield

data/lib/cm_admin/models/filter.rb

@@ -1,6 +1,10 @@
+require_relative 'utils/helpers'
+
 module CmAdmin
   module Models
     class Filter
+      include Utils::Helpers
+
       attr_accessor :db_column_name, :filter_type, :placeholder, :collection
 
       VALID_FILTER_TYPES = Set[:date, :multi_select, :range, :search, :single_select].freeze
@@ -8,37 +12,55 @@ module CmAdmin
       def initialize(db_column_name:, filter_type:, options: {})
         raise TypeError, "Can't have array of multiple columns for #{filter_type} filter" if db_column_name.is_a?(Array) && db_column_name.size > 1 && !filter_type.to_sym.eql?(:search)
         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)
+        set_default_values
         options.each do |key, value|
-          self.send("#{key.to_s}=", value)
+          send("#{key}=", value)
         end
       end
 
       def structure_data(db_column_name, filter_type)
         filter_type = filter_type.is_a?(Array) ? filter_type[0].to_sym : filter_type.to_sym
 
-        case filter_type
-        when :search
-          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
+        db_column_name = case filter_type
+                         when :search
+                           ([] << db_column_name).flatten.map { |x| x.instance_of?(Hash) ? x : x.to_sym }
+                         else
+                           db_column_name.is_a?(Array) ? db_column_name[0].to_sym : db_column_name.to_sym
+                         end
         [db_column_name, filter_type]
       end
 
+      # Set default placeholder for the filter.
+      # Date and range filter will not have any placeholder.
+      # Else condition is added for fallback.
+      def set_default_values
+        placeholder = case filter_type
+                      when :search
+                        'Search'
+                      when :single_select, :multi_select
+                        "Select/search #{humanized_field_value(db_column_name)}"
+                      else
+                        "Enter #{humanized_field_value(db_column_name)}"
+                      end
+        self.placeholder = placeholder
+      end
+
       # Methods to filter the records based on the filter type.
       class << self
         def filtered_data(filter_params, records, filters)
           if filter_params
             filter_params.each do |scope_type, scope_value|
-              scope_name = if scope_type.eql?('date') || scope_type.eql?('range')
-                'date_and_range'
-              elsif scope_type.eql?('single_select') || scope_type.eql?('multi_select')
-                'dropdown'
-              else
-                scope_type
-              end
-              records = self.send("cm_#{scope_name}_filter", scope_value, records, filters) if scope_value.present?
+              scope_name = case scope_type
+                           when 'date', 'range'
+                             'date_and_range'
+                           when 'single_select', 'multi_select'
+                             'dropdown'
+                           else
+                             scope_type
+                           end
+              records = send("cm_#{scope_name}_filter", scope_value, records, filters) if scope_value.present?
             end
           end
           records
@@ -46,15 +68,17 @@ 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|
+          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)
+              case col
+              when Symbol
                 query_variables << "#{table_name.pluralize}.#{col}"
-              elsif col.is_a?(Hash)
+              when Hash
                 col.map do |key, value|
-                  value.map {|val| query_variables << "#{key.to_s.pluralize}.#{val}" }
+                  value.map { |val| query_variables << "#{key.to_s.pluralize}.#{val}" }
                 end
               end
             end
@@ -62,14 +86,14 @@ module CmAdmin
             terms = terms.map { |e|
               (e.gsub('*', '%').prepend('%') + '%').gsub(/%+/, '%')
             }
-            sql = ""
+            sql = ''
             query_variables.each.with_index do |column, i|
               sql.concat("#{column} ILIKE ?")
-              sql.concat(' OR ') unless query_variables.size.eql?(i+1)
+              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
+            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
 
@@ -85,19 +109,21 @@ module CmAdmin
 
         def cm_date_and_range_filter(scope_value, records, filters)
           return nil if scope_value.nil?
+
           scope_value.each do |key, value|
-            if value.present?
-              value = value.split(' to ')
-              from = value[0].presence
-              to = value[1].presence
-              records = records.where(key => from..to)
-            end
+            next unless value.present?
+
+            value = value.split(' to ')
+            from = value[0].presence
+            to = value[1].presence
+            records = records.where(key => from..to)
           end
           records
         end
 
         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/models/form_field.rb

@@ -1,6 +1,10 @@
+require_relative 'utils/helpers'
+
 module CmAdmin
   module Models
     class FormField
+      include Utils::Helpers
+
       attr_accessor :field_name, :label, :header, :input_type, :collection, :disabled, :helper_method,
                     :placeholder, :display_if, :html_attr, :target
 
@@ -13,9 +17,10 @@ module CmAdmin
         @field_name = field_name
         set_default_values
         attributes.each do |key, value|
-          self.send("#{key.to_s}=", value)
+          send("#{key}=", value)
         end
-        self.display_if = lambda { |arg| return true } if self.display_if.nil?
+        set_default_placeholder
+        self.display_if = lambda { |arg| return true } if display_if.nil?
         raise ArgumentError, "Kindly select a valid input type like #{VALID_INPUT_TYPES.sort.to_sentence(last_word_connector: ', or ')} instead of #{self.input_type} for form field #{field_name}" unless VALID_INPUT_TYPES.include?(self.input_type.to_sym)
       end
 
@@ -23,10 +28,20 @@ module CmAdmin
         self.disabled = false
         self.label = self.field_name.to_s.titleize
         self.input_type = :string
-        self.placeholder = "Enter #{self.field_name.to_s.downcase.gsub('_', ' ')}"
         self.html_attr = {}
         self.target = {}
       end
+
+      def set_default_placeholder
+        return unless placeholder.nil?
+
+        self.placeholder = case input_type&.to_sym
+                           when :single_select, :multi_select, :date, :date_time
+                             "Select #{humanized_field_value(field_name)}"
+                           else
+                             "Enter #{humanized_field_value(field_name)}"
+                           end
+      end
     end
   end
 end

data/lib/cm_admin/models/utils/helpers.rb

@@ -0,0 +1,14 @@
+module CmAdmin
+  module Models
+    module Utils
+      module Helpers
+        extend ActiveSupport::Concern
+
+        # Returns the humanized value of the field.
+        def humanized_field_value(name, capitalize: false)
+          name.to_s.humanize(capitalize: capitalize)
+        end
+      end
+    end
+  end
+end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.1.7'
+  VERSION = '1.1.9'
 end

data/lib/cm_admin/view_helpers/filter_helper.rb

@@ -169,7 +169,7 @@ module CmAdmin
         else
           value_mapped_text = value
         end
-        
+
         concat(content_tag(:div, class: "position-relative mr-3 #{value ? '' : 'hidden'}") do
           concat filter_chip(value_mapped_text, filter)