cm-admin 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 255cb085f8e8d797c77241f882c2b6dc7894878572a230158b3376df9c9aa485
-  data.tar.gz: a4acd31793b97d16d1790ea61a24fd0a2411f756bcbd36226baea380f7b77959
+  metadata.gz: 86d2406a7cec46cd375fad274561e1545668f65124652803db2e533c48ba9721
+  data.tar.gz: 6a8aa052b4e7264822320a588a95f6aa5187c548383de450a4d287299b818601
 SHA512:
-  metadata.gz: 69bd5e4f1753bb6d46028a604defe82dcae819e04c94482594197a984c6d6d648e04c530de0302e6714e6254df2c22bfc59a4ffad9fadfa51b64fe2e4125237b
-  data.tar.gz: f8eb530cd2e7c41dc04bc3c653dad14a433f38f53a7641fd5ca05c881e44c2b0a0c12594bdba8fc5e78c2e4e4af5e6da68b31cb51fe0bb13ef4f2ad162c06766
+  metadata.gz: 79dca0f6279868346d75204aff4fa4188778530b2443f87623f0855737b9008032b4661ca82b40c857c29224a084e243d6571c5cbcdfbde84b59ead69f855df6
+  data.tar.gz: 0d5f9f625e5536bed4590f1ec4957bc3b9e4e028beca1be33138972755744b5c6e0f109c295e32f7cd8adfcde18b297968b9b922a5503410a19b42528ba842e9

data/Gemfile.lock

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

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

@@ -44,6 +44,11 @@
   @extend .form-control;
 }
 
+//upload attachment style
+.destroy-attachment {
+  margin-top: 4px;
+}
+
 // Nested form styles
 .nested-field-wrapper {
   .nested-single-field {

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

@@ -3,7 +3,7 @@
 
 .entity-header {
   @extend .d-flex.justify-content-between.align-items-start.p-4;
-  min-height: 109px; // Height needs to be removed once all the layouts are revamped
+  // min-height: 109px; // Height needs to be removed once all the layouts are revamped
   background-color: var(--bs-white);
   &__info {
     .breadcrumb {

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

@@ -252,58 +252,30 @@
     }
   }
 
-  .cm-pagination {
-    position: sticky;
+  .pagination-bar {
+    @extend .position-sticky,
+      .bottom-0,
+      .start-0,
+      .d-flex,
+      .justify-content-between,
+      .align-items-center,
+      .w-100,
+      .py-2,
+      .px-4,
+      .bg-white !optional;
     bottom: 0;
     left: 0;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    width: 100%;
-    padding: 16px 24px;
-    background-color: $white;
     border: 1px solid $grey-lighter-clr;
     box-shadow: inset 0px 1px 0px rgba(148, 151, 155, 0.3);
     z-index: 2;
-    &__lhs {
-      @include font($size: $t4-text, $color: $ink-lightest-clr, $weight: bold);
-      line-height: 22px;
+    .count-text {
+      @include font($size: $t4-text, $color: var(--bs-body-color));
     }
-    &__rhs {
-      display: inline-flex;
-      align-items: center;
-      .page-move-btn {
-        @include font($size: 10px, $color: $primary-text-clr);
-        line-height: 12px;
-        padding: 10px 11px;
-        cursor: pointer;
-        &.disabled {
-          color: $disabled-clr;
-          cursor: initial;
-          pointer-events: none;
-        }
-      }
-      .page-num-btn {
-        @include font($size: $t4-text, $color: $primary-text-clr, $weight: bold);
-        display: inline-flex;
-        justify-content: center;
-        align-items: center;
-        width: 32px;
-        height: 32px;
-        margin: 0 8px;
-        border-radius: 4px;
-        cursor: pointer;
-        &:hover {
-          border: 1px solid $grey-light-clr;
-        }
-        &.active {
-          color: $primary-text-clr;
-          background-color: $grey-lightest-clr;
-          border: 1px solid $grey-light-clr;
-          border-radius: $radius-4;
-          cursor: initial;
-          pointer-events: none;
-        }
+    .pagination-actions {
+      @extend .pagination;
+      gap: 4px;
+      span {
+        @extend .d-inline-flex;
       }
     }
   }

data/app/assets/stylesheets/cm_admin/components/_buttons.scss

@@ -1,37 +1,39 @@
 @import "../helpers/index.scss";
 @import "../dependency/bootstrap/scss/bootstrap";
 
-// Custom style for icon btn
-.btn-icon {
-  i {
-    margin-right: 4px;
-  }
+.btn-icon-spacing {
+  @extend .d-inline-flex, .align-items-center, .justify-content-center;
+  gap: 4px;
 }
 
 // New buttons with bootstrap button styles
 .cm-admin .btn-cta {
-  @include button-variant($primary, $primary);
-  @extend .btn.btn-sm.btn-icon;
+  --bs-btn-color: var(--bs-white) !important;
+  --bs-btn-bg: var(--bs-primary) !important;
+  --bs-btn-border-color: var(--bs-primary);
+  --bs-btn-hover-color: var(--bs-white);
+  --bs-btn-hover-bg: #{shade-color($primary, 10%)};
+  @extend .btn, .btn-sm, .btn-icon-spacing;
 }
 
 .cm-admin .btn-primary {
-  @extend .btn.btn-outline-primary.btn-sm.btn-icon;
+  @extend .btn, .btn-outline-primary, .btn-sm, .btn-icon-spacing;
 }
 
 .cm-admin .btn-secondary {
-  @extend .btn.btn-outline-secondary.btn-sm.btn-icon;
+  @extend .btn, .btn-outline-secondary, .btn-sm, .btn-icon-spacing;
 }
 
 .cm-admin .btn-ghost {
-  @extend .btn.btn-light.btn-sm.btn-icon;
+  @extend .btn, .btn-light, .btn-sm, .btn-icon-spacing;
 }
 
 .cm-admin .btn-danger {
-  @extend .btn.btn-outline-danger.btn-sm.btn-icon;
+  @extend .btn, .btn-outline-danger, .btn-sm, .btn-icon-spacing;
 }
 
 .cm-admin .btn-link {
-  @extend .btn.btn-link.btn-sm.btn-icon;
+  @extend .btn, .btn-link, .btn-sm, .btn-icon-spacing;
   text-decoration: underline;
 }
 

data/app/assets/stylesheets/cm_admin/components/_input.scss

@@ -34,30 +34,6 @@
   }
 }
 
-//Search input styles
-.search-input {
-  position: relative;
-  width: 100%;
-  padding: 5px 0 5px 38px;
-  @include font($size: $t4-text, $color: $primary-text-clr);
-  line-height: 22px;
-  background-color: $white;
-  border: 1px solid $grey-light-clr;
-  border-radius: $radius-4;
-  &::placeholder {
-    color: $ink-lightest-clr;
-  }
-  &:focus {
-    outline: 3px auto rgba(47, 128, 237, 0.3);
-  }
-}
-.search-input-icon {
-  position: absolute;
-  top: 8px;
-  left: 16px;
-  @include font($size: $t4-text, $color: $ink-lightest-clr);
-}
-
 //Normal input styles
 .normal-input {
   width: 100%;

data/app/assets/stylesheets/cm_admin/components/_status-tag.scss

@@ -1,15 +1,43 @@
 @import "../helpers/index.scss";
+@import "../dependency/bootstrap/scss/bootstrap";
 
 .status-tag {
-  font-size: $t4-text;
-  line-height: 22px;
-  padding: 4px;
-  color: $primary-text-clr;
-  background: $grey-lighter-clr;
-  border-radius: 2px;
-  &.success {
-    color: $green-regular-clr;
-    background: $green-lightest-clr;
+  @extend .badge;
+  &.active {
+    background: var(--blue-100, #e7f1ff);
+    color: var(--blue-700, #084298);
+  }
+  &.active-one {
+    background: var(--Blue-100, #e7f1ff);
+    color: var(--Blue-700, #084298);
+  }
+  &.active-two {
+    background: var(--Yellow-100, #fff3cd);
+    color: var(--Yellow-700, #997404);
+  }
+  &.active-three {
+    background: var(--Orange-100, #ffe5d0);
+    color: var(--Orange-700, #984c0c);
+  }
+  &.active-four {
+    background: var(--Indigo-100, #e0cffc);
+    color: var(--Indigo-700, #3d0a91);
+  }
+  &.active-five {
+    background: var(--Cyan-100, #cff4fc);
+    color: var(--Cyan-700, #087990);
+  }
+  &.completed {
+    background: var(--green-100, #d1e7dd);
+    color: var(--green-700, #0f5132);
+  }
+  &.neutral {
+    background: var(--bs-gray-300);
+    color: var(--bs-gray-700);
+  }
+  &.danger {
+    background: var(--red-100, #f8d7da);
+    color: var(--red-700, #842029);
   }
 }
 

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

@@ -1,23 +1,23 @@
 - link = pagy_link_proc(pagy)
 
-nav.pagy_nav.pagination role="navigation" aria-label="pager"
+nav.pagination-actions role="navigation" aria-label="pager"
 
   - if pagy.prev
-    span ==> link.call(pagy.prev, '<', 'aria-label="previous" class="page-move-btn"')
+    span ==> link.call(pagy.prev, '<i class="fas fa-chevron-left"></i>'.html_safe, 'aria-label="previous" class="btn-ghost"')
   - else
-    span ==> link.call('#', '<', 'class="page-move-btn disabled"')
+    span ==> link.call('#', '<i class="fas fa-chevron-left"></i>'.html_safe, 'class="btn-ghost disabled"')
 
   - pagy.series.each do |item|        # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
     - if item.is_a?(Integer)          # page link
-      span ==> link.call(item, item, 'class="page-num-btn"')
+      span ==> link.call(item, item, 'class="btn-ghost"')
 
     - elsif item.is_a?(String)        # current page
-      span ==> link.call(item, item, 'class="page-num-btn active"')
+      span ==> link.call(item, item, 'class="btn-ghost active"')
 
     - elsif item == :gap              # page gap
       span.page.gap ==> pagy_t('pagy.nav.gap')
 
   - if pagy.next
-    span == link.call(pagy.next, '>', 'aria-label="next" class="page-move-btn"')
+    span == link.call(pagy.next, '<i class="fas fa-chevron-right"></i>'.html_safe, 'aria-label="next" class="btn-ghost"')
   - else
-    span ==> link.call('#', '>', 'class="page-move-btn disabled"')
+    span ==> link.call('#', '<i class="fas fa-chevron-right"></i>'.html_safe, 'class="btn-ghost disabled"')

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

@@ -1,46 +1,7 @@
-- if fields.count == 1
-  .nested-single-field.nested-fields
-    - fields.each do |field|
-        .field-input
-          = input_field_for_column(f, field)
-        .field-remove-action
-          - unless field.input_type == :hidden
-            - if @reflections.select {|x| x if x.name == assoc_name}.first.macro == :has_many
-              = link_to_remove_association "", f, class: 'fa fa-times'
-- else
-  tr
-    td.item-delete-cell
-      - if @reflections.select {|x| x if x.name == assoc_name}.first.macro == :has_many
-        = link_to_remove_association "", f, class: 'fa fa-trash btn-ghost'
-    - fields.each do |field|
-      td
-        = input_field_for_column(f, field)
-
-
-  / .field-remove-action
-  /   - if @reflections.select {|x| x if x.name == assoc_name}.first.macro == :has_many
-  /     .accordion-delete-btn
-  /       = link_to_remove_association "", f, class: 'fa fa-trash btn-ghost'
-  / - 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)
-        
-  / .accordion-item.nested-fields
-  /   h2#headingOne.accordion-header
-  /     button.accordion-button[type="button" data-bs-toggle="collapse" data-bs-target="##{assoc_name}-#{f.object.id}" aria-expanded="true" aria-controls="collapseOne"]
-  /       | Chapter 1
-  /     .field-remove-action
-  /       - if @reflections.select {|x| x if x.name == assoc_name}.first.macro == :has_many
-  /         .accordion-delete-btn
-  /           = link_to_remove_association "", f, class: 'fa fa-trash btn-ghost'
-  /   div.accordion-collapse.collapse.show[aria-labelledby="headingOne" id="#{assoc_name}-#{f.object.id}"]
-  /     .accordion-body
-  /       - 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)
+tr.nested-fields
+  td.item-delete-cell
+    - if @reflections.select {|x| x if x.name == assoc_name}.first.macro == :has_many
+      = link_to_remove_association "", f, class: 'fa-regular fa-trash-can btn-ghost'
+  - fields.each do |field|
+    td 
+      = input_field_for_column(f, field)

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

@@ -12,8 +12,8 @@
             = field.field_name.to_s.titleize 
     tbody.insert-cocoon-position
       = f.fields_for table_name do |record|
-        - if record.object.persisted?
+        - 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-secondary'
+      = 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'

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

@@ -49,9 +49,8 @@
           - if @model
             == render partial: 'cm_admin/main/actions_dropdown', locals: { cm_model: @model, ar_object: ar_object }
 
-  .cm-pagination
-    .cm-pagination__lhs Showing #{@ar_object.pagy.from} to #{@ar_object.pagy.to} out of #{@ar_object.pagy.count}
-    .cm-pagination__rhs
-      == render partial: 'cm_admin/main/cm_pagy_nav', locals: { pagy: @ar_object.pagy }
+  .pagination-bar
+    p.count-text.m-0 Showing #{@ar_object.pagy.from} to #{@ar_object.pagy.to} out of #{@ar_object.pagy.count}
+    == render partial: 'cm_admin/main/cm_pagy_nav', locals: { pagy: @ar_object.pagy }
 
 / = render partial: 'cm_admin/main/member_custom_action_modal', locals: { cm_model: @model, ar_collection: @ar_object }

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

@@ -4,7 +4,8 @@
       .breadcrumb
         = link_to "#{@model.name.titleize.pluralize} /", cm_admin.send(:"#{@model.name.underscore}_index_path"), class: 'text-reset'
     h4 = action_title
-    p.mb-0.text-body-secondary = action_description
+    - if @model.current_action.page_description
+      p.mb-0.text-body-secondary = @model.current_action.page_description
   .entity-header__actions
     - if @model.current_action.name == 'index'
       - if has_valid_policy(@model.name, :exportable)

data/lib/cm_admin/version.rb

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

data/lib/cm_admin/view_helpers/filter_helper.rb

@@ -19,8 +19,9 @@ module CmAdmin
       end
 
       def add_filters_dropdown(filters)
-        concat(content_tag(:div, class: 'dropdown add-filter-btn', data: {bs_toggle: 'dropdown'}) do
-          tag.span '+ Add filter'
+        concat(content_tag(:button, class: 'dropdown btn-ghost', data: {bs_toggle: 'dropdown'}) do
+          concat tag.i(class: 'fas fa-filter')
+          concat tag.span 'Filter'
         end)
 
         concat(content_tag(:div, class: 'dropdown-menu dropdown-popup') do
@@ -86,15 +87,12 @@ module CmAdmin
 
       def add_search_filter(filter)
         tag.div class: 'filter-search mr-3' do
-          tag.div class: 'form-field' do
-            tag.div class: 'field-input-wrapper' do
-              concat(content_tag(:input, class: 'search-input', value: "#{params.dig(:filters, :search)}", placeholder: "#{filter.placeholder}", data: {behaviour: 'input-search'}) do
-                tag.span class: 'search-input-icon' do
-                  tag.i class: 'fa fa-search'
-                end
-              end)
-            end
-          end
+          concat(content_tag(:div, class: 'input-group input-group-sm') do
+            concat(content_tag(:span, class: 'input-group-text') do
+              tag.i class: 'fa fa-search'
+            end)
+            concat tag.input type: 'string', class: 'form-control', value: "#{params.dig(:filters, :search)}", placeholder: "#{filter.placeholder}", data: {behaviour: 'input-search'}
+          end)
         end
       end
 

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -90,14 +90,14 @@ module CmAdmin
 
       def cm_single_file_upload_field(form_obj, cm_field, _value, required_class, _target_action)
         content_tag(:div) do
-          concat form_obj.file_field cm_field.field_name, class: "normal-input #{required_class}"
+          concat form_obj.file_field cm_field.field_name, class: "form-control #{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)
         content_tag(:div) do
-          concat form_obj.file_field cm_field.field_name, multiple: true, class: "normal-input #{required_class}"
+          concat form_obj.file_field cm_field.field_name, multiple: true, class: "form-control #{required_class}"
           concat attachment_list(form_obj, cm_field, _value, required_class, _target_action)
         end
       end
@@ -117,8 +117,10 @@ module CmAdmin
 
       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)
+          concat(content_tag(:button, '', class: 'btn-ghost') do
+            concat tag.i(class: 'fa-regular fa-trash-can')
+          end)
+          concat content_tag(:span, attachment.filename.to_s, class: 'btn-link')
         end
       end
 

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -42,6 +42,8 @@ module CmAdmin
             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)
@@ -53,6 +55,8 @@ module CmAdmin
       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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-21 00:00:00.000000000 Z
+date: 2023-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails