effective_bootstrap 1.21.18 → 1.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64de3114cb44191a5ad9d4b30dd1f833896acad490d49fc8dc271fabf0150480
-  data.tar.gz: 1b605eb69132875095ac0931af2f9258081c8eb498a4c0f6e60ecfe27aa341ed
+  metadata.gz: c321d5d268e543127c41df4c6f31ea499b43021d1c1127b91a11445aa780f307
+  data.tar.gz: 7941d92194800d275b26872e16b93754ab385957864eee73671e471e1460cac4
 SHA512:
-  metadata.gz: d9303be0c0fc5e730e3bbdcadbc3c948ba9eb4484057368b567ffbb7c0cc560634a14720d33c1eafa55116e54c161c0a65d9b2af99e1fe2c27df2e84c3abad41
-  data.tar.gz: b2b0a1be778d7865f3d37779ff029c936690af09a0645f427d54a150afafbda5474da64cc425be4057898f233c1dd0d495499ed410e54928eec004c5e3c3c3bc
+  metadata.gz: 9aaac1a47471607309798d803a61b7a248a327c3c528d905ae36cce254f2f2e27b3590b0b0fdb77ec75c3879d5f54ff68f3b946addf523d9dbed21d4904bd289
+  data.tar.gz: fb2a659ea5312021b4924ab455b5d92be4a0f2d74f7549558bf47b3ee85e92c76c28a52319da59d3263c7a5a6b06ee10b2f977f327fba14b7a8745bf4b22a43a

data/app/assets/javascripts/effective_file/initialize.js.coffee

@@ -67,3 +67,19 @@ $(document).on 'drop', '.effective-file-drop-zone', (event) ->
     $input[0].files = dt.files
 
   $input.trigger('change')
+
+# Per-file Remove / Undo toggle on existing attachments
+$(document).on 'click', '.effective-file-remove', (event) ->
+  event.preventDefault()
+  $button = $(event.currentTarget)
+  $attachment = $button.closest('.effective-file-attachment')
+  $input = $attachment.find('.effective-file-remove-input')
+
+  if $input.prop('disabled')
+    $input.prop('disabled', false)
+    $attachment.addClass('effective-file-attachment--pending-removal')
+    $button.text('Undo').removeClass('btn-outline-danger').addClass('btn-outline-secondary')
+  else
+    $input.prop('disabled', true)
+    $attachment.removeClass('effective-file-attachment--pending-removal')
+    $button.text('Remove').removeClass('btn-outline-secondary').addClass('btn-outline-danger')

data/app/assets/stylesheets/effective_file/input.scss

@@ -69,3 +69,10 @@ input.form-control-file {
   cursor: pointer;
 }
 
+.effective-file-attachment--pending-removal {
+  opacity: 0.5;
+
+  .card-link, a { text-decoration: line-through; }
+  img { filter: grayscale(100%); }
+}
+

data/app/models/effective/form_inputs/file_field.rb

@@ -73,17 +73,19 @@ module Effective
       end
 
       def build_table_attachments(attachments)
-        content_tag(:table, class: 'table table-hover effective_file_attachments') do
+        content_tag(:table, class: 'table table-hover effective_file_attachments mt-2') do
           content_tag(:thead) do
             content_tag(:tr) do
-              content_tag(:th, 'Image') +
+              content_tag(:th, '') +
               content_tag(:th, 'Title') +
               content_tag(:th, 'Size') +
               content_tag(:th, '')
             end
           end +
           content_tag(:tbody) do
-            attachments.map { |attachment| content_tag(:tr, build_table_attachment(attachment)) }.join.html_safe
+            attachments.map do |attachment|
+              content_tag(:tr, build_table_attachment(attachment), class: 'effective-file-attachment', data: { signed_id: attachment.signed_id })
+            end.join.html_safe
           end
         end
       end
@@ -96,7 +98,7 @@ module Effective
 
         image_tag = content_tag(:img, '', class: '', src: url, alt: attachment.filename.to_s) if attachment.image?
         link_tag = link_to(attachment.filename, url)
-        size_tag = (attachment.content_type + '<br>' + @template.number_to_human_size(attachment.byte_size)).html_safe
+        size_tag = @template.number_to_human_size(attachment.byte_size)
 
         content_tag(:td, image_tag) +
         content_tag(:td, link_tag) +
@@ -105,6 +107,8 @@ module Effective
         content_tag(:td) do
           if attachments_style == :ck_assets
             link_to('Attach', url, class: 'btn btn-primary', 'data-insert-ck-asset': true, alt: attachment.filename.to_s)
+          else
+            build_attachment_remove(attachment)
           end
         end
       end
@@ -119,9 +123,9 @@ module Effective
 
         return unless url
 
-        content_tag(:div, class: 'col-lg-4') do
+        content_tag(:div, class: 'col-lg-4 effective-file-attachment', data: { signed_id: attachment.signed_id }) do
           content_tag(:div, class: 'card mb-3') do
-            if attachment.image?
+            body = if attachment.image?
               content_tag(:div, class: 'card-body text-center') do
                 content_tag(:div, image_tag(url, alt: attachment.filename.to_s, class: 'img-fluid mb-2')) +
                 content_tag(:div, link_to(attachment.filename, url, class: 'card-link'))
@@ -129,29 +133,18 @@ module Effective
             else
               content_tag(:div, class: 'card-body') do
                 content_tag(:p, class: 'card-text') do
-                  link_to(attachment.filename, url, class: 'card-link stretched-link') +
-                  ('<br />' +
-                    @template.number_to_human_size(attachment.byte_size
-                  )).html_safe
+                  link_to(attachment.filename, url, class: 'card-link') + '<br>'.html_safe + @template.number_to_human_size(attachment.byte_size)
                 end
               end
+            end
 
-            end.html_safe
+            body + build_attachment_remove(attachment, footer: true)
           end
         end
       end
 
       def build_uploads_and_purge(super_file_field)
-        wrapped_input = content_tag(:div, super_file_field, class: 'effective-file-drop-zone')
-
-        if purge? && attachments_present?
-          content_tag(:div) do
-            content_tag(:div, (build_uploads + wrapped_input), class: 'mb-3') +
-            content_tag(:div, build_purge)
-          end
-        else
-          build_uploads + wrapped_input
-        end
+        build_uploads + content_tag(:div, super_file_field, class: 'effective-file-drop-zone')
       end
 
       def build_uploads
@@ -165,11 +158,17 @@ module Effective
         end
       end
 
-      def build_purge
-        return ''.html_safe unless purge? && !disabled?
+      def build_attachment_remove(attachment, footer: false)
+        return ''.html_safe if disabled? || !purge?
+
+        hidden = @template.hidden_field_tag("#{@builder.object_name}[_purge][]", attachment.signed_id, disabled: true, class: 'effective-file-remove-input', id: nil)
+        button = @template.content_tag(:button, 'Remove', type: 'button', class: 'btn btn-sm btn-outline-danger effective-file-remove')
 
-        label = (multiple? ? 'Delete existing files on save' : 'Delete existing file on save')
-        @builder.check_box('_purge', multiple: true, label: label, id: "#{tag_id}_purge", checked_value: name)
+        if footer
+          content_tag(:div, hidden + button, class: 'card-footer bg-transparent text-right')
+        else
+          hidden + button
+        end
       end
 
       def purge?

data/app/models/effective/table_builder.rb

@@ -257,7 +257,7 @@ module Effective
         end
       end
 
-      rows[name] = "None" if value(name).blank?
+      #rows[name] = "" if value(name).blank?
 
       nil
     end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '1.21.18'.freeze
+  VERSION = '1.22.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 1.21.18
+  version: 1.22.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-25 00:00:00.000000000 Z
+date: 2026-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails