Include page heading from guidance in the read only file upload question when the form is live

When a file upload question has guidance, we want to include the guidance page header in the title of the card so that it provides context to the question text

Author: alice-carr

app/services/page_options_service.rb

@@ -16,9 +16,17 @@ def initialize(page:, pages:, read_only: true)
   def all_options_for_answer_type
     options = []
 
-    options.concat(page_heading_options) if @page.respond_to?(:page_heading) && @page.page_heading.present?
+    # Prioritize guidance markdown for file uploads
     options.concat(guidance_markdown_options) if @page.respond_to?(:guidance_markdown) && @page.guidance_markdown.present?
 
+    # Page heading for non-file types
+    options.concat(page_heading_options) if @page.respond_to?(:page_heading) && @page.page_heading.present? && @page.answer_type != "file"
+
+    # File upload: If a page heading/guidance is present, show the question text in the body of the summary card
+    # as we're using the heading in the title rather than the question text.
+    options.concat(question_text_options) if @page.answer_type == "file" && @page.page_heading.present?
+
+    # Other answer types
     options.concat(hint_options) if @page.hint_text?.present?
     options.concat(generic_options) if @read_only && %w[address date text selection name].exclude?(@page.answer_type)
 
@@ -40,6 +48,13 @@ def page_heading_options
     }]
   end
 
+  def question_text_options
+    [{
+      key: { text: I18n.t("reports.form_or_questions_list_table.headings.question_text") },
+      value: { text: @page.question_text },
+    }]
+  end
+
   def markdown_content
     safe_join(['<pre class="app-markdown-editor__markdown-example-block">'.html_safe, @page.guidance_markdown, "</pre>".html_safe])
   end

app/services/page_summary_card_data_service.rb

@@ -24,9 +24,20 @@ def build_data
 private
 
   def build_title
-    return "#{page_number(@page)}. #{@page.question_text}" unless @page.is_optional? && @page.answer_type != "selection"
+    page_number = page_number(@page)
+    heading = @page.page_heading
+    question = @page.question_text
 
-    "#{page_number(@page)}. #{@page.question_text} (optional)"
+    # Use the actual heading instead of the question text for the title on file upload type
+    title = if @page.answer_type == "file" && heading.present?
+              "#{page_number}. #{heading}"
+            else
+              "#{page_number}. #{question}"
+            end
+
+    title += " (optional)" if @page.is_optional? && @page.answer_type != "selection"
+
+    title
   end
 
   def page_number(page)

spec/factories/models/pages.rb

@@ -37,6 +37,10 @@ def as_json(*args)
       answer_type { Page::ANSWER_TYPES_WITHOUT_SETTINGS.sample }
     end
 
+    trait :with_file_upload_answer_type do
+      answer_type { "file" }
+    end
+
     trait :with_selection_settings do
       transient do
         only_one_option { "true" }

spec/services/page_options_service_spec.rb

@@ -348,5 +348,35 @@
         end
       end
     end
+
+    context "with answer type of file" do
+      context "when file upload question does not have a page heading" do
+        let(:page) { build :page, :with_file_upload_answer_type }
+
+        it "does not include the question text" do
+          expect(page_options_service.all_options_for_answer_type).not_to include(
+            { key: { text: I18n.t("reports.form_or_questions_list_table.headings.question_text") },
+              value: { text: page.question_text } },
+          )
+        end
+      end
+
+      context "when file upload question contains guidance text" do
+        let(:page) { build :page, :with_guidance, :with_file_upload_answer_type }
+
+        it "returns question text" do
+          expect(page_options_service.all_options_for_answer_type).to include(
+            { key: { text: I18n.t("reports.form_or_questions_list_table.headings.question_text") },
+              value: { text: page.question_text } },
+          )
+        end
+
+        it "does not return page heading" do
+          expect(page_options_service.all_options_for_answer_type).not_to include(
+            { key: { text: I18n.t("page_options_service.page_heading") } },
+          )
+        end
+      end
+    end
   end
 end

spec/services/page_summary_card_data_service_spec.rb

@@ -60,5 +60,21 @@
         end
       end
     end
+
+    context "when file upload question contains guidance text" do
+      let(:page) { build :page, :with_guidance, :with_file_upload_answer_type, is_optional: }
+
+      it "includes the guidance text page heading as title" do
+        expect(service.build_data[:card][:title]).to eq "1. #{page.page_heading}"
+      end
+
+      context "when the question is optional" do
+        let(:is_optional) { "true" }
+
+        it "includes a title with (optional) added to it" do
+          expect(service.build_data[:card][:title]).to eq "1. #{page.page_heading} (optional)"
+        end
+      end
+    end
   end
 end