cm-admin 1.2.7 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: befa5f5406ee5c883398ac3a1134ff865c403bcdd4ffbea17a0845b55e58f728
-  data.tar.gz: a14fc15107042c6763a518588c12f67f6e5de3efff11b4af833c3e0728a07e0e
+  metadata.gz: 0ea404058404f7948f1494c54f7a44f902be4ad7ed6ee3d9d16821202aee5c0e
+  data.tar.gz: a586637429a44643c18b88113254ae24127aa2b80383a93030e9d4a23b1c2958
 SHA512:
-  metadata.gz: d3e2b316707f6877476f0854b07d975a0ca5b5a6b594865227b2feea2b9c8569eb6338c567b7bf3b4aa08d7813897059619841e4ded430c505d9ccc508b6d606
-  data.tar.gz: ae93a4a2fabd6af3b99beae3a53e3b32fe05c4074f23230c6a8eff4157783806d274ccb8664e210c9baa301073da109612d6431c7618032382c783207fe49e27
+  metadata.gz: 21327b7346f99b2fc2c2e7e9d4c6a30c0985670378aa08a435b8ffdafc5fc6d6bf4b0f54a9cbb4f2b22c5cf4b975dfeee1622da6bb182d93923686169f8d936d
+  data.tar.gz: 834908bf51760be3905ada3947d349d091a72b282af270f870aaedee1e702365b17c8810467f4ea60f3174ce92e8e62cec7fcfacefa1c42c4caa91d28610be52

data/Gemfile.lock

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

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

@@ -35,7 +35,9 @@ document.addEventListener("turbo:load", function () {
   flatpickr("[data-behaviour='filter'][data-filter-type='date']", {
     mode: 'range'
   })
-  $('.select-2').select2();
+  $('.select-2').select2({
+    theme: "bootstrap-5",
+  });
   jqueryJgrowl()
 });
 

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

@@ -138,14 +138,14 @@ var replaceAccordionTitle = function (element) {
   var table_name = $(element).data("table-name");
   var model_name = $(element).data("model-name");
   $(element)
-    .find(".accordion-item:visible")
+    .find("[data-card-name='" + table_name + "']")
     .each(function () {
       i++;
       var accordion_title = model_name + " " + i;
       var accordion_id = table_name + "-" + i;
-      $(this).find(".accordion-button").text(accordion_title);
+      $(this).find(".card-title").text(accordion_title);
       $(this)
-        .find(".accordion-button")
+        .find(".card-title")
         .attr("data-bs-target", "#" + accordion_id);
       $(this).find(".accordion-collapse").attr("id", accordion_id);
     });

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

@@ -49,32 +49,45 @@
   margin-top: 4px;
 }
 
