cm-admin 3.0.4 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a4959d23e72acb3973b23cd3c275cc64545fa0d99a899d6315df73026fd889d
-  data.tar.gz: dd2daf0d768d1dc01409383c1966905975bfdead82aa126909228ec9b88e90dc
+  metadata.gz: edc4e96d677eaa2324f074cf028cf3defc717a49a64a64331e65d18c2b55ecce
+  data.tar.gz: d3cb35655e16e1c36ebb221be9782d6720f556ed0dba3acff74afdf45981f61d
 SHA512:
-  metadata.gz: b323940b77edf010dd5079c53f2a17b5334c8e005f430a27097f9597e827343f5ab9342452a74060f9703d9c3ac7010454bdb99ace1353cf5679749a98f82cb3
-  data.tar.gz: 412ff6701ea7ec48b982c8ee011fed1728ae9ac48334b80e7ca5b6f20f5a8d48d95d3f4f3c2ddbd3a945578b1baa84df4ecf026586ede4fb46783338abb20b2d
+  metadata.gz: '0686244e80d49a67a4caaa628c1dd05b6f09917fe6a74edd7707607f86d6e41325d7ba0da9d637080a8e0a616856f90d2f4d191a436a6a0fe724b1e94eeae674'
+  data.tar.gz: 0fd14c5144600550b7cde3644c1f44e30f3aaa3c3099feb849784d8673cb1eac9dfa88a7257a42bad27b1f943bee1fc27ce44ba6c7ec488c50bdf0d914d2a3d1

data/Gemfile.lock

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

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

@@ -9,14 +9,10 @@
 .form-page {
   background-color: $white;
   &__header {
-    @extend .position-sticky, .top-0, .bg-white;
+    @extend .top-0, .bg-white;
     z-index: 5;
   }
-  &__body {
-    padding: 24px;
-  }
   .form-container {
-    margin-bottom: 24px;
     .form-title {
       @extend .h6, .fw-semibold;
       color: $primary-text-clr;
@@ -33,6 +29,17 @@
       }
     }
   }
+
+  .form-section-container {
+    @extend .p-4;
+    margin-bottom: 64px;
+  }
+
+  .form-submit-button-container {
+    @extend .position-absolute, .bottom-0, .bg-white, .py-3, .px-4, .w-100;
+    border-top: 1px solid $gray-300;
+    z-index: 5;
+  }
 }
 
 //form field styles
@@ -151,4 +158,3 @@
     gap: 8px;
   }
 }
-

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

@@ -4,16 +4,14 @@
       .breadcrumb
         = link_to "#{@model.model_name.titleize.pluralize} /", cm_admin.send(:"cm_index_#{@model.name.underscore}_path"), class: 'text-reset'
     h4 = action_title
-    / - 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)
         .export-container
           .dropdown
             button.btn-secondary.dropdown-toggle data-bs-toggle='dropdown'
-                i.fa.fa-arrow-down
-                | Export
+              i.fa.fa-arrow-down
+              | Export
             ul.dropdown-menu.export-popup
               li
                 .popup-option.pointer data-bs-toggle='modal' data-bs-target='#exportmodal'

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '3.0.4'
+  VERSION = '3.0.6'
 end

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -40,7 +40,7 @@ module CmAdmin
       end
 
       def split_form_into_section(resource, form_obj, entities)
-        content_tag :div do
+        content_tag :div, class: 'form-section-container' do
           entities.each do |entity|
             if entity.class == CmAdmin::Models::Row
               concat create_rows(resource, form_obj, entity)
@@ -187,13 +187,14 @@ module CmAdmin
           end
 
           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", 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...'
+          concat(content_tag(:div, class: 'form-submit-button-container') do
+            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)
-          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

@@ -38,7 +38,8 @@ module CmAdmin
       end
 
       def custom_action_items(custom_action, current_action_name)
-        return unless custom_action.name.present? && policy([:cm_admin, @model.name.classify.constantize]).send(:"#{custom_action.name}?")
+        action_name = "#{custom_action.name}?".to_sym
+        return unless custom_action.name.present? && policy([:cm_admin, @model.name.classify.constantize]).respond_to?(action_name) && policy([:cm_admin, @model.name.classify.constantize]).send(action_name)
 
         scoped_model = "CmAdmin::#{@model.name}Policy::#{custom_action.name.classify}Scope".constantize.new(Current.user, @model.name.constantize).resolve
         has_scoped_record = if current_action_name == 'index'
@@ -125,7 +126,7 @@ module CmAdmin
 
       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
+          button_to cm_admin.send("cm_#{bulk_action.name}_#{@model.name.underscore}_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)
@@ -147,7 +148,7 @@ module CmAdmin
       
       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
+          link_to cm_admin.send("cm_#{bulk_action.name}_#{@model.name.underscore}_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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.6
 platform: ruby
 authors:
 - Michael
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-24 00:00:00.000000000 Z
+date: 2024-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails