cm-admin 2.4.2 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78f89e2eccee1468634aeeb827a6316ad2aab8b6159e1be81fedad7dcf4af917
-  data.tar.gz: ce2f0dfc441128af6fac25e51eb64131b3e5aea68398b41af8f585d1529022c8
+  metadata.gz: d0637794147d28cbeb2b09c9162104aabb3c5b7f52e3fb9e42c6a291e89b8e5e
+  data.tar.gz: 7971b87140570d9a486c65522fa762a960b5d5bc1e2cb392abcb36beec867003
 SHA512:
-  metadata.gz: '09855ccdcdec4dde56de8242614948af82513b56c38383e89149416b0e6e39ac0c0f58284410e9b536eb7dd89ccdcaa2f40b6933ecd76e506f7b478f02fc5ad3'
-  data.tar.gz: 259d5867d373e63750f9af64ab874f1402f2a6dfe7b3cc839ac6a9cb7bb6f29f729d48f24b9537146fafe0951cfff6b1184fbd8a94cce441639ee17ddebceec6
+  metadata.gz: 5e61028998a91e7279541570fd4e881cdc9263f3bd89f03db97e0b057c6667e32f69481164cf294bd6c517a55ec34de5c744b50e98340192c56861325eb9a7bb
+  data.tar.gz: 2cacfa59737f253733fe9b362464515f944e876e4e67b5e21f0895bd5691c6888c7a9d4013432d80b0ad24b04b4e9f52712786e445826ab539aef4d490a6a1cc

data/Gemfile.lock

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

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

@@ -23,14 +23,16 @@ function setBulkActionParams() {
   $('[data-behaviour="bulk-action-checkbox"]:checked').each(function(){ selected_ids.push($(this).data('ar-object-id')) })
   var bulk_action_form = '[data-section="bulk-action"] form'
   if ($(bulk_action_form)) {
-    if ($(bulk_action_form + ' [name="selected_ids"]').length == 0) {
-      $('<input>').attr({
-        type: 'hidden',
-        name: 'selected_ids'
-      }).appendTo(bulk_action_form);
-    }
+     $(bulk_action_form).each(function( i ) {
+      if ($(this).find('[name="selected_ids"]').length == 0) {
+        $('<input>').attr({
+          type: 'hidden',
+          name: 'selected_ids'
+        }).appendTo(this);
+      }
+    })
   }
   $('[data-section="bulk-action"] [name="selected_ids"]').each(function( i ) {
     $(this).val(selected_ids)
   })
-}
+}

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/base/form.scss

@@ -118,3 +118,37 @@
 .discard-form {
   margin-left: 16px;
 }
+
+// Bulk Actions Dropdown
+.bulk-action-item {
+
+  form {
+    width: 100%;
+  }
+
+  .bulk-action-icon {
+    width: 20px;
+    height: 20px;
+
+    svg {
+      width: 100%;
+      height: 100%;
+      object-fit: contain;
+    }
+  }
+
+  .bulk-action-button {
+    @extend .d-flex, .align-items-center, .gap-2;
+  
+    &:hover {
+      color: inherit;
+      text-decoration: none;
+    }
+  }
+
+  a {
+    display: flex;
+    gap: 8px;
+  }
+}
+

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/app/views/cm_admin/main/_table.html.slim

@@ -20,8 +20,7 @@
 - bulk_actions = actions_filter(@model, @ar_object, :bulk_action)
 - if bulk_actions.present?
   .table-top.hidden data-section="bulk-action"
-    - bulk_actions.each do |action|
-      = custom_action_items(action, 'index')
+    = bulk_action_items(bulk_actions, 'index')
 .table-wrapper
   table.index-table data-bulk-actions=(bulk_actions.present? && "present")
     thead

data/lib/cm_admin/models/bulk_action.rb

@@ -7,11 +7,7 @@ module CmAdmin
 
       def initialize(attributes = {}, &block)
         super
-        override_default_values
-      end
-
-      def override_default_values
-        self.icon_name = 'fa fa-layer-group'
+        self.icon_name ||= 'fa fa-layer-group' 
         self.verb = :post
       end
     end

data/lib/cm_admin/models/dsl_method.rb

@@ -282,7 +282,7 @@ module CmAdmin
       # @param redirection_url [String] the redirection url of action
       # @param icon_name [String] the icon name of action, follow font-awesome icon name
       # @param verb [String] the verb of action, +get+, +post+, +put+, +patch+ or +delete+
-      # @param display_type [Symbol] the display type of action, +:page+, +:modal+
+      # @param display_type [Symbol] the display type of action, +:page+, +:modal+, +:button+, +:icon_only+[deprecated]
       # @param modal_configuration [Hash] the configuration of modal
       # @param route_type [String] the route type of action, +member+, +collection+
       # @param partial [String] the partial path of action

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '2.4.2'
+  VERSION = '2.4.4'
 end

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -185,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

data/lib/cm_admin/view_helpers/page_info_helper.rb

@@ -86,6 +86,76 @@ module CmAdmin
         end
       end
 
+      def bulk_action_items(bulk_items, current_action_name)
+        content_tag :div, class: 'dropdown' do
+          concat(link_to('Bulk Actions', '#', class: 'dropdown-toggle', role: 'button', id: 'dropdownMenuLink', data: { bs_toggle: 'dropdown' }, aria: { expanded: false }))
+
+          concat(
+            content_tag(:ul, class: 'dropdown-menu', aria: { labelledby: 'dropdownMenuLink' }) do
+              bulk_action_dropdown_items(bulk_items, current_action_name)
+            end
+          )
+        end
+      end
+
+      def bulk_action_dropdown_items(bulk_items, current_action_name)
+        bulk_items.each do |bulk_action|
+          next unless bulk_action.name.present? && policy([:cm_admin, @model.name.classify.constantize]).send(:"#{bulk_action.name}?")
+
+          scoped_model = bulk_action.name.present? && policy([:cm_admin, @model.name.classify.constantize]).send(:"#{bulk_action.name}?")
+
+          has_scoped_record = if current_action_name == 'index'
+                                scoped_model.present?
+                              else
+                                scoped_model.find_by(id: ar_object.id).present?
+                              end
+
+          next unless bulk_action.display_if.call(@ar_object) && has_scoped_record
+
+          case bulk_action.display_type
+          when :button
+            bulk_action_button(bulk_action)
+          when :modal
+            bulk_action_modal(bulk_action)
+          when :page
+            bulk_action_page(bulk_action)
+          end
+        end
+      end
+
+      def bulk_action_button(bulk_action)
+        concat(content_tag(:li, class: 'bulk-action-item', data: { action: bulk_action.name }) do
+          button_to cm_admin.send("#{@model.name.underscore}_#{bulk_action.name}_path"), method: :post, params: { selected_ids: '' }, class: 'bulk-action-button dropdown-item' do
+            concat(content_tag(:div, class: 'bulk-action-icon') do
+              concat(content_tag(:i, '', class: bulk_action.icon_name))
+            end)
+            concat(content_tag(:span, custom_action_title(bulk_action)))
+          end
+        end)
+      end
+      
+      def bulk_action_modal(bulk_action)
+        concat(content_tag(:li, class: 'bulk-action-item', data: { action: bulk_action.name }) do
+          link_to '#', data: { bs_toggle: 'modal', bs_target: "##{bulk_action.name.classify}Modal-#{@ar_object.id}" }, class: 'dropdown-item' do
+            concat(content_tag(:div, class: 'bulk-action-icon') do
+              concat(content_tag(:i, '', class: bulk_action.icon_name))
+            end)
+            concat(content_tag(:span, bulk_action.display_name))
+          end
+        end)
+      end
+      
+      def bulk_action_page(bulk_action)
+        concat(content_tag(:li, class: 'bulk-action-item', data: { action: bulk_action.name }) do
+          link_to cm_admin.send("#{@model.name.underscore}_#{bulk_action.name}_path", @ar_object, bulk_action.url_params), class: 'dropdown-item' do
+            concat(content_tag(:div, class: 'bulk-action-icon') do
+              concat(content_tag(:i, '', class: bulk_action.icon_name))
+            end)
+            concat(content_tag(:span, bulk_action.display_name))
+          end
+        end)
+      end
+
       def custom_action_title(custom_action)
          custom_action.display_name.to_s.presence || custom_action.name.to_s.titleize
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.4
 platform: ruby
 authors:
 - Michael
@@ -11,10 +11,10 @@ authors:
 - Pranav
 - Mahaveer
 - Austin
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-16 00:00:00.000000000 Z
+date: 2024-10-18 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