cm-admin 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab22f4bef2b77930d17a0910dbc5ee20f0773f9f025d7e7ba7fde8a55be7e5f8
-  data.tar.gz: ba334104c29113fbec5440dbe31b13b8fb8513efd6a8be7308928815141256a0
+  metadata.gz: f02c4921628126ddc305b8f76fefe27c325d11a90b6649166f30376af4983b9d
+  data.tar.gz: a0f263e975a1b4e7505bb6174a4cfe9942c55103259fda85d33e2cbf1b29af4b
 SHA512:
-  metadata.gz: 67c7bf36f684d04d976fbad85a58f5910a84762f2e750918b3ab2eef6b7c9b4471bb9ff6f8b1594bb8dc7f3bf9910cf6b4560d9e80ad8ae24d6a8b56321901ae
-  data.tar.gz: 47b9d696e72e73ef748ffc51301891dc2fa3667f3f201ec61643167d13b286d0dc289ec7ddd4a867700c93a1b23bdbb5395b747d82e7fc71e00c39fc42e77e44
+  metadata.gz: '0286312409deddb904e8f85ec754fc07c62b91db53f8d46171bfcb65e94bf3418578eca0ea9d329cf6b11a1c7447941508da91152b132d74e2e207bc93c3818e'
+  data.tar.gz: 66ca0d6ccacf4440b180a7e5b1b37e723e5f1363a96b3fa0e30d88d365476a94d5ff6a67590fdca34af18ebf08c026b6eecd6fae0739286512e9a858644d68e5

data/Gemfile.lock

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

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

@@ -1,7 +1,7 @@
 // Card view right now is application specific, so card partial will be overwritten in the application
 
 .table-top
-  p.table-top__total-count = "#{humanized_ar_collection_count(@ar_object.pagy.count, @model.table_name)}"
+  p.table-top__total-count = "#{humanized_ar_collection_count(@ar_object.pagy.count, @model.formatted_name)}"
   .table-top__column-action
     .btn-group[role="group" aria-label="Basic example"]
       a.btn.btn-ghost href="#{cm_admin.send("#{@model.name.underscore}_index_path")}?page=#{params[:page] || 1}"
@@ -68,4 +68,4 @@
     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 }
+/ = render partial: 'cm_admin/main/member_custom_action_modal', locals: { cm_model: @model, ar_collection: @ar_object }

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

@@ -4,6 +4,8 @@
       p.section-heading = section.section_name
       .card
         .card-body
+          - if section.partial.present?
+            = render partial: section.partial, locals: { ar_object: @ar_object }
           - if !section.section_fields.empty?
             - section.section_fields.each do |field|
               = show_field(@ar_object, field)

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

@@ -1,5 +1,5 @@
 .table-top
-  p.table-top__total-count = "#{humanized_ar_collection_count(@ar_object.pagy.count, @model.table_name)}"
+  p.table-top__total-count = "#{humanized_ar_collection_count(@ar_object.pagy.count, @model.formatted_name)}"
   .table-top__column-action
     - if @current_action.view_type == :card_view
       .btn-group[role="group" aria-label="Card Toggle"]
@@ -55,4 +55,4 @@
     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 }
+/ = render partial: 'cm_admin/main/member_custom_action_modal', locals: { cm_model: @model, ar_collection: @ar_object }

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

@@ -3,5 +3,7 @@
     p.section-heading = section.section_name
     .card
       .card-body
+        - if section.partial.present?
+          = render partial: section.partial, locals: { ar_object: @associated_ar_object }
         - section.section_fields.each do |field|
           = show_field(@associated_ar_object, field)

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

@@ -5,12 +5,31 @@
   .show-page__inner
     .card.col-7
       .card-body
-         ul.history-items-list
-          - @ar_object.action_trails.each do |at|
+        ul.history-items-list
+          - @ar_object.versions.each do |version|
             li.history-item
               .d-inline-flex.mb-2
-                span.fw-bold.me-1 = at.actor.first_name
-                span.me-1 = at.trail_type.titleize
+                span.fw-bold.me-1 = User.find_by(id: version.whodunnit).present? ? User.find_by(id: version.whodunnit).full_name : "Anonymous"
+                span.me-1 = version.event
                 span.me-1 the
-                span.fw-bold.me-1 = at.entity_type
-                span.text-body-tertiary.me-1 = at.created_at.strftime("%B")
+                span.fw-bold.me-1 = version.item_type
+                span.text-body-tertiary.me-1 = version.created_at.strftime("%B %d, %Y, %H:%M %p")
+              - if version.event == 'update' && version.changeset.present?
+                .history-details
+                  table.table.table-bordered.table-light style="width: 600px;"
+                    thead
+                      tr
+                        th
+                          | Updated Column
+                        th
+                          | Previous Value
+                        th
+                          | Updated Value
+                    tbody
+                      - version.changeset.each do |key, value|
+                        tr
+                          td = key
+                          td = value[0] || '-'
+                          td = value[1].instance_of?(ActiveSupport::TimeWithZone) ? value[1].strftime("%B %d, %Y, %H:%M %p") : value[1]
+
+

data/lib/cm_admin/model.rb

@@ -121,8 +121,8 @@ module CmAdmin
       @additional_permitted_fields = fields
     end
 
-    def table_name
-      @display_name.present? ? @display_name : @ar_model.table_name
+    def formatted_name
+      @display_name != @name ? @display_name : @ar_model.table_name
     end
 
     def alert_box(options = {})

data/lib/cm_admin/models/dsl_method.rb

@@ -175,14 +175,14 @@ module CmAdmin
       #  cm_section('Basic Information', display_if: ->(current_object) { current_object.name == 'John' }, col_size: 6, html_attrs: { class: 'section-class' }) do
       #    field :title, input_type: :string
       #  end
-      def cm_section(section_name, display_if: nil, col_size: nil, html_attrs: nil, &block)
+      def cm_section(section_name, display_if: nil, col_size: nil, html_attrs: nil, partial: nil, &block)
         @available_fields[@current_action.name.to_sym] ||= []
-        @available_fields[@current_action.name.to_sym] << CmAdmin::Models::Section.new(section_name, @current_action, @model, display_if, html_attrs, col_size, &block)
+        @available_fields[@current_action.name.to_sym] << CmAdmin::Models::Section.new(section_name, @current_action, @model, display_if, html_attrs, col_size, partial, &block)
       end
 
       # @deprecated Use {#cm_section} instead of this method
-      def cm_show_section(section_name, display_if: nil, html_attrs: nil, &block)
-        cm_section(section_name, display_if:, html_attrs:, &block)
+      def cm_show_section(section_name, display_if: nil, html_attrs: nil, partial: nil, &block)
+        cm_section(section_name, display_if:, html_attrs:, partial:, &block)
       end
 
       # Create a new column on index layout.
@@ -378,12 +378,15 @@ module CmAdmin
       end
 
       # Configure sortable columns for model
+      # @note default sort direction will be ascending
       # @param columns [Array] the array of hash for column and display name
       # @example Sortable Columns
-      #   sortable_columns([{column: 'id', display_name: 'ID'}, {column: 'updated_at', display_name: 'Last Updated At'}])
+      #   sortable_columns([{column: 'id', display_name: 'ID'},
+      #                     {column: 'updated_at', display_name: 'Last Updated At'}])
       #
       # @example Sortable Columns with default column and direction
-      #   sortable_columns([{column: 'id', display_name: 'ID', default: true, default_direction: 'desc'}, {column: 'updated_at', display_name: 'Last Updated At'}])
+      #   sortable_columns([{column: 'id', display_name: 'ID', default: true, default_direction: 'desc'},
+      #                     {column: 'updated_at', display_name: 'Last Updated At'}])
       def sortable_columns(columns)
         @sort_columns = columns
         default_column = columns.filter do |column|

data/lib/cm_admin/models/row.rb

@@ -35,17 +35,17 @@ module CmAdmin
         end
       end
 
-      def cm_section(section_name, col_size: nil, display_if: nil, html_attrs: nil, &block)
-        @sections << CmAdmin::Models::Section.new(section_name, @current_action, @model, display_if, html_attrs, col_size, &block)
+      def cm_section(section_name, col_size: nil, display_if: nil, html_attrs: nil, partial: nil, &block)
+        @sections << CmAdmin::Models::Section.new(section_name, @current_action, @model, display_if, html_attrs, col_size, partial, &block)
       end
 
       # This method is deprecated. Use cm_section instead.
-      def cm_show_section(section_name, col_size: nil, display_if: nil, html_attrs: nil, &block)
-        cm_section(section_name, col_size: col_size, display_if: display_if, html_attrs: html_attrs, &block)
+      def cm_show_section(section_name, col_size: nil, display_if: nil, html_attrs: nil, partial: nil, &block)
+        cm_section(section_name, col_size: col_size, display_if: display_if, html_attrs: html_attrs, partial: partial, &block)
       end
 
-      def nested_form_section(section_name, display_if: nil, col_size: nil, html_attrs: nil, &block)
-        nested_section = CmAdmin::Models::Section.new(section_name, @current_action, @cm_model, display_if, html_attrs, col_size, &block)
+      def nested_form_section(section_name, display_if: nil, col_size: nil, html_attrs: nil, partial: nil, &block)
+        nested_section = CmAdmin::Models::Section.new(section_name, @current_action, @cm_model, display_if, html_attrs, col_size, partial, &block)
         nested_section.parent_section = self
         @row_fields << nested_section
       end

data/lib/cm_admin/models/section.rb

@@ -7,9 +7,9 @@ module CmAdmin
       # It also contains rows, which contains sections and fields.
 
       attr_accessor :section_name, :section_fields, :display_if, :current_action, :cm_model, :parent_section,
-                    :nested_table_fields, :rows, :col_size, :current_nested_field, :nested_sections, :html_attrs
+                    :nested_table_fields, :rows, :col_size, :current_nested_field, :nested_sections, :html_attrs, :partial
 
-      def initialize(section_name, current_action, cm_model, display_if, html_attrs, col_size, &block)
+      def initialize(section_name, current_action, cm_model, display_if, html_attrs, col_size, partial, &block) 
         @section_fields = []
         @rows = []
         @nested_table_fields = []
@@ -22,6 +22,7 @@ module CmAdmin
         @current_nested_field = nil
         @nested_sections = []
         @parent_section = nil
+        @partial = partial || nil
         instance_eval(&block)
       end
 
@@ -63,8 +64,8 @@ module CmAdmin
         @rows << CmAdmin::Models::Row.new(@current_action, @model, display_if, html_attrs, &block)
       end
 
-      def nested_form_section(section_name, display_if: nil, col_size: nil, html_attrs: nil, &block)
-        nested_section = CmAdmin::Models::Section.new(section_name, @current_action, @cm_model, display_if, html_attrs, col_size, &block)
+      def nested_form_section(section_name, display_if: nil, col_size: nil, html_attrs: nil, partial: nil, &block)
+        nested_section = CmAdmin::Models::Section.new(section_name, @current_action, @cm_model, display_if, html_attrs, col_size, partial, &block)
         nested_section.parent_section = self
         @nested_sections ||= []
         @nested_sections << nested_section

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -65,6 +65,7 @@ module CmAdmin
 
       def create_sections(resource, form_obj, section)
         content_tag :div, class: 'col form-container' do
+          return render partial: section.partial, locals: { form_obj: } if section.partial
           concat content_tag(:p, section.section_name, class: 'form-title') unless section.parent_section.present?
           concat set_form_for_fields(resource, form_obj, section)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Michael
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-01 00:00:00.000000000 Z
+date: 2024-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails