cm-admin 1.5.1 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ff4795451733611c79424a5a0ac4aaacd838b34c8d7aea5fdfe6cb127367a97
-  data.tar.gz: 4f856a769adc82e99b13a243973906ef387cb00fe892eec14422286f622e80b7
+  metadata.gz: 20dd363538f277075fce6205a1121d1cc7c4b2446efd4ca40672989f2b096028
+  data.tar.gz: aac47d0f9d55366272478be2f3328b020774b5645a3f2b7567b7c3edb52490bf
 SHA512:
-  metadata.gz: faa21284eae53b8fe3a1834bf6a27d0820197e714da9e23d6243d14ed54d94db314260da3db6893dba3dff37ec1e8e377af27eb668a98fa5de513b94edb1c29f
-  data.tar.gz: ad2570287ad72e499c468e9006720022fe67d1a1f98d10ab60c88cbdeaccf0d1f6fd0c492f5141ad08b3de745bb2d1373797b6af1343b721fbdec121404e9fd8
+  metadata.gz: ac0eeff444c884518caebc20724330a849a468112336f5c130c12a1aefd0010151c3727099b00b352457e521986ed47bbe5a0b78250e93f400bc0419140c3f18
+  data.tar.gz: a487366a4b8a831d24586e691ecc3b98e7f98c55559dd9090e68b1e60a1ca76d5162acf699fa3e0f23d7e263583e858d4ec65bb5f6ccf389eb9d6756824914d5

data/Gemfile.lock

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

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

@@ -214,9 +214,11 @@ var unhideClearFilterBtn = function(filterValue) {
   }
 }
 
+$(document).on('click', '[data-behaviour="select-option"] .cm-checkbox', function(e) {
+  $(this).prop('checked', !$(this).prop('checked'));
+})
 // Selecting options for single and multi select filters
 $(document).on('click', '[data-behaviour="select-option"]', function(e) {
-  debugger
   var filterType = $(this).data('filter-type')
   var filterColumn = $(this).data('db-column')
 

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

@@ -1,4 +1,4 @@
-$(document).on('click', '.form_submit', function (e) {
+$(document).on('click', '[data-behaviour="form_submit"]', function (e) {
   e.preventDefault();
   var submit = [];
   var form_class = $(this).data('form-class');
@@ -30,6 +30,6 @@ $(document).on('click', '.form_submit', function (e) {
   });
   if (submit.length === 0) {
     $('.' + form_class).submit();
-    return $('.form_submit').button('loading');
+    return $('[data-behaviour="form_submit"]').button('loading');
   }
 });

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

@@ -65,12 +65,6 @@
           z-index: 2;
           background-color: $white;
         }
-        th:nth-child(2) {
-          position: sticky;
-          left: 32px;
-          z-index: 2;
-          background-color: $white;
-        }
       }
 
       tbody {
@@ -93,12 +87,6 @@
           z-index: 2;
           background-color: $white;
         }
-        td:nth-child(2) {
-          position: sticky;
-          left: 32px;
-          z-index: 2;
-          background-color: $white;
-        }
       }
 
       .check-box-space {
@@ -128,6 +116,37 @@
         }
       }
     }
+
+    [data-bulk-actions="present"] {
+      thead {
+        th:nth-child(1) {
+          position: sticky;
+          left: 0;
+          z-index: 2;
+          background-color: $white;
+        }
+        th:nth-child(2) {
+          position: sticky;
+          left: 32px;
+          z-index: 2;
+          background-color: $white;
+        }
+      }
+      tbody {
+        td:nth-child(1) {
+          position: sticky;
+          left: 0;
+          z-index: 2;
+          background-color: $white;
+        }
+        td:nth-child(2) {
+          position: sticky;
+          left: 32px;
+          z-index: 2;
+          background-color: $white;
+        }
+      }
+    }
   }
 
   // table-column-modal

data/app/controllers/cm_admin/resource_controller.rb

@@ -323,6 +323,7 @@ module CmAdmin
           column_names << generate_nested_params(associated_field)
         end
       end
+      column_names += attachment_fields(table_name.to_s.classify.constantize)
       Hash[
         "#{table_name}_attributes",
         column_names
@@ -335,14 +336,7 @@ module CmAdmin
       }
       columns += @model.ar_model.stored_attributes.values.flatten
       permittable_fields = @model.additional_permitted_fields + columns.reject { |i| CmAdmin::REJECTABLE_FIELDS.include?(i) }
-      permittable_fields += @model.ar_model.name.constantize.reflect_on_all_associations.map {|x|
-        next if x.options[:polymorphic]
-        if x.class.name.include?('HasOne')
-          x.name.to_s.gsub('_attachment', '').gsub('rich_text_', '').to_sym
-        elsif x.class.name.include?('HasMany')
-          Hash[x.name.to_s.gsub('_attachments', ''), []]
-        end
-      }.compact
+      permittable_fields += attachment_fields(@model.ar_model.name.constantize)
       nested_table_fields = get_nested_table_fields(@model.available_fields[:new])
       nested_table_fields += get_nested_table_fields(@model.available_fields[:edit])
       nested_fields = nested_table_fields.uniq.map {|nested_table_field|
@@ -358,5 +352,18 @@ module CmAdmin
 
       model_object.find(id)
     end
+
+    private
+    
+    def attachment_fields(model_object)
+      model_object.reflect_on_all_associations.map {|reflection|
+        next if reflection.options[:polymorphic]
+        if reflection.class.name.include?('HasOne')
+          reflection.name.to_s.gsub('_attachment', '').gsub('rich_text_', '').to_sym
+        elsif reflection.class.name.include?('HasMany')
+          Hash[reflection.name.to_s.gsub('_attachments', ''), []]
+        end
+      }.compact
+    end
   end
 end

data/app/models/concerns/cm_admin/file_import.rb

@@ -2,7 +2,7 @@ module CmAdmin::FileImport
   extend ActiveSupport::Concern
   included do
     cm_admin do
-      STATUS_TAG_COLOR = { in_progress: 'yellow-tag', success: 'success'}
+      STATUS_TAG_COLOR = { in_progress: 'active-two', success: 'completed', failed: 'danger' }
       actions only: [:index, :show]
       set_icon 'fa fa-file-upload'
       cm_index do
@@ -21,7 +21,7 @@ module CmAdmin::FileImport
         column :status, field_type: :tag, tag_class: STATUS_TAG_COLOR
         column :associated_model_name, header: 'Table name'
         column :added_by_name, header: 'Uploaded By'
-        
+
       end
 
       cm_show page_title: :id do
@@ -43,4 +43,4 @@ module CmAdmin::FileImport
       end
     end
   end
-end
+end

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

@@ -26,7 +26,7 @@
     - bulk_actions.each do |action|
       = custom_action_items(action, 'index')
 .table-wrapper
-  table.index-table
+  table.index-table data-bulk-actions=(bulk_actions.present? && "present")
     thead.cm-table__header
       tr.header-row
         - if bulk_actions.present?

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

@@ -25,7 +25,7 @@
     - bulk_actions.each do |action|
       = custom_action_items(action, 'index')
 .table-wrapper
-  table.index-table
+  table.index-table data-bulk-actions=(bulk_actions.present? && "present")
     thead
       tr
         - if bulk_actions.present?

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.5.1'
+  VERSION = '1.5.3'
 end

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -135,8 +135,7 @@ module CmAdmin
           end
           concat split_form_into_section(resource, form_obj, entities)
           concat tag.br
-           # TODO: form_submit class is used for JS functionality, Have to remove 
-          concat form_obj.submit 'Save', class: 'btn-cta form_submit', data: {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"}
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.3
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-02 00:00:00.000000000 Z
+date: 2024-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails