cm-admin 2.4.1 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bcc252aa00bb8dac32547d85cf1fd53c72a4c9726b3e092389e9ad1ef464095
-  data.tar.gz: 4c5c3d415f82750e64ab281791a90ed8a1069b52e136f399fca6baabe34a9bb0
+  metadata.gz: 1811b7dc704a66a4f26ec20ee3ff1a72c1cd369d19cc968d60fcfb135eab8ded
+  data.tar.gz: d2b62571d0a3f3205615a604bcfdaa046590621478be3aebd37be2025dac130b
 SHA512:
-  metadata.gz: d9c004225ef93e480ff61f4f1a244639afbab8fcdd532295f4cd459b8e693429f6a62810871a0f3a7bdcba67c42883c6fdf069b983ccd2e8ffc244af536212b6
-  data.tar.gz: f49305ebbc5e40be87ab257273e26a2c51fffa497f6dd9ae4831cfb17d6c07f1a4e98ce629337b0ce0e8925d10a4c8147a0079f8b86b380c96860722507e023b
+  metadata.gz: ee0549268bffe487c3eeabea14b127ea036b71ffbf18fbcdca944832c42558fb121f11cb4b4e7f5eb1baa9153614e588e92c21b295efce2511c06c7cfcd414a8
+  data.tar.gz: da4a8ab490c02decefe6597d8937da700762e91171af8859ee246e8cf769dab48356c292c750e26f111891496cf4100b865dd728cb750f7e979d0d90c10e9676

data/Gemfile.lock

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

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

@@ -47,7 +47,8 @@ $(document).on("click", '[data-behaviour="form_submit"]', function (e) {
   });
   if (submit.length === 0) {
     $("." + form_class).submit();
-    return $('[data-behaviour="form_submit"]').button("loading");
+    $('[data-behaviour="form_submit_spinner"]').removeClass("visually-hidden");
+    return $('[data-behaviour="form_submit"]').addClass("visually-hidden");
   }
 });
 

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

@@ -36,6 +36,10 @@
   text-decoration: underline;
 }
 
+.cm-admin .btn-loading {
+  @extend .btn, .btn-primary, .btn-sm, .btn-icon-spacing, .disabled;
+}
+
 // button mixin - We can use if needed
 // @include button-variant($background: #6554e0, $border: #6554e0);
 

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '2.4.1'
+  VERSION = '2.4.3'
 end

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -142,9 +142,14 @@ module CmAdmin
         ar_object = model_name.constantize.new if model_name.present?
         return unless field.input_type.to_s == 'single_select' && model_name.present? && has_valid_policy(ar_object, 'new')
 
+        entity_formatted_name = if field.can_create_new_entity.is_a?(Hash) && field.can_create_new_entity[:display_name].present?
+                                  field.can_create_new_entity[:display_name]
+                                else
+                                  CmAdmin::Model.find_by(name: model_name)&.formatted_name
+                                end
         field_id = form_obj.field_id(field.field_name.to_sym)
         drawer_fetch_url = "#{CmAdmin::Engine.mount_path}/#{model_name.tableize}/fetch_drawer?from_field_id=#{field_id}"
-        tag.div 'New Entity', class: 'drawer-btn', data: { behaviour: 'offcanvas', drawer_fetch_url: }
+        tag.div "New #{entity_formatted_name}", class: 'drawer-btn', data: { behaviour: 'offcanvas', drawer_fetch_url: }
       end
 
       def set_nested_section_form_fields(resource, form_obj, nested_sections)
@@ -180,7 +185,11 @@ module CmAdmin
 
           concat split_form_into_section(resource, form_obj, entities)
           concat tag.br
-          concat form_obj.submit 'Save', class: 'btn-cta', data: { behaviour: 'form_submit', form_class: "cm_#{form_obj.object.class.name.downcase}_form" }
+          concat form_obj.submit 'Save', class: 'btn-cta', data: { behaviour: 'form_submit', form_class: "cm_#{form_obj.object.class.name.downcase}_form", turbo_submits_with: 'Submitting...' }
+          concat (button_tag(type: 'button', class: 'btn-loading visually-hidden', data: { behaviour: 'form_submit_spinner' }) do
+            concat content_tag(:span, '', class: 'spinner-border spinner-border-sm', role: 'status')
+            concat ' Submitting...'
+          end)
           concat button_tag 'Discard', class: 'btn-secondary discard-form', data: { behaviour: 'discard_form' } unless @is_drawer_form
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.3
 platform: ruby
 authors:
 - Michael
@@ -11,10 +11,10 @@ authors:
 - Pranav
 - Mahaveer
 - Austin
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-15 00:00:00.000000000 Z
+date: 2024-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails
@@ -507,7 +507,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/commutatus/cm-admin
   source_code_uri: https://github.com/commutatus/cm-admin
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -523,7 +523,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.5.16
-signing_key:
+signing_key: 
 specification_version: 4
 summary: CmAdmin is a robust gem designed to assist in creating admin panels for Rails
   applications