cm-admin 1.0.7 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cafa2525f536777ecf8b3307495183e0d9fcf943437221d855a9896428b848f9
-  data.tar.gz: 61ac21f29c6ba46c46306e556418ee1982a72a07ced8870795b4d462fff24e70
+  metadata.gz: 85496e0fb2a6c7fdafd600df87f9696a93602e4373a7ab58134e74de2b8ac0fd
+  data.tar.gz: 76a47ad8ff3e0f84850377bb7ed4edac39641bfc1989f603fffa554905e21721
 SHA512:
-  metadata.gz: f9963bef79936d74e35d893ab29dd472cd5d7eb562855bf766ea77b259e35cd5e2a0800911db1035ea1265c628bc25beaebc8f4f1bb3ebf8c5ba55c5277c8b04
-  data.tar.gz: 0c40a31d97908fdb9b440d337525fd9e13f594b1a4860eacbb7898d0e3a1ebd752e5559c72d0dc00c961e4f21c54743a8067628719cdc9fd456945ef2954924b
+  metadata.gz: 38a6525246bcfe77af5e15e7a54bc855fde8429547019a4171ae45a67a5fec87b17d4a8cdda7131d7d7be3643cb47ca9fb0e2822fe23bf4a61ec8f47538f8c42
+  data.tar.gz: 1c7801e19d0eb171e0e0cda085b3bc129c0e27d700e85438e1a2d5e06a83f1e7f2a67a00e69b849a518e40e5a76e307a535cb1e22370e7a3c01f51b5c09ffa48

data/Gemfile.lock

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

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/assets/javascripts/cm_admin/scaffolds.js

@@ -26,22 +26,18 @@ import '@fortawesome/fontawesome-free'
 import jqueryJgrowl from 'jgrowl';
 
 
-flatpickr("[data-behaviour='date-only']", {
-  dateFormat: "d-m-Y"
-})
-flatpickr("[data-behaviour='date-time']", {
-  enableTime: true
-})
-flatpickr("[data-behaviour='filter'][data-filter-type='date']", {
-  mode: 'range'
-})
-$('.select-2').select2();
-$(document).on('turbolinks:load', function () {
-  $('.select-2').select2();
+document.addEventListener("turbo:load", function () {
   flatpickr("[data-behaviour='date-only']", {
     dateFormat: "d-m-Y"
   })
-})
+  flatpickr("[data-behaviour='date-time']", {
+    enableTime: true
+  })
+  flatpickr("[data-behaviour='filter'][data-filter-type='date']", {
+    mode: 'range'
+  })
+  $('.select-2').select2();
+});
 
 $(document).on('click', '.menu-item', function(e) {
   $('.profile-popup').toggleClass('hidden');

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.7'
+  VERSION = '1.0.9'
 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.7
+  version: 1.0.9
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-23 00:00:00.000000000 Z
+date: 2023-06-06 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