Merge pull request #3527 from AlchemyCMS/backport/8.0-stable/pr-3526

[8.0-stable] Fix overlay uploader

Author: tvdeyen

app/views/alchemy/admin/attachments/_archive_overlay.html.erb

@@ -7,6 +7,9 @@
           dropzone: '#assign_file_list',
           file_attribute: 'file',
           in_dialog: true,
+          accept: Array(search_filter_params[:only]).map { |extension|
+            Marcel::MimeType.for(extension:)
+          }.join(",").presence,
           redirect_url: admin_attachments_path(
             form_field_id: @form_field_id
           ) %>

app/views/alchemy/admin/attachments/_replace_button.html.erb

@@ -1,9 +1,11 @@
 <% file_upload_id = "file_upload_#{dom_id(object)}" %>
+<% file_types = Alchemy.config.uploader.allowed_filetypes[object.class.model_name.collection] || ['*'] %>
+<% accept ||= file_types.to_a == ["*"] ? nil : file_types.map {|type| ".#{type}"}.join(", ") %>
 
 <alchemy-uploader id="<%= file_upload_id %>">
   <%= form_for [:admin, object], html: {multipart: true, class: 'upload-button'} do |f| %>
     <%= f.file_field file_attribute,
-      class: 'fileupload--field',
+      class: 'fileupload--field', accept: accept,
       name: "#{f.object_name}[#{file_attribute}]",
       id: "replace_#{dom_id(object)}" %>
     <%= label_tag "replace_#{dom_id(object)}", class: "icon_button" do %>
@@ -12,7 +14,7 @@
   <% end %>
 </alchemy-uploader>
 
-<script type='text/javascript'>
+<script type="text/javascript">
   document.getElementById("<%= file_upload_id %>").addEventListener("Alchemy.upload.successful", (event) => {
     Turbo.visit('<%= redirect_url.html_safe %>');
   })

app/views/alchemy/admin/uploader/_button.html.erb

@@ -1,5 +1,5 @@
 <% file_types = Alchemy.config.uploader.allowed_filetypes[object.class.model_name.collection] || ['*'] %>
-<% accept = file_types.to_a == ["*"] ? nil : file_types.map {|type| ".#{type}"}.join(", ") %>
+<% accept ||= file_types.to_a == ["*"] ? nil : file_types.map {|type| ".#{type}"}.join(", ") %>
 
 <alchemy-uploader dropzone="<%= local_assigns[:dropzone] || "#main_content" %>">
   <%= form_for [:admin, object], html: { multipart: true, class: 'upload-button' } do |f| %>

spec/views/alchemy/admin/attachments/_replace_button.html.erb_spec.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe "alchemy/admin/attachments/_replace_button.html.erb" do
+  let(:object) { Alchemy::Attachment.new(id: 666) }
+  let(:file_attribute) { :file }
+  let(:redirect_url) { "/admin/attachments" }
+
+  before do
+    allow(view).to receive(:admin_attachments_path).and_return("/admin/attachments")
+    view.extend Alchemy::BaseHelper
+  end
+
+  it "renders a alchemy-uploader component" do
+    render partial: "alchemy/admin/attachments/replace_button",
+      locals: {object: object, file_attribute: file_attribute, redirect_url: redirect_url}
+    expect(rendered).to have_selector("alchemy-uploader#file_upload_attachment_666")
+  end
+
+  context "with allowed_filetypes configured as wildcard" do
+    before do
+      allow(Alchemy.config.uploader.allowed_filetypes).to receive(:alchemy_attachments) do
+        ["*"]
+      end
+    end
+
+    it "does not render the accept attribute" do
+      render partial: "alchemy/admin/attachments/replace_button",
+        locals: {object: object, file_attribute: file_attribute, redirect_url: redirect_url}
+
+      expect(rendered).not_to have_selector('input[type="file"][accept]')
+    end
+  end
+
+  context "with allowed_filetypes configured as specific file types" do
+    before do
+      allow(Alchemy.config.uploader.allowed_filetypes).to receive(:alchemy_attachments) do
+        ["pdf", "doc", "docx"]
+      end
+    end
+
+    it "renders the accept attribute with the correct file extensions" do
+      render partial: "alchemy/admin/attachments/replace_button",
+        locals: {object: object, file_attribute: file_attribute, redirect_url: redirect_url}
+
+      expect(rendered).to have_selector('input[type="file"][accept=".pdf, .doc, .docx"]')
+    end
+  end
+end