cm-admin 1.1.9 → 1.2.1

data/app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/vendor/_rfs.scss

@@ -0,0 +1,348 @@
+// stylelint-disable scss/dimension-no-non-numeric-values
+
+// SCSS RFS mixin
+//
+// Automated responsive values for font sizes, paddings, margins and much more
+//
+// Licensed under MIT (https://github.com/twbs/rfs/blob/main/LICENSE)
+
+// Configuration
+
+// Base value
+$rfs-base-value: 1.25rem !default;
+$rfs-unit: rem !default;
+
+@if $rfs-unit != rem and $rfs-unit != px {
+  @error "`#{$rfs-unit}` is not a valid unit for $rfs-unit. Use `px` or `rem`.";
+}
+
+// Breakpoint at where values start decreasing if screen width is smaller
+$rfs-breakpoint: 1200px !default;
+$rfs-breakpoint-unit: px !default;
+
+@if $rfs-breakpoint-unit != px and $rfs-breakpoint-unit != em and $rfs-breakpoint-unit != rem {
+  @error "`#{$rfs-breakpoint-unit}` is not a valid unit for $rfs-breakpoint-unit. Use `px`, `em` or `rem`.";
+}
+
+// Resize values based on screen height and width
+$rfs-two-dimensional: false !default;
+
+// Factor of decrease
+$rfs-factor: 10 !default;
+
+@if type-of($rfs-factor) != number or $rfs-factor <= 1 {
+  @error "`#{$rfs-factor}` is not a valid  $rfs-factor, it must be greater than 1.";
+}
+
+// Mode. Possibilities: "min-media-query", "max-media-query"
+$rfs-mode: min-media-query !default;
+
+// Generate enable or disable classes. Possibilities: false, "enable" or "disable"
+$rfs-class: false !default;
+
+// 1 rem = $rfs-rem-value px
+$rfs-rem-value: 16 !default;
+
+// Safari iframe resize bug: https://github.com/twbs/rfs/issues/14
+$rfs-safari-iframe-resize-bug-fix: false !default;
+
+// Disable RFS by setting $enable-rfs to false
+$enable-rfs: true !default;
+
+// Cache $rfs-base-value unit
+$rfs-base-value-unit: unit($rfs-base-value);
+
+@function divide($dividend, $divisor, $precision: 10) {
+  $sign: if($dividend > 0 and $divisor > 0 or $dividend < 0 and $divisor < 0, 1, -1);
+  $dividend: abs($dividend);
+  $divisor: abs($divisor);
+  @if $dividend == 0 {
+    @return 0;
+  }
+  @if $divisor == 0 {
+    @error "Cannot divide by 0";
+  }
+  $remainder: $dividend;
+  $result: 0;
+  $factor: 10;
+  @while ($remainder > 0 and $precision >= 0) {
+    $quotient: 0;
+    @while ($remainder >= $divisor) {
+      $remainder: $remainder - $divisor;
+      $quotient: $quotient + 1;
+    }
+    $result: $result * 10 + $quotient;
+    $factor: $factor * .1;
+    $remainder: $remainder * 10;
+    $precision: $precision - 1;
+    @if ($precision < 0 and $remainder >= $divisor * 5) {
+      $result: $result + 1;
+    }
+  }
+  $result: $result * $factor * $sign;
+  $dividend-unit: unit($dividend);
+  $divisor-unit: unit($divisor);
+  $unit-map: (
+    "px": 1px,
+    "rem": 1rem,
+    "em": 1em,
+    "%": 1%
+  );
+  @if ($dividend-unit != $divisor-unit and map-has-key($unit-map, $dividend-unit)) {
+    $result: $result * map-get($unit-map, $dividend-unit);
+  }
+  @return $result;
+}
+
+// Remove px-unit from $rfs-base-value for calculations
+@if $rfs-base-value-unit == px {
+  $rfs-base-value: divide($rfs-base-value, $rfs-base-value * 0 + 1);
+}
+@else if $rfs-base-value-unit == rem {
+  $rfs-base-value: divide($rfs-base-value, divide($rfs-base-value * 0 + 1, $rfs-rem-value));
+}
+
+// Cache $rfs-breakpoint unit to prevent multiple calls
+$rfs-breakpoint-unit-cache: unit($rfs-breakpoint);
+
+// Remove unit from $rfs-breakpoint for calculations
+@if $rfs-breakpoint-unit-cache == px {
+  $rfs-breakpoint: divide($rfs-breakpoint, $rfs-breakpoint * 0 + 1);
+}
+@else if $rfs-breakpoint-unit-cache == rem or $rfs-breakpoint-unit-cache == "em" {
+  $rfs-breakpoint: divide($rfs-breakpoint, divide($rfs-breakpoint * 0 + 1, $rfs-rem-value));
+}
+
+// Calculate the media query value
+$rfs-mq-value: if($rfs-breakpoint-unit == px, #{$rfs-breakpoint}px, #{divide($rfs-breakpoint, $rfs-rem-value)}#{$rfs-breakpoint-unit});
+$rfs-mq-property-width: if($rfs-mode == max-media-query, max-width, min-width);
+$rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height);
+
+// Internal mixin used to determine which media query needs to be used
+@mixin _rfs-media-query {
+  @if $rfs-two-dimensional {
+    @if $rfs-mode == max-media-query {
+      @media (#{$rfs-mq-property-width}: #{$rfs-mq-value}), (#{$rfs-mq-property-height}: #{$rfs-mq-value}) {
+        @content;
+      }
+    }
+    @else {
+      @media (#{$rfs-mq-property-width}: #{$rfs-mq-value}) and (#{$rfs-mq-property-height}: #{$rfs-mq-value}) {
+        @content;
+      }
+    }
+  }
+  @else {
+    @media (#{$rfs-mq-property-width}: #{$rfs-mq-value}) {
+      @content;
+    }
+  }
+}
+
+// Internal mixin that adds disable classes to the selector if needed.
+@mixin _rfs-rule {
+  @if $rfs-class == disable and $rfs-mode == max-media-query {
+    // Adding an extra class increases specificity, which prevents the media query to override the property
+    &,
+    .disable-rfs &,
+    &.disable-rfs {
+      @content;
+    }
+  }
+  @else if $rfs-class == enable and $rfs-mode == min-media-query {
+    .enable-rfs &,
+    &.enable-rfs {
+      @content;
+    }
+  } @else {
+    @content;
+  }
+}
+
+// Internal mixin that adds enable classes to the selector if needed.
+@mixin _rfs-media-query-rule {
+
+  @if $rfs-class == enable {
+    @if $rfs-mode == min-media-query {
+      @content;
+    }
+
+    @include _rfs-media-query () {
+      .enable-rfs &,
+      &.enable-rfs {
+        @content;
+      }
+    }
+  }
+  @else {
+    @if $rfs-class == disable and $rfs-mode == min-media-query {
+      .disable-rfs &,
+      &.disable-rfs {
+        @content;
+      }
+    }
+    @include _rfs-media-query () {
+      @content;
+    }
+  }
+}
+
+// Helper function to get the formatted non-responsive value
+@function rfs-value($values) {
+  // Convert to list
+  $values: if(type-of($values) != list, ($values,), $values);
+
+  $val: "";
+
+  // Loop over each value and calculate value
+  @each $value in $values {
+    @if $value == 0 {
+      $val: $val + " 0";
+    }
+    @else {
+      // Cache $value unit
+      $unit: if(type-of($value) == "number", unit($value), false);
+
+      @if $unit == px {
+        // Convert to rem if needed
+        $val: $val + " " + if($rfs-unit == rem, #{divide($value, $value * 0 + $rfs-rem-value)}rem, $value);
+      }
+      @else if $unit == rem {
+        // Convert to px if needed
+        $val: $val + " " + if($rfs-unit == px, #{divide($value, $value * 0 + 1) * $rfs-rem-value}px, $value);
+      } @else {
+        // If $value isn't a number (like inherit) or $value has a unit (not px or rem, like 1.5em) or $ is 0, just print the value
+        $val: $val + " " + $value;
+      }
+    }
+  }
+
+  // Remove first space
+  @return unquote(str-slice($val, 2));
+}
+
+// Helper function to get the responsive value calculated by RFS
+@function rfs-fluid-value($values) {
+  // Convert to list
+  $values: if(type-of($values) != list, ($values,), $values);
+
+  $val: "";
+
+  // Loop over each value and calculate value
+  @each $value in $values {
+    @if $value == 0 {
+      $val: $val + " 0";
+    } @else {
+      // Cache $value unit
+      $unit: if(type-of($value) == "number", unit($value), false);
+
+      // If $value isn't a number (like inherit) or $value has a unit (not px or rem, like 1.5em) or $ is 0, just print the value
+      @if not $unit or $unit != px and $unit != rem {
+        $val: $val + " " + $value;
+      } @else {
+        // Remove unit from $value for calculations
+        $value: divide($value, $value * 0 + if($unit == px, 1, divide(1, $rfs-rem-value)));
+
+        // Only add the media query if the value is greater than the minimum value
+        @if abs($value) <= $rfs-base-value or not $enable-rfs {
+          $val: $val + " " + if($rfs-unit == rem, #{divide($value, $rfs-rem-value)}rem, #{$value}px);
+        }
+        @else {
+          // Calculate the minimum value
+          $value-min: $rfs-base-value + divide(abs($value) - $rfs-base-value, $rfs-factor);
+
+          // Calculate difference between $value and the minimum value
+          $value-diff: abs($value) - $value-min;
+
+          // Base value formatting
+          $min-width: if($rfs-unit == rem, #{divide($value-min, $rfs-rem-value)}rem, #{$value-min}px);
+
+          // Use negative value if needed
+          $min-width: if($value < 0, -$min-width, $min-width);
+
+          // Use `vmin` if two-dimensional is enabled
+          $variable-unit: if($rfs-two-dimensional, vmin, vw);
+
+          // Calculate the variable width between 0 and $rfs-breakpoint
+          $variable-width: #{divide($value-diff * 100, $rfs-breakpoint)}#{$variable-unit};
+
+          // Return the calculated value
+          $val: $val + " calc(" + $min-width + if($value < 0, " - ", " + ") + $variable-width + ")";
+        }
+      }
+    }
+  }
+
+  // Remove first space
+  @return unquote(str-slice($val, 2));
+}
+
+// RFS mixin
+@mixin rfs($values, $property: font-size) {
+  @if $values != null {
+    $val: rfs-value($values);
+    $fluid-val: rfs-fluid-value($values);
+
+    // Do not print the media query if responsive & non-responsive values are the same
+    @if $val == $fluid-val {
+      #{$property}: $val;
+    }
+    @else {
+      @include _rfs-rule () {
+        #{$property}: if($rfs-mode == max-media-query, $val, $fluid-val);
+
+        // Include safari iframe resize fix if needed
+        min-width: if($rfs-safari-iframe-resize-bug-fix, (0 * 1vw), null);
+      }
+
+      @include _rfs-media-query-rule () {
+        #{$property}: if($rfs-mode == max-media-query, $fluid-val, $val);
+      }
+    }
+  }
+}
+
+// Shorthand helper mixins
+@mixin font-size($value) {
+  @include rfs($value);
+}
+
+@mixin padding($value) {
+  @include rfs($value, padding);
+}
+
+@mixin padding-top($value) {
+  @include rfs($value, padding-top);
+}
+
+@mixin padding-right($value) {
+  @include rfs($value, padding-right);
+}
+
+@mixin padding-bottom($value) {
+  @include rfs($value, padding-bottom);
+}
+
+@mixin padding-left($value) {
+  @include rfs($value, padding-left);
+}
+
+@mixin margin($value) {
+  @include rfs($value, margin);
+}
+
+@mixin margin-top($value) {
+  @include rfs($value, margin-top);
+}
+
+@mixin margin-right($value) {
+  @include rfs($value, margin-right);
+}
+
+@mixin margin-bottom($value) {
+  @include rfs($value, margin-bottom);
+}
+
+@mixin margin-left($value) {
+  @include rfs($value, margin-left);
+}

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

@@ -22,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/_cm_pagy_nav.html.slim

@@ -1,23 +1,23 @@
 - link = pagy_link_proc(pagy)
 
-nav.pagy_nav.pagination role="navigation" aria-label="pager"
+nav.pagination-actions role="navigation" aria-label="pager"
 
   - if pagy.prev
-    span ==> link.call(pagy.prev, '<', 'aria-label="previous" class="page-move-btn"')
+    span ==> link.call(pagy.prev, '<i class="fas fa-chevron-left"></i>'.html_safe, 'aria-label="previous" class="btn-ghost"')
   - else
-    span ==> link.call('#', '<', 'class="page-move-btn disabled"')
+    span ==> link.call('#', '<i class="fas fa-chevron-left"></i>'.html_safe, 'class="btn-ghost disabled"')
 
   - pagy.series.each do |item|        # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
     - if item.is_a?(Integer)          # page link
-      span ==> link.call(item, item, 'class="page-num-btn"')
+      span ==> link.call(item, item, 'class="btn-ghost"')
 
     - elsif item.is_a?(String)        # current page
-      span ==> link.call(item, item, 'class="page-num-btn active"')
+      span ==> link.call(item, item, 'class="btn-ghost active"')
 
     - elsif item == :gap              # page gap
       span.page.gap ==> pagy_t('pagy.nav.gap')
 
   - if pagy.next
-    span == link.call(pagy.next, '>', 'aria-label="next" class="page-move-btn"')
+    span == link.call(pagy.next, '<i class="fas fa-chevron-right"></i>'.html_safe, 'aria-label="next" class="btn-ghost"')
   - else
-    span ==> link.call('#', '>', 'class="page-move-btn disabled"')
+    span ==> link.call('#', '<i class="fas fa-chevron-right"></i>'.html_safe, 'class="btn-ghost disabled"')

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,27 +1,7 @@
-- fields = section.nested_table_fields[assoc_name]
-- if fields.count == 1
-  .nested-single-field.nested-fields
-    - fields.each do |field|
-        .field-input
-          = input_field_for_column(f, field)
-        .field-remove-action
-          - unless field.input_type == :hidden
-            - 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
-          .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)
+tr.nested-fields
+  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-regular fa-trash-can btn-ghost'
+  - fields.each do |field|
+    td 
+      = 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 btn-secondary 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? || @ar_object.errors.present?
+          = 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-primary'

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

@@ -49,9 +49,8 @@
           - if @model
             == render partial: 'cm_admin/main/actions_dropdown', locals: { cm_model: @model, ar_object: ar_object }
 
-  .cm-pagination
-    .cm-pagination__lhs Showing #{@ar_object.pagy.from} to #{@ar_object.pagy.to} out of #{@ar_object.pagy.count}
-    .cm-pagination__rhs
-      == render partial: 'cm_admin/main/cm_pagy_nav', locals: { pagy: @ar_object.pagy }
+  .pagination-bar
+    p.count-text.m-0 Showing #{@ar_object.pagy.from} to #{@ar_object.pagy.to} out of #{@ar_object.pagy.count}
+    == render partial: 'cm_admin/main/cm_pagy_nav', locals: { pagy: @ar_object.pagy }
 
 / = render partial: 'cm_admin/main/member_custom_action_modal', locals: { cm_model: @model, ar_collection: @ar_object }

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

@@ -6,6 +6,6 @@ ul.tabs
           - 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

@@ -4,7 +4,8 @@
       .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
+    - if @model.current_action.page_description
+      p.mb-0.text-body-secondary = @model.current_action.page_description
   .entity-header__actions
     - if @model.current_action.name == 'index'
       - if has_valid_policy(@model.name, :exportable)
@@ -18,10 +19,10 @@
                 .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: 'btn-primary 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: 'btn-primary 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'
@@ -29,5 +30,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: 'btn-primary 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)