administrate-field-active_storage 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12fb995471a84f218352f4c630c6de6088c1eec7b975671f42125a1f91fe05d5
-  data.tar.gz: 797c67a7742599097b761314a457f1f53f3153aeb5c6aa72c4556cfd0a86d449
+  metadata.gz: 8c328387cb1fe2e92dfc18952fc3b91d88a711afa5f962adf9899f58cda1aa8a
+  data.tar.gz: 12bb047a9cf65ea4540e19737c0d9907f8e9f042a75548fc79de0871cbad9232
 SHA512:
-  metadata.gz: 3d285fd017385d5ce56a18a2ef464b5ec5d981fa065fe8a59706db2b7716676d81fbff44909a4b1543cfb70821c2368057184d0095bf6aaaafcf3e9139ad1b8e
-  data.tar.gz: 6ccbf0a5119607bda9110ace878002ba9a8fd40ae39573c112c96f14cc69c0fa54855ddf28bc5ce7e437776532a85f2d3f5c44cea8373b4a695176cd78000493
+  metadata.gz: 05e3e458a12c3abac03e1869cffbe00adafc015adef2e07bc7606adfd5afdf1e592efdceb399c92d42167f14e20164fab2b35098cb719253ccf0bb1b04ca125b
+  data.tar.gz: 5f16cda52260f09e57c7974de9671985501bf0457fce31d0589d9941adebcd6444ed56b201a52be6d4ed78de47754396157d8e9d0d209718925b0222dbb21827

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    administrate-field-active_storage (1.0.2)
+    administrate-field-active_storage (1.0.3)
       administrate (>= 0.2.2)
       rails (>= 7.0)
 

data/README.md

@@ -54,7 +54,7 @@ class ModelDashboard < Administrate::BaseDashboard
   }
 
   # permitted for has_many_attached
-  def permitted_attributes
+  def permitted_attributes(_action = nil)
     super + [:attachments => []]
   end
 ```
@@ -63,6 +63,43 @@ I know it is not ideal, if you have a workaround please submit a PR.
 Note: Rails 6 introduced a new config to determine the behavior on updates to `has_many_attached`.  Setting `Rails.application.config.active_storage.replace_on_assign_to_many` to `true` will overwrite any existing values (purging the old ones), and setting it to `false` will append the new values. Please note that this configuation was [deprecated with Rails 7.1](https://github.com/rails/rails/blob/v7.0.2.3/activestorage/lib/active_storage/attached/model.rb#L150)
 >config.active_storage.replace_on_assign_to_many is deprecated and will be removed in Rails 7.1. Make sure that your code works well with config.active_storage.replace_on_assign_to_many set to true before upgrading. To append new attachables to the Active Storage association, prefer using attach. Using association setter would result in purging the existing attached attachments and replacing them with new ones.
 
+This means that in Rails 7 for `has_many_attached`, whenever a form is submitted, all associations to existing attachments are being removed without the ActiveStorage objects being deleted. This is undesired behaviour because you have to re attach every time you update an object and it will result in orphaned ActiveStorage objects. To fix this and to add the ability to add more attachments to an existing set of attachments, follow this [workaround](https://stackoverflow.com/a/74207496). In short, you can create a concern:
+
+```ruby
+# app/models/concerns/append_to_has_many_attached.rb
+module AppendToHasManyAttached
+  def self.[](fields)
+    Module.new do
+      extend ActiveSupport::Concern
+
+      fields = Array(fields).compact_blank # will always return an array ( worst case is an empty array)
+
+      fields.each do |field|
+        field = field.to_s # We need the string version
+        define_method :"#{field}=" do |attachables|
+          attachables = Array(attachables).compact_blank
+
+          if attachables.any?
+            attachment_changes[field] =
+              ActiveStorage::Attached::Changes::CreateMany.new(field, self, public_send(field).public_send(:blobs) + attachables)
+          end
+        end
+      end
+    end
+  end
+end
+```
+
+And then load this concern in your model:
+```ruby
+class Model < ApplicationModel
+  include AppendToHasManyAttached['files'] # you can include it before or after, order does not matter, explanation below
+
+  has_many_attached :files
+end
+```
+
+Please note, it does not matter if you prepend or include the module, see [original post](https://stackoverflow.com/a/74207496) for details.
 
 ### Prevent N+1 queries
 In order to prevent N+1 queries from active storage you have to modify your admin model controller, below an example for a model called `User` and with attached avatars
@@ -217,11 +254,17 @@ Displays the number of attachments in the `index` action.
 
 Defaults to `true` if number of attachments is not 1.
 
-### direct_upload
+### file_field_options
+
+Configure any options to give to `file_field`.
+
+`multiple` is set by default based on `::ActiveStorage::Attached::Many`, but can be overridden.
+
+#### direct
 
 Enables direct upload from the browser to the cloud.
 
-Defaults to `false`.
+Defaults to `false`. Configure with `file_field_options: { direct: true }`.
 
 Don't forget to include [ActiveStorage JavaScript](https://edgeguides.rubyonrails.org/active_storage_overview.html#direct-uploads). You can use `rails generate administrate:assets:javascripts` to be able to customize Administrate JavaScripts in your application.
 

data/administrate-field-active_storage.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name = "administrate-field-active_storage"
-  gem.version = "1.0.3"
+  gem.version = "1.0.4"
   gem.authors = ["Hamad AlGhanim"]
   gem.email = ["hamadyalghanim@gmail.com"]
   gem.homepage = "https://github.com/Dreamersoul/administrate-field-active_storage"

data/app/views/fields/active_storage/_form.html.erb

@@ -29,6 +29,6 @@ By default, the input is a text field for the image's URL.
           I18n.t("administrate.fields.active_storage.add", default: 'Add') :
           I18n.t("administrate.fields.active_storage.replace", default: 'Replace')
     %>
-    <%= f.file_field field.attribute, multiple: field.many?, direct_upload: field.direct? %>
+    <%= f.file_field field.attribute, field.file_field_options %>
   </div>
 </div>

data/lib/administrate/field/active_storage.rb

@@ -40,6 +40,13 @@ module Administrate
         options.fetch(:show_preview_variant, nil)
       end
 
+      def file_field_options
+        {
+          direct_upload: field.direct?,
+          multiple: field.many?,
+        }.merge options.fetch(:file_field_options, {})
+      end
+
       def many?
         data.is_a? ::ActiveStorage::Attached::Many
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrate-field-active_storage
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Hamad AlGhanim
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-17 00:00:00.000000000 Z
+date: 2025-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate