cm-admin 2.1.4 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea557439972b4bf69c93412b81415aed76726933fde6e45599ee6f08bdc9e5be
-  data.tar.gz: f1b704b48795f36a0b8efe342dc4f4de49351112c47a2e6fd6dfbec982fa5bc1
+  metadata.gz: ab22f4bef2b77930d17a0910dbc5ee20f0773f9f025d7e7ba7fde8a55be7e5f8
+  data.tar.gz: ba334104c29113fbec5440dbe31b13b8fb8513efd6a8be7308928815141256a0
 SHA512:
-  metadata.gz: ce7a4d687dcbcd2db7eafaaf77fa45f0d0048b3ba3bfef259c5eb9c7510a569d7c2d9e4876342973d343aca20d295959df33455dbd150e684bea4deb17418f7b
-  data.tar.gz: 4c823776edeb548873d43caf016c402cf102eac48d41b5c9d94e6a7bfd8fbd31ab61dea523215d3d55192312387c0f56465bd5591fb6461f69a771240a81d411
+  metadata.gz: 67c7bf36f684d04d976fbad85a58f5910a84762f2e750918b3ab2eef6b7c9b4471bb9ff6f8b1594bb8dc7f3bf9910cf6b4560d9e80ad8ae24d6a8b56321901ae
+  data.tar.gz: 47b9d696e72e73ef748ffc51301891dc2fa3667f3f201ec61643167d13b286d0dc289ec7ddd4a867700c93a1b23bdbb5395b747d82e7fc71e00c39fc42e77e44

data/Gemfile.lock

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

data/app/assets/javascripts/cm_admin/filters.js

@@ -19,6 +19,9 @@ var CmFilter = {
 // Main method which will structure the existing filter values with the newly
 // applied filter. Send and receive the value from the backend.
 var getFilteredData = function(filterType, filterValue, filterColumn=null) {
+  let sortColumn = $('[data-behaviour="sort-column"]').val();
+  let sortDirection = $('[data-behaviour="sort-direction"]:checked').val();
+
   var url = window.location.pathname
 
   // Based on the value changed for recent filter generate the filterParams hash
@@ -27,15 +30,16 @@ var getFilteredData = function(filterType, filterValue, filterColumn=null) {
     filterParams[filterType] = {};
     filterParams[filterType][filterColumn] = filterValue
   } else {
-    filterParams[filterType] = filterValue
+    if (filterType) filterParams[filterType] = filterValue
   }
 
-  // TODO add sort params in the queryString
   // page params is reinitialized to 1 when any new filter value is applied so
   // that it won't throw the error when the user doesn't have sufficent data
   // to display on the table.
   var queryString = {
     filters: filterParams,
+    sort_column: sortColumn,
+    sort_direction: sortDirection,
     page: 1
   };
 
@@ -346,4 +350,27 @@ $(document).on('click', '[data-behaviour="selected-chip"]', function(e) {
     $(selectElement).parent().siblings(':first').addClass('search-area').removeClass('search-with-chips')
     $(selectElement).parent().siblings(':last').removeClass('active')
   }
-})
+})
+
+$(document).on("change", '[data-behaviour="sort-column"], [data-behaviour="sort-direction"]', function (e) {
+  getFilteredData(null, null, null);
+});
+
+$(document).on("click", '[data-behaviour="reset-sort"]', function (e) {
+  let url = window.location.pathname;
+  let queryString = getParamsAsObject(window.location.search);
+  delete queryString["sort_column"];
+  delete queryString["sort_direction"];
+  let queryParam = jQuery.param(queryString);
+  $.ajax({
+    type: 'POST',
+    url: url + "/reset_sort_columns",
+    success: function(data) {
+      window.history.pushState("", "", url + "?" + queryParam);
+      window.location.reload();
+    },
+    error: function(jqxhr, textStatus, errorThrown) {
+      console.log(errorThrown, textStatus);
+    }
+  });
+});

