<%= f.text_area :name, required: true, rows: 1, class: "min-w-0 flex-[3_1_10rem] rounded border-gray-300 shadow-sm px-2 py-1 text-sm" %>
<%
- type_order = %w[free_form_input_one_line free_form_input_paragraph single_select_radio single_select_dropdown multi_select_checkbox no_user_input group_header]
+ type_order = %w[free_form_input_one_line free_form_input_paragraph single_select_radio single_select_dropdown multi_select_checkbox file_upload no_user_input group_header]
type_options = type_order.map { |t| [ FormField::ANSWER_TYPE_LABELS[t] || t.titleize, t ] }
%>
<%= f.select :answer_type, type_options,
diff --git a/app/views/scholarships/_form_submission.html.erb b/app/views/scholarships/_form_submission.html.erb
index 2ab3fe1c97..39d2311b91 100644
--- a/app/views/scholarships/_form_submission.html.erb
+++ b/app/views/scholarships/_form_submission.html.erb
@@ -25,7 +25,7 @@
<% @scholarship_answers.each do |field, response| %>
<%= display_question_label(field, response) %>
- <%= display_response_text(field, response) %>
+ <%= render "shared/form_answer_value", field: field, response: response %>
<% end %>
diff --git a/app/views/shared/_form_answer_value.html.erb b/app/views/shared/_form_answer_value.html.erb
new file mode 100644
index 0000000000..c17febfcfc
--- /dev/null
+++ b/app/views/shared/_form_answer_value.html.erb
@@ -0,0 +1,22 @@
+<%# Renders one form answer's value: a file-upload answer shows an inline image
+ preview (or a file link for non-images) plus a download link; every other
+ answer type shows its resolved text. Locals: field, response. %>
+<% if field.file_upload? && (uploaded = response&.uploaded_file) %>
+
+ <% if uploaded.content_type.to_s.start_with?("image/") %>
+ <%= link_to url_for(uploaded), target: "_blank", rel: "noopener" do %>
+ <%= image_tag(uploaded.variable? ? uploaded.variant(:thumbnail) : uploaded,
+ class: "max-h-48 w-auto rounded-lg border border-gray-200 shadow-sm",
+ alt: uploaded.filename.to_s) %>
+ <% end %>
+ <% end %>
+ <%= link_to url_for(uploaded), target: "_blank", rel: "noopener",
+ class: "inline-flex items-center gap-1.5 text-sm text-blue-700 hover:text-blue-900 underline" do %>
+ <%= uploaded.filename %>
+ <% end %>
+
+<% elsif field.file_upload? %>
+
—
+<% else %>
+ <%= display_response_text(field, response) %>
+<% end %>
diff --git a/spec/factories/form_fields.rb b/spec/factories/form_fields.rb
index 3446d04415..de04425090 100644
--- a/spec/factories/form_fields.rb
+++ b/spec/factories/form_fields.rb
@@ -13,5 +13,9 @@
required { FormField::NON_INPUT_ANSWER_TYPES.exclude?(answer_type.to_s) }
# Add other attributes based on schema if needed
+
+ trait :file_upload do
+ answer_type { :file_upload }
+ end
end
end
diff --git a/spec/models/form_answer_spec.rb b/spec/models/form_answer_spec.rb
index cc2b36ef6d..f06d11cf80 100644
--- a/spec/models/form_answer_spec.rb
+++ b/spec/models/form_answer_spec.rb
@@ -4,6 +4,27 @@
describe "associations" do
it { should belong_to(:form_field).optional }
it { should belong_to(:form_submission) }
+ it { should have_one(:asset).dependent(:destroy) }
+ end
+
+ describe "#uploaded_file" do
+ let(:form) { create(:form) }
+ let(:submission) { create(:form_submission, form: form) }
+ let(:answer) { create(:form_answer, form_submission: submission, submitted_answer: "sample.png") }
+
+ it "returns nil when no asset is attached" do
+ expect(answer.uploaded_file).to be_nil
+ end
+
+ it "returns the attachment when a file is on file" do
+ asset = answer.build_asset
+ asset.file.attach(io: File.open(Rails.root.join("spec/fixtures/files/sample.png")),
+ filename: "sample.png", content_type: "image/png")
+ asset.save!
+
+ expect(answer.reload.uploaded_file).to be_attached
+ expect(answer.uploaded_file.filename.to_s).to eq("sample.png")
+ end
end
describe "#name" do
diff --git a/spec/models/form_field_spec.rb b/spec/models/form_field_spec.rb
index 4acece44a7..2bdda30643 100644
--- a/spec/models/form_field_spec.rb
+++ b/spec/models/form_field_spec.rb
@@ -48,6 +48,31 @@
field = build(:form_field, form: form, answer_type: :free_form_input_one_line, required: true)
expect(field).to be_valid
end
+
+ it "allows a required file-upload field" do
+ field = build(:form_field, form: form, answer_type: :file_upload, required: true)
+ expect(field).to be_valid
+ end
+ end
+
+ describe "file-upload answer type" do
+ let(:form) { create(:form) }
+ let(:field) { build(:form_field, :file_upload, form: form) }
+
+ it "is a valid answer type" do
+ expect(field).to be_valid
+ expect(field.answer_type).to eq("file_upload")
+ end
+
+ it "collects input but is neither selectable nor free-form text" do
+ expect(field.collects_input?).to be(true)
+ expect(field.selectable?).to be(false)
+ expect(field.free_form_text?).to be(false)
+ end
+
+ it "labels the type in sentence case" do
+ expect(field.answer_type_label).to eq("File upload")
+ end
end
describe "field_identifier uniqueness" do
@@ -94,7 +119,7 @@
it { should define_enum_for(:status).with_values([ :inactive, :active ]) }
it { should define_enum_for(:answer_type).with_values([ :free_form_input_one_line, :free_form_input_paragraph,
:single_select_radio, :no_user_input, :multi_select_checkbox,
- :group_header, :single_select_dropdown ]) }
+ :group_header, :single_select_dropdown, :file_upload ]) }
it { should define_enum_for(:input_type).with_values([ :text_alphanumeric, :number_integer, :number_decimal, :date ]) }
end
diff --git a/spec/requests/events/public_registrations_spec.rb b/spec/requests/events/public_registrations_spec.rb
index 3fa397e963..fefa4745ea 100644
--- a/spec/requests/events/public_registrations_spec.rb
+++ b/spec/requests/events/public_registrations_spec.rb
@@ -630,6 +630,24 @@ def post_with_scholarship(scholarship_answer)
expect(response.body).not_to include("Reworded after submission")
end
+ it "renders an uploaded file answer as an image preview and download link" do
+ upload_field = create(:form_field, :file_upload, form: form, name: "Photo of your creation")
+ submission = FormSubmission.find_by(person: person, form: form)
+ answer = submission.form_answers.create!(form_field: upload_field, submitted_answer: "sample.png")
+ answer.build_asset.tap do |asset|
+ asset.file.attach(io: File.open(Rails.root.join("spec/fixtures/files/sample.png")),
+ filename: "sample.png", content_type: "image/png")
+ asset.save!
+ end
+
+ get event_public_registration_path(event, person_id: person.id)
+
+ expect(response).to have_http_status(:success)
+ expect(response.body).to include("Photo of your creation")
+ expect(response.body).to include("sample.png")
+ expect(response.body).to include(rails_blob_path(answer.uploaded_file, only_path: true))
+ end
+
context "when the registrant filled out a separate scholarship form" do
let(:scholarship_form) { create(:form, role: "scholarship") }
let!(:scholarship_field) do
diff --git a/spec/services/event_registration_services/public_registration_spec.rb b/spec/services/event_registration_services/public_registration_spec.rb
index 8f9a207e5f..a4000b0617 100644
--- a/spec/services/event_registration_services/public_registration_spec.rb
+++ b/spec/services/event_registration_services/public_registration_spec.rb
@@ -955,4 +955,57 @@ def register_with_additional_forms(selections)
expect(FormSubmission.where(person: person, role: "scholarship")).to be_empty
end
end
+
+ describe "file-upload answers" do
+ let!(:upload_field) do
+ form.form_fields.create!(name: "Photo of your creation", answer_type: :file_upload,
+ status: :active, position: 999)
+ end
+
+ def signed_id_for(fixture, content_type)
+ blob = ActiveStorage::Blob.create_and_upload!(
+ io: File.open(Rails.root.join("spec/fixtures/files", fixture)),
+ filename: fixture, content_type: content_type
+ )
+ blob.signed_id
+ end
+
+ it "attaches the uploaded blob to the answer and stores its filename" do
+ params = base_form_params(first_name: "Pat", last_name: "Art", email: "pat@example.com").merge(
+ upload_field.id.to_s => signed_id_for("sample.png", "image/png")
+ )
+
+ result = described_class.call(event: event, registration_form: form, form_params: params)
+
+ expect(result.success?).to be true
+ answer = result.form_submission.form_answers.find_by(form_field: upload_field)
+ expect(answer.uploaded_file).to be_attached
+ expect(answer.uploaded_file.filename.to_s).to eq("sample.png")
+ expect(answer.submitted_answer).to eq("sample.png")
+ end
+
+ it "leaves the answer fileless when nothing was uploaded" do
+ params = base_form_params(first_name: "No", last_name: "File", email: "nofile@example.com").merge(
+ upload_field.id.to_s => ""
+ )
+
+ result = described_class.call(event: event, registration_form: form, form_params: params)
+
+ expect(result.success?).to be true
+ answer = result.form_submission.form_answers.find_by(form_field: upload_field)
+ expect(answer.uploaded_file).to be_nil
+ expect(answer.submitted_answer).to eq("")
+ end
+
+ it "rejects a file whose content type Asset does not accept" do
+ params = base_form_params(first_name: "Bad", last_name: "Type", email: "bad@example.com").merge(
+ upload_field.id.to_s => signed_id_for("sample.txt", "text/plain")
+ )
+
+ result = described_class.call(event: event, registration_form: form, form_params: params)
+
+ expect(result.success?).to be false
+ expect(Person.find_by(email: "bad@example.com")).to be_nil
+ end
+ end
end
diff --git a/spec/services/form_answer_validator_spec.rb b/spec/services/form_answer_validator_spec.rb
index 4969218218..936b6d2e67 100644
--- a/spec/services/form_answer_validator_spec.rb
+++ b/spec/services/form_answer_validator_spec.rb
@@ -77,6 +77,21 @@ def validate(field, value)
end
end
+ describe "file upload" do
+ it "flags a required file question with no upload" do
+ field = create(:form_field, :file_upload, form: form, required: true)
+
+ expect(validate(field, "")).to eq(field.id => "can't be blank")
+ end
+
+ it "accepts a signed blob id and skips the text-shaped checks" do
+ field = create(:form_field, :file_upload, form: form, required: true)
+
+ # A long signed id would trip a character cap, but file uploads have none.
+ expect(validate(field, "a" * 5_000)).to eq({})
+ end
+ end
+
describe "min words / max characters" do
it "surfaces the min-words error" do
field = create(:form_field, form: form, answer_type: :free_form_input_paragraph, min_words: 3)