effective_bootstrap 0.11.20 → 0.11.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b17b0b143dc410da0e359a4b406f05f7607c888a8ab40915b1b9ef2222a7b0e
-  data.tar.gz: 5aeb0b56cbc7c04581c762e190c40ab0abf3e1234a1fd3769832379f2198c22e
+  metadata.gz: 8f7d3d759a80f960a770651a200dd08795822a5c8e1d57b240d2c56af494e81e
+  data.tar.gz: 107c0dc7bdf0529edefa778fe8c56701030eb156ff0d07766424f68c6935f064
 SHA512:
-  metadata.gz: 9fcb532a43efc45d16ad110070caed501efed1221a73825079c69030b40eb6d66f6eece93c3ea50662bb05f29fcfb697d2a80f38003b24cfab440d537cfabb40
-  data.tar.gz: cfc958e31b2e6e0d7397c6cd9248d6ecd89b34f65dab6ebbd52cd717563a57daceba6965af1a06735d0c739a420b48b01856108a86dd1c1aed83cda6bb27be15
+  metadata.gz: 6d3e32a038a89be7ddf2e9970653dd0d8e6b2565d9daeca2cc6e0a8b6d660ca6f1bfee617ff1788a9512a6969cc1f9cdca2b15f31d30606d515c32790c14b8d2
+  data.tar.gz: '0323491a386671c02bc3787a585a5af61c4c11cba2d568ffffe5e029357f2ec51ef9ca28feb2129cda3cd62af288aef6ab1a6b0866ca4351e11700746ed8927e'

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

@@ -7,9 +7,9 @@ module Effective
       def build_input(&block)
         case attachments_style
         when :card
-          build_existing_attachments + build_attachments + build_uploads + super
+          build_existing_attachments + build_attachments + build_uploads_and_purge(super)
         when :table, :ck_assets
-          super + build_existing_attachments + build_uploads + build_attachments
+          build_existing_attachments + build_uploads_and_purge(super) + build_attachments
         else
           raise('unsupported attachments_style, try :card or :table')
         end
@@ -31,11 +31,27 @@ module Effective
         @multiple = options.key?(:multiple) ? options.delete(:multiple) : (name.to_s.pluralize == name.to_s)
       end
 
+      def append?
+        return @append unless @append.nil?
+        @append = options[:input].key?(:append) ? options[:input].delete(:append) : false
+      end
+
       def required_presence?(obj, name)
-        super(obj, name) && Array(object.public_send(name)).length == 0
+        super(obj, name) && attachments_blank?
       end
 
+      def attachments_present?
+        Array(object.public_send(name)).length > 0
+      end
+
+      def attachments_blank?
+        Array(object.public_send(name)).length == 0
+      end
+
+      # This has the affect of appending files to the has_many. Which usually isnt what we want
       def build_existing_attachments
+        return ''.html_safe unless append?
+
         attachments = Array(object.send(name))
 
         attachments.map.with_index do |attachment, index|
@@ -127,7 +143,17 @@ module Effective
             end.html_safe
           end
         end
+      end
 
+      def build_uploads_and_purge(super_file_field)
+        if purge? && attachments_present?
+          content_tag(:div, class: 'd-flex align-items-center') do
+            content_tag(:div, (build_uploads + super_file_field), class: 'flex-grow-1 mr-3') +
+            content_tag(:div, build_purge)
+          end
+        else
+          build_uploads + super_file_field
+        end
       end
 
       def build_uploads
@@ -141,6 +167,23 @@ module Effective
         end
       end
 
+      def build_purge
+        return ''.html_safe unless purge?
+
+        label = (multiple? ? 'Delete files on save' : 'Delete file on save')
+        @builder.check_box('_purge_attached', multiple: true, label: label, id: "#{tag_id}_purge_attached", checked_value: name)
+      end
+
+      def purge?
+        return @purge unless @purge.nil?
+        @purge = options[:input].key?(:purge) ? (options[:input].delete(:purge) && purgable?) : purgable?
+      end
+
+      def purgable?
+        return false unless object.class.try(:has_many_purgable?)
+        object.has_many_purgable_names.include?(name.to_sym)
+      end
+
       def click_submit?
         return @click_submit unless @click_submit.nil?
         @click_submit ||= (options.delete(:click_submit) || false)

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.11.20'.freeze
+  VERSION = '0.11.21'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.11.20
+  version: 0.11.21
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-18 00:00:00.000000000 Z
+date: 2023-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails