cm-admin 1.4.3 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5080b57069dd34ff0559c7ff7ef7b9b589301d5b1534a7f6c61ef44992406f43
-  data.tar.gz: 0f28ec4d74b95812dfc24ab7cd4dd4337811b315421f00dd924eb98a142c8f9e
+  metadata.gz: 00cd64c6ef60a6e6a8764533d677a742765dc47b30db30fb64e302d350faaaac
+  data.tar.gz: 6a9ab9b8dd72eedf62c31892753103f1c73570ff3a17c6cea60edddfaa52f9b1
 SHA512:
-  metadata.gz: f95420881ff2843976b6d7ca46201283e4ed5fe503f3db79269e8e2f0d344464d413b9b998d23f2441ae343f5ddec71d77968a9b36a0e25d2c524a4c65ed3faf
-  data.tar.gz: 958914689cca99ae2f55494a619c8811052ae9bd034abe420065bdd4d8d61584171444b550d90c25b92048fc2546b9ab74dbef2d9e1d1708914eb64adc9181f9
+  metadata.gz: 02c38abf40ff1651525e1b103bafaf920e18a320abd5fc631779fa6b5d99944bc9546c1145ddfa2a0cd2ef5b78b94eab45fb06b012d66fc74e64e3550d24b8ad
+  data.tar.gz: 63051f6070b8ab489b3d6e55b397cdb7e7e8402284d3436c80cb46d821613a62303544acee2fd0c9bc876bd3631062f9191d3d11334cd50d2b0b461aabe9dc8f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (1.4.3)
+    cm-admin (1.4.5)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)
@@ -143,8 +143,6 @@ GEM
     nio4r (2.7.0)
     nokogiri (1.16.0-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.0-x86_64-linux)
-      racc (~> 1.4)
     pagy (4.11.0)
     parallel (1.22.1)
     parser (3.1.2.1)

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

@@ -18,6 +18,7 @@ import 'flatpickr'
 import 'jgrowl'
 import Select2 from "select2"
 Select2()
+jqueryJgrowl()
 
 // import '@nathanvda/cocoon'
 import 'daterangepicker'
@@ -38,7 +39,7 @@ document.addEventListener("turbo:load", function () {
   $('.select-2').select2({
     theme: "bootstrap-5",
   });
-  jqueryJgrowl()
+  
 });
 
 $(document).on('click', '.menu-item', function(e) {

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

@@ -72,3 +72,31 @@
     visibility: hidden;
   }
 }
+
+.form-modal {
+  .form-info-text {
+    @extend .text-body, .mb-3;
+  }
+}
+
+// Simple form UI
+.simple_form {
+  .input {
+    @extend .mb-3;
+  }
+  label {
+    @extend .form-label;
+  }
+  input {
+    @extend .form-control;
+  }
+  input[type="submit"] {
+    width: auto;
+    float: right;
+    @extend .mt-3;
+  }
+  .select-2 {
+    appearance: auto;
+    @extend .form-control;
+  }
+}

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

@@ -102,6 +102,9 @@
       [class^="col-"] {
         width: 100% !important;
       }
+      .show-page__inner {
+        height: calc(100vh - 126px);
+      }
     }
   }
 }

data/app/controllers/cm_admin/resource_controller.rb

@@ -35,7 +35,7 @@ module CmAdmin
       resource_identifier
       respond_to do |format|
         if request.xhr?
-          format.html { render partial: '/cm_admin/main/show_content' }
+          format.html { render partial: '/cm_admin/main/show_content', locals: { via_xhr: true } }
         else
           format.html { render '/cm_admin/main/' + action_name }
         end
@@ -162,7 +162,7 @@ module CmAdmin
                 format.html { redirect_to request.referrer, alert: "<b>#{@action.name.titleize} is unsuccessful</b><br /><ul>#{error_messages}</ul>" }
               end
             rescue => exception
-              format.html { redirect_to request.referrer, alert: "<b>#{@action.name.titleize} is unsuccessful</b><br /><p>#{exception.message}</p>" }
+              format.html { redirect_to request.referrer, alert: "<div><b>#{@action.name.titleize} is unsuccessful</b><br /><ul><li>#{exception.message}</li></ul></div>" }
             end
           end
         end

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

@@ -5,7 +5,7 @@
   p.table-top__total-count = "#{humanized_ar_collection_count(@associated_ar_object.pagy.count, @action.child_records.to_s)}"
   .table-top__column-action
     - if @associated_model && @associated_model.available_actions.map(&:name).include?('new') && has_valid_policy(@associated_ar_object, 'new')
-      - association = @ar_object.class.reflect_on_all_associations.select{|x| x.name == @associated_model.name.tableize.to_sym }.first
+      - association = @ar_object.class.reflect_on_all_associations.select{|x| x.name == @associated_model.name.tableize.to_sym }.first      
       - polymorphic_name = (association && association.inverse_of && association.inverse_of.options[:polymorphic]) ? association.inverse_of.name : ''
       a href="#{CmAdmin::Engine.mount_path}/#{@associated_model.name.tableize}/new?associated_id=#{@ar_object.id}&associated_class=#{@ar_object.class.name.underscore}&polymorphic_name=#{polymorphic_name}&referrer=#{request.path}"
         button.btn-secondary Add

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

@@ -1,6 +1,6 @@
 .show-page__header.page-top-bar
   == render 'cm_admin/main/top_navbar'
-  == render 'cm_admin/main/tabs'
+  == render 'cm_admin/main/tabs', via_xhr: defined?(via_xhr) ? via_xhr : false
 .show-page__inner
   - if @action.partial
     == render @action.partial

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

@@ -4,7 +4,10 @@ ul.tabs
       - if nav_item.custom_action.empty? || (nav_item.custom_action.present? && policy([:cm_admin, @model.name.classify.constantize]).send(:"#{nav_item.custom_action}?"))
         li.nav-item
           - nav_item_action_name = nav_item.custom_action.present? ? nav_item.custom_action : 'show'
-          = link_to tab_display_name(nav_item.nav_item_name), cm_admin.send("#{@ar_object.model_name.singular}_#{nav_item_action_name}_path", @ar_object.id), class: "nav-link #{ nav_item_action_name == action_name ? 'active' : ''}"
+          - if via_xhr
+            = link_to tab_display_name(nav_item.nav_item_name), cm_admin.send("#{@ar_object.model_name.singular}_#{nav_item_action_name}_path", @ar_object.id), class: "nav-link #{ nav_item_action_name == action_name ? 'active' : ''}", target: '_blank'
+          - else
+            = link_to tab_display_name(nav_item.nav_item_name), cm_admin.send("#{@ar_object.model_name.singular}_#{nav_item_action_name}_path", @ar_object.id), class: "nav-link #{ nav_item_action_name == action_name ? 'active' : ''}"
   // current_action_name is defined when action trail is added to that model
   - if policy([:cm_admin, @model.name.classify.constantize]).send(:history?)
     li.nav-item

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

@@ -1,7 +1,7 @@
 .show-page
   .show-page__header.page-top-bar
     == render 'cm_admin/main/top_navbar'
-    == render 'cm_admin/main/tabs'
+    == render 'cm_admin/main/tabs', via_xhr: false
   .show-page__inner
     .card.col-7
       .card-body

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

@@ -1,2 +1,2 @@
 .show-page
-  = render partial: 'cm_admin/main/show_content'
+  = render partial: 'cm_admin/main/show_content', via_xhr: false

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

@@ -6,6 +6,6 @@
         button.btn-close aria-label="Close" data-bs-dismiss="modal" type="button" 
       .modal-body
         - if custom_action.partial
-          = render partial: custom_action.partial
+          = render partial: custom_action.partial, locals: { custom_action: custom_action, ar_object: ar_object }
         - else
           = render partial: 'cm_admin/main/custom_action_modal_form', locals: { custom_action: custom_action, ar_object: ar_object }

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

@@ -31,7 +31,7 @@ html
           .show-page
             .show-page__header.page-top-bar
               == render 'cm_admin/main/top_navbar'
-              == render 'cm_admin/main/tabs'
+              == render 'cm_admin/main/tabs', via_xhr: false
             .show-page__inner
               = yield
         - elsif defined?(@action) && (@action&.layout_type.to_s == 'cm_association_index' || @action.parent == "index")
@@ -39,7 +39,7 @@ html
             .show-page__header.page-top-bar
               == render 'cm_admin/main/top_navbar'
               - if @ar_object.model_name
-                == render 'cm_admin/main/tabs'
+                == render 'cm_admin/main/tabs', via_xhr: false
               - if @associated_model && @associated_model.filters.present?
                 .filters-bar
                   == render partial: 'cm_admin/main/filters', locals: { filters: @associated_model.filters }
@@ -47,6 +47,6 @@ html
         - else
           = yield
     = render 'layouts/cm_flash_message'
-    - unless (@current_action.view_type == :kanban || params[:view_type] == 'kanban')
+    - unless (@current_action&.view_type == :kanban || params[:view_type] == 'kanban')
       = render 'layouts/custom_action_modals'
 

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.4.3'
+  VERSION = '1.4.5'
 end

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -142,7 +142,7 @@ module CmAdmin
 
       def attachment_list(form_obj, cm_field, _value, required_class, _target_action)
         attached = form_obj.object.send(cm_field.field_name)
-        return if attached.instance_of?(Paperclip::Attachment)
+        return if defined?(::Paperclip) && attached.instance_of?(::Paperclip::Attachment)
         
         content_tag(:div) do
           if attached.class == ActiveStorage::Attached::Many

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.5
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-12 00:00:00.000000000 Z
+date: 2024-03-01 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.2.33
+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