-// Nested form styles
-.nested-field-wrapper {
-  .nested-single-field {
-    display: grid;
-    grid-template-columns: 1fr 32px;
-    align-items: center;
-    width: 352px;
-    margin-bottom: 8px;
-    .field-remove-action {
-      font-size: $t3-text;
-      text-align: center;
-      a {
-        color: $primary-text-clr;
-        &:hover {
-          color: $primary-text-clr;
-        }
+//Form card UI
+.form-card {
+  @extend .card, .mt-3;
+  background-color: var(--bs-gray-100);
+  background-blend-mode: multiply;
+  mix-blend-mode: multiply;
+  .card-title-wrapper {
+    @extend .d-flex, .align-items-center, .mb-3;
+    &:hover {
+      div:last-of-type {
+        visibility: visible;
       }
     }
   }
+  .card-title {
+    font-size: $t4-text;
+    color: var(--bs-tertiary-color);
+    margin: 0;
+  }
+  .card-delete {
+    visibility: hidden;
+  }
 }
 
 //Nested form table styles
-.nested-form-table {
-  @extend .table, .table-light, .table-hover, .table-bordered;
-  .item-delete-cell {
-    vertical-align: middle;
-    text-align: center;
+.nested-form-table-wrapper {
+  overflow-y: scroll;
+  .nested-form-table {
+    @extend .table, .table-light, .table-hover, .table-bordered, .m-0;
+    width: max-content;
+    .item-delete-cell {
+      vertical-align: middle;
+      text-align: center;
+    }
   }
 }
+
+.nested-table-footer {
+  padding: 8px;
+  border: 1px solid var(--bs-border-color);
+  border-top: 0;
+}

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

@@ -124,44 +124,7 @@ a {
 }
 
 //select 2 styles
-.select2-container {
-  .selection {
-    .select2-selection {
-      padding: 8px 16px;
-      background-color: $white;
-      border: 1px solid $grey-light-clr;
-      border-radius: $radius-4;
-      height: 40px;
-      .select2-selection__rendered {
-        padding-left: 0;
-        @include font($size: $t4-text, $color: $primary-text-clr);
-        line-height: 22px;
-      }
-      .select2-selection__arrow {
-        top: 6px;
-      }
-    }
-  }
-  .select2-dropdown {
-    border: 1px solid $grey-lighter-clr;
-    box-shadow: 0px 4px 16px rgba(0, 0, 0, 0.16);
-    border-radius: $radius-4;
-    .select2-results {
-      .select2-results__options {
-        .select2-results__option {
-          padding: 9px 16px;
-          @include font($size: $t4-text, $color: $primary-text-clr);
-          line-height: 22px;
-        }
-      }
-      .select2-results__option--highlighted.select2-results__option--selectable {
-        background: $grey-lighter-clr;
-        color: $primary-text-clr;
-      }
-      .select2-results__option--selected {
-        color: $brand-color !important;
-        background-color: $grey-lighter-clr !important;
-      }
-    }
-  }
+.select2-container--bootstrap-5 .select2-selection--single {
+  padding: 0.375rem 0.75rem 0.375rem 0.75rem !important;
+  background-position: right 0.75rem center !important;
 }

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

@@ -39,6 +39,9 @@
         &:nth-last-child(1) {
           margin-bottom: 0;
         }
+        &__title {
+          @include font($size: $t4-text, $color: $primary-text-clr, $weight: 600);
+        }
         &__label {
           @include font($size: $t4-text, $color: $ink-lighter-clr);
         }

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

@@ -282,6 +282,10 @@
 }
 
 //Nested table styles
-.nested-table {
-  @extend .table, .table-light, .table-hover, .table-bordered;
+.nested-table-wrapper {
+  overflow-y: scroll;
+  .nested-table {
+    @extend .table, .table-light, .table-hover, .table-bordered;
+    width: max-content;
+  }
 }

data/app/controllers/cm_admin/resource_controller.rb

@@ -135,7 +135,9 @@ module CmAdmin
             end
           elsif @action.display_type == :page
             data = @action.parent == "index" ? @ar_object.data : @ar_object
-            format.html { render @action.partial }
+            # 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' }
           else
             begin
               response_object = @action.code_block.call(@response_object)
@@ -160,9 +162,9 @@ module CmAdmin
       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
+          nested_table_fields += field.sections.map(&:nested_table_fields).flatten
         elsif field.class == CmAdmin::Models::Section
-          nested_table_fields += field.nested_table_fields.map(&:keys).flatten
+          nested_table_fields += field.nested_table_fields.flatten
         end
       end
       nested_table_fields.flatten
@@ -173,10 +175,11 @@ module CmAdmin
       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 = get_nested_table_fields(@model.available_fields[:new])
-      nested_tables += get_nested_table_fields(@model.available_fields[:edit])
+      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_tables.each do |table_name|
+      nested_fields.each do |nested_field|
+        table_name = nested_field.field_name
         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"
@@ -255,6 +258,27 @@ module CmAdmin
       return filtered_result
     end
 
+    def generate_nested_params(nested_table_field)
+      if nested_table_field.parent_field
+        ar_model = nested_table_field.parent_field.to_s.classify.constantize
+        table_name = ar_model.reflections[nested_table_field.field_name.to_s].klass.table_name
+      else
+        table_name = @model.ar_model.reflections[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]
+      if nested_table_field.associated_fields
+        nested_table_field.associated_fields.each do |associated_field|
+          column_names << generate_nested_params(associated_field)
+        end
+      end
+      Hash[
+        "#{table_name}_attributes",
+        column_names
+      ]
+    end
+
     def resource_params(params)
       columns = @model.ar_model.columns_hash.map {|key, ar_adapter|
         ar_adapter.sql_type_metadata.sql_type.ends_with?('[]') ? Hash[ar_adapter.name, []] : ar_adapter.name.to_sym
@@ -269,21 +293,17 @@ module CmAdmin
           Hash[x.name.to_s.gsub('_attachments', ''), []]
         end
       }.compact
-      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",
-          column_names.reject { |column_name| CmAdmin::REJECTABLE_FIELDS.include?(column_name) }.map(&:to_sym) + [:id, :_destroy]
-        ]
+      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|
+        generate_nested_params(nested_table_field)
       }
       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)
     end
 
+    
+
   end
 end

data/app/javascript/packs/cm_admin/scaffolds.js

@@ -1,5 +1,7 @@
 $(document).on('turbolinks:load', function () {
-  $('.select-2').select2();
+  $('.select-2').select2({
+    theme: "bootstrap-5",
+  });
   flatpickr("[data-behaviour='date-only']", {
     dateFormat: "d-m-Y"
   })

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

@@ -1,7 +1,26 @@
-tr.nested-fields
-  td.item-delete-cell
-    - if @reflections.select {|x| x if x.name == assoc_name}.first.macro == :has_many
+- if nested_table_field.display_type == :table
+  tr.nested-fields
+    td.item-delete-cell
       = link_to_remove_association "", f, class: 'fa-regular fa-trash-can btn-ghost'
-  - fields.each do |field|
-    td 
-      = input_field_for_column(f, field)
+    - nested_table_field.fields.each do |field|
+      td 
+        = input_field_for_column(f, field)
+- else
+  .form-card.nested-fields
+    .card-body
+      .card-item data-card-name=assoc_name
+        .card-title-wrapper
+          h6.card-title
+            | Title 1
+          .card-delete
+            = link_to_remove_association "", f, class: 'fa-regular fa-trash-can btn-ghost'
+        div
+          - nested_table_field.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)
+      - if nested_table_field.associated_fields.present?
+        - nested_table_field.associated_fields.each do |associated_nested_field|
+          = render partial: '/cm_admin/main/nested_table_form', locals: { f: f, nested_table_field: associated_nested_field }

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

@@ -1,19 +1,32 @@
-- 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.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
+- assoc_name = nested_table_field.field_name
+- table_name = f.object._reflections[assoc_name.to_s].klass.table_name.to_sym
+- if nested_table_field.display_type == :table
+  .nested-field-wrapper data-table-name=assoc_name data-model-name=assoc_name.to_s.classify
+    / label.field-label = nested_table_field.label.to_s.titleize
+    - uniq_no = Random.rand(10000)
+    .nested-form-table-wrapper
+      table.nested-form-table
+        thead
+          tr
+            th
+              | 
+            - nested_table_field.fields.each do |field|
+              th
+                = 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?
+              = render partial: '/cm_admin/main/nested_fields', locals: { f: record, assoc_name: assoc_name, nested_table_field: nested_table_field }
+    - if f.object._reflections[assoc_name.to_s]&.macro == :has_many
+      .nested-table-footer
+        = link_to_add_association "#{nested_table_field.submit_text}", f, table_name, partial: '/cm_admin/main/nested_fields', render_options:  {locals: { assoc_name: assoc_name, nested_table_field: nested_table_field }}, data: { association_insertion_node: ".insert-cocoon-position-#{uniq_no}", association_insertion_method: 'append' }, class: 'btn-primary'
+- else
+  .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
+    .nested-form
       = 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'
+        - if record.object.persisted?
+          = render partial: '/cm_admin/main/nested_fields', locals: { f: record, assoc_name: assoc_name, nested_table_field: nested_table_field }
+      - if f.object._reflections[assoc_name.to_s]&.macro == :has_many
+        .links.mt-3
+          = link_to_add_association "#{nested_table_field.submit_text}", f, table_name, partial: '/cm_admin/main/nested_fields', render_options:  {locals: { assoc_name: assoc_name, nested_table_field: nested_table_field }}, class: 'd-inline-block btn-primary mt-2'

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

@@ -1,17 +1,30 @@
-.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|
+- associated_records = ar_object.send(nested_field.field_name)
+- if nested_field.display_type == :table
+  div class="#{nested_field.label ? 'card-info' : ''}"
+    - if nested_field.label
+      p.card-info__label = nested_field.label.to_s.titleize
+    .card-info__description.nested-table-wrapper
+      table.nested-table
+        thead
           tr
-            - table_fields.each do |field|
-              td
-                = record.send(field.field_name)
-          
+            - nested_field.fields.each do |field|
+              th scope="col"
+                = field.label || field.field_name.to_s.titleize
+        tbody
+          - associated_records.each do |record|
+            tr
+              - nested_field.fields.each do |field|
+                td
+                  = record.send(field.field_name)
+- else
+  - associated_records.each do |record|
+    .card.mb-3
+      .card-body
+        .card-info
+          .card-info__title = nested_section_title(record, nested_field)
+        - nested_field.fields.each do |field|
+          = show_field(record, field)  
+
+        - if nested_field.associated_fields.present?
+          - nested_field.associated_fields.each do |associated_nested_field|
+            = render partial: 'cm_admin/main/nested_table_section', locals: { nested_field: associated_nested_field, ar_object: record }

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

@@ -6,5 +6,5 @@
         .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 }
+          - section.nested_table_fields.each do |nested_field|
+            = render partial: 'cm_admin/main/nested_table_section', locals: { nested_field: nested_field, ar_object: @ar_object }

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

@@ -19,6 +19,10 @@ html
     link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" /
     
     script src="https://raw.githack.com/SortableJS/Sortable/master/Sortable.js"
+
+    link[rel="stylesheet" href="https://cdn.jsdelivr.net/npm/select2-bootstrap-5-theme@1.3.0/dist/select2-bootstrap-5-theme.min.css"]
+    link[rel="stylesheet" href="https://cdn.jsdelivr.net/npm/select2-bootstrap-5-theme@1.3.0/dist/select2-bootstrap-5-theme.rtl.min.css"]
+    
   body
     .cm-admin
       = render 'layouts/left_sidebar_nav'

data/lib/cm_admin/model.rb

@@ -3,6 +3,7 @@ require_relative 'models/action'
 require_relative 'models/importer'
 require_relative 'models/custom_action'
 require_relative 'models/bulk_action'
+require_relative 'models/nested_field'
 require_relative 'models/field'
 require_relative 'models/form_field'
 require_relative 'models/blocks'

data/lib/cm_admin/models/custom_action.rb

@@ -3,7 +3,7 @@ require_relative 'actions/blocks'
 module CmAdmin
   module Models
     class CustomAction < Action
-      attr_accessor :modal_configuration
+      attr_accessor :modal_configuration, :url_params
 
       def initialize(attributes = {}, &block)
         super

data/lib/cm_admin/models/dsl_method.rb

@@ -121,13 +121,14 @@ module CmAdmin
       #     end
       #   end
       # end
-      def custom_action(name: nil, page_title: nil, page_description: nil, display_name: nil, verb: nil, layout: nil, layout_type: nil, partial: nil, path: nil, display_type: nil, modal_configuration: {}, display_if: lambda { |arg| return true }, route_type: nil, icon_name: 'fa fa-th-large', &block)
+      def custom_action(name: nil, page_title: nil, page_description: nil, display_name: nil, verb: nil, layout: nil, layout_type: nil, partial: nil, path: nil, display_type: nil, modal_configuration: {}, url_params: {}, display_if: lambda { |arg| return true }, route_type: nil, icon_name: 'fa fa-th-large', &block)
         action = CmAdmin::Models::CustomAction.new(
           page_title: page_title, page_description: page_description,
           name: name, display_name: display_name, verb: verb, layout: layout,
           layout_type: layout_type, partial: partial, path: path,
           parent: self.current_action.name, display_type: display_type, display_if: display_if,
-          action_type: :custom, route_type: route_type, icon_name: icon_name, modal_configuration: modal_configuration, &block)
+          action_type: :custom, route_type: route_type, icon_name: icon_name, modal_configuration: modal_configuration,
+          url_params: url_params, &block)
         @available_actions << action
         # self.class.class_eval(&block)
       end

data/lib/cm_admin/models/nested_field.rb

@@ -0,0 +1,26 @@
+module CmAdmin
+  module Models
+    class NestedField
+
+      # NestedField is like a container to hold Field and FormField object
+
+      attr_accessor :field_name, :display_type, :fields, :associated_fields, :parent_field, :header, :label, :submit_text
+
+      def initialize(field_name, attributes={})
+        @field_name = field_name
+        set_default_values
+        attributes.each do |key, value|
+          self.send("#{key.to_s}=", value)
+        end
+      end
+
+      def set_default_values
+        self.display_type = :table
+        self.fields = []
+        self.associated_fields = []
+        self.submit_text = "+ Add #{@field_name.to_s.titleize}"
+      end
+
+    end
+  end
+end

data/lib/cm_admin/models/section.rb

@@ -7,41 +7,47 @@ module CmAdmin
       # These list of fields are iterated and displayed on show/new/edit page.
       # It also contains rows, which contains sections and fields.
 
-      attr_accessor :section_name, :section_fields, :display_if, :current_action, :cm_model, :nested_table_fields, :rows, :col_size
+      attr_accessor :section_name, :section_fields, :display_if, :current_action, :cm_model, :nested_table_fields, :rows, :col_size, :current_nested_field
 
       def initialize(section_name, current_action, cm_model, display_if, col_size, &block)
         @section_fields = []
         @rows = []
-        @nested_table_fields = {}
+        @nested_table_fields = []
         @col_size = col_size
         @section_name = section_name
         @current_action = current_action
         @cm_model = cm_model
         @display_if = display_if || lambda { |arg| return true }
+        @current_nested_field = nil
         instance_eval(&block)
       end
 
       def field(field_name, options={})
-        if @current_action.is_nested_field
-          @nested_table_fields[@current_action.nested_table_name] ||= []
-          @nested_table_fields[@current_action.nested_table_name] << CmAdmin::Models::Field.new(field_name, options)
+        if @current_nested_field
+          @current_nested_field.fields << CmAdmin::Models::Field.new(field_name, options)
         else
           @section_fields << CmAdmin::Models::Field.new(field_name, options)
         end
       end
 
       def form_field(field_name, options={}, arg=nil)
-        if @current_action.is_nested_field
-          @nested_table_fields[@current_action.nested_table_name] ||= []
-          @nested_table_fields[@current_action.nested_table_name] << CmAdmin::Models::FormField.new(field_name, options[:input_type], options)
+        if @current_nested_field
+          @current_nested_field.fields << CmAdmin::Models::FormField.new(field_name, options[:input_type], options)
         else
           @section_fields << CmAdmin::Models::FormField.new(field_name, options[:input_type], options)
         end
       end
 
-      def nested_form_field(field_name, &block)
-        @current_action.is_nested_field = true
-        @current_action.nested_table_name = field_name
+      def nested_form_field(field_name, options={}, &block)
+        # @current_action.is_nested_field = true
+        # @current_action.nested_table_name = field_name
+        nested_field = CmAdmin::Models::NestedField.new(field_name, options)
+        if nested_field.parent_field
+          @current_nested_field.associated_fields << nested_field
+        else
+          @nested_table_fields << nested_field
+        end
+        @current_nested_field = nested_field
         yield
       end
 

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.2.7'
+  VERSION = '1.2.9'
 end

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -116,8 +116,8 @@ module CmAdmin
 
       def set_nested_form_fields(form_obj, section)
         content_tag(:div) do
-          section.nested_table_fields.keys.each do |key|
-            concat(render partial: '/cm_admin/main/nested_table_form', locals: { f: form_obj, assoc_name: key, section: section })
+          section.nested_table_fields.each do |nested_table_field|
+            concat(render partial: '/cm_admin/main/nested_table_form', locals: { f: form_obj, nested_table_field: nested_table_field })
           end
         end
       end

data/lib/cm_admin/view_helpers/page_info_helper.rb

@@ -48,7 +48,8 @@ module CmAdmin
             when :modal
               custom_modal_button(custom_action)
             when :page
-              link_to custom_action_title(custom_action), "#{@model.ar_model.table_name}/#{custom_action.path}", class: 'btn-secondary ms-2', method: custom_action.verb
+              path = cm_admin.send("#{@model.name.underscore}_#{custom_action.name}_path", @ar_object.id, custom_action.url_params)
+              link_to custom_action_title(custom_action), path, class: 'btn-secondary ms-2', method: custom_action.verb
             end
           end
         end
@@ -92,6 +93,14 @@ module CmAdmin
         return current_user.full_name if defined?(current_user.full_name)
         current_user.email.split('@').first
       end
+
+      def nested_section_title(record, nested_form_field)
+        if nested_form_field.header.present?
+          record.send(nested_form_field.header)
+        else
+          nested_form_field.field_name.to_s.titleize
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.9
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-16 00:00:00.000000000 Z
+date: 2023-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -414,6 +414,7 @@ files:
 - lib/cm_admin/models/filter.rb
 - lib/cm_admin/models/form_field.rb
 - lib/cm_admin/models/importer.rb
+- lib/cm_admin/models/nested_field.rb
 - lib/cm_admin/models/row.rb
 - lib/cm_admin/models/section.rb
 - lib/cm_admin/models/tab.rb