cm-admin 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1090a3a388d95d97dd96bd211bcb03731e42fa5ebee07b0a6f276e5b9160d952
-  data.tar.gz: 8a4417d459df6f2380890a9a89bf538fc7803c5d2ed5ff1c07858966c097e66a
+  metadata.gz: 2f85a062f8d926712d7817aeb392c0233208690eacbefeccdbcadb90ac6e85cf
+  data.tar.gz: eb59e86b5c40e9e592d8c1c488cbb5bf9ab2d7de5e66fbad97c0abb401449688
 SHA512:
-  metadata.gz: d123a4ceacfe88f2d4e734fe5ed216333936dc5796da00f3f7c5e3cd2b57d5e83a941fef80266c3d318bafaa31ccba35182f8c6c49c2bfdfb5e9308c03aa40f4
-  data.tar.gz: 2ee1bb8c761def45e410be1a064a48d298068618b041daa20da1a9eb3c56f4d628587ac6a0241fc4e8e1635327a0d6b6b60928b1c79f15d06d927e20ca9fbac5
+  metadata.gz: e4bf5998df379c42994928003eac0f18770c1650983520aae1fd2940f062d239f567066ea16469b1c7fa5135d9d77a0307be7df13c2a34342625b02da0ed2445
+  data.tar.gz: 0a7d326057c1a49aff2ef3db674ab7e21f1634634f1b527d4cb85bc535c49c0ef441b102bcb16b6d8077f33f5866d333b49c9ab6d096c9833bd7da019c43e961

data/Gemfile.lock

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

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

@@ -40,6 +40,19 @@ document.addEventListener("turbo:load", function () {
   });
   jqueryJgrowl();
   setup_select_2_ajax();
+  var el = $("[data-section='nested-form-body']")
+  if(el[0]) {
+    Sortable.create(el[0],{
+      handle: '.drag-handle',
+      animation: 150,
+      onUpdate: function (evt) {
+        var itemEl = evt.item
+        $("[data-section='nested-form-body'] tr").each(function(index, el){
+          $(el).find('.hidden-position').val(index+1)
+        })
+      }
+    });
+  }
 });
 
 $(document).on(

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

@@ -1,7 +1,11 @@
 - if nested_table_field.display_type == :table
   tr.nested-fields
-    td.item-delete-cell
-      - if nested_table_field.is_deletable.call(f.object)
+    - if nested_table_field.is_positionable.call(f.object)
+      td
+        i class='fa-solid fa-arrows-up-down-left-right drag-handle'
+        = f.hidden_field :position, class: 'hidden-position'
+    - if nested_table_field.is_deletable.call(f.object)
+      td.item-delete-cell
         = link_to_remove_association "", f, class: 'fa-regular fa-trash-can btn-ghost'
     - nested_table_field.fields.each do |field|
       td data-field-type="#{field.input_type}"

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

@@ -8,13 +8,17 @@
       table.nested-form-table
         thead
           tr
-            th
-              | 
-            - nested_table_field.fields.each do |field|
+            - if nested_table_field.is_positionable.call(f.object)
+              th
+                | 
+            - if nested_table_field.is_deletable.call(f.object)
+              th
+                |
+            - nested_table_field.fields.each do |field| 
               th data-field-type="#{field.input_type}"
                 - if field.label
                   = field.label.to_s || field.field_name.to_s.titleize 
-        tbody class="insert-cocoon-position-#{uniq_no}"
+        tbody class="insert-cocoon-position-#{uniq_no}" data-section='nested-form-body'
           = f.fields_for table_name do |record|
             - if record.object.persisted? || @ar_object.errors.present?
               = render partial: '/cm_admin/main/nested_fields', locals: { f: record, assoc_name: assoc_name, nested_table_field: nested_table_field }

data/lib/cm_admin/models/form_field.rb

@@ -6,7 +6,8 @@ module CmAdmin
       include Utils::Helpers
 
       attr_accessor :field_name, :label, :header, :input_type, :collection, :disabled, :helper_method,
-                    :placeholder, :display_if, :html_attrs, :target, :col_size, :ajax_url, :helper_text
+                    :placeholder, :display_if, :html_attrs, :target, :col_size, :ajax_url, :helper_text,
+                    :image_preview
 
       VALID_INPUT_TYPES = %i[
         integer decimal string single_select multi_select date date_time text switch custom_single_select checkbox_group
@@ -32,6 +33,7 @@ module CmAdmin
         self.html_attrs = {}
         self.target = {}
         self.col_size = nil
+        self.image_preview = false
       end
 
       def set_default_placeholder

data/lib/cm_admin/models/nested_field.rb

@@ -4,7 +4,8 @@ module CmAdmin
 
       # NestedField is like a container to hold Field and FormField object
 
-      attr_accessor :field_name, :display_type, :fields, :associated_fields, :parent_field, :header, :label, :submit_text, :is_deletable, :is_creatable
+      attr_accessor :field_name, :display_type, :fields, :associated_fields, :parent_field,
+                    :header, :label, :submit_text, :is_deletable, :is_creatable, :is_positionable
 
       def initialize(field_name, attributes={})
         @field_name = field_name
@@ -21,6 +22,7 @@ module CmAdmin
         self.submit_text = "+ Add #{@field_name.to_s.titleize}"
         self.is_deletable = lambda { |arg| return true }
         self.is_creatable = lambda { |arg| return true }
+        self.is_positionable = lambda { |arg| return false }
       end
 
     end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '2.3.2'
+  VERSION = '2.3.3'
 end

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -222,20 +222,25 @@ module CmAdmin
         content_tag(:div) do
           if attached.class == ActiveStorage::Attached::Many
             attached.each do |attachment|
-              concat attachment_with_icon(attachment, attachment_name:)
+              concat attachment_with_icon(cm_field, attachment, attachment_name:)
             end
           elsif attached.attached?
-            concat attachment_with_icon(attached, attachment_name:)
+            concat attachment_with_icon(cm_field, attached, attachment_name:)
           end
         end
       end
 
-      def attachment_with_icon(attachment, attachment_name:)
+      def attachment_with_icon(cm_field, 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)
           concat content_tag(:span, attachment.filename.to_s, class: 'btn-link')
+          concat(content_tag(:a, href: attachment.url, target: '_blank') do
+            if attachment.content_type.include?('image')
+              image_tag(attachment.url, height: 50, width: 50, class: "rounded")
+            end
+          end) if cm_field.image_preview
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Michael