cm-admin 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9d5d1694d9470dd58f68fc032596d9c30205c0d5afec2776f8c5c4ea6d10ba7
-  data.tar.gz: 91de086adf1f05d4dcc10d257ee26f00913e487b887ab7321d1af00db700d6e9
+  metadata.gz: 6ca2b1b912d7ae2bc0925180a861cba806874e54baa273c2176af245e68940c0
+  data.tar.gz: d56e8c3155712a502cab04a22aa209877988cc85593d56008155e0daf7d4778b
 SHA512:
-  metadata.gz: 3df8b75e1d1afdcabe543e27cfaac0fd6bef428b9443a4154fdfb6653b5ac44acc491c3003d78d7ddcc0e2dd30616e97f532774c84d96cc6b94780ef5613322b
-  data.tar.gz: 5dd8fa05c669399326c6b1d0b3f2650891273f4cd70179ff2bdc69ec1a65483cc3191ac924bf5fe73f7fabce35bfa5cce3e2f05c72b7e441da831405b12705c0
+  metadata.gz: d71ce2f05820e692c76d40db3fee7f646066a3bff0c1341b2ef78dae62339f6d750bfacc38d4a8d4676ce73b5bb502469487c93a9a32246281d3bdfa14eb2933
+  data.tar.gz: 564ddd3e0842b3ce7505e41f4f34a26a55bb3428aac6e7c9960af3bf34cb2c17877f4c251c0c3f6f54981d19a2f33fc87b2a761d6782f55a4a9d231e9ae044b6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (1.1.0)
+    cm-admin (1.1.2)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)
@@ -87,7 +87,7 @@ GEM
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
     builder (3.2.4)
-    caxlsx (3.4.0)
+    caxlsx (3.4.1)
       htmlentities (~> 4.3, >= 4.3.4)
       marcel (~> 1.0)
       nokogiri (~> 1.10, >= 1.10.4)
@@ -113,7 +113,7 @@ GEM
     i18n (1.11.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    importmap-rails (1.1.6)
+    importmap-rails (1.2.1)
       actionpack (>= 6.0.0)
       railties (>= 6.0.0)
     json (2.6.2)
@@ -130,7 +130,7 @@ GEM
     method_source (1.0.0)
     mini_mime (1.1.2)
     minitest (5.16.2)
-    net-imap (0.3.4)
+    net-imap (0.3.6)
       date
       net-protocol
     net-pop (0.1.2)
@@ -140,7 +140,7 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.15.0-arm64-darwin)
+    nokogiri (1.15.2-arm64-darwin)
       racc (~> 1.4)
     pagy (4.11.0)
     parallel (1.22.1)
@@ -148,7 +148,7 @@ GEM
       ast (~> 2.4.1)
     pundit (2.2.0)
       activesupport (>= 3.0.0)
-    racc (1.6.2)
+    racc (1.7.1)
     rack (2.2.6.4)
     rack-proxy (0.7.6)
       rack
@@ -168,11 +168,13 @@ GEM
       activesupport (= 7.0.3.1)
       bundler (>= 1.15.0)
       railties (= 7.0.3.1)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.1.1)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     railties (7.0.3.1)
       actionpack (= 7.0.3.1)
       activesupport (= 7.0.3.1)
@@ -226,7 +228,7 @@ GEM
     thor (1.2.2)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    timeout (0.3.2)
+    timeout (0.4.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.3.0)

data/app/controllers/cm_admin/resource_controller.rb

@@ -237,10 +237,11 @@ module CmAdmin
       }.compact
       nested_tables = @model.available_fields[:new].map(&:nested_table_fields).map(&:keys).flatten
       nested_tables += @model.available_fields[:edit].map(&:nested_table_fields).map(&:keys).flatten
-      nested_fields = nested_tables.uniq.map {|table|
+      nested_fields = nested_tables.uniq.map {|assoc_name|
+        table_name = @ar_object._reflections[assoc_name.to_s].klass.table_name
         Hash[
-          table.to_s + '_attributes',
-          table.to_s.classify.constantize.column_names.reject { |i| CmAdmin::REJECTABLE_FIELDS.include?(i) }.map(&:to_sym) + [:id, :_destroy]
+          table_name.to_s + '_attributes',
+          table_name.to_s.classify.constantize.column_names.reject { |i| CmAdmin::REJECTABLE_FIELDS.include?(i) }.map(&:to_sym) + [:id, :_destroy]
         ]
       }
       permittable_fields += nested_fields

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

@@ -1,9 +1,10 @@
-.nested-field-wrapper data-table-name=table_name data-model-name=table_name.to_s.classify
-  label.nested-field-label = table_name.to_s.titleize
+- table_name = @ar_object._reflections[assoc_name.to_s].klass.table_name.to_sym
+.nested-field-wrapper data-table-name=assoc_name data-model-name=assoc_name.to_s.classify
+  label.nested-field-label = assoc_name.to_s.titleize
   .accordion.nested-form-accordion
     = f.fields_for table_name do |record|
       - if record.object.persisted?
-        = render partial: '/cm_admin/main/nested_fields', locals: { f: record, assoc_name: table_name, section: section }
-    - if @reflections.select {|x| x if x.name == table_name}.first.macro == :has_many
+        = render partial: '/cm_admin/main/nested_fields', locals: { f: record, assoc_name: assoc_name, section: section }
+    - if @reflections.select {|x| x if x.name == assoc_name}.first.macro == :has_many
       .links
-        = link_to_add_association "+ Add #{table_name.to_s.titleize}", f, table_name, partial: '/cm_admin/main/nested_fields', render_options:  {locals: { assoc_name: table_name, section: section }}, class: 'd-inline-block secondary-btn mt-2'
+        = link_to_add_association "+ Add #{assoc_name.to_s.titleize}", f, table_name, partial: '/cm_admin/main/nested_fields', render_options:  {locals: { assoc_name: assoc_name, section: section }}, class: 'd-inline-block secondary-btn mt-2'

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

@@ -16,8 +16,8 @@
     .sidebar__footer
       .menu-item
         .profile-name
-          span.profile-avatar J
-          | #{user_full_name}
+          span.profile-avatar #{user_full_name.first.titleize}
+          | #{user_full_name.titleize}
       .profile-popup.hidden
         .profile-info
           .profile-info__left

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.1.0'
+  VERSION = '1.1.2'
 end

data/lib/cm_admin/view_helpers/field_display_helper.rb

@@ -77,7 +77,17 @@ module CmAdmin
         when :image
           content_tag(:div, class: 'd-flex') do
             if ar_object.send(field.field_name).attached?
-              image_tag(ar_object.send(field.field_name).url, height: field.height, width: field.height)
+              if has_one_image_attached?(ar_object, field)
+                content_tag :a, href: rails_blob_path(ar_object.send(field.field_name)), target: '_blank' do
+                  image_tag(ar_object.send(field.field_name).url, height: field.height, width: field.width, class: 'rounded')
+                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), target: '_blank' do
+                    image_tag(asset.url, height: field.height, width: field.width, class: 'rounded mr-1')
+                  end
+                end.join("\n").html_safe
+              end
             else
               image_tag('https://cm-admin.s3.ap-south-1.amazonaws.com/gem_static_assets/image_not_available.png', height: 50, width: 50)
             end
@@ -95,11 +105,11 @@ module CmAdmin
 
       def show_attachment_value(ar_object, field)
         if ar_object.send(field.field_name).attached?
-          if ar_object.send(field.field_name).class.name.include?('One')
+          if has_one_image_attached?(ar_object, field)
             content_tag :a, href: rails_blob_path(ar_object.send(field.field_name), disposition: "attachment") do
               ar_object.send(field.field_name).filename.to_s
             end
-          elsif ar_object.send(field.field_name).class.name.include?('Many')
+          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
@@ -114,6 +124,15 @@ module CmAdmin
           return hash[association_name.to_sym] if hash.has_key?(association_name.to_sym)
         end
       end
+
+      def has_one_image_attached?(ar_object, field)
+        ar_object.send(field.field_name).class.name.include?('One')
+      end
+
+      def has_many_image_attached?(ar_object, field)
+        ar_object.send(field.field_name).class.name.include?('Many')
+      end
+
     end
   end
 end

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -76,7 +76,7 @@ module CmAdmin
       def set_nested_form_fields(form_obj, section)
         content_tag(:div) do
           section.nested_table_fields.keys.each do |key|
-            concat(render partial: '/cm_admin/main/nested_table_form', locals: {f: form_obj, table_name: key, section: section})
+            concat(render partial: '/cm_admin/main/nested_table_form', locals: {f: form_obj, assoc_name: key, section: section})
           end
         end
       end

data/lib/cm_admin/view_helpers/navigation_helper.rb

@@ -14,7 +14,7 @@ module CmAdmin
                     content_tag(:span, class: 'menu-icon') do
                       concat tag.i class: "#{model.icon_name}"
                     end +
-                    model.name.pluralize
+                    model.name.underscore.titleize.pluralize
                   end
                 end
               elsif navigation_type == "quick_links"