cm-admin 1.1.9 → 1.2.1

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -28,48 +28,89 @@ 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
+              next unless entity.display_if.call(form_obj.object)
+
+              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|
+            next unless section.display_if.call(form_obj.object)
+
             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
 
-            if field.input_type.eql?(:hidden)
+      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)
+            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 +122,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 +133,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

data/lib/cm_admin/view_helpers/page_info_helper.rb

@@ -23,25 +23,6 @@ module CmAdmin
         end
       end
 
-      def action_description
-        show_action = CmAdmin::Models::Action.find_by(@model, name: 'show')
-        if @model.current_action.page_description
-          title = @model.current_action.page_description
-        elsif show_action.page_description
-          title = show_action.page_description
-        else
-          title = "#{@model.name}"
-          case action_name
-          when 'index'
-            title + " list record"
-          when 'new'
-            title + " new record"
-          when 'edit'
-            title + " edit record"
-          end
-        end
-      end
-
       def page_url(action_name=@action.name, ar_object=nil)
         base_path = CmAdmin::Engine.mount_path + '/' + @model.name.downcase.pluralize
         case action_name
@@ -67,7 +48,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: 'btn-secondary 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 +64,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: 'btn-secondary 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: 'btn-secondary 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: 'btn-secondary 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.2.1
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-29 00:00:00.000000000 Z
+date: 2023-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -223,6 +223,105 @@ files:
 - app/assets/stylesheets/cm_admin/components/_status-tag.scss
 - app/assets/stylesheets/cm_admin/components/index.scss
 - app/assets/stylesheets/cm_admin/dependency/bootstrap.min.css
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_accordion.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_alert.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_badge.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_breadcrumb.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_button-group.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_buttons.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_card.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_carousel.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_close.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_containers.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_dropdown.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_forms.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_functions.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_grid.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_helpers.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_images.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_list-group.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_maps.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_mixins.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_modal.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_nav.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_navbar.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_offcanvas.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_pagination.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_placeholders.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_popover.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_progress.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_reboot.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_root.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_spinners.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_tables.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_toasts.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_tooltip.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_transitions.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_type.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_utilities.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_variables-dark.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/_variables.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/bootstrap-grid.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/bootstrap-reboot.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/bootstrap-utilities.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/bootstrap.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/forms/_floating-labels.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/forms/_form-check.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/forms/_form-control.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/forms/_form-range.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/forms/_form-select.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/forms/_form-text.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/forms/_input-group.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/forms/_labels.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/forms/_validation.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/helpers/_clearfix.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/helpers/_color-bg.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/helpers/_colored-links.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/helpers/_focus-ring.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/helpers/_icon-link.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/helpers/_position.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/helpers/_ratio.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/helpers/_stacks.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/helpers/_stretched-link.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/helpers/_text-truncation.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/helpers/_visually-hidden.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/helpers/_vr.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_alert.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_backdrop.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_banner.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_border-radius.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_box-shadow.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_breakpoints.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_buttons.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_caret.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_clearfix.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_color-mode.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_color-scheme.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_container.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_deprecate.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_forms.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_gradients.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_grid.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_image.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_list-group.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_lists.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_pagination.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_reset-text.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_resize.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_table-variants.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_text-truncate.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_transition.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_utilities.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/mixins/_visually-hidden.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/tests/jasmine.js
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/tests/mixins/_color-modes.test.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/tests/mixins/_media-query-color-mode-full.test.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/tests/mixins/_utilities.test.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/tests/sass-true/register.js
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/tests/sass-true/runner.js
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/tests/utilities/_api.test.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/utilities/_api.scss
+- app/assets/stylesheets/cm_admin/dependency/bootstrap/scss/vendor/_rfs.scss
 - app/assets/stylesheets/cm_admin/dependency/flatpickr.min.css
 - app/assets/stylesheets/cm_admin/dependency/fontawesome.all.css
 - app/assets/stylesheets/cm_admin/dependency/jquery-jgrowl.min.css
@@ -249,11 +348,14 @@ files:
 - app/views/cm_admin/main/_actions_dropdown.html.slim
 - app/views/cm_admin/main/_associated_table.html.slim
 - app/views/cm_admin/main/_cm_pagy_nav.html.slim
+- app/views/cm_admin/main/_custom_action_modal_form.html.slim
 - app/views/cm_admin/main/_drawer.html.slim
 - app/views/cm_admin/main/_filters.html.slim
 - app/views/cm_admin/main/_member_custom_action_modal.html.slim
 - app/views/cm_admin/main/_nested_fields.html.slim
 - app/views/cm_admin/main/_nested_table_form.html.slim
+- app/views/cm_admin/main/_nested_table_section.html.slim
+- app/views/cm_admin/main/_show_section.html.slim
 - app/views/cm_admin/main/_table.html.slim
 - app/views/cm_admin/main/_tabs.html.slim
 - app/views/cm_admin/main/_top_navbar.html.slim
@@ -270,7 +372,9 @@ files:
 - app/views/cm_admin/static/error_401.html.slim
 - app/views/cm_admin/static/error_403.html.slim
 - app/views/layouts/_cm_flash_message.html.slim
+- app/views/layouts/_custom_action_modal.html.slim
 - app/views/layouts/_custom_action_modals.html.slim
+- app/views/layouts/_destroy_action_modal.html.slim
 - app/views/layouts/_left_sidebar_nav.html.slim
 - app/views/layouts/_quick_links.html.slim
 - app/views/layouts/cm_admin.html.slim
@@ -309,6 +413,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/row.rb
 - lib/cm_admin/models/section.rb
 - lib/cm_admin/models/tab.rb
 - lib/cm_admin/models/utils/associations.rb