data/app/assets/javascripts/cm_admin/scaffolds.js

@@ -23,7 +23,6 @@ Select2();
 
 // import '@nathanvda/cocoon'
 import "daterangepicker";
-import "@fortawesome/fontawesome-free";
 import jqueryJgrowl from "jgrowl";
 
 document.addEventListener("turbo:load", function () {

data/app/assets/stylesheets/cm_admin/base/filters.scss

@@ -199,3 +199,23 @@
     height: 31px;
   }
 }
+
+.sort-button {
+  @extend .btn, .btn-outline-dark, .btn-sm, .d-flex;
+  gap: 4px;
+}
+
+.sort-menu {
+  padding: 0;
+  &__top {
+    @extend .p-3, .d-flex, .flex-column, .gap-3;
+  }
+  &__bottom {
+    @extend .d-flex, .px-3, .py-2, .bg-light, .rounded-2;
+    justify-content: center;
+    align-items: center;
+    button {
+      width: 100%;
+    }
+  }
+}

data/app/assets/stylesheets/cm_admin/cm_admin.css.scss

@@ -21,6 +21,5 @@
 @import "./base/alertbanner";
 @import "./components/index";
 @import "./dependency/flatpickr.min";
-@import "./dependency/fontawesome.all";
 @import "./dependency/jquery-jgrowl.min";
 @import "./scaffold";

data/app/controllers/cm_admin/resource_controller.rb

@@ -5,19 +5,21 @@ module CmAdmin
 
     helper CmAdmin::ViewHelpers
 
+    skip_before_action :verify_authenticity_token, only: :reset_sort_columns
+
     def cm_index(params)
       @current_action = CmAdmin::Models::Action.find_by(@model, name: 'index')
       # Based on the params the filter and pagination object to be set
       authorize @ar_object, policy_class: "CmAdmin::#{controller_name.classify}Policy".constantize if defined? "CmAdmin::#{controller_name.classify}Policy".constantize
-      records = "CmAdmin::#{@model.name}Policy::Scope".constantize.new(Current.user, @model.name.constantize).resolve
+      records = "CmAdmin::#{@model.name}Policy::IndexScope".constantize.new(Current.user, @model.name.constantize).resolve
       records = apply_scopes(records)
-      if (['table', 'card'].include?(params[:view_type]) || [:table, :card].include?(@current_action.view_type))
-        @ar_object = filter_by(params, records, filter_params: @model.filter_params(params))
-      elsif (request.xhr? && params[:view_type] == 'kanban') || @current_action.view_type == :kanban
-        @ar_object = kanban_filter_by(params, records, @model.filter_params(params))
-      else
-        @ar_object = filter_by(params, records, filter_params: @model.filter_params(params))
-      end
+      @ar_object = if %w[table card].include?(params[:view_type]) || %i[table card].include?(@current_action.view_type)
+                     filter_by(params, records, filter_params: @model.filter_params(params))
+                   elsif (request.xhr? && params[:view_type] == 'kanban') || @current_action.view_type == :kanban
+                     kanban_filter_by(params, records, @model.filter_params(params))
+                   else
+                     filter_by(params, records, filter_params: @model.filter_params(params))
+                   end
       respond_to do |format|
         if request.xhr? && (params[:view_type] == 'kanban' || @current_action.view_type == :kanban)
           format.json { render json: @ar_object }
@@ -31,7 +33,7 @@ module CmAdmin
 
     def cm_show(params)
       @current_action = CmAdmin::Models::Action.find_by(@model, name: 'show')
-      scoped_model = "CmAdmin::#{@model.name}Policy::Scope".constantize.new(Current.user, @model.name.constantize).resolve
+      scoped_model = "CmAdmin::#{@model.name}Policy::ShowScope".constantize.new(Current.user, @model.name.constantize).resolve
       @ar_object = fetch_ar_object(scoped_model, params[:id])
       @alerts = @model.alerts
       resource_identifier
