cm-admin 1.1.8 → 1.2.0

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.8'
+  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,9 +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
-          concat form_obj.submit 'Save', class: 'cta-btn mt-3 form_submit', data: {form_class: "cm_#{form_obj.object.class.name.downcase}_form"}
+           # TODO: form_submit class is used for JS functionality, Have to remove 
+          concat form_obj.submit 'Save', class: 'btn-cta form_submit', data: {form_class: "cm_#{form_obj.object.class.name.downcase}_form"}
         end
       end
     end

data/lib/cm_admin/view_helpers/manage_column_popup_helper.rb

@@ -65,8 +65,8 @@ module CmAdmin
 
       def manage_column_footer
         concat(content_tag(:div, class: 'modal-footer') do
-          concat tag.button 'Close', class: 'gray-border-btn', data: {bs_dismiss: 'modal'}
-          concat tag.button 'Save', class: 'cta-btn'
+          concat tag.button 'Close', class: 'btn-secondary', data: {bs_dismiss: 'modal'}
+          concat tag.button 'Save', class: 'btn-cta'
         end)
         return
       end

data/lib/cm_admin/view_helpers/page_info_helper.rb

@@ -67,7 +67,7 @@ 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: 'secondary-btn ml-2', method: custom_action.verb
+              link_to custom_action_title(custom_action), "#{@model.ar_model.table_name}/#{custom_action.path}", class: 'btn-secondary ms-2', method: custom_action.verb
             end
           end
         end
@@ -83,14 +83,14 @@ module CmAdmin
 
       def custom_action_button(custom_action, current_action_name)
         if current_action_name == "index"
-          button_to custom_action_title(custom_action), @model.ar_model.table_name + '/' + custom_action.path, class: 'secondary-btn ml-2', method: custom_action.verb
+          button_to custom_action_title(custom_action), @model.ar_model.table_name + '/' + custom_action.path, class: 'btn-secondary ms-2', method: custom_action.verb
         elsif current_action_name == "show"
-          button_to custom_action_title(custom_action), custom_action.path.gsub(':id', params[:id]), class: 'secondary-btn ml-2', method: custom_action.verb
+          button_to custom_action_title(custom_action), custom_action.path.gsub(':id', params[:id]), class: 'btn-secondary ms-2', method: custom_action.verb
         end
       end
 
       def custom_modal_button(custom_action)
-        link_to custom_action_title(custom_action), '', class: 'secondary-btn ml-2', data: { bs_toggle: "modal", bs_target: "##{custom_action.name.classify}Modal" }
+        link_to custom_action_title(custom_action), '', class: 'btn-secondary ms-2', data: { bs_toggle: "modal", bs_target: "##{custom_action.name.classify}Modal-#{@ar_object.id}" }
       end
 
       def custom_action_title(custom_action)

data/lib/cm_admin/view_helpers.rb

@@ -15,7 +15,7 @@ module CmAdmin
     include ActionView::Helpers::TagHelper
 
     def exportable(_klass, html_class: [])
-      tag.a 'Export as excel', class: html_class.append('filter-btn modal-btn mr-2'), data: { toggle: 'modal', target: '#exportmodal' } do
+      tag.a 'Export as excel', class: html_class.append('filter-btn modal-btn me-2'), data: { toggle: 'modal', target: '#exportmodal' } do
         concat tag.i class: 'fa fa-download'
         concat tag.span ' Export'
       end
@@ -53,7 +53,8 @@ module CmAdmin
           concat hidden_field_tag 'class_name', klass.name.to_s, id: 'export-to-file-klass'
           concat checkbox_row(klass)
           concat tag.hr
-          concat submit_tag 'Export', class: 'btn btn-primary btn-bordered export-to-file-btn'
+          # TODO: export-to-file-btn class is used for JS functionality, Have to remove 
+          concat submit_tag 'Export', class: 'btn-primary export-to-file-btn' 
         end
       end
     end