cm-admin 1.0.6 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86d033fefa5d556af30d7127b65993513423c82a5358774eba875ab17d8946a1
-  data.tar.gz: 466f4769e70f2d6133873d5931cb4d6fbf826629b8ad3b837ff06b5fe36c49ca
+  metadata.gz: 2fa1190d6f07315dbcefb3d73dec3c4bf707ebe525f9f7e5e0286e741c4d27c7
+  data.tar.gz: c0f55a1fec64fc363ee790b88ece877aed4145d1711dacf7032ac6155e71aba5
 SHA512:
-  metadata.gz: 5d5f05bc6a9a5e02226c95e8a487210b391272e4d8bf871327fbc013359f9f4e25e50d0bb68b57c08607573e57fb92e142282f0176bb3e7ad5473047904f97c7
-  data.tar.gz: 0b6f062d86781a11903361f97bd2d3de607d500ff675b0ce1acebfbdb0548cd4842033d54066ba058aacd7f57ec6570383570ae5f6a7d1eb8e263884f0e6d535
+  metadata.gz: 67c6cd0cbb94ae18ce9c51f9764bed6100ae69c0d7522524dc8bcbd36987a02463bbd9e9ca9c901371e37e6665235bfb97a5a18789047ca83315e6c5bff9eb83
+  data.tar.gz: 68bcd00f9814c034736c518357bfe1abe10f0a1f7f0ce7a5084f69e4608359f26c93b439405d6ed75bee023b69e8ece738a8d23d2177509f474118d33520391e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (1.0.6)
+    cm-admin (1.0.8)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)
@@ -113,14 +113,14 @@ GEM
     i18n (1.11.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    importmap-rails (1.1.5)
+    importmap-rails (1.1.6)
       actionpack (>= 6.0.0)
       railties (>= 6.0.0)
     json (2.6.2)
     local_time (2.1.0)
-    loofah (2.20.0)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
@@ -140,7 +140,7 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.14.3-arm64-darwin)
+    nokogiri (1.15.0-arm64-darwin)
       racc (~> 1.4)
     pagy (4.11.0)
     parallel (1.22.1)
@@ -223,7 +223,7 @@ GEM
       temple (>= 0.7.6, < 0.9)
       tilt (>= 2.0.6, < 2.1)
     temple (0.8.2)
-    thor (1.2.1)
+    thor (1.2.2)
     thread_safe (0.3.6)
     tilt (2.0.10)
     timeout (0.3.2)
@@ -242,7 +242,7 @@ GEM
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.7)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   arm64-darwin-20

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

@@ -1,4 +1,5 @@
 import './scaffolds.js';
+import './cocoon.js'
 import './shared_scaffolds.js';
 import './form_validation.js'
 import './quick_search.js'

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

@@ -0,0 +1 @@
+import '@nathanvda/cocoon'

data/app/controllers/cm_admin/resource_controller.rb

@@ -232,7 +232,7 @@ module CmAdmin
         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('_attachment', ''), []]
+          Hash[x.name.to_s.gsub('_attachments', ''), []]
         end
       }.compact
       nested_tables = @model.available_fields[:new].map(&:nested_table_fields).map(&:keys).flatten

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

@@ -28,8 +28,8 @@
               ul.steps-list
                 li
                   | Download this 
-                  a href="#" template file
+                  a href="#{@model.importer.sample_file_path}" template file
                 li Add your data on the file without changing the format
-                li Save the file as a csv, xls or xlsx
+                li Save the file as a csv
                 li Upload the file in the field above
         = f.button :submit, class: "cta-btn import-btn", value: 'Import data'

data/lib/cm_admin/model.rb

@@ -83,8 +83,8 @@ module CmAdmin
       @actions_set = true
     end
 
-    def importable(class_name:, importer_type:)
-      @importer = CmAdmin::Models::Importer.new(class_name, importer_type)
+    def importable(class_name:, importer_type:, sample_file_path: nil)
+      @importer = CmAdmin::Models::Importer.new(class_name, importer_type, sample_file_path)
     end
 
     def visible_on_sidebar(visible_option)

data/lib/cm_admin/models/importer.rb

@@ -2,14 +2,15 @@ module CmAdmin
   module Models
     class Importer
 
-      attr_accessor :class_name, :importer_type
+      attr_accessor :class_name, :importer_type, :sample_file_path
 
       VALID_IMPORTER_TYPES = [:csv_importer, :custom_importer]
 
-      def initialize(class_name, importer_type=:csv_importer)
+      def initialize(class_name, importer_type=:csv_importer, sample_file_path=nil)
         raise ArgumentError, "Kindly select a valid importer type like #{VALID_IMPORTER_TYPES.sort.to_sentence(last_word_connector: ', or ')} instead of #{importer_type}" unless VALID_IMPORTER_TYPES.include?(importer_type.to_sym)
         @class_name = class_name
         @importer_type = importer_type
+        @sample_file_path = sample_file_path
       end
 
     end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.0.6'
+  VERSION = '1.0.8'
 end

data/lib/cm_admin/view_helpers/field_display_helper.rb

@@ -43,6 +43,8 @@ module CmAdmin
           self.extend LocalTimeHelper
           local_time(ar_object.send(field.field_name).strftime(field.format || "%d/%m/%Y").to_s) if ar_object.send(field.field_name)
         when :date
+          return unless ar_object.send(field.field_name)
+
           self.extend LocalTimeHelper
           local_date(ar_object.send(field.field_name), (field.format || '%B %e, %Y'))
         when :text

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -88,11 +88,11 @@ module CmAdmin
                                 placeholder: "Enter #{cm_field.field_name.to_s.downcase.gsub('_', ' ')}"
       end
 
-      def cm_single_file_upload_field(form_obj, cm_field, value, required_class, _target_action)
+      def cm_single_file_upload_field(form_obj, cm_field, _value, required_class, _target_action)
         form_obj.file_field cm_field.field_name, class: "normal-input #{required_class}"
       end
 
-      def cm_single_multi_upload_field(form_obj, cm_field, value, required_class, _target_action)
+      def cm_multi_file_upload_field(form_obj, cm_field, _value, required_class, _target_action)
         form_obj.file_field cm_field.field_name, multiple: true, class: "normal-input #{required_class}"
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.8
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-03 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -179,6 +179,7 @@ files:
 - app/assets/images/image_not_available.png
 - app/assets/images/logo.png
 - app/assets/javascripts/cm_admin/application.js
+- app/assets/javascripts/cm_admin/cocoon.js
 - app/assets/javascripts/cm_admin/exports.js
 - app/assets/javascripts/cm_admin/filters.js
 - app/assets/javascripts/cm_admin/form_validation.js