@@ -45,7 +47,7 @@ module CmAdmin
       end
     end
 
-    def cm_new(params)
+    def cm_new(_params)
       @current_action = CmAdmin::Models::Action.find_by(@model, name: 'new')
       @ar_object = @model.ar_model.new
       resource_identifier
@@ -91,19 +93,17 @@ module CmAdmin
     end
 
     def import
-      @model = Model.find_by({name: controller_name.classify})
-      allowed_params = params.permit(file_import: [:associated_model_name, :import_file]).to_h
+      @model = Model.find_by({ name: controller_name.classify })
+      allowed_params = params.permit(file_import: %i[associated_model_name import_file]).to_h
       file_import = ::FileImport.new(allowed_params[:file_import])
       file_import.added_by = Current.user
       respond_to do |format|
-        if file_import.save!
-          format.html { redirect_back fallback_location: cm_admin.send("#{@model.name.underscore}_index_path"), notice: "Your import is successfully queued." }
-        end
+        format.html { redirect_back fallback_location: cm_admin.send("#{@model.name.underscore}_index_path"), notice: 'Your import is successfully queued.' } if file_import.save!
       end
     end
 
     def import_form
-      @model = Model.find_by({name: controller_name.classify})
+      @model = Model.find_by({ name: controller_name.classify })
       respond_to do |format|
         format.html { render '/cm_admin/main/import_form' }
       end
@@ -116,9 +116,9 @@ module CmAdmin
         if @bulk_action_processor.invalid_records.empty?
           format.html { redirect_to request.referrer, notice: "#{@action.name.humanize} is successful" }
         else
-          error_messages = @bulk_action_processor.invalid_records.map { |invalid_record|
+          error_messages = @bulk_action_processor.invalid_records.map do |invalid_record|
             "<li>#{invalid_record.error_message}</li>"
-          }.join
+          end.join
           format.html { redirect_to request.referrer, alert: "<b>#{@action.name.humanize} is unsuccessful</b><br /><ul>#{error_messages}</ul>" }
         end
       end
@@ -133,9 +133,9 @@ module CmAdmin
     end
 
     def cm_custom_method(params)
-      records = "CmAdmin::#{@model.name}Policy::Scope".constantize.new(Current.user, @model.name.constantize).resolve
+      records = "CmAdmin::#{@model.name}Policy::#{@action.name.classify}Scope".constantize.new(Current.user, @model.name.constantize).resolve
       @current_action = @action
-      if  @action.parent == 'index'
+      if @action.parent == 'index'
         records = apply_scopes(records)
         @ar_object = filter_by(params, records, filter_params: @model.filter_params(params))
       else
@@ -150,7 +150,7 @@ module CmAdmin
               format.html { render @action.layout }
             end
           elsif @action.display_type == :page
-            data = @action.parent == "index" ? @ar_object.data : @ar_object
+            @action.parent == 'index' ? @ar_object.data : @ar_object
             # TODO: To set a default value for @action.layout, Since it is used in render above,
             # Need to check and fix it.
             format.html { render @action.partial, layout: @action.layout || 'cm_admin' }
@@ -163,11 +163,11 @@ module CmAdmin
                 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
+                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: "<div><b>#{@action.name.titleize} is unsuccessful</b><br /><ul><li>#{exception.message}</li></ul></div>" }
+            rescue StandardError => e
+              format.html { redirect_to request.referrer, alert: "<div><b>#{@action.name.titleize} is unsuccessful</b><br /><ul><li>#{e.message}</li></ul></div>" }
             end
           end
         end
@@ -175,7 +175,7 @@ module CmAdmin
     end
 
     def cm_custom_action_modal(params)
-      scoped_model = "CmAdmin::#{@model.name}Policy::Scope".constantize.new(Current.user, @model.name.constantize).resolve
+      scoped_model = "CmAdmin::#{@model.name}Policy::#{params[:action_name].classify}Scope".constantize.new(Current.user, @model.name.constantize).resolve
       @ar_object = fetch_ar_object(scoped_model, params[:id])
       if params[:action_name] == 'destroy'
         render partial: '/layouts/destroy_action_modal', locals: { ar_object: @ar_object }
@@ -185,6 +185,12 @@ module CmAdmin
       end
     end
 
+    def reset_sort_columns
+      @model = Model.find_by({ name: controller_name.classify })
+      @model.default_sort_column = nil
+      @model.default_sort_direction = nil
+    end
+
     def get_nested_table_fields(fields)
       nested_table_fields = []
       fields.each do |field|
@@ -200,17 +206,17 @@ module CmAdmin
     def resource_identifier
       @ar_object, @associated_model, @associated_ar_object = custom_controller_action(action_name, params.permit!) if !@ar_object.present? && params[:id].present?
       authorize @ar_object, policy_class: "CmAdmin::#{controller_name.classify}Policy".constantize if defined? "CmAdmin::#{controller_name.classify}Policy".constantize
-      aar_model = request.url.split('/')[-2].classify.constantize  if params[:aar_id]
+      aar_model = request.url.split('/')[-2].classify.constantize if params[:aar_id]
       @associated_ar_object = fetch_ar_object(aar_model, params[:aar_id]) if params[:aar_id]
       nested_fields = get_nested_table_fields(@model.available_fields[:new])
       nested_fields += get_nested_table_fields(@model.available_fields[:edit])
       @reflections = @model.ar_model.reflect_on_all_associations
       nested_fields.each do |nested_field|
         table_name = nested_field.field_name
-        reflection = @reflections.select {|x| x if x.name == table_name}.first
+        reflection = @reflections.select { |x| x if x.name == table_name }.first
         if reflection.macro == :has_many
-          @ar_object.send(table_name).build if action_name == "new" || action_name == "edit"
-        elsif action_name == "new"
+          @ar_object.send(table_name).build if action_name == 'new' || action_name == 'edit'
+        elsif action_name == 'new'
           @ar_object.send(('build_' + table_name.to_s).to_sym)
         end
       end
@@ -226,9 +232,7 @@ module CmAdmin
                          else
                            cm_admin.send("#{@model.name.underscore}_show_path", @ar_object)
                          end
-          if params['attachment_destroy_ids'].present?
-            ActiveStorage::Attachment.where(id: params['attachment_destroy_ids']).destroy_all
-          end
+          ActiveStorage::Attachment.where(id: params['attachment_destroy_ids']).destroy_all if params['attachment_destroy_ids'].present?
           format.html { redirect_to redirect_url, allow_other_host: true, notice: "#{action_name.titleize} #{@ar_object.class.name.downcase} is successful" }
         else
           format.html { render '/cm_admin/main/new', notice: "#{action_name.titleize} #{@ar_object.class.name.downcase} is unsuccessful" }
@@ -240,7 +244,8 @@ module CmAdmin
       @current_action = CmAdmin::Models::Action.find_by(@model, name: action_name.to_s)
       return unless @current_action
 
-      @ar_object = fetch_ar_object(@model.ar_model.name.classify.constantize, params[:id])
+      scoped_model = "CmAdmin::#{@model.name}Policy::#{action_name.classify}Scope".constantize.new(Current.user, @model.ar_model.name.classify.constantize).resolve
+      @ar_object = fetch_ar_object(scoped_model, params[:id])
       return @ar_object unless @current_action.child_records
 
       child_records = @ar_object.send(@current_action.child_records)
@@ -258,7 +263,7 @@ module CmAdmin
                               else
                                 child_records
                               end
-      return @ar_object, @associated_model, @associated_ar_object
+      [@ar_object, @associated_model, @associated_ar_object]
     end
 
     def apply_scopes(records)
