cm-admin 1.1.9 → 1.2.0

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

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

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, @model)
+    = generate_form(@ar_object, @model)

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

@@ -1,15 +1,15 @@
-.show-page.cm-page-container
-  .show-page__header.sticky-container.page-top-bar
+.show-page
+  .show-page__header.page-top-bar
     == render 'cm_admin/main/top_navbar'
     == render 'cm_admin/main/tabs'
-  .show-page__inner.scrollable
+  .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/cm_admin.html.slim

@@ -24,15 +24,15 @@ 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__header.sticky-container.page-top-bar
+          .show-page
+            .show-page__header.page-top-bar
               == render 'cm_admin/main/top_navbar'
               == render 'cm_admin/main/tabs'
-            .show-page__inner.scrollable
+            .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__header.sticky-container.page-top-bar
+          .show-page
+            .show-page__header.page-top-bar
               == render 'cm_admin/main/top_navbar'
               - if @ar_object.model_name
                 == render 'cm_admin/main/tabs'

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

data/lib/cm_admin/model.rb

@@ -10,6 +10,7 @@ require_relative 'models/column'
 require_relative 'models/filter'
 require_relative 'models/export'
 require_relative 'models/section'
+require_relative 'models/row'
 require_relative 'models/tab'
 require_relative 'models/dsl_method'
 require 'pagy'

data/lib/cm_admin/models/custom_action.rb

@@ -3,6 +3,12 @@ require_relative 'actions/blocks'
 module CmAdmin
   module Models
     class CustomAction < Action
+      attr_accessor :modal_configuration
+
+      def initialize(attributes = {}, &block)
+        super
+      end
+
       class << self
         def find_by(model, search_hash)
           model.available_actions.find { |i| i.name == search_hash[:name] }

data/lib/cm_admin/models/dsl_method.rb

@@ -60,9 +60,14 @@ module CmAdmin
         yield if block
       end
 
-      def cm_section(section_name, display_if: nil, &block)
+      def row(display_if: 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, &block)
+        @available_fields[@current_action.name.to_sym] << CmAdmin::Models::Row.new(@current_action, @model, display_if, &block)
+      end
+
+      def cm_section(section_name, display_if: nil, col_size: 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, col_size, &block)
       end
 
       # This method is deprecated. Use cm_section instead.
@@ -116,13 +121,13 @@ 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, 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: {}, 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, &block)
+          action_type: :custom, route_type: route_type, icon_name: icon_name, modal_configuration: modal_configuration, &block)
         @available_actions << action
         # self.class.class_eval(&block)
       end

data/lib/cm_admin/models/field.rb

@@ -7,7 +7,7 @@ module CmAdmin
 
       attr_accessor :field_name, :label, :header, :field_type, :format, :precision, :height,
         :width, :helper_method, :preview, :custom_link, :prefix, :suffix, :tag_class,
-        :display_if, :association_name, :association_type
+        :display_if, :association_name, :association_type, :col_size
 
       def initialize(field_name, attributes = {})
         @field_name = field_name
@@ -24,6 +24,7 @@ module CmAdmin
 
       def set_default_values
         self.tag_class = {}
+        self.col_size = nil
       end
     end
   end

data/lib/cm_admin/models/form_field.rb

@@ -6,7 +6,7 @@ module CmAdmin
       include Utils::Helpers
 
       attr_accessor :field_name, :label, :header, :input_type, :collection, :disabled, :helper_method,
-                    :placeholder, :display_if, :html_attr, :target
+                    :placeholder, :display_if, :html_attr, :target, :col_size
 
       VALID_INPUT_TYPES = %i[
         integer decimal string single_select multi_select date date_time text
@@ -30,6 +30,7 @@ module CmAdmin
         self.input_type = :string
         self.html_attr = {}
         self.target = {}
+        self.col_size = nil
       end
 
       def set_default_placeholder

data/lib/cm_admin/models/row.rb

@@ -0,0 +1,40 @@
+module CmAdmin
+  module Models
+    class Row
+
+      # Description
+      # A row is like a container which holds a list of form_field or section.
+      # These list of fields or section are iterated and displayed on new/edit page.
+      # A row is like a wrapper on the HTML, which adds a div element 'row' class from bootstrap.
+
+      attr_accessor :sections, :display_if, :row_fields
+
+      def initialize(current_action, cm_model, display_if, &block)
+        @sections = []
+        @row_fields = []
+        @display_if = display_if || lambda { |arg| return true }
+        @current_action = current_action
+        @cm_model = cm_model
+        instance_eval(&block)
+      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)
+        else
+          @row_fields << CmAdmin::Models::FormField.new(field_name, options[:input_type], options)
+        end
+      end
+
+      def cm_section(section_name, col_size: nil, display_if: nil, &block)
+        @sections << CmAdmin::Models::Section.new(section_name, @current_action, @model, display_if, col_size, &block)
+      end
+
+      # This method is deprecated. Use cm_section instead.
+      def cm_show_section(section_name, col_size: nil, display_if: nil, &block)
+        cm_section(section_name, col_size: col_size, display_if: display_if, &block)
+      end
+    end
+  end
+end

data/lib/cm_admin/models/section.rb

@@ -2,11 +2,18 @@ module CmAdmin
   module Models
     class Section
 
-      attr_accessor :section_name, :section_fields, :display_if, :current_action, :cm_model, :nested_table_fields
+      # Description
+      # A section is like a container which holds a list of fields or form fields
+      # These list of fields are iterated and displayed on show/new/edit page.
+      # It also contains rows, which contains sections and fields.
 
-      def initialize(section_name, current_action, cm_model, display_if, &block)
+      attr_accessor :section_name, :section_fields, :display_if, :current_action, :cm_model, :nested_table_fields, :rows, :col_size
+
+      def initialize(section_name, current_action, cm_model, display_if, col_size, &block)
         @section_fields = []
+        @rows = []
         @nested_table_fields = {}
+        @col_size = col_size
         @section_name = section_name
         @current_action = current_action
         @cm_model = cm_model
@@ -15,7 +22,12 @@ module CmAdmin
       end
 
       def field(field_name, options={})
-        @section_fields << CmAdmin::Models::Field.new(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)
+        else
+          @section_fields << CmAdmin::Models::Field.new(field_name, options)
+        end
       end
 
       def form_field(field_name, options={}, arg=nil)
@@ -33,6 +45,11 @@ module CmAdmin
         yield
       end
 
+      def row(display_if: nil, &block)
+        @rows ||= []
+        @rows << CmAdmin::Models::Row.new(@current_action, @model, display_if, &block)
+      end
+
     end
   end
 end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.1.9'
+  VERSION = '1.2.0'
 end

data/lib/cm_admin/view_helpers/field_display_helper.rb

@@ -3,14 +3,14 @@ module CmAdmin
     module FieldDisplayHelper
       def show_field(ar_object, field)
         return unless field.display_if.call(ar_object)
-        content_tag(:div, class: "info-split") do
+        content_tag(:div, class: "card-info") do
           concat show_field_label(ar_object, field)
           concat value_with_prefix_and_suffix(ar_object, field)
         end
       end
 
       def show_field_label(ar_object, field)
-        content_tag(:div, class: "info-split__lhs") do
+        content_tag(:div, class: "card-info__label") do
           field_label = if field.label.present?
                           field.label.to_s
                         elsif field.association_type.to_s == "polymorphic"
@@ -24,7 +24,7 @@ module CmAdmin
 
       def value_with_prefix_and_suffix(ar_object, field)
         value = show_field_value(ar_object, field)
-        content_tag(:div, class: "info-split__rhs") do
+        content_tag(:div, class: "card-info__description") do
           concat field.prefix
           concat value
           concat field.suffix

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -13,7 +13,7 @@ module CmAdmin
 
       def cm_integer_field(form_obj, cm_field, value, required_class, _target_action)
         form_obj.text_field cm_field.field_name,
-                            class: "normal-input #{required_class}",
+                            class: "field-control #{required_class}",
                             disabled: cm_field.disabled,
                             value: value,
                             placeholder: cm_field.placeholder,
@@ -22,7 +22,7 @@ module CmAdmin
 
       def cm_decimal_field(form_obj, cm_field, value, required_class, _target_action)
         form_obj.number_field cm_field.field_name,
-                              class: "normal-input #{required_class}",
+                              class: "field-control #{required_class}",
                               disabled: cm_field.disabled,
                               value: value,
                               placeholder: cm_field.placeholder,
@@ -31,7 +31,7 @@ module CmAdmin
 
       def cm_string_field(form_obj, cm_field, value, required_class, _target_action)
         form_obj.text_field cm_field.field_name,
-                            class: "normal-input #{required_class}",
+                            class: "field-control #{required_class}",
                             disabled: cm_field.disabled,
                             value: value,
                             placeholder: cm_field.placeholder
@@ -40,7 +40,7 @@ module CmAdmin
       def cm_single_select_field(form_obj, cm_field, value, required_class, target_action)
         form_obj.select cm_field.field_name, options_for_select(select_collection_value(form_obj.object, cm_field), form_obj.object.send(cm_field.field_name)),
                         { include_blank: cm_field.placeholder },
-                        class: "normal-input #{required_class} select-2",
+                        class: "field-control #{required_class} select-2",
                         disabled: cm_field.disabled,
                         data: {
                           field_name: cm_field.field_name,
@@ -54,13 +54,13 @@ module CmAdmin
         form_obj.select cm_field.field_name,
                         options_for_select(select_collection_value(form_obj.object, cm_field), form_obj.object.send(cm_field.field_name)),
                         { include_blank: cm_field.placeholder },
-                        class: "normal-input #{required_class} select-2",
+                        class: "field-control #{required_class} select-2",
                         disabled: cm_field.disabled, multiple: true
       end
 
       def cm_date_field(form_obj, cm_field, value, required_class, _target_action)
         form_obj.text_field cm_field.field_name,
-                            class: "normal-input #{required_class}",
+                            class: "field-control #{required_class}",
                             disabled: cm_field.disabled,
                             value: value&.strftime('%d-%m-%Y'),
                             placeholder: cm_field.placeholder,
@@ -69,7 +69,7 @@ module CmAdmin
 
       def cm_date_time_field(form_obj, cm_field, value, required_class, _target_action)
         form_obj.text_field cm_field.field_name,
-                            class: "normal-input #{required_class}",
+                            class: "field-control #{required_class}",
                             disabled: cm_field.disabled,
                             value: value,
                             placeholder: cm_field.placeholder,
@@ -78,22 +78,48 @@ module CmAdmin
 
       def cm_text_field(form_obj, cm_field, value, required_class, _target_action)
         form_obj.text_area cm_field.field_name,
-                           class: "normal-input #{required_class}",
+                           class: "field-control #{required_class}",
                            placeholder: cm_field.placeholder
       end
 
       def cm_rich_text_field(form_obj, cm_field, value, required_class, _target_action)
         form_obj.rich_text_area cm_field.field_name,
-                                class: "normal-input #{required_class}",
+                                class: "field-control #{required_class}",
                                 placeholder: cm_field.placeholder
       end
 
       def cm_single_file_upload_field(form_obj, cm_field, _value, required_class, _target_action)
-        form_obj.file_field cm_field.field_name, class: "normal-input #{required_class}"
+        content_tag(:div) do
+          concat form_obj.file_field cm_field.field_name, class: "normal-input #{required_class}"
+          concat attachment_list(form_obj, cm_field, _value, required_class, _target_action)
+        end
       end
 
       def cm_multi_file_upload_field(form_obj, cm_field, _value, required_class, _target_action)
-        form_obj.file_field cm_field.field_name, multiple: true, class: "normal-input #{required_class}"
+        content_tag(:div) do
+          concat form_obj.file_field cm_field.field_name, multiple: true, class: "normal-input #{required_class}"
+          concat attachment_list(form_obj, cm_field, _value, required_class, _target_action)
+        end
+      end
+
+      def attachment_list(form_obj, cm_field, _value, required_class, _target_action)
+        attached = form_obj.object.send(cm_field.field_name)
+        content_tag(:div) do
+          if attached.class == ActiveStorage::Attached::Many
+            attached.each do |attachment|
+              concat attachment_with_icon(attachment)
+            end
+          else
+            concat attachment_with_icon(attached)
+          end
+        end
+      end
+
+      def attachment_with_icon(attachment)
+        content_tag(:div, class: 'destroy-attachment', data: { ar_id: attachment.id}) do
+          concat content_tag(:i, '', class: 'fa-solid fa-trash-can')
+          concat content_tag(:span, attachment.filename.to_s)
+        end
       end
 
       def cm_check_box_field(form_obj, cm_field, value, required_class, target_action)
@@ -128,7 +154,7 @@ module CmAdmin
         else
           form_obj.check_box cm_field.field_name,
                              {
-                               class: "normal-input cm-checkbox #{required_class} #{target_action.present? ? 'linked-field-request' : ''}",
+                               class: "field-control cm-checkbox #{required_class} #{target_action.present? ? 'linked-field-request' : ''}",
                                disabled: cm_field.disabled,
                                data: {
                                  field_name: cm_field.field_name,
@@ -158,7 +184,7 @@ module CmAdmin
         content_tag :div, class: 'cm-radio-tag' do
           concat form_obj.check_box cm_field.field_name,
                                     {
-                                      class: "normal-input cm-checkbox #{required_class} #{target_action.present? ? 'linked-field-request' : ''}",
+                                      class: "field-control cm-checkbox #{required_class} #{target_action.present? ? 'linked-field-request' : ''}",
                                       disabled: cm_field.disabled,
                                       name: "#{@model.name.underscore}[#{cm_field.field_name}][]",
                                       data: {
@@ -186,7 +212,7 @@ module CmAdmin
 
       def format_radio_button(val, form_obj)
         content_tag :div, class: 'cm-radio-tag' do
-          concat form_obj.radio_button :level, val, class: 'normal-input cm-radio'
+          concat form_obj.radio_button :level, val, class: 'field-control cm-radio'
         end
       end
     end

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -28,48 +28,85 @@ module CmAdmin
         set_form_for_fields(resource, columns, url, method)
       end
 
-      def form_with_mentioned_fields(resource, sections_array, method)
+      def form_with_mentioned_fields(resource, entities, method)
         # columns = resource.class.columns.select { |i| available_fields.map(&:field_name).include?(i.name.to_sym) }
         table_name = resource.model_name.collection
         # columns.reject! { |i| REJECTABLE.include?(i.name) }
         url = CmAdmin::Engine.mount_path + "/#{table_name}/#{resource.id}"
-        set_form_with_sections(resource, sections_array, url, method)
+        set_form_with_sections(resource, entities, url, method)
       end
 
-      def split_form_into_section(resource, form_obj, sections_array)
+      def split_form_into_section(resource, form_obj, entities)
         content_tag :div do
-          sections_array.each do |section|
+          entities.each do |entity|
+            if entity.class == CmAdmin::Models::Row
+              concat create_rows(resource, form_obj, entity)
+            elsif entity.class == CmAdmin::Models::Section
+              concat(content_tag(:div, class: 'row') do
+                concat create_sections(resource, form_obj, entity)
+              end)
+            end
+          end
+        end
+      end
+
+      def create_rows(resource, form_obj, row)
+        content_tag :div, class: 'row' do
+          row.sections.each do |section|
             concat create_sections(resource, form_obj, section)
           end
         end
       end
 
       def create_sections(resource, form_obj, section)
-        content_tag :div, class: 'form-container' do
+        content_tag :div, class: 'col form-container' do
           concat content_tag(:p, section.section_name, class: 'form-title')
           concat set_form_for_fields(resource, form_obj, section)
         end
       end
 
+      def create_row_inside_section(resource, form_obj, rows)
+        rows.each do |row|
+          concat(content_tag(:div, class: 'row') do
+            row.row_fields.each do |field|
+              concat set_form_field(resource, form_obj, field)
+            end
+          end)
+        end
+        return
+      end
+
       def set_form_for_fields(resource, form_obj, section)
         content_tag(:div, class: 'form-container__inner') do
-          section.section_fields.each do |field|
-            next unless field.display_if.call(form_obj.object)
+          concat create_row_inside_section(resource, form_obj, section.rows) if section.rows.present?
+          concat set_form_fields(resource, form_obj, section.section_fields)
+          concat set_nested_form_fields(form_obj, section)
+        end
+      end
+
+      def set_form_fields(resource, form_obj, fields)
+        fields.each do |field|
+          concat(content_tag(:div, class: 'row') do
+            concat set_form_field(resource, form_obj, field)
+          end)
+        end
+        return
+      end
+
+      def set_form_field(resource, form_obj, field)
+        content_tag(:div, class: field.col_size ? "col-#{field.col_size}" : 'col') do
+          next unless field.display_if.call(form_obj.object)
 
-            if field.input_type.eql?(:hidden)
+          if field.input_type.eql?(:hidden)
+            concat input_field_for_column(form_obj, field)
+          else
+            concat(content_tag(:div, class: "form-field #{field.disabled ? 'disabled' : ''}") do
+              concat form_obj.label field.label, field.label, class: 'field-label'
+              concat tag.br
               concat input_field_for_column(form_obj, field)
-            else
-              concat(content_tag(:div, class: "input-wrapper #{field.disabled ? 'disabled' : ''}") do
-                concat form_obj.label field.label, field.label, class: 'field-label'
-                concat tag.br
-                concat(content_tag(:div, class: 'datetime-wrapper') do
-                  concat input_field_for_column(form_obj, field)
-                end)
-                concat tag.p resource.errors[field.field_name].first if resource.errors[field.field_name].present?
-              end)
-            end
+              concat tag.p resource.errors[field.field_name].first if resource.errors[field.field_name].present?
+            end)
           end
-          concat set_nested_form_fields(form_obj, section)
         end
       end
 
@@ -81,7 +118,7 @@ module CmAdmin
         end
       end
 
-      def set_form_with_sections(resource, sections_array, url, method)
+      def set_form_with_sections(resource, entities, url, method)
         form_for(resource, url: url, method: method, html: { class: "cm_#{resource.class.name.downcase}_form" } ) do |form_obj|
           if params[:referrer]
             concat form_obj.text_field "referrer", class: "normal-input", hidden: true, value: params[:referrer], name: 'referrer'
@@ -92,10 +129,10 @@ module CmAdmin
           elsif params[:associated_class] && params[:associated_id]
             concat form_obj.text_field params[:associated_class] + '_id', class: "normal-input", hidden: true, value: params[:associated_id]
           end
-          concat split_form_into_section(resource, form_obj, sections_array)
+          concat split_form_into_section(resource, form_obj, entities)
           concat tag.br
            # TODO: form_submit class is used for JS functionality, Have to remove 
-          concat form_obj.submit 'Save', class: 'btn-cta mt-3 form_submit', data: {form_class: "cm_#{form_obj.object.class.name.downcase}_form"}
+          concat form_obj.submit 'Save', class: 'btn-cta form_submit', data: {form_class: "cm_#{form_obj.object.class.name.downcase}_form"}
         end
       end
     end