cm-admin 1.5.42 → 1.5.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25d1608feb2a0f90e9e8e8202d8898e511a1e1bbb4bc463e0a327190eeedb27a
-  data.tar.gz: 7a2ccc290b1545db664634cb915f81a8dca27630c024e38cbbb9fbf1898cee72
+  metadata.gz: 063a8dffa41719953d125e6fddb24a3e59f3869ba6a82da090b50aaee5a0d495
+  data.tar.gz: 470c4ffbeff36d4bdbc77af410430b5861eac385b5848536d4796eaa480a4a9f
 SHA512:
-  metadata.gz: 15783cf2216b6390a976eeacc314f5a89b0b696ee777648c2e8bcd9e58fff27e625b1b5f29336d0ac31327833e148b5fb8c563b984df79e1e8d5c321ba27b23a
-  data.tar.gz: 2d3672c631061c354c3e2b72589ceb8b4e5d42f81b3efd9eed9f8b55a743336d434c4ea826bd3a66c3befb11bc770a8c647ddf879c9b86fa1c10296f4c2d265f
+  metadata.gz: a3e2798dcfc91f39751010f3956d033ceb852a23ab3bc0b0b992d8f64c2679cb3330385055c519c719083e3c7ee9b5c911abd2cbff8a879205caad2e4eb8b415
+  data.tar.gz: 393ebc8dd097f9b06f837289e86dba708cce6e21721050354fffeb5732b32e6bfd8cc8229df82aec6bca2a8d0ff5285eff1d254f0f5f4dfdbb251fd9fc450e4f

data/.github/workflows/deploy-yard-docs.yml

@@ -1,6 +1,11 @@
 name: Deploy Yard Docs
 
 on:
+  workflow_run:
+    workflows:
+      - Bump Gem
+    types:
+      - completed
   workflow_dispatch:
 
 jobs:
@@ -15,7 +20,7 @@ jobs:
       - name: Install Yard gem
         run: gem install yard
       - name: Build Yard Docs
-        run: yardoc lib/cm_admin/models/dsl_method.rb
+        run: yardoc
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v1
         with:

data/.yardopts

@@ -0,0 +1 @@
+lib/cm_admin/models/dsl_method.rb

data/Gemfile.lock

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

data/app/assets/stylesheets/cm_admin/base/form.scss

@@ -42,6 +42,10 @@
 
 .field-label {
   @extend .form-label;
+  &.required-label::after {
+    content: " *";
+    color: $red;
+  }
 }
 
 .field-control {

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

@@ -1,7 +1,7 @@
 .import-page
   .import-page__header 
     h1.header-title #{@model.name} Import
-    p.header-description To import #{@model.name.underscore} data using the form below.
+    p.header-description To import #{@model.name.titleize.downcase} data using the form below.
   .import-page__body 
     h6.body-title Import data
     - if flash[:notice]
@@ -15,7 +15,7 @@
         a.btn-secondary href="#{cm_admin.send(:"#{@model.name.underscore}_import_path")}" Import new data
         / button.cta-btn.ms-2 Back to Page_Name
     - else
-      = simple_form_for(FileImport.new, url: "/admin/#{@model.ar_model.table_name}/import", method: :post, html: { class: "csv-import-form" }) do |f|
+      = simple_form_for(FileImport.new, url: "#{cm_admin.send(:"#{@model.name.underscore}_import_path")}", method: :post, html: { class: "csv-import-form" }) do |f|
         .form-card
           = f.input :associated_model_name, as: :hidden, placeholder: 'Enter product title', label: false, input_html: { value: @model.name }
           = f.input :import_file, as: :file, placeholder: 'Enter product title', label: false

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.5.42'
+  VERSION = '1.5.44'
 end

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -1,7 +1,7 @@
 module CmAdmin
   module ViewHelpers
     module FormFieldHelper
-      def input_field_for_column(form_obj, cm_field)
+      def input_field_for_column(form_obj, cm_field, is_required: nil)
         return unless cm_field.display_if.call(form_obj.object)
 
         value = if cm_field.helper_method
@@ -12,7 +12,7 @@ module CmAdmin
                   form_obj.object.send(cm_field.field_name)
                 end
         # value = cm_field.helper_method ? send(cm_field.helper_method, form_obj.object, cm_field.field_name) : form_obj.object.send(cm_field.field_name)
-        is_required = form_obj.object._validators[cm_field.field_name].map(&:kind).include?(:presence)
+        is_required = form_obj.object._validators[cm_field.field_name].map(&:kind).include?(:presence) if is_required.nil?
         required_class = is_required ? 'required' : ''
         target_action = @model.available_actions.select { |x| x.name == cm_field.target[:action_name].to_s }.first if cm_field.target.present?
         send("cm_#{cm_field.input_type}_field", form_obj, cm_field, value, required_class, target_action, cm_field.ajax_url)

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -106,17 +106,18 @@ module CmAdmin
 
       def set_form_field(resource, form_obj, field)
         return unless field.display_if.call(form_obj.object)
+        is_required = form_obj.object._validators[field.field_name].map(&:kind).include?(:presence)
 
         content_tag(:div, class: field.col_size ? "col-#{field.col_size}" : 'col') do
           if field.input_type.eql?(:hidden)
-            concat input_field_for_column(form_obj, field)
+            concat input_field_for_column(form_obj, field, is_required:)
           else
             concat(content_tag(:div, class: "form-field #{field.disabled ? 'disabled' : ''}") do
               if field.label && %i[check_box switch].exclude?(field.input_type)
-                concat form_obj.label field.label, field.label, class: 'field-label'
+                concat form_obj.label field.label, field.label, class: "field-label #{is_required ? 'required-label' : ''}"
                 concat tag.br
               end
-              concat input_field_for_column(form_obj, field)
+              concat input_field_for_column(form_obj, field, is_required:)
               concat tag.small field.helper_text, class: 'form-text text-muted' if field.helper_text.present?
               concat tag.p resource.errors[field.field_name].first if resource.errors[field.field_name].present?
             end)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.5.42
+  version: 1.5.44
 platform: ruby
 authors:
 - Michael
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-05 00:00:00.000000000 Z
+date: 2024-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails
@@ -185,6 +185,7 @@ files:
 - ".stylelintrc.json"
 - ".travis.yml"
 - ".vscode/settings.json"
+- ".yardopts"
 - CNAME
 - CODE_OF_CONDUCT.md
 - Gemfile