@@ -271,35 +276,32 @@ module CmAdmin
     def filter_by(params, records, parent_record: nil, filter_params: {}, sort_params: {})
       filtered_result = OpenStruct.new
       cm_model = @associated_model || @model
-      db_columns = cm_model.ar_model&.columns&.map{|x| x.name.to_sym}
-      if db_columns.include?(@current_action.sort_column)
-        sort_column = @current_action.sort_column
-      else
-        sort_column = 'created_at'
-      end
-      records = "CmAdmin::#{@model.name}Policy::Scope".constantize.new(Current.user, @model.name.constantize).resolve if records.nil?
-      records = records.order("#{sort_column} #{@current_action.sort_direction}")
+      db_columns = cm_model.ar_model&.columns&.map { |x| x.name.to_sym }
+      sort_column = if db_columns.include?(params[:sort_column]&.to_sym)
+                      params[:sort_column]
+                    else
+                      cm_model.default_sort_column
+                    end
+      sort_direction = params[:sort_direction] || cm_model.default_sort_direction
+      records = "CmAdmin::#{@model.name}Policy::#{@current_action.name.classify}Scope".constantize.new(Current.user, @model.name.constantize).resolve if records.nil?
+      records = records.order("#{sort_column} #{sort_direction}") if sort_column.present?
       final_data = CmAdmin::Models::Filter.filtered_data(filter_params, records, cm_model.filters)
       pagy, records = pagy(final_data)
       filtered_result.data = records
       filtered_result.pagy = pagy
       filtered_result.parent_record = parent_record
       filtered_result.associated_model = @associated_model.name if @associated_model
-      # filtered_result.ar_model =
-      # filtered_result.facets = paginate(page, raw_data.size)
-      # filtered_result.sort = sort_params
-      # filtered_result.facets.sort = sort_params
-      return filtered_result
+      filtered_result
     end
 
-    def kanban_filter_by(params, records, filter_params={}, sort_params={})
+    def kanban_filter_by(params, records, filter_params = {}, _sort_params = {})
       filtered_result = OpenStruct.new
       cm_model = @associated_model || @model
-      db_columns = cm_model.ar_model&.columns&.map{|x| x.name.to_sym}
+      db_columns = cm_model.ar_model&.columns&.map { |x| x.name.to_sym }
       if db_columns.include?(@current_action.sort_column)
-        sort_column = @current_action.sort_column
+        @current_action.sort_column
       else
-        sort_column = 'created_at'
+        'created_at'
       end
       records = "CmAdmin::#{@model.name}Policy::Scope".constantize.new(Current.user, @model.name.constantize).resolve if records.nil?
       # records = records.order("#{sort_column} #{@current_action.sort_direction}")
@@ -312,7 +314,7 @@ module CmAdmin
       page = params[:page] || 1
       max_page = (group_record_count.values.max.to_i / per_page.to_f).ceil
       filtered_result.paging['next_page'] = (page.to_i < max_page)
-      filtered_result.column_count = group_record_count.reject {|key, value| key.blank? }
+      filtered_result.column_count = group_record_count.reject { |key, _value| key.blank? }
 
       column_names = @model.ar_model.send(params[:kanban_column_name]&.pluralize || @current_action.kanban_attr[:column_name].pluralize).keys
       if @current_action.kanban_attr[:only].present?
@@ -325,8 +327,8 @@ module CmAdmin
         filtered_result.data[column] = ''
         next if page.to_i > (total_count.to_i / per_page.to_f).ceil
 
-        pagy, records = pagy(final_data.send(column), items: per_page.to_i)
-        filtered_result.data[column] = render_to_string partial: 'cm_admin/main/kanban_card', locals: { ar_collection: records}
+        _, records = pagy(final_data.send(column), items: per_page.to_i)
+        filtered_result.data[column] = render_to_string partial: 'cm_admin/main/kanban_card', locals: { ar_collection: records }
       end
       filtered_result
     end
@@ -339,8 +341,8 @@ module CmAdmin
         table_name = @model.ar_model.reflections.with_indifferent_access[nested_table_field.field_name.to_s].klass.table_name
       end
       column_names = table_name.to_s.classify.constantize.column_names
-      column_names = column_names.map {|column_name| column_name.gsub('_cents', '') }
-      column_names = column_names.reject { |column_name| CmAdmin::REJECTABLE_FIELDS.include?(column_name) }.map(&:to_sym) + [:id, :_destroy]
+      column_names = column_names.map { |column_name| column_name.gsub('_cents', '') }
+      column_names = column_names.reject { |column_name| CmAdmin::REJECTABLE_FIELDS.include?(column_name) }.map(&:to_sym) + %i[id _destroy]
       if nested_table_field.associated_fields
         nested_table_field.associated_fields.each do |associated_field|
           column_names << generate_nested_params(associated_field)
@@ -354,17 +356,17 @@ module CmAdmin
     end
 
     def resource_params(params)
-      columns = @model.ar_model.columns_hash.map {|key, ar_adapter|
+      columns = @model.ar_model.columns_hash.map do |_key, ar_adapter|
         ar_adapter.sql_type_metadata.sql_type.ends_with?('[]') ? Hash[ar_adapter.name, []] : ar_adapter.name.to_sym
-      }
+      end
       columns += @model.ar_model.stored_attributes.values.flatten
       permittable_fields = @model.additional_permitted_fields + columns.reject { |i| CmAdmin::REJECTABLE_FIELDS.include?(i) }
       permittable_fields += attachment_fields(@model.ar_model.name.constantize)
       nested_table_fields = get_nested_table_fields(@model.available_fields[:new])
       nested_table_fields += get_nested_table_fields(@model.available_fields[:edit])
-      nested_fields = nested_table_fields.uniq.map {|nested_table_field|
+      nested_fields = nested_table_fields.uniq.map do |nested_table_field|
         generate_nested_params(nested_table_field)
-      }
+      end
       permittable_fields += nested_fields
       @model.ar_model.columns.map { |col| permittable_fields << col.name.split('_cents') if col.name.include?('_cents') }
       params.require(@model.name.underscore.to_sym).permit(*permittable_fields)
@@ -379,14 +381,15 @@ module CmAdmin
     private
 
     def attachment_fields(model_object)
-      model_object.reflect_on_all_associations.map {|reflection|
+      model_object.reflect_on_all_associations.map do |reflection|
         next if reflection.options[:polymorphic]
+
         if reflection.class.name.include?('HasOne')
           reflection.name.to_s.gsub('_attachment', '').gsub('rich_text_', '').to_sym
         elsif reflection.class.name.include?('HasMany')
           Hash[reflection.name.to_s.gsub('_attachments', ''), []]
         end
-      }.compact
+      end.compact
     end
   end
 end

data/app/models/concerns/cm_admin/cm_role.rb

@@ -3,9 +3,10 @@ module CmAdmin::CmRole
   included do
     cm_admin do
       actions only: []
-      set_icon "fa fa-database"
+      set_icon 'fa fa-database'
       cm_index do
-        page_title 'Role'
+        page_title 'Roles & Permissions'
+        set_display_name 'Role'
 
         filter [:name], :search, placeholder: 'Search'
 
@@ -20,10 +21,13 @@ module CmAdmin::CmRole
           # allowed_params = params.permit(role_permission: []).to_h
           @role = CmRole.find(params[:id])
           params[:role_permission].except(:submit).each do |model_name, action_arr|
-            @role.cm_permissions.where(ar_model_name: model_name).where.not(action_name: action_arr.select{ |k,v| k if v.has_key?('is_checked')}.keys).destroy_all
+            action_names = action_arr.select { |k, v| k if v.key?('is_checked') }.keys
+            action_names << 'create' if action_names.include?('new')
+            action_names << 'update' if action_names.include?('edit')
+            @role.cm_permissions.where(ar_model_name: model_name).where.not(action_name: action_names).destroy_all
             action_arr.each do |action_name, selected_option|
               if selected_option.has_key?('is_checked')
-                permission = @role.cm_permissions.where(action_name: action_name, ar_model_name: model_name).first_or_create
+                permission = @role.cm_permissions.where(action_name:, ar_model_name: model_name).first_or_create
                 permission.update(scope_name: selected_option['scope_name'])
               end
             end
@@ -34,7 +38,7 @@ module CmAdmin::CmRole
           cm_show_section 'Role details' do
             field :name
             field :created_at, field_type: :date, format: '%d %b, %Y'
-            field :updated_at, field_type: :date, format: '%d %b, %Y'    
+            field :updated_at, field_type: :date, format: '%d %b, %Y'
           end
         end
         tab :permissions, 'permissions', layout_type: 'cm_association_show', partial: '/cm_admin/roles/permissions'
@@ -53,4 +57,4 @@ module CmAdmin::CmRole
       end
     end
   end
-end
+end

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

@@ -3,18 +3,16 @@
     .cm-index-page__filters
       == render partial: 'cm_admin/main/filters', locals: { filters: @associated_model.filters }
   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_ar_object, 'new')
-      - 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.btn-secondary Add
-    / button.secondary-btn.column-btn data-target="#columnActionModal" data-toggle="modal" type="button"
-    /   span
-    /     i.fa.fa-columns.bolder
-    /   span
-    /     i.fa.fa-angle-down
+  div.d-flex.gap-3
+    .table-top__column-action
+      - if @associated_model && @associated_model.available_actions.map(&:name).include?('new') && has_valid_policy(@associated_ar_object, 'new')
+        - 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.btn-secondary Add
+    - if @associated_model.sort_columns.present?
+      = render 'cm_admin/main/sort', model: @associated_model, ar_object: @associated_ar_object
+
 - if flash[:alert].present?
   .alert.alert-danger role="alert"
     = flash[:alert].html_safe

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

@@ -13,7 +13,7 @@
             - nested_table_field.fields.each do |field|
               th data-field-type="#{field.input_type}"
                 - if field.label
-                  = field.label.to_s.titleize || field.field_name.to_s.titleize 
+                  = field.label.to_s || field.field_name.to_s.titleize 
         tbody class="insert-cocoon-position-#{uniq_no}"
           = f.fields_for table_name do |record|
             - if record.object.persisted? || @ar_object.errors.present?

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

@@ -0,0 +1,27 @@
+- sort_column = params[:sort_column] || model.default_sort_column
+- sort_direction = params[:sort_direction] || model.default_sort_direction
+.dropdown
+  button.sort-button data-bs-toggle="dropdown"
+    - if sort_column.present?
+      span
+        - if sort_direction == 'asc'
+          i.fa-duotone.fa-solid.fa-arrow-up-short-wide
+        - else
+          i.fa-duotone.fa-solid.fa-arrow-down-short-wide
+      = "#{model.sort_columns.find{ |c| c[:column] == sort_column }[:display_name]}"
+    - else
+      span
+        i.fa-solid.fa-arrow-down-arrow-up
+      | Sort
+  .dropdown-menu.sort-menu
+    div.sort-menu__top
+      = select_tag 'sort_column', options_for_select([['Select Column', '']] + model.sort_columns.map { |column| [column[:display_name], column[:column]] }, selected: sort_column), { class: 'form-select form-select-sm', data: { behaviour: 'sort-column' } }
+      .div.btn-group role="group"
+        input.btn-check type="radio" name="sort_direction" id="asc" value="asc" autocomplete="off" data-behaviour="sort-direction" checked=(sort_direction.blank? ? true : (sort_direction == 'asc' ? true : nil))
+        label.btn.btn-outline-dark.btn-sm for="asc" Ascending
+
+        input.btn-check type="radio" name="sort_direction" id="desc" value="desc" autocomplete="off" data-behaviour="sort-direction" checked=(sort_direction == 'desc' ? true : nil)
+        label.btn.btn-outline-dark.btn-sm for="desc" Descending
+    .sort-menu__bottom
+      button.btn.btn-sm.btn-ghost data-behaviour="reset-sort"
+        | Reset

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

@@ -7,11 +7,10 @@
           i.fa.fa-table
         a.btn.btn-ghost href="#{cm_admin.send("#{@model.name.underscore}_index_path")}?page=#{params[:page] || 1}&view_type=card"
           i.fa.fa-table-cells
-  /  button.secondary-btn.column-btn data-bs-target="#columnActionModal" data-bs-toggle="modal"
-  /    span
-  /      i.fa.fa-columns.bolder
-  /    span
-  /      i.fa.fa-angle-down
+
+  - if @model.sort_columns.present?
+    = render 'cm_admin/main/sort', model: @model, ar_object: @ar_object
+
 - if flash[:alert].present?
   .alert.alert-danger.me-4 role="alert"
     = flash[:alert].html_safe

data/app/views/cm_admin/roles/permissions.html.slim

@@ -2,7 +2,8 @@
   .form-page__body
     .form-container
       = form_for CmPermission.new, url: cm_admin.send('cm_role_create_role_permission_path', @ar_object), method: :post do |f|
-        - CmAdmin.config.cm_admin_models.each do |model|
+        - cm_models = CmAdmin.config.cm_admin_models.sort_by{|k, v| k.display_name}
+        - cm_models.each do |model|
           - next if model.override_policy == true
           .row
             .col.form-container

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

@@ -29,6 +29,7 @@ html
       = javascript_importmap_tags
       = javascript_import_module_tag "cm_admin/application"
     = javascript_include_tag 'cm_admin/custom', 'data-turbolinks-track': 'reload'
+    script src="https://kit.fontawesome.com/9c93dde7a7.js" data-mutate-approach="sync"
     = stylesheet_link_tag 'cm_admin/custom', media: 'all', 'data-turbolinks-track': 'reload'
     link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" /
     

data/config/importmap.rb

@@ -7,7 +7,6 @@ pin 'jgrowl', to: 'https://ga.jspm.io/npm:jgrowl@1.4.8/jquery.jgrowl.js'
 pin 'moment', to: 'https://ga.jspm.io/npm:moment@2.29.4/moment.js'
 pin 'trix', to: 'https://ga.jspm.io/npm:trix@2.1.3/dist/trix.esm.min.js'
 pin '@rails/actiontext', to: 'https://ga.jspm.io/npm:@rails/actiontext@7.1.3-4/app/assets/javascripts/actiontext.esm.js'
-pin '@fortawesome/fontawesome-free', to: 'https://ga.jspm.io/npm:@fortawesome/fontawesome-free@6.1.1/js/all.js'
 pin 'daterangepicker', to: 'https://ga.jspm.io/npm:daterangepicker@3.1.0/daterangepicker.js'
 pin '@nathanvda/cocoon', to: 'https://ga.jspm.io/npm:@nathanvda/cocoon@1.2.14/cocoon.js'
 pin 'select2', to: 'https://ga.jspm.io/npm:select2@4.1.0-rc.0/dist/js/select2.js'

data/config/routes.rb

@@ -17,7 +17,13 @@ CmAdmin::Engine.routes.draw do
       end
     end
 
-    model.available_actions.sort_by {|act| act.name}.each do |act|
+    if model.sort_columns.present?
+      scope model.name.tableize do
+        send(:post, 'reset_sort_columns', to: "#{model.name.underscore}#reset_sort_columns", as: "#{model.name.underscore}_reset_sort_columns")
+      end
+    end
+
+    model.available_actions.sort_by { |act| act.name }.each do |act|
       scope model.name.tableize do
         # Define route only when action trail related field is present
         if act.name == 'history'