cm-admin 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05e22c2322e5dada38d27e45852884ee430d88ddc8977470148558f27b4e2c68
-  data.tar.gz: 367177c2663be7f2efc5802f97228bdae67646ffa9cd38ee9cf6a011dfe6919e
+  metadata.gz: 4ff4795451733611c79424a5a0ac4aaacd838b34c8d7aea5fdfe6cb127367a97
+  data.tar.gz: 4f856a769adc82e99b13a243973906ef387cb00fe892eec14422286f622e80b7
 SHA512:
-  metadata.gz: ecd9f3390b5591fda9b2096c0e0b0c29ce8f337aca166d9fb4c062dd5c6248171fab707db3dbaacada448f6b7a8d38223294dab660ee10c3ee425295db1856dd
-  data.tar.gz: 297546816171bdcd42c1d4a2d9306554d824ba723e7520cc534c59522bce4e1bd6f15cad3b2a2ba2ff5c5f73d53ef7e4e2153a787bae9b325c2435da0d1e7f08
+  metadata.gz: faa21284eae53b8fe3a1834bf6a27d0820197e714da9e23d6243d14ed54d94db314260da3db6893dba3dff37ec1e8e377af27eb668a98fa5de513b94edb1c29f
+  data.tar.gz: ad2570287ad72e499c468e9006720022fe67d1a1f98d10ab60c88cbdeaccf0d1f6fd0c492f5141ad08b3de745bb2d1373797b6af1343b721fbdec121404e9fd8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (1.5.0)
+    cm-admin (1.5.1)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)
@@ -143,8 +143,6 @@ GEM
     nio4r (2.7.1)
     nokogiri (1.16.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.4-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/filters.js

@@ -42,7 +42,9 @@ var getFilteredData = function(filterType, filterValue, filterColumn=null) {
   // Generate the queryString by concatenating the filterParams and
   // searchParams that are already applied, if searchParams are present.
   var searchParams = window.location.search
-  if (searchParams.length > 0) {
+  var searchParamshash = getParamsAsObject(searchParams)
+  var tempsearchParamshash = delete searchParamshash['page']
+  if (tempsearchParamshash.length > 0) {
     // Delete the previous applied value for multi_select filter from the
     // searchParams as altering the array with new and old value will create
     // more complicated logic. The new value is passed and structured in
@@ -214,6 +216,7 @@ var unhideClearFilterBtn = function(filterValue) {
 
 // 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')
 
@@ -326,7 +329,6 @@ $(document).on('click', '[data-behaviour="selected-chip"]', function(e) {
   var filterType = $(this).parents(':nth(5)').find('.filter-chip').data('filter-type')
   var filterColumn = $(this).parents(':nth(5)').find('.filter-chip').data('db-column')
   var filterValue = $(this).siblings().text()
-
   var selectElement = $('[data-behaviour="select-option"][data-filter-type=' + filterType + '][data-db-column=' + filterColumn + ']')
   $(this).parent().remove()
 

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

@@ -1,7 +1,8 @@
 - if nested_table_field.display_type == :table
   tr.nested-fields
     td.item-delete-cell
-      = link_to_remove_association "", f, class: 'fa-regular fa-trash-can btn-ghost'
+      - if nested_table_field.is_deletable.call(f.object)
+        = link_to_remove_association "", f, class: 'fa-regular fa-trash-can btn-ghost'
     - nested_table_field.fields.each do |field|
       td data-field-type="#{field.input_type}"
         = input_field_for_column(f, field)
@@ -9,11 +10,12 @@
   .form-card.nested-fields
     .card-body
       .card-item data-card-name=assoc_name
-        .card-title-wrapper
-          h6.card-title
-            | Title 1
-          .card-delete
-            = link_to_remove_association "", f, class: 'fa-regular fa-trash-can btn-ghost'
+        - if nested_table_field.is_deletable.call(f.object)
+          .card-title-wrapper
+            h6.card-title
+              | Title 1
+            .card-delete
+              = link_to_remove_association "", f, class: 'fa-regular fa-trash-can btn-ghost'
         div
           - nested_table_field.fields.each do |field|
             .form-field

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

@@ -17,7 +17,7 @@
           = f.fields_for table_name do |record|
             - if record.object.persisted? || @ar_object.errors.present?
               = render partial: '/cm_admin/main/nested_fields', locals: { f: record, assoc_name: assoc_name, nested_table_field: nested_table_field }
-    - if f.object._reflections[assoc_name.to_s]&.macro == :has_many
+    - if f.object._reflections[assoc_name.to_s]&.macro == :has_many && nested_table_field.is_creatable.call(f.object)
       .nested-table-footer
         = link_to_add_association "#{nested_table_field.submit_text}", f, table_name, partial: '/cm_admin/main/nested_fields', render_options:  {locals: { assoc_name: assoc_name, nested_table_field: nested_table_field }}, data: { association_insertion_node: ".insert-cocoon-position-#{uniq_no}", association_insertion_method: 'append' }, class: 'btn-primary'
 - else

data/lib/cm_admin/models/nested_field.rb

@@ -4,7 +4,7 @@ module CmAdmin
 
       # NestedField is like a container to hold Field and FormField object
 
-      attr_accessor :field_name, :display_type, :fields, :associated_fields, :parent_field, :header, :label, :submit_text
+      attr_accessor :field_name, :display_type, :fields, :associated_fields, :parent_field, :header, :label, :submit_text, :is_deletable, :is_creatable
 
       def initialize(field_name, attributes={})
         @field_name = field_name
@@ -19,6 +19,8 @@ module CmAdmin
         self.fields = []
         self.associated_fields = []
         self.submit_text = "+ Add #{@field_name.to_s.titleize}"
+        self.is_deletable = lambda { |arg| return true }
+        self.is_creatable = lambda { |arg| return true }
       end
 
     end

data/lib/cm_admin/version.rb

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

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -198,7 +198,7 @@ module CmAdmin
         else
           form_obj.check_box cm_field.field_name,
                              {
-                               class: "field-control cm-checkbox #{required_class} #{target_action.present? ? 'linked-field-request' : ''}",
+                               class: "cm-checkbox #{required_class} #{target_action.present? ? 'linked-field-request' : ''}",
                                disabled: cm_field.disabled.call(form_obj.object),
                                data: {
                                  field_name: cm_field.field_name,
@@ -228,7 +228,7 @@ module CmAdmin
         content_tag :div, class: 'cm-radio-tag' do
           concat form_obj.check_box cm_field.field_name,
                                     {
-                                      class: "field-control cm-checkbox #{required_class} #{target_action.present? ? 'linked-field-request' : ''}",
+                                      class: "cm-checkbox #{required_class} #{target_action.present? ? 'linked-field-request' : ''}",
                                       disabled: cm_field.disabled.call(form_obj.object),
                                       name: "#{@model.name.underscore}[#{cm_field.field_name}][]",
                                       data: {

metadata

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