Merge branch 'main' into configure-config-hosts

Author: sarahseewhy

Gemfile.lock

@@ -109,14 +109,14 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1190.0)
+    aws-partitions (1.1196.0)
     aws-sdk-cloudwatch (1.125.0)
       aws-sdk-core (~> 3, >= 3.239.1)
       aws-sigv4 (~> 1.5)
     aws-sdk-codepipeline (1.109.0)
       aws-sdk-core (~> 3, >= 3.239.1)
       aws-sigv4 (~> 1.5)
-    aws-sdk-core (3.239.2)
+    aws-sdk-core (3.240.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -127,7 +127,7 @@ GEM
     aws-sdk-kms (1.118.0)
       aws-sdk-core (~> 3, >= 3.239.1)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.205.0)
+    aws-sdk-s3 (1.208.0)
       aws-sdk-core (~> 3, >= 3.234.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -156,7 +156,7 @@ GEM
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
     base64 (0.3.0)
-    bigdecimal (3.3.1)
+    bigdecimal (4.0.1)
     bootsnap (1.19.0)
       msgpack (~> 1.2)
     brakeman (7.1.1)
@@ -600,12 +600,12 @@ CHECKSUMS
   addressable (2.8.6) sha256=798f6af3556641a7619bad1dce04cdb6eb44b0216a991b0396ea7339276f2b47
   ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
   aws-eventstream (1.4.0) sha256=116bf85c436200d1060811e6f5d2d40c88f65448f2125bc77ffce5121e6e183b
-  aws-partitions (1.1190.0) sha256=3e21ce1c99329a96fb71419a5d92d0cece5b276a9f47bc91d6a1290450fb3669
+  aws-partitions (1.1196.0) sha256=1a62cf7f1298f785bf9fca59ab77f3ceb49dd73bcc547c877236905887c35564
   aws-sdk-cloudwatch (1.125.0) sha256=2ff95a362fc2b539936b61e07669ca882939f24487b09e24e794d8c792613793
   aws-sdk-codepipeline (1.109.0) sha256=15c0bd0e1e50cc689dbb7394e81e0df1bef7f5e5086340a8ba789027bc3d650c
-  aws-sdk-core (3.239.2) sha256=a6801845ee0bdb061a3f9fb488136f3a585d51ff05b77063a9e228c9539cf239
+  aws-sdk-core (3.240.0) sha256=86b63890525caaf56702972e2669b30ec89230c2b45f12c88290ee678d8d189e
   aws-sdk-kms (1.118.0) sha256=c9c751596d4f1502adac857c90010f00a9a52370b78e170acb198af7fa716fbd
-  aws-sdk-s3 (1.205.0) sha256=dcffbd495dfd2d6ba5bc86e7b0c58facb982aae298b328e5f199ece38dea2ee9
+  aws-sdk-s3 (1.208.0) sha256=3fce13500171bae425ffb0fd30f4caef081c5e9780714ac3484b48e0a1797d6d
   aws-sdk-sesv2 (1.88.0) sha256=e227bba17217613a99b22524eebea6ea91b7d7407631e4734e07f5bafb9c985d
   aws-sdk-sqs (1.107.0) sha256=437ab2b6fdb23eec551038a1c79d9e686a222fef7e38d4318e93b9a74295b50e
   aws-sdk-sts (1.12.0) sha256=9bbd64223dd2423540291d9faaac4a169ace8cfe123b1075c9a127fcd65e061f
@@ -614,7 +614,7 @@ CHECKSUMS
   axe-core-rspec (4.11.0) sha256=3c3e3ef3863d9f5243e056b7da328932c0b6682dda299bb4bd74d760641486d7
   axiom-types (0.1.1) sha256=c1ff113f3de516fa195b2db7e0a9a95fd1b08475a502ff660d04507a09980383
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
-  bigdecimal (3.3.1) sha256=eaa01e228be54c4f9f53bf3cc34fe3d5e845c31963e7fcc5bedb05a4e7d52218
+  bigdecimal (4.0.1) sha256=8b07d3d065a9f921c80ceaea7c9d4ae596697295b584c296fe599dd0ad01c4a7
   bootsnap (1.19.0) sha256=d3e54558c1a9ea10cb095eb1eb8e921ae83fd4d5764b8809f63aec18ce9f60b5
   brakeman (7.1.1) sha256=629426b5d6496c75e3ffa2299e1ab1bb3ba721fea03d8808414c083660439498
   builder (3.3.0) sha256=497918d2f9dca528fdca4b88d84e4ef4387256d984b8154e9d5d3fe5a9c8835f

app/components/check_your_answers_component/view.html.erb

@@ -0,0 +1,7 @@
+<div class="govuk-grid-row">
+  <div class="<%= full_width? ? 'govuk-grid-column-full' : 'govuk-grid-column-two-thirds-from-desktop' %>">
+    <% if rows %>
+      <%= govuk_summary_list(rows: rows) %>
+    <% end %>
+  </div>
+</div>

app/components/check_your_answers_component/view.rb

@@ -0,0 +1,59 @@
+module CheckYourAnswersComponent
+  class View < ApplicationComponent
+    def initialize(form:, steps:, mode:)
+      @form = form
+      @steps = steps
+      @mode = mode
+      super()
+    end
+
+    def rows
+      @rows ||= @steps.flat_map { |step| step_to_row(step) }
+    end
+
+    def full_width?
+      @steps.any? { |step| step.question.has_long_answer? }
+    end
+
+  private
+
+    def step_to_row(step)
+      question_name = step.question.question_text_for_check_your_answers
+      row = row(question_name:, answer: step.show_answer, change_link: change_link(step))
+      return row unless is_selection_with_none_of_the_above_answer?(step)
+
+      none_of_the_above_answer_row = none_of_the_above_answer_row(step)
+      [row, none_of_the_above_answer_row]
+    end
+
+    def none_of_the_above_answer_row(step)
+      question_name = step.question.none_of_the_above_question_text
+      answer = step.question.none_of_the_above_answer
+      row(question_name:, answer:, change_link: change_link(step))
+    end
+
+    def row(question_name:, answer:, change_link:)
+      {
+        key: { text: helpers.sanitize(question_name) },
+        value: { text: answer_text(answer) },
+        actions: [{ text: I18n.t("govuk_components.govuk_summary_list.change"), href: change_link, visually_hidden_text: helpers.strip_tags(question_name) }],
+      }
+    end
+
+    def is_selection_with_none_of_the_above_answer?(step)
+      step.question.try(:show_none_of_the_above_question?)
+    end
+
+    def answer_text(answer)
+      HtmlMarkdownSanitizer.new.format_paragraphs(answer.presence || I18n.t("form.check_your_answers.not_completed"))
+    end
+
+    def change_link(step)
+      if step.repeatable? && step.show_answer.present?
+        change_add_another_answer_path(mode: @mode, form_id: @form.id, form_slug: @form.form_slug, page_slug: step.id)
+      else
+        form_change_answer_path(mode: @mode, form_id: @form.id, form_slug: @form.form_slug, page_slug: step.id)
+      end
+    end
+  end
+end

app/components/question/base.rb

@@ -1,17 +1,17 @@
 module Question
   class Base < ApplicationComponent
-    attr_accessor :form_builder, :question, :extra_question_text_suffix, :hint_id
+    attr_accessor :form_builder, :question, :mode, :hint_id
 
-    def initialize(form_builder:, question:, extra_question_text_suffix:)
+    def initialize(form_builder:, question:, mode:)
       @form_builder = form_builder
       @question = question
-      @extra_question_text_suffix = extra_question_text_suffix
+      @mode = mode
       @hint_id = question.hint_text.present? ? "govuk-address-hint" : ""
       super()
     end
 
     def question_text_with_extra_suffix
-      [CGI.escapeHTML(question.question_text_with_optional_suffix), extra_question_text_suffix].compact_blank.join(" ").html_safe
+      helpers.question_text_with_hidden_mode(question.question_text_with_optional_suffix, mode)
     end
 
     def hint_text

app/components/question/file_remove_component/view.rb

@@ -2,10 +2,10 @@
 
 module Question::FileRemoveComponent
   class View < Question::Base
-    def initialize(question:, extra_question_text_suffix:, remove_file_url:, remove_input:)
+    def initialize(question:, mode:, remove_file_url:, remove_input:)
       @remove_file_url = remove_file_url
       @remove_input = remove_input
-      super(form_builder: nil, question:, extra_question_text_suffix:)
+      super(form_builder: nil, question:, mode:)
     end
   end
 end

app/components/question/file_review_component/view.rb

@@ -2,9 +2,9 @@
 
 module Question::FileReviewComponent
   class View < Question::Base
-    def initialize(question:, extra_question_text_suffix:, remove_file_confirmation_url:)
+    def initialize(question:, mode:, remove_file_confirmation_url:)
       @remove_file_confirmation_url = remove_file_confirmation_url
-      super(form_builder: nil, question:, extra_question_text_suffix:)
+      super(form_builder: nil, question:, mode:)
     end
   end
 end

app/components/question/selection_component/view.rb

@@ -56,17 +56,10 @@ def none_of_the_above_checkbox
 
       def none_of_the_above_question_field
         if question.has_none_of_the_above_question?
-          form_builder.govuk_text_field :none_of_the_above_answer, label: { text: none_of_the_above_question_text }, width: "three-quarters"
+          form_builder.govuk_text_field :none_of_the_above_answer, label: { text: question.none_of_the_above_question_text }, width: "three-quarters"
         end
       end
 
-      def none_of_the_above_question_text
-        none_of_the_above_question = question.answer_settings.none_of_the_above_question
-        return none_of_the_above_question.question_text if none_of_the_above_question.is_optional != "true"
-
-        "#{none_of_the_above_question.question_text} #{I18n.t('page.optional')}"
-      end
-
       def radio_button_options
         question.answer_settings.selection_options.map.with_index do |option, index|
           form_builder.govuk_radio_button :selection, option.name, label: { text: option.name }, link_errors: index.zero?

app/controllers/forms/check_your_answers_controller.rb

@@ -57,43 +57,18 @@ def submit_answers
 
   private
 
-    def step_to_row(step)
-      question_name = step.question.question_text_for_check_your_answers
-      {
-        key: { text: helpers.sanitize(question_name) },
-        value: { text: step.show_answer },
-        actions: [{ text: I18n.t("govuk_components.govuk_summary_list.change"), href: change_link(step), visually_hidden_text: helpers.strip_tags(question_name) }],
-      }
-    end
-
-    def change_link(step)
-      return change_add_another_answer_path(@form.id, @form.form_slug, step.id) if step.repeatable? && step.show_answer.present?
-
-      form_change_answer_path(@form.id, @form.form_slug, step.id)
-    end
-
-    def check_your_answers_rows
-      current_context.completed_steps.map { |step| step_to_row(step) }
-    end
-
-    def answers_need_full_width
-      @full_width = current_context.completed_steps.any? { |step| step.question.has_long_answer? }
-    end
-
     def email_confirmation_input_params
       params.require(:email_confirmation_input).permit(:send_confirmation, :confirmation_email_address, :confirmation_email_reference)
     end
 
     def setup_check_your_answers
       @back_link = back_link
-      @rows = check_your_answers_rows
+      @steps = current_context.completed_steps
       @form_submit_path = form_submit_answers_path
 
       unless mode.preview?
         EventLogger.log_form_event("check_answers")
       end
-
-      answers_need_full_width
     end
 
     def back_link

app/helpers/application_helper.rb

@@ -19,17 +19,8 @@ def form_title(page_name:, form_name:, mode:, error: false)
     "#{t('page_titles.error_prefix') if error}#{page_name}#{mode_string} - #{form_name}"
   end
 
-  def hidden_text_mode(mode)
-    return "" unless mode.preview?
-
-    mode_name = if mode.preview_draft?
-                  "draft"
-                elsif mode.preview_archived?
-                  "archived"
-                elsif mode.preview_live?
-                  "live"
-                end
-    "<span class='govuk-visually-hidden'>&nbsp;#{t("page.#{mode_name}_preview".to_s)}</span>".html_safe
+  def question_text_with_hidden_mode(question_text, mode)
+    [CGI.escapeHTML(question_text), hidden_text_mode(mode)].compact_blank.join(" ").html_safe
   end
 
   def format_paragraphs(text)
@@ -70,4 +61,17 @@ def init_autocomplete_script
   def join_title_elements(title_elements)
     title_elements.compact.join(" – ")
   end
+
+  def hidden_text_mode(mode)
+    return "" unless mode.preview?
+
+    mode_name = if mode.preview_draft?
+                  "draft"
+                elsif mode.preview_archived?
+                  "archived"
+                elsif mode.preview_live?
+                  "live"
+                end
+    "<span class='govuk-visually-hidden'>&nbsp;#{t("page.#{mode_name}_preview")}</span>".html_safe
+  end
 end

app/models/question/selection.rb

@@ -55,10 +55,21 @@ def autocomplete_component?
       answer_settings.selection_options.count > 30
     end
 
+    def show_none_of_the_above_question?
+      has_none_of_the_above_question? && none_of_the_above_selected?
+    end
+
     def has_none_of_the_above_question?
       none_of_the_above_question.present?
     end
 
+    def none_of_the_above_question_text
+      return nil unless has_none_of_the_above_question?
+      return none_of_the_above_question.question_text if none_of_the_above_question.is_optional != "true"
+
+      "#{none_of_the_above_question.question_text} #{I18n.t('page.optional')}"
+    end
+
   private
 
     def clear_none_of_the_above_answer_if_not_selected