Merge pull request #4755 from manyfold3d/remove-attachments

Add form option to remove avatar and banner images

Author: Floppy

app/deserializers/form/creator_deserializer.rb

@@ -10,7 +10,9 @@ def deserialize
         :indexable,
         :ai_indexable,
         :avatar,
+        :remove_avatar,
         :banner,
+        :remove_banner,
         links_attributes: [:id, :url, :_destroy]
       ).deep_merge(caber_relations_params(type: :creator))
     end

app/helpers/application_helper.rb

@@ -210,12 +210,18 @@ def file_input_row(form, name, options = {})
         form.label(name, options[:label], class: "col-auto col-form-label"),
         content_tag(:div, class: "col p-0") do
           safe_join [
-            form.file_field(name, {class: "form-control"}.merge(options)),
+            content_tag(:div, class: "input-group") do
+              safe_join [
+                form.file_field(name, class: "form-control"),
+                options[:remove] ? form.check_box(:"remove_#{name}", class: "btn-check", autocomplete: "off") : nil,
+                options[:remove] ? form.label(:"remove_#{name}", icon("trash", options[:remove_label]), class: "btn btn-outline-danger") : nil
+              ].compact
+            end,
             errors_for(form.object, name),
             (options[:help] ? content_tag(:span, class: "form-text") { options[:help] } : nil)
           ].compact
         end
-      ]
+      ].compact
     end
   end
 

app/uploaders/application_uploader.rb

@@ -18,6 +18,7 @@ class ApplicationUploader < Shrine
   plugin :remote_url, max_size: SiteSettings.max_file_upload_size
   plugin :infer_extension
   plugin :derivatives
+  plugin :remove_attachment
 
   self.storages = {
     cache: Shrine::Storage::FileSystem.new("tmp/shrine"),

app/views/creators/_form.html.erb

@@ -9,8 +9,8 @@
   <%= rich_text_input_row form, :notes, help: t(".notes.help_html") %>
   <%= select_input_row form, :indexable, indexable_select_options(form.object) %>
   <%= select_input_row form, :ai_indexable, ai_indexable_select_options(form.object) if SiteSettings.allow_ai_bots %>
-  <%= file_input_row form, :avatar, help: "#{t(".avatar.help")} #{@creator.avatar ? t(".avatar.current", filename: @creator.avatar.metadata["filename"]) : t(".avatar.none")}" %>
-  <%= file_input_row form, :banner, help: "#{t(".banner.help")} #{@creator.banner ? t(".banner.current", filename: @creator.banner.metadata["filename"]) : t(".banner.none")}" %>
+  <%= file_input_row form, :avatar, help: "#{t(".avatar.help")} #{@creator.avatar ? t(".avatar.current", filename: @creator.avatar.metadata["filename"]) : t(".avatar.none")}", remove: @creator.avatar.present?, remove_label: t(".avatar.remove") %>
+  <%= file_input_row form, :banner, help: "#{t(".banner.help")} #{@creator.banner ? t(".banner.current", filename: @creator.banner.metadata["filename"]) : t(".banner.none")}", remove: @creator.banner.present?, remove_label: t(".banner.remove") %>
   <%= render "caber_relations_form", form: form %>
   <%= form.submit translate("general.save"), class: "btn btn-primary float-start" %>
 <% end %>

config/locales/creators/en.yml

@@ -22,10 +22,12 @@ en:
         current: Currently using `%{filename}`.
         help: A square profile image around 256x256px, in WEBP, PNG, GIF or JPG format.
         none: Not currently set.
+        remove: Remove avatar
       banner:
         current: Currently using `%{filename}`.
         help: A background image around 1000x200px, in WEBP, PNG, GIF or JPG format.
         none: Not currently set.
+        remove: Remove banner
       notes:
         help_html: You can use <a href="https://www.markdownguide.org/cheat-sheet/" target="markdown">Markdown</a>.
       slug: