cm-admin 1.4.8 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 739e610f8a75252258bd23ad714ba42235f099b2966450609d811a4a87ad8f6b
-  data.tar.gz: cb48e10324ba8876d10299e5f80ac34ed623a7c35ea768415587c81f87e42fb1
+  metadata.gz: 05e22c2322e5dada38d27e45852884ee430d88ddc8977470148558f27b4e2c68
+  data.tar.gz: 367177c2663be7f2efc5802f97228bdae67646ffa9cd38ee9cf6a011dfe6919e
 SHA512:
-  metadata.gz: 4106dee29b565d27cea6ea4f10d3775d8d3cfbb8cb2e22b9dfcfab0f23eae421f74602b516053e7ce1d84e6a742173e1780475a28196ca3dd23948503f0e1ae2
-  data.tar.gz: f0c32a23b1c364d2b5028f71be1e4ab4105f9316ef2585f68eeb11a814ed519548885fcd2292be7f1fb892e17eb151a82df25080b51cbf212678506a668880c1
+  metadata.gz: ecd9f3390b5591fda9b2096c0e0b0c29ce8f337aca166d9fb4c062dd5c6248171fab707db3dbaacada448f6b7a8d38223294dab660ee10c3ee425295db1856dd
+  data.tar.gz: 297546816171bdcd42c1d4a2d9306554d824ba723e7520cc534c59522bce4e1bd6f15cad3b2a2ba2ff5c5f73d53ef7e4e2153a787bae9b325c2435da0d1e7f08

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (1.4.8)
+    cm-admin (1.5.0)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)
@@ -128,7 +128,7 @@ GEM
       net-pop
       net-smtp
     marcel (1.0.4)
-    method_source (1.0.0)
+    method_source (1.1.0)
     mini_mime (1.1.5)
     minitest (5.18.1)
     net-imap (0.4.10)
@@ -138,10 +138,12 @@ GEM
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.1)
-    nokogiri (1.16.3-arm64-darwin)
+    nokogiri (1.16.4-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.4-x86_64-linux)
       racc (~> 1.4)
     pagy (4.11.0)
     parallel (1.22.1)

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

@@ -1,8 +1,8 @@
-$(document).on('click', '.form_submit', function(e) {
+$(document).on('click', '.form_submit', function (e) {
   e.preventDefault();
   var submit = [];
   var form_class = $(this).data('form-class');
-  $("." + form_class + " input.required, ." + form_class + " textarea.required").each(function() {
+  $("." + form_class + " input.required, ." + form_class + " textarea.required").each(function () {
     $(this).removeClass('is-invalid');
     if ($(this).val().trim().length === 0) {
       $(this).addClass('is-invalid');
@@ -10,15 +10,15 @@ $(document).on('click', '.form_submit', function(e) {
       submit.push(true);
     }
   });
-  $("." + form_class + " select.required").each(function() {
+  $("." + form_class + " select.required").each(function () {
     $(this).removeClass('is-invalid');
     if ($(this).val().trim().length === 0) {
-      $(this).parent().find('.select2').addClass('is-invalid');
+      $(this).parent().find('select').addClass('is-invalid');
       $(this)[0].scrollIntoView(true);
       submit.push(true);
     }
   });
-  $('.nested_input_validation').each(function() {
+  $('.nested_input_validation').each(function () {
     var class_name;
     class_name = $(this).data('class-name');
     $(this).parents(':nth(1)').find('.' + class_name).addClass('hidden');

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

@@ -42,8 +42,16 @@ document.addEventListener("turbo:load", function () {
   setup_select_2_ajax();
 });
 
-$(document).on('click', '.menu-item', function(e) {
-  $('.profile-popup').toggleClass('hidden');
+$(document).on('click', '[data-behaviour="toggle-profile-popup"]', function(e) {
+  e.stopPropagation();
+  $('[data-behaviour="profile-popup"]').toggleClass('hidden');
+});
+
+$(document).on('click', function(e) {
+  var popup = $('[data-behaviour="profile-popup"]');
+  if (!popup.is(e.target) && popup.has(e.target).length === 0) {
+    popup.addClass('hidden');
+  }
 });
 
 $(document).on('click', '.destroy-attachment', function(e) {

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

@@ -1,4 +1,4 @@
-@import '../helpers/index.scss';
+@import "../helpers/index.scss";
 
 .auth {
   display: flex;
@@ -66,7 +66,8 @@
       &:focus {
         border-color: #66afe9 !important;
         outline: 0 !important;
-        box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6) !important;
+        box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075),
+          0 0 8px rgba(102, 175, 233, 0.6) !important;
       }
     }
   }
@@ -101,8 +102,9 @@
       height: 22px;
       margin-right: 8px;
       @include font($size: 10px, $color: $white, $weight: 900);
+      line-height: 24px;
       background-color: $brand-color;
-      vertical-align: middle; 
+      vertical-align: middle;
       border-radius: 50%;
       img {
         width: 22px;
@@ -188,4 +190,4 @@
       }
     }
   }
-}
+}

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

@@ -3,7 +3,6 @@
 
 .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
   background-color: var(--bs-white);
   &__info {
     .breadcrumb {

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

@@ -1,4 +1,5 @@
 @import "../helpers/index.scss";
+@import "../dependency/bootstrap/scss/bootstrap";
 
 .quick-search-modal {
   .modal-dialog {
@@ -11,12 +12,17 @@
     }
   }
   .quick-search-field {
+    @extend .input-group;
+    .search-input {
+      @extend .form-control;
+    }
     .clear-search {
       position: absolute;
       top: 8px;
       right: 16px;
       @include font($size: $t4-text, $color: $ink-lighter-clr);
       line-height: 22px;
+      z-index: 9;
       cursor: pointer;
     }
   }

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

@@ -172,8 +172,8 @@
           display: inline-flex;
           align-items: center;
           justify-content: center;
-          width: 32px;
-          height: 32px;
+          width: 22px;
+          height: 22px;
           @include font($size: $t3-text, $color: $white, $weight: 600);
           background-color: $brand-color;
           border-radius: $circle;
@@ -216,5 +216,3 @@
     }
   }
 }
-
-

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

@@ -13,10 +13,10 @@
   /    span
   /      i.fa.fa-angle-down
 - if flash[:alert].present?
-  .alert.alert-danger role="alert"
+  .alert.alert-danger.me-4 role="alert"
     = flash[:alert].html_safe
 - elsif flash[:notice].present?
-  .alert.alert-success
+  .alert.alert-success.me-4
     = flash[:notice].html_safe
 
 - bulk_actions = actions_filter(@model, @ar_object, :bulk_action)

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

@@ -4,8 +4,8 @@
       .breadcrumb
         = link_to "#{@model.name.titleize.pluralize} /", cm_admin.send(:"#{@model.name.underscore}_index_path"), class: 'text-reset'
     h4 = action_title
-    - if @model.current_action.page_description
-      p.mb-0.text-body-secondary = @model.current_action.page_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(@ar_object, :exportable)

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

@@ -1,6 +1,6 @@
 - custom_action_with_modals = @model.available_actions.select{ |act| act if act.display_type == :modal && act.action_type == :custom }
 - bulk_action_with_modals = @model.available_actions.select{ |act| act if act.display_type == :modal && act.action_type == :bulk_action }
-- destroy_action = available_actions(@model, @ar_object, 'destroy')
+- destroy_action = @ar_object ? available_actions(@model, @ar_object, 'destroy') : nil
 - if @associated_model
   - custom_action_with_modals += @associated_model.available_actions.select{ |act| act if act.display_type == :modal }
 - if @current_action&.name == 'index'

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

@@ -7,7 +7,7 @@
       .modal-body
         .custom-modal-body
           .modal-info data-section="bulk-action"
-            | Are you sure you want to delete this #{@model.name.classify}
+            | 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), method: :delete, class: "btn btn-primary" do
               span

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

@@ -14,16 +14,16 @@
 
   - if defined?(user_full_name)
     .sidebar__footer
-      .menu-item
+      .menu-item data-behaviour="toggle-profile-popup"
         .profile-name
           span.profile-avatar #{user_full_name.first.titleize}
           | #{user_full_name.titleize}
-      .profile-popup.hidden
+      .profile-popup.hidden data-behaviour="profile-popup"
         .profile-info
           .profile-info__left
             p.name-text = user_full_name
             p.email-text = current_user.email
-          .profile-info__right
+          .profile-info__right #{user_full_name.first.titleize}
         .auth-option
           = button_to destroy_user_session_path, method: :delete, class: 'auth-link', data: { turbo: :false }
             | Logout

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

@@ -3,13 +3,11 @@
     .modal-content
       .modal-body
         .quick-search-field
-          .form-field
-            .field-input-wrapper
-              input#quick-search-input.search-input placeholder="Search" data-behaviour="quick-input-search" autocomplete="off"
-              span.search-input-icon
-                i.fa.fa-search
-              span.clear-search.hidden
-                i.fa.fa-times
+          span.input-group-text
+            i.fa.fa-search
+          input#quick-search-input.search-input placeholder="Search" data-behaviour="quick-input-search" autocomplete="off"
+          span.clear-search.hidden
+            i.fa.fa-times
         .search-results-container.list-area
           = navigation_links('quick_links')
         .results-action

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.4.8'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.5.0
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-03 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails
@@ -498,7 +498,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: CmAdmin is a robust gem designed to assist in creating admin panels for Rails