cm-admin 1.4.9 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3bdeb9aab9e5eb7d88bfa184cf5fdd2282650bbc065e1f5139b3c417f3fed34
-  data.tar.gz: 228f5e430f7066eb1c1db1a83ddd21700e9ca7030bffef76cbd45c87ac543680
+  metadata.gz: 4ff4795451733611c79424a5a0ac4aaacd838b34c8d7aea5fdfe6cb127367a97
+  data.tar.gz: 4f856a769adc82e99b13a243973906ef387cb00fe892eec14422286f622e80b7
 SHA512:
-  metadata.gz: 50a43eb5dbc704f6b7018260d3d844ba6f7ba9cf2d465cfc16b72d594b879883a90615ef5985df225d6db54315b449cb2edfbebb4c26392770ca7864a8dfbf47
-  data.tar.gz: c91fc2f56e355271d49009e991e00156b29e5d8ccab21d64b0fe787595c88d12a0a1eb8b83ea874014b1f7c6a5f8a4d4199b87ecac6bec26dc74c9bdf7efee0a
+  metadata.gz: faa21284eae53b8fe3a1834bf6a27d0820197e714da9e23d6243d14ed54d94db314260da3db6893dba3dff37ec1e8e377af27eb668a98fa5de513b94edb1c29f
+  data.tar.gz: ad2570287ad72e499c468e9006720022fe67d1a1f98d10ab60c88cbdeaccf0d1f6fd0c492f5141ad08b3de745bb2d1373797b6af1343b721fbdec121404e9fd8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (1.4.8)
+    cm-admin (1.5.1)
       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,10 @@ 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)
     pagy (4.11.0)
     parallel (1.22.1)

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

@@ -42,7 +42,9 @@ var getFilteredData = function(filterType, filterValue, filterColumn=null) {
   // Generate the queryString by concatenating the filterParams and
   // searchParams that are already applied, if searchParams are present.
   var searchParams = window.location.search
-  if (searchParams.length > 0) {
+  var searchParamshash = getParamsAsObject(searchParams)
+  var tempsearchParamshash = delete searchParamshash['page']
+  if (tempsearchParamshash.length > 0) {
     // Delete the previous applied value for multi_select filter from the
     // searchParams as altering the array with new and old value will create
     // more complicated logic. The new value is passed and structured in
@@ -214,6 +216,7 @@ var unhideClearFilterBtn = function(filterValue) {
 
 // Selecting options for single and multi select filters
 $(document).on('click', '[data-behaviour="select-option"]', function(e) {
+  debugger
   var filterType = $(this).data('filter-type')
   var filterColumn = $(this).data('db-column')
 
@@ -326,7 +329,6 @@ $(document).on('click', '[data-behaviour="selected-chip"]', function(e) {
   var filterType = $(this).parents(':nth(5)').find('.filter-chip').data('filter-type')
   var filterColumn = $(this).parents(':nth(5)').find('.filter-chip').data('db-column')
   var filterValue = $(this).siblings().text()
-
   var selectElement = $('[data-behaviour="select-option"][data-filter-type=' + filterType + '][data-db-column=' + filterColumn + ']')
   $(this).parent().remove()
 

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/_nested_fields.html.slim

@@ -1,7 +1,8 @@
 - if nested_table_field.display_type == :table
   tr.nested-fields
     td.item-delete-cell
-      = link_to_remove_association "", f, class: 'fa-regular fa-trash-can btn-ghost'
+      - if nested_table_field.is_deletable.call(f.object)
+        = link_to_remove_association "", f, class: 'fa-regular fa-trash-can btn-ghost'
     - nested_table_field.fields.each do |field|
       td data-field-type="#{field.input_type}"
         = input_field_for_column(f, field)
@@ -9,11 +10,12 @@
   .form-card.nested-fields
     .card-body
       .card-item data-card-name=assoc_name
-        .card-title-wrapper
-          h6.card-title
-            | Title 1
-          .card-delete
-            = link_to_remove_association "", f, class: 'fa-regular fa-trash-can btn-ghost'
+        - if nested_table_field.is_deletable.call(f.object)
+          .card-title-wrapper
+            h6.card-title
+              | Title 1
+            .card-delete
+              = link_to_remove_association "", f, class: 'fa-regular fa-trash-can btn-ghost'
         div
           - nested_table_field.fields.each do |field|
             .form-field

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

@@ -17,7 +17,7 @@
           = f.fields_for table_name do |record|
             - if record.object.persisted? || @ar_object.errors.present?
               = render partial: '/cm_admin/main/nested_fields', locals: { f: record, assoc_name: assoc_name, nested_table_field: nested_table_field }
-    - if f.object._reflections[assoc_name.to_s]&.macro == :has_many
+    - if f.object._reflections[assoc_name.to_s]&.macro == :has_many && nested_table_field.is_creatable.call(f.object)
       .nested-table-footer
         = link_to_add_association "#{nested_table_field.submit_text}", f, table_name, partial: '/cm_admin/main/nested_fields', render_options:  {locals: { assoc_name: assoc_name, nested_table_field: nested_table_field }}, data: { association_insertion_node: ".insert-cocoon-position-#{uniq_no}", association_insertion_method: 'append' }, class: 'btn-primary'
 - else

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/_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/models/nested_field.rb

@@ -4,7 +4,7 @@ module CmAdmin
 
       # NestedField is like a container to hold Field and FormField object
 
-      attr_accessor :field_name, :display_type, :fields, :associated_fields, :parent_field, :header, :label, :submit_text
+      attr_accessor :field_name, :display_type, :fields, :associated_fields, :parent_field, :header, :label, :submit_text, :is_deletable, :is_creatable
 
       def initialize(field_name, attributes={})
         @field_name = field_name
@@ -19,6 +19,8 @@ module CmAdmin
         self.fields = []
         self.associated_fields = []
         self.submit_text = "+ Add #{@field_name.to_s.titleize}"
+        self.is_deletable = lambda { |arg| return true }
+        self.is_creatable = lambda { |arg| return true }
       end
 
     end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.4.9'
+  VERSION = '1.5.1'
 end

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -198,7 +198,7 @@ module CmAdmin
         else
           form_obj.check_box cm_field.field_name,
                              {
-                               class: "field-control cm-checkbox #{required_class} #{target_action.present? ? 'linked-field-request' : ''}",
+                               class: "cm-checkbox #{required_class} #{target_action.present? ? 'linked-field-request' : ''}",
                                disabled: cm_field.disabled.call(form_obj.object),
                                data: {
                                  field_name: cm_field.field_name,
@@ -228,7 +228,7 @@ module CmAdmin
         content_tag :div, class: 'cm-radio-tag' do
           concat form_obj.check_box cm_field.field_name,
                                     {
-                                      class: "field-control cm-checkbox #{required_class} #{target_action.present? ? 'linked-field-request' : ''}",
+                                      class: "cm-checkbox #{required_class} #{target_action.present? ? 'linked-field-request' : ''}",
                                       disabled: cm_field.disabled.call(form_obj.object),
                                       name: "#{@model.name.underscore}[#{cm_field.field_name}][]",
                                       data: {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.5.1
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-05 00:00:00.000000000 Z
+date: 2024-05-02 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.5.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: CmAdmin is a robust gem designed to assist in creating admin panels for Rails