cm-admin 1.5.47 → 1.5.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57f4f569dd190c4beda6a88e60269f61170e1f4e57b84a4b8628bc5ffcee5590
-  data.tar.gz: 114732f4357071651829db26e0f6a9fed0fbc9bfc70f7ef269c01b17f344dd2b
+  metadata.gz: 15551855652f4c5ac77f380e97f4ffee2641505f1daf273d47eae69c571322d1
+  data.tar.gz: bc0face163e5ace8d25df0c19c093673d7bf28d1f36b8bd607d717e7143634b5
 SHA512:
-  metadata.gz: 486c5bd7d7f3602d25df34ac7e62c0bd5a562ae34d4737f0f7787a3b64ec3f561fe60d550980c8e50962d176ff9bc4c8cfe69b2400ced3a8718f049cabe25bea
-  data.tar.gz: a8db47cc780c85b77ad7afe9f1e6a37da27362d56d134fd6f95d795032c7adbda6e863aa18f8fce711d065ae712f34891097889ccec79ace88c3847a04fb1a84
+  metadata.gz: 0ed4fb721ecc53c56b6a808817a9873fe4f4fa11d2b1d24c56f4514775b24ef5fc79cbdf6f0d90f9c0b78e20af154d2712eaf4e5d93c84a7ef0efe2fe292e6ad
+  data.tar.gz: 22a7d944b8fb5a351a519a0df3bbfb1d48b7d220df715cd017345acee909c638020bee23b28fe044528492431b4c81673b1617332498de262335dcadab833a9a

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+* @Mahaveer1141 @anbublacky @mikevic

data/Gemfile.lock

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

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

@@ -5,9 +5,12 @@ $(document).on("click", '[data-behaviour="form_submit"]', function (e) {
   $(
     "." + form_class + " input.required, ." + form_class + " textarea.required",
   ).each(function () {
-    if($(this).attr('type') === 'file') return;
     $(this).removeClass("is-invalid");
-    if ($(this).val().trim().length === 0) {
+    let isValueNull = $(this).val().trim().length === 0
+    if(isValueNull && $(this).attr('type') === 'file') {
+      isValueNull = $(`[data-attachment-name="${$(this).attr('id')}_attachments"]`).not('.hidden').length === 0
+    }
+    if (isValueNull) {
       $(this).addClass("is-invalid");
       $(this)[0].scrollIntoView(true);
       submit.push(true);

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

@@ -1,8 +1,22 @@
 doctype html
 html
   head
+    - if CmAdmin.config.enable_tracking
+      / Google Tag Manager
+      script
+        | (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+        | new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+        | j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+        | 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+        | })(window,document,'script','dataLayer','GTM-N6898ZX9');
+      / End Google Tag Manager
+      script
+        | window.dataLayer = window.dataLayer || [];
+        | dataLayer.push({
+        |   'projectName': "#{project_name_with_env}"
+        | });
     title
-      | Admin
+      = project_name_with_env
     meta[name="viewport" content="width=device-width,initial-scale=1"]
     = csrf_meta_tags
     = csp_meta_tag
@@ -24,6 +38,11 @@ html
     link[rel="stylesheet" href="https://cdn.jsdelivr.net/npm/select2-bootstrap-5-theme@1.3.0/dist/select2-bootstrap-5-theme.rtl.min.css"]
     
   body
+    - if CmAdmin.config.enable_tracking
+      / Google Tag Manager (noscript)
+      noscript
+        iframe src="https://www.googletagmanager.com/ns.html?id=GTM-N6898ZX9" height="0" width="0" style="display:none;visibility:hidden"
+      / End Google Tag Manager (noscript)
     .cm-admin
       = render 'layouts/left_sidebar_nav'
       .panel-area

data/lib/cm_admin/configuration.rb

@@ -1,12 +1,13 @@
 module CmAdmin
   class Configuration
-    attr_accessor :layout, :included_models, :cm_admin_models
-    
+    attr_accessor :layout, :included_models, :cm_admin_models, :enable_tracking, :project_name
+
     def initialize
       @layout = 'admin'
       @included_models = []
       @cm_admin_models = []
+      @enable_tracking = false
+      @project_name = ''
     end
-
   end
-end
+end

data/lib/cm_admin/models/utils/helpers.rb

@@ -6,7 +6,7 @@ module CmAdmin
 
         # Returns the humanized value of the field.
         def humanized_field_value(name, capitalize: false)
-          name.to_s.humanize(capitalize: capitalize)
+          name.to_s.humanize(capitalize:)
         end
       end
     end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.5.47'
+  VERSION = '1.5.48'
 end

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -216,21 +216,22 @@ module CmAdmin
 
       def attachment_list(form_obj, cm_field, _value, _required_class, _target_action)
         attached = form_obj.object.send(cm_field.field_name)
+        attachment_name = "#{form_obj.object_name}_#{cm_field.field_name}_attachments"
         return if defined?(::Paperclip) && attached.instance_of?(::Paperclip::Attachment)
 
         content_tag(:div) do
           if attached.class == ActiveStorage::Attached::Many
             attached.each do |attachment|
-              concat attachment_with_icon(attachment)
+              concat attachment_with_icon(attachment, attachment_name:)
             end
           elsif attached.attached?
-            concat attachment_with_icon(attached)
+            concat attachment_with_icon(attached, attachment_name:)
           end
         end
       end
 
-      def attachment_with_icon(attachment)
-        content_tag(:div, class: 'destroy-attachment', data: { ar_id: attachment.id }) do
+      def attachment_with_icon(attachment, attachment_name:)
+        content_tag(:div, class: 'destroy-attachment', data: { ar_id: attachment.id, attachment_name: }) do
           concat(content_tag(:button, '', class: 'btn-ghost') do
             concat tag.i(class: 'fa-regular fa-trash-can')
           end)

data/lib/cm_admin/view_helpers.rb

@@ -53,8 +53,8 @@ module CmAdmin
           concat hidden_field_tag 'class_name', klass.name.to_s, id: 'export-to-file-klass'
           concat checkbox_row(klass)
           concat tag.hr
-          # TODO: export-to-file-btn class is used for JS functionality, Have to remove 
-          concat submit_tag 'Export', class: 'btn-primary export-to-file-btn' 
+          # TODO: export-to-file-btn class is used for JS functionality, Have to remove
+          concat submit_tag 'Export', class: 'btn-primary export-to-file-btn'
         end
       end
     end
@@ -76,7 +76,20 @@ module CmAdmin
 
     def humanized_ar_collection_count(count, model_name)
       table_name = count == 1 ? model_name.singularize : model_name.pluralize
-      return "#{count} #{table_name.humanize.downcase} found"
+      "#{count} #{table_name.humanize.downcase} found"
+    end
+
+    def project_name_with_env
+      return CmAdmin.config.project_name if Rails.env.production?
+
+      env = if Rails.env.development?
+              'DEV'
+            elsif Rails.env.staging?
+              'STG'
+            else
+              Rails.env
+            end
+      "[#{env}] #{CmAdmin.config.project_name}"
     end
   end
 end

data/lib/cm_admin.rb

@@ -16,7 +16,6 @@ module CmAdmin
   @@cm_admin_models ||= []
 
   class << self
-
     def webpacker
       @webpacker ||= ::Webpacker::Instance.new(
         root_path: CmAdmin::Engine.root,
@@ -24,25 +23,23 @@ module CmAdmin
       )
     end
 
-    def configure(&block)
+    def configure
       # instance_eval(&block)
       @config ||= Configuration.new
       yield(@config)
     end
 
-    def layout
-    end
+    def layout; end
 
     def config
       @config ||= Configuration.new
     end
 
     def initialize_model(entity, &block)
-      if entity.is_a?(Class)
-        return if CmAdmin::Model.find_by({name: entity.name})
-        config.cm_admin_models << CmAdmin::Model.new(entity, &block)
-      end
+      return unless entity.is_a?(Class)
+      return if CmAdmin::Model.find_by({ name: entity.name })
+
+      config.cm_admin_models << CmAdmin::Model.new(entity, &block)
     end
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.5.47
+  version: 1.5.48
 platform: ruby
 authors:
 - Michael
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-09-02 00:00:00.000000000 Z
+date: 2024-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails
@@ -172,6 +172,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/CODEOWNERS"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/config.yml"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
@@ -512,7 +513,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.16
 signing_key: 
 specification_version: 4
 summary: CmAdmin is a robust gem designed to assist in creating admin panels for Rails