cm-admin 1.1.8 → 1.2.0

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

@@ -156,13 +156,25 @@ module CmAdmin
       end
     end
 
+    def get_nested_table_fields(fields)
+      nested_table_fields = []
+      fields.each do |field|
+        if field.class == CmAdmin::Models::Row
+          nested_table_fields += field.sections.map(&:nested_table_fields).map(&:keys).flatten
+        elsif field.class == CmAdmin::Models::Section
+          nested_table_fields += field.nested_table_fields.map(&:keys).flatten
+        end
+      end
+      nested_table_fields.flatten
+    end
+
     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 controller_name.classify.constantize, 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]
       @associated_ar_object = aar_model.find(params[:aar_id]) if params[:aar_id]
-      nested_tables = @model.available_fields[:new].map(&:nested_table_fields).map(&:keys).flatten
-      nested_tables += @model.available_fields[:edit].map(&:nested_table_fields).map(&:keys).flatten
+      nested_tables = get_nested_table_fields(@model.available_fields[:new])
+      nested_tables += get_nested_table_fields(@model.available_fields[:edit])
       @reflections = @model.ar_model.reflect_on_all_associations
       nested_tables.each do |table_name|
         reflection = @reflections.select {|x| x if x.name == table_name}.first
@@ -182,6 +194,9 @@ module CmAdmin
           redirect_url = CmAdmin::Engine.mount_path + "/#{@model.name.underscore.pluralize}/#{@ar_object.id}"
         end
         if @ar_object.save
+          if params['attachment_destroy_ids'].present?
+            ActiveStorage::Attachment.where(id: params['attachment_destroy_ids']).destroy_all
+          end
           format.html { redirect_to  redirect_url, 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" }
@@ -254,13 +269,15 @@ module CmAdmin
           Hash[x.name.to_s.gsub('_attachments', ''), []]
         end
       }.compact
-      nested_tables = @model.available_fields[:new].map(&:nested_table_fields).map(&:keys).flatten
-      nested_tables += @model.available_fields[:edit].map(&:nested_table_fields).map(&:keys).flatten
+      nested_tables = get_nested_table_fields(@model.available_fields[:new])
+      nested_tables += get_nested_table_fields(@model.available_fields[:edit])
       nested_fields = nested_tables.uniq.map {|assoc_name|
         table_name = @model.ar_model.reflections[assoc_name.to_s].klass.table_name
+        column_names = table_name.to_s.classify.constantize.column_names
+        column_names = column_names.map {|column_name| column_name.gsub('_cents', '') }
         Hash[
           "#{table_name}_attributes",
-          table_name.to_s.classify.constantize.column_names.reject { |i| CmAdmin::REJECTABLE_FIELDS.include?(i) }.map(&:to_sym) + [:id, :_destroy]
+          column_names.reject { |column_name| CmAdmin::REJECTABLE_FIELDS.include?(column_name) }.map(&:to_sym) + [:id, :_destroy]
         ]
       }
       permittable_fields += nested_fields

data/app/helpers/cm_admin/application_helper.rb

@@ -33,8 +33,8 @@ module CmAdmin
     end
 
     def error_header
-      content_tag :div, class: 'info-split' do
-        concat content_tag(:div, "Row number", class: 'info-split__lhs')
+      content_tag :div, class: 'card-info' do
+        concat content_tag(:div, "Row number", class: 'card-info__label')
         concat content_tag(:div, "Error")
       end
     end
@@ -48,8 +48,8 @@ module CmAdmin
     end
 
     def format_error_item(row_item)
-      content_tag :div, class: 'info-split' do
-        concat content_tag(:div, row_item[0], class: 'info-split__lhs')
+      content_tag :div, class: 'info-point' do
+        concat content_tag(:div, row_item[0], class: 'card-info__label')
         concat format_error(row_item[2])
       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
@@ -24,8 +22,8 @@
                 span
                   i.fa.fa-trash
                 | Destroy
-          - else  
-            = button_to cm_admin.send("#{current_model.name.underscore}_destroy_path", ar_object.id), method: :delete, form: { data: { turbo_confirm: 'Are you sure?' } } do
+          - else
+            = link_to '', data: { bs_toggle: 'modal', bs_target: "##{@model.name.classify}DestroyModal-#{ar_object.id.to_s}" } do  
               .popup-option
                 span
                   i.fa.fa-trash

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/_custom_action_modal_form.html.slim

@@ -0,0 +1,6 @@
+.custom-modal-body
+  .modal-info data-section="bulk-action"
+    = custom_action.modal_configuration[:description]
+  .modal-footer
+    = simple_form_for(ar_object, url: cm_admin.send("#{ar_object.class.name.underscore}_#{custom_action.name}_path", ar_object.id), method: custom_action.verb) do |f|
+      = f.button :submit, custom_action.modal_configuration[:confirmation_text] || 'Update', class: "btn btn-primary"

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

@@ -1,4 +1,3 @@
-- fields = section.nested_table_fields[assoc_name]
 - if fields.count == 1
   .nested-single-field.nested-fields
     - fields.each do |field|
@@ -9,18 +8,39 @@
             - if @reflections.select {|x| x if x.name == assoc_name}.first.macro == :has_many
               = link_to_remove_association "", f, class: 'fa fa-times'
 - else
-  .accordion-item.nested-fields
-    h2#headingOne.accordion-header
-      button.accordion-button[type="button" data-bs-toggle="collapse" data-bs-target="##{assoc_name}-#{f.object.id}" aria-expanded="true" aria-controls="collapseOne"]
-        | 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'
-    div.accordion-collapse.collapse.show[aria-labelledby="headingOne" id="#{assoc_name}-#{f.object.id}"]
-      .accordion-body
-        - fields.each do |field|
-          .form-field
-            .field-label-wrapper
-              label.field-label = field.field_name.to_s.titleize 
-            .field-input-wrapper
-              = input_field_for_column(f, field)
+  tr
+    td.item-delete-cell
+      - if @reflections.select {|x| x if x.name == assoc_name}.first.macro == :has_many
+        = link_to_remove_association "", f, class: 'fa fa-trash btn-ghost'
+    - fields.each do |field|
+      td
+        = input_field_for_column(f, field)
+
+
+  / .field-remove-action
+  /   - if @reflections.select {|x| x if x.name == assoc_name}.first.macro == :has_many
+  /     .accordion-delete-btn
+  /       = link_to_remove_association "", f, class: 'fa fa-trash btn-ghost'
+  / - fields.each do |field|
+  /   .form-field
+  /     .field-label-wrapper
+  /       label.field-label = field.field_name.to_s.titleize 
+  /     .field-input-wrapper
+  /       = input_field_for_column(f, field)
+        
+  / .accordion-item.nested-fields
+  /   h2#headingOne.accordion-header
+  /     button.accordion-button[type="button" data-bs-toggle="collapse" data-bs-target="##{assoc_name}-#{f.object.id}" aria-expanded="true" aria-controls="collapseOne"]
+  /       | Chapter 1
+  /     .field-remove-action
+  /       - if @reflections.select {|x| x if x.name == assoc_name}.first.macro == :has_many
+  /         .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|
+  /         .form-field
+  /           .field-label-wrapper
+  /             label.field-label = field.field_name.to_s.titleize 
+  /           .field-input-wrapper
+  /             = input_field_for_column(f, field)

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

@@ -1,10 +1,19 @@
 - table_name = @ar_object._reflections[assoc_name.to_s].klass.table_name.to_sym
 .nested-field-wrapper data-table-name=assoc_name data-model-name=assoc_name.to_s.classify
-  label.nested-field-label = assoc_name.to_s.titleize
-  .accordion.nested-form-accordion
-    = f.fields_for table_name do |record|
-      - if record.object.persisted?
-        = 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'
+  label.field-label = assoc_name.to_s.titleize
+  - fields = section.nested_table_fields[assoc_name]
+  table.nested-form-table
+    thead
+      tr
+        th
+          | 
+        - fields.each do |field|
+          th
+            = field.field_name.to_s.titleize 
+    tbody.insert-cocoon-position
+      = f.fields_for table_name do |record|
+        - if record.object.persisted?
+          = render partial: '/cm_admin/main/nested_fields', locals: { f: record, assoc_name: assoc_name, section: section, fields: fields }
+  - 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, fields: fields }}, data: { association_insertion_node: '.insert-cocoon-position', association_insertion_method: 'append' }, class: 'btn-secondary'

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

@@ -0,0 +1,17 @@
+.card-info 
+  p.card-info__label = table_name.to_s.titleize
+  .card-info__description
+    - associated_records = @ar_object.send(table_name)
+    table.nested-table
+      thead
+        tr
+          - table_fields.each do |field|
+            th scope="col"
+              = field.label
+      tbody
+        - associated_records.each do |record|
+          tr
+            - table_fields.each do |field|
+              td
+                = record.send(field.field_name)
+          

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

@@ -0,0 +1,10 @@
+- if section.display_if.call(@ar_object)
+  div class="#{section.col_size ? 'col-' + section.col_size.to_s : 'col'}"
+    .section
+      p.section-heading = section.section_name
+      .card
+        .card-body
+          - section.section_fields.each do |field|
+            = show_field(@ar_object, field)
+          - section.nested_table_fields.each do |key, value|
+            = render partial: 'cm_admin/main/nested_table_section', locals: { table_name: key, table_fields: value }

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}?"))
@@ -6,6 +6,6 @@ ul.nav.nav-pills
           - nav_item_action_name = nav_item.custom_action.present? ? nav_item.custom_action : 'show'
           = link_to tab_display_name(nav_item.nav_item_name), cm_admin.send("#{@ar_object.model_name.singular}_#{nav_item_action_name}_path", @ar_object.id), class: "nav-link #{ nav_item_action_name == action_name ? 'active' : ''}"
   // current_action_name is defined when action trail is added to that model
-  - if defined?(@ar_object.current_action_name)
+  - if policy([:cm_admin, @model.name.classify.constantize]).send(:history?)
     li.nav-item
       = link_to 'History', cm_admin.send("#{@ar_object.model_name.singular}_history_path", @ar_object.id), class: "nav-link #{ action_name == 'history' ? 'active' : ''}"

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 ms-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 ms-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'
@@ -35,5 +29,11 @@
         = custom_action_items(custom_action, 'show')
 
       - edit_action = @model.available_actions.select{|act| act if act.action_type.eql?(:default) && act.name.eql?('edit')}
+      - destroy_action = available_actions(@model, 'destroy')
       - 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 ms-2'
+      - if destroy_action
+        = link_to '', data: { bs_toggle: 'modal', bs_target: "##{@model.name.classify}DestroyModal-#{@ar_object.id.to_s}" }, class: 'btn-primary ms-2' do
+          span
+            i.fa.fa-trash
+          | Destroy

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

@@ -1,6 +1,7 @@
 - @model.available_fields[@action.name.to_sym].each do |section|
-  .info-section
+  .section
     p.section-heading = section.section_name
-    .paper
-      - section.section_fields.each do |field|
-        = show_field(@associated_ar_object, field)
+    .card
+      .card-body
+        - section.section_fields.each do |field|
+          = show_field(@associated_ar_object, field)

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

@@ -1,19 +1,19 @@
-== render 'cm_admin/main/top_navbar'
 .form-page
-  .form-page__inner
-    .form-wrapper
-      - if @ar_object.errors.present?
-        .flag-alert.mb-4
-          p.alert-header
-            span
-              i.fa.fa-exclamation-triangle
-            | Attention
-          .alert-body
-            p.body-title 
-              | Error heading
-            p.body-info 
-              ul
-                - @ar_object.errors.full_messages.each do |error_message|
-                  li = error_message
-      .form-container
-        = generate_form(@ar_object, @model)
+  .form-page__header
+    == render 'cm_admin/main/top_navbar'
+  .form-page__body
+    - if @ar_object.errors.present?
+      .flag-alert.mb-4
+        p.alert-header
+          span
+            i.fa.fa-exclamation-triangle
+          | Attention
+        .alert-body
+          p.body-title 
+            | Error heading
+          p.body-info 
+            ul
+              - @ar_object.errors.full_messages.each do |error_message|
+                li = error_message
+    .form-container
+      = generate_form(@ar_object, @model)

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

@@ -1,9 +1,8 @@
-.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__inner.scrollable
+.show-page
+  .show-page__header.page-top-bar
+    == render 'cm_admin/main/top_navbar'
+    == render 'cm_admin/main/tabs'
+  .show-page__inner
     .history-box
       - @ar_object.action_trails.each do |at|
         .history-item

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

@@ -12,8 +12,8 @@
         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
-        / button.cta-btn.ml-2 Back to Page_Name
+        a.btn-secondary href="#{cm_admin.send(:"#{@model.name.underscore}_import_path")}" Import new data
+        / button.cta-btn.ms-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|
         .form-card
@@ -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

@@ -1,19 +1,19 @@
-== render 'cm_admin/main/top_navbar'
 .form-page
-  .form-page__inner
-    .form-wrapper
-      - if @ar_object.errors.present?
-        .flag-alert.mb-4
-          p.alert-header
-              span
-                i.fa.fa-exclamation-triangle
-              | Attention
-          .alert-body
-            p.body-title 
-              | Error saving #{@ar_object.class}
-            p.body-info
-              ul
-                - @ar_object.errors.full_messages.each do |error_message|
-                  li = error_message
+  .form-page__header
+    == render 'cm_admin/main/top_navbar'
+  .form-page__body
+    - if @ar_object.errors.present?
+      .flag-alert.mb-4
+        p.alert-header
+            span
+              i.fa.fa-exclamation-triangle
+            | Attention
+        .alert-body
+          p.body-title 
+            | Error saving #{@ar_object.class}
+          p.body-info
+            ul
+              - @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,16 +1,15 @@
-.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__inner.scrollable
+.show-page
+  .show-page__header.page-top-bar
+    == render 'cm_admin/main/top_navbar'
+    == render 'cm_admin/main/tabs'
+  .show-page__inner
     - if @action.partial
       == render @action.partial
     - else
-      - @model.available_fields[:show].each do |section|
-        - if section.display_if.call(@ar_object)
-          .info-section
-            p.section-heading = section.section_name
-            .paper
-              - section.section_fields.each do |field|
-                = show_field(@ar_object, field)
+      - @model.available_fields[:show].each do |entity|
+        .row
+          - if entity.class == CmAdmin::Models::Row
+            - entity.sections.each do |section|
+              = render partial: 'cm_admin/main/show_section', locals: { section: section }
+          - elsif entity.class == CmAdmin::Models::Section
+            = render partial: 'cm_admin/main/show_section', locals: { section: entity }

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

@@ -0,0 +1,11 @@
+.modal.fade id="#{custom_action.name.classify}Modal-#{ar_object.id}" aria-hidden="true" aria-labelledby="#{custom_action.name.classify}ModalLabel" tabindex="1" 
+  .modal-dialog
+    .modal-content
+      .modal-header
+        h5.modal-title id="#{custom_action.name.classify}ModalLabel" = custom_action.modal_configuration[:title] || custom_action.name.classify
+        button.btn-close aria-label="Close" data-bs-dismiss="modal" type="button" 
+      .modal-body
+        - if custom_action.partial
+          = render partial: custom_action.partial
+        - else
+          = render partial: 'cm_admin/main/custom_action_modal_form', locals: { custom_action: custom_action, ar_object: ar_object }

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

@@ -1,12 +1,16 @@
 - custom_action_with_modals = @model.available_actions.select{ |act| act if act.display_type == :modal }
+- destroy_action = available_actions(@model, 'destroy')
 - if @associated_model
   - custom_action_with_modals += @associated_model.available_actions.select{ |act| act if act.display_type == :modal }
-- custom_action_with_modals.each do |custom_action|
-  .modal.fade id="#{custom_action.name.classify}Modal" aria-hidden="true" aria-labelledby="#{custom_action.name.classify}ModalLabel" tabindex="1" 
-    .modal-dialog
-      .modal-content
-        .modal-header
-          h5.modal-title id="#{custom_action.name.classify}ModalLabel" = custom_action.name.classify
-          button.btn-close aria-label="Close" data-bs-dismiss="modal" type="button" 
-        .modal-body
-          = render partial: custom_action.partial
+
+- if @current_action&.name == 'index'
+  - @ar_object.data.each do |ar_object|
+    - custom_action_with_modals.each do |custom_action|
+      = render partial: '/layouts/custom_action_modal', locals: { custom_action: custom_action, ar_object: ar_object }
+    - if destroy_action
+      = render partial: '/layouts/destroy_action_modal', locals: { ar_object: ar_object }
+- elsif @current_action&.name == 'show'
+  - custom_action_with_modals.each do |custom_action|
+    = render partial: '/layouts/custom_action_modal', locals: { custom_action: custom_action, ar_object: @ar_object }
+  - if destroy_action
+      = render partial: '/layouts/destroy_action_modal', locals: { ar_object: @ar_object }

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

@@ -0,0 +1,16 @@
+.modal.fade id="#{@model.name.classify}DestroyModal-#{ar_object.id}" aria-hidden="true" aria-labelledby="#{@model.name.classify}DestroyModalLabel" tabindex="1" 
+  .modal-dialog
+    .modal-content
+      .modal-header
+        h5.modal-title id="#{@model.name.classify}DestroyModalLabel" = "#{@model.name.classify} Destroy"
+        button.btn-close aria-label="Close" data-bs-dismiss="modal" type="button" 
+      .modal-body
+        .custom-modal-body
+          .modal-info data-section="bulk-action"
+            | Are you sure you want to delete this #{@model.name.classify}
+          .modal-footer
+            = button_to cm_admin.send("#{@model.name.underscore}_destroy_path", ar_object.id), method: :delete, class: "btn btn-primary" do
+              span
+                i.fa.fa-trash
+              | Destroy
+              

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

@@ -24,23 +24,21 @@ html
       = render 'layouts/left_sidebar_nav'
       .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__inner.scrollable
+          .show-page
+            .show-page__header.page-top-bar
+              == render 'cm_admin/main/top_navbar'
+              == render 'cm_admin/main/tabs'
+            .show-page__inner
               = 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
+            .show-page__header.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/config/routes.rb

@@ -21,9 +21,7 @@ CmAdmin::Engine.routes.draw do
       scope model.name.tableize do
         # Define route only when action trail related field is present
         if act.name == 'history'
-          if defined?(model.ar_model.new.current_action_name)
-            send(:get, ':id/history', to: "#{model.name.underscore}#history", as: "#{model.name.underscore}_history")
-          end
+          send(:get, ':id/history', to: "#{model.name.underscore}#history", as: "#{model.name.underscore}_history")
         else
           send(act.verb, act.path.present? ? act.path : act.name, to: "#{model.name.underscore}##{act.name}", as: "#{model.name.underscore}_#{act.name}")
         end