cm-admin 1.5.7 → 1.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2683d5547505d258f1bf7c0ea82236130ec6287ead5ab3670a29d909bc7a895
-  data.tar.gz: ad8a5db9a2a05d60ba04ced18d09591c56b78dc0cf849823c9a63b296ec43454
+  metadata.gz: 94f9ea02b086e8af0391fd20f7022e27ac569120264a1c3a35933df453ee1116
+  data.tar.gz: eecd4a2bfdbfd0c5a8638749fdcb6b3fdd196fed10469703caead69daee4febd
 SHA512:
-  metadata.gz: 7630c3561997e736dc4a0400d2c734d3e383545f11a5173061196fc84ab12b27322ac6f3945168db80e50713158d341534573632b148c3f682314c7a32fbdc0f
-  data.tar.gz: edef5e258984bdd78e2a195ad0434df645d13a8c8c4a84254ea9689b7ede1d1aaa6b0e1fad0a2e0ed87c415e1219f4406991411e8bb7f7dfc93b66a6f672ea4a
+  metadata.gz: c624e3c088c6bf3d19e10a45708a376baffb539911f8a0a7f984f2fae763f3e4a746e9d2a7f70f68944d24423d6969a7c50f08d3300fc45ac3c520608f403542
+  data.tar.gz: 953765a6b3bf55d8b8dbd85a105469007f107238773562543f8ffc7c97104a6b6529dcbb4580addda3c997ce2036d056887ba72ec103f24a95d0cfb7061a86fa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (1.5.6)
+    cm-admin (1.5.9)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)
@@ -245,7 +245,7 @@ GEM
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.14)
+    zeitwerk (2.6.15)
 
 PLATFORMS
   arm64-darwin-20

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

@@ -28,12 +28,6 @@ $(document).on(
 
 $(document).on("click", ".row-action-cell", function (e) {
   e.stopPropagation();
-  if ($(this).hasClass("opacity-1")) {
-    $(".row-action-cell").removeClass("opacity-1");
-  } else {
-    $(".row-action-cell").removeClass("opacity-1");
-    $(this).addClass("opacity-1");
-  }
   if ($(this).find(".table-export-popup").hasClass("hidden")) {
     return $(this).find(".table-export-popup").removeClass("hidden");
   } else {
@@ -41,6 +35,10 @@ $(document).on("click", ".row-action-cell", function (e) {
   }
 });
 
+$(document).on("mouseleave", ".row-action-cell", function () {
+  $(this).find(".table-export-popup").addClass("hidden");
+});
+
 $(document).on("click", ".drawer-btn", function (e) {
   e.stopPropagation();
   var drawer_el = $(this).parent().closest(".drawer").find(".cm-drawer");

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

@@ -16,16 +16,15 @@
   border-radius: $radius-4;
   z-index: 1;
   &.table-export-popup {
-    top: 40px;
-    right: 30px;
+    top: 36px;
+    right: 40px;
     width: 156px;
     padding: 8px 0;
-    animation: fadeIn .2s ease-in-out;
     .popup-option {
       padding: 8px 16px;
       @include font($size: $t4-text, $color: $primary-text-clr);
       line-height: 22px;
-      transition: all .2s linear;
+      transition: all 0.2s linear;
       cursor: pointer;
       &:hover {
         background-color: $grey-lighter-clr;
@@ -34,6 +33,14 @@
         margin-right: 8px;
       }
     }
+    button {
+      width: 100%;
+      margin: 0;
+      padding: 0;
+      background: transparent;
+      border: none;
+      text-align: left;
+    }
   }
 }
 

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

@@ -67,15 +67,21 @@
         }
       }
 
+      [data-field-type="action-cell-th"] {
+        min-width: 60px;
+        max-width: 60px;
+      }
+
       tbody {
         tr {
           border-bottom: 1px solid var(--bs-border-color);
           &:hover {
-            .row-action-cell {
+            .row-action-tool {
               visibility: visible;
             }
           }
         }
+
         td {
           font-size: $t4-text;
           min-width: 120px;
@@ -101,10 +107,11 @@
         max-width: inherit;
         min-width: inherit;
         padding: 4px;
-        background: $gradient-one;
-        visibility: hidden;
         z-index: 3 !important;
+        background: transparent;
         .row-action-tool {
+          visibility: hidden;
+          position: relative;
           .popup-card {
             .popup-option {
               a {

data/app/controllers/cm_admin/resource_controller.rb

@@ -39,6 +39,7 @@ module CmAdmin
         else
           format.html { render '/cm_admin/main/' + action_name }
         end
+        format.json { render json: @ar_object }
       end
     end
 

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

@@ -34,7 +34,7 @@
         - @model.available_fields[:index].each do |column|
           - if column.display_if.call(Current.user) && column.viewable
             th data-field-type="#{column.field_type}" = column.header
-        th
+        th data-field-type='action-cell-th'
     tbody
       - @ar_object.data.each do |ar_object|
         tr.body-row

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.5.7'
+  VERSION = '1.5.9'
 end

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -126,16 +126,17 @@ module CmAdmin
       end
 
       def set_form_with_sections(resource, entities, url, method)
-        polymorphic_name, associated_id, associated_class = extract_referrer_query_params
-        form_for(resource, url: url, method: method, html: { class: "cm_#{resource.class.name.downcase}_form" } ) do |form_obj|
+        url_with_query_params = extract_query_params(url)
+
+        form_for(resource, url: url_with_query_params || url, method: method, html: { class: "cm_#{resource.class.name.downcase}_form" } ) do |form_obj|
           if params[:referrer]
             concat form_obj.text_field "referrer", class: "normal-input", hidden: true, value: params[:referrer], name: 'referrer'
           end
-          if params[:polymorphic_name].present? || polymorphic_name.present?
-            concat form_obj.text_field ( params[:polymorphic_name] || polymorphic_name ) + '_type', class: "normal-input", hidden: true, value: ( params[:associated_class] || associated_class ).classify
-            concat form_obj.text_field ( params[:polymorphic_name] || polymorphic_name ) + '_id', class: "normal-input", hidden: true, value: ( params[:associated_id] || associated_id )
-          elsif (params[:associated_class] && params[:associated_id] || associated_id.present? && associated_class.present? )
-            concat form_obj.text_field ( params[:associated_class] || associated_class ) + '_id', class: "normal-input", hidden: true, value: ( params[:associated_id] || associated_id )
+          if params[:polymorphic_name].present?
+            concat form_obj.text_field params[:polymorphic_name] + '_type', class: "normal-input", hidden: true, value: params[:associated_class].classify
+            concat form_obj.text_field params[:polymorphic_name] + '_id', class: "normal-input", hidden: true, value: params[:associated_id]
+          elsif params[:associated_class] && params[:associated_id]
+            concat form_obj.text_field params[:associated_class] + '_id', class: "normal-input", hidden: true, value: params[:associated_id]
           end
 
           concat split_form_into_section(resource, form_obj, entities)
@@ -145,18 +146,16 @@ module CmAdmin
       end
 
 
-      def extract_referrer_query_params
-        uri = URI.parse(request.referrer)
-
-        return unless uri.query.present?
-
-        query_params = CGI.parse(uri.query)
+      def extract_query_params(url)
+        query_params = {}
+        if params[:polymorphic_name].present? || params[:associated_id].present? && params[:associated_class].present?
+          query_params[:polymorphic_name] = params[:polymorphic_name]
+          query_params[:associated_id] = params[:associated_id]
+          query_params[:associated_class] = params[:associated_class]
+          query_params[:referrer] = params[:referrer] if params[:referrer].present?
 
-        polymorphic_name = query_params['polymorphic_name'].first
-        associated_id = query_params['associated_id'].first
-        associated_class = query_params['associated_class'].first
-
-        return polymorphic_name, associated_id, associated_class
+          return url + '?' + query_params.to_query unless query_params.empty?
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.9
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-30 00:00:00.000000000 Z
+date: 2024-06-10 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.5.3
+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