cm-admin 1.2.3 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a5441ee465f81a38a87aca50f03be7b93364612a1c009c0459da7aa229f90d2
-  data.tar.gz: 40b464190eb0c6f99fea77b435f32f8d7ea76eec1aa21484d52bf1a691bad10a
+  metadata.gz: 56179a4d588a2f01a6b817c6c2ad4adb47d3be819aa9ed2680fe1944d21fb807
+  data.tar.gz: 624bc396f461879c5ff551e2a1105808a90fed770391805d8c197a3d6cc0d650
 SHA512:
-  metadata.gz: af42d7bf84785cb9d485a9f5d6c648ae2745d6fc684684c040fd9c2b65c280d253af6d29a6b0cf1972ba720975047aa94eb9133a430918ece96dd162be9389f0
-  data.tar.gz: 8de410310ee77d14f76765d282e69bd0f9d5540e54142bcf1c4df7473b3734f837fe44dd2cd079ddbbea22080c642328b9541797d380ccdc7fd8dafb60fbd07d
+  metadata.gz: 04ae93d9491118e0cfe36d71035883af6b41ed04491fb654d4b0a422f0ea47c41f536778be308c9a9c01aeb891c91f2a075f294f671398135ebf6e8eaf9ba6c3
+  data.tar.gz: 62d3ac65b2049a1361822b02a533eb18d7aa3e3ef836f1dee981642f639c8a678a95b8a5fcffcb089f1b7b47534e96fe5f85f2396ac0eff3915091d4f8459174

data/Gemfile.lock

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

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

@@ -0,0 +1,8 @@
+@import "../helpers/index";
+@import "../dependency/bootstrap/scss/bootstrap";
+
+.cm-admin .accordion {
+  @extend .accordion;
+  --bs-accordion-active-bg: var(--bs-gray-100);
+  --bs-accordion-btn-bg: var(--bs-gray-100);
+}

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

@@ -1,5 +1,12 @@
-@import "../helpers/index.scss";
+@import "../helpers/index";
+@import "../dependency/bootstrap/scss/bootstrap";
 
+// New alert styles
+.cm-admin .alert {
+  @extend .alert-dismissible, .d-flex, .align-items-center;
+}
+
+//Old alert styles
 .flag-alert {
   max-width: 752px;
   padding: 24px;
@@ -40,62 +47,3 @@
     }
   }
 }
-
-.toast-alert {
-  display: flex;
-  align-items: center;
-  max-width: 225px;
-  padding: 8px 16px;
-  border-radius: $radius-4;
-  &.informative {
-    background: $blue-light-clr;
-  }
-  &.successful {
-    background: $green-light-clr;
-  }
-  &.warning {
-    background: $yellow-light-clr;
-  }
-  &.error {
-    background: $red-light-clr;
-  }
-  .toast-info {
-    @include font($size: $t4-text, $color: $primary-text-clr);
-    line-height: 22px;
-    margin: 0;
-  }
-  .toast-close {
-    @include font($size: $t4-text, $color: $ink-lighter-clr);
-    margin-left: 24px;
-    cursor: pointer;
-  }
-}
-
-.inline-alert {
-  @include font($size: $t4-text, $color: $primary-text-clr);
-  line-height: 22px;
-  span {
-    margin-right: 4px;
-  }
-  &.informative {
-    span {
-      color: $blue-regular-clr;
-    }
-  }
-  &.successful {
-    span {
-      color: $green-regular-clr;
-    }
-  }
-  &.warning {
-    span {
-      color: $yellow-regular-clr;
-    }
-  }
-  &.error {
-    color: $red-regular-clr;
-    span {
-      color: $red-regular-clr;
-    }
-  }
-}

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

@@ -1,8 +1,9 @@
-@import './alerts';
-@import './buttons';
-@import './input';
-@import './status-tag';
-@import './dropdown-popup';
-@import './range';
-@import './modal';
-@import './drawer';
+@import "./alerts";
+@import "./buttons";
+@import "./input";
+@import "./status-tag";
+@import "./dropdown-popup";
+@import "./range";
+@import "./modal";
+@import "./drawer";
+@import "./accordion";

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

@@ -1,4 +1,4 @@
-.modal.fade id="#{custom_action.name.classify}Modal-#{ar_object.id}" aria-hidden="true" aria-labelledby="#{custom_action.name.classify}ModalLabel" tabindex="1" 
+.modal.fade id="#{custom_action.name.classify}Modal-#{ar_object&.id}" aria-hidden="true" aria-labelledby="#{custom_action.name.classify}ModalLabel" tabindex="1" 
   .modal-dialog
     .modal-content
       .modal-header

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

@@ -1,9 +1,11 @@
-- custom_action_with_modals = @model.available_actions.select{ |act| act if act.display_type == :modal }
+- 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, 'destroy')
 - if @associated_model
   - custom_action_with_modals += @associated_model.available_actions.select{ |act| act if act.display_type == :modal }
-
 - if @current_action&.name == 'index'
+  - bulk_action_with_modals.each do |bulk_action|
+    = render partial: '/layouts/custom_action_modal', locals: { custom_action: bulk_action, ar_object: nil }
   - @ar_object.data.each do |ar_object|
     - custom_action_with_modals.each do |custom_action|
       = render partial: '/layouts/custom_action_modal', locals: { custom_action: custom_action, ar_object: ar_object }

data/lib/cm_admin/models/bulk_action.rb

@@ -3,6 +3,7 @@ require_relative 'actions/blocks'
 module CmAdmin
   module Models
     class BulkAction < Action
+      attr_accessor :modal_configuration
 
       def initialize(attributes = {}, &block)
         super

data/lib/cm_admin/models/dsl_method.rb

@@ -132,9 +132,9 @@ module CmAdmin
         # self.class.class_eval(&block)
       end
 
-      def bulk_action(name: nil, display_name: nil, display_if: lambda { |arg| return true }, redirection_url: nil, icon_name: nil, verb: nil, display_type: nil, route_type: nil, partial: nil, &block)
+      def bulk_action(name: nil, display_name: nil, display_if: lambda { |arg| return true }, redirection_url: nil, icon_name: nil, verb: nil, display_type: nil, modal_configuration: {}, route_type: nil, partial: nil, &block)
         bulk_action = CmAdmin::Models::BulkAction.new(
-          name: name, display_name: display_name, display_if: display_if,
+          name: name, display_name: display_name, display_if: display_if, modal_configuration: modal_configuration,
           redirection_url: redirection_url, icon_name: icon_name, action_type: :bulk_action,
           verb: verb, display_type: display_type, route_type: route_type, partial: partial, &block
         )

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.2.3'
+  VERSION = '1.2.5'
 end

data/lib/cm_admin/view_helpers/field_display_helper.rb

@@ -111,8 +111,10 @@ module CmAdmin
             end
           elsif has_many_image_attached?(ar_object, field)
             ar_object.send(field.field_name).map do |asset|
-              content_tag :a, href: rails_blob_path(asset, disposition: "attachment") do
-                asset.filename.to_s
+              content_tag(:div) do
+                content_tag :a, href: rails_blob_path(asset, disposition: "attachment") do
+                  asset.filename.to_s
+                end
               end
             end.join("\n").html_safe
           end

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -90,14 +90,14 @@ module CmAdmin
 
       def cm_single_file_upload_field(form_obj, cm_field, _value, required_class, _target_action)
         content_tag(:div) do
-          concat form_obj.file_field cm_field.field_name, class: "form-control #{required_class}"
+          concat form_obj.file_field cm_field.field_name, class: "form-control #{required_class}", disabled: cm_field.disabled
           concat attachment_list(form_obj, cm_field, _value, required_class, _target_action)
         end
       end
 
       def cm_multi_file_upload_field(form_obj, cm_field, _value, required_class, _target_action)
         content_tag(:div) do
-          concat form_obj.file_field cm_field.field_name, multiple: true, class: "form-control #{required_class}"
+          concat form_obj.file_field cm_field.field_name, multiple: true, class: "form-control #{required_class}", disabled: cm_field.disabled
           concat attachment_list(form_obj, cm_field, _value, required_class, _target_action)
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.5
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-11 00:00:00.000000000 Z
+date: 2023-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -213,6 +213,7 @@ files:
 - app/assets/stylesheets/cm_admin/base/table.scss
 - app/assets/stylesheets/cm_admin/base/tabs.scss
 - app/assets/stylesheets/cm_admin/cm_admin.css.scss
+- app/assets/stylesheets/cm_admin/components/_accordion.scss
 - app/assets/stylesheets/cm_admin/components/_alerts.scss
 - app/assets/stylesheets/cm_admin/components/_buttons.scss
 - app/assets/stylesheets/cm_admin/components/_drawer.scss