From 0faa846f72238ee0e0a06c30db9e06a762ec4e31 Mon Sep 17 00:00:00 2001
From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
Date: Fri, 12 Jul 2024 09:51:36 +0100
Subject: [PATCH] CLDC-3465 Do not display non persisted values in check errors
 page (#2484)

* Do not display non persisted values on check_errors page

* Remove govuk button styling from link

* Update warning message
---
 app/controllers/form_controller.rb                        | 1 +
 app/views/check_errors/confirm_clear_all_answers.html.erb | 2 +-
 app/views/form/page.html.erb                              | 2 +-
 spec/requests/check_errors_controller_spec.rb             | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/form_controller.rb b/app/controllers/form_controller.rb
index ed7e8ba58..d84f8642a 100644
--- a/app/controllers/form_controller.rb
+++ b/app/controllers/form_controller.rb
@@ -418,6 +418,7 @@ private
       responses_for_page = responses_for_page(@page)
       @log.assign_attributes(responses_for_page)
       @log.valid?
+      @log.reload
       error_attributes = @log.errors.map(&:attribute)
       @questions = @log.form.questions.select { |q| error_attributes.include?(q.id.to_sym) }
     end
diff --git a/app/views/check_errors/confirm_clear_all_answers.html.erb b/app/views/check_errors/confirm_clear_all_answers.html.erb
index f49ea98cd..85e936aef 100644
--- a/app/views/check_errors/confirm_clear_all_answers.html.erb
+++ b/app/views/check_errors/confirm_clear_all_answers.html.erb
@@ -9,7 +9,7 @@
     </h1>
     <p class="govuk-body">You've selected <%= @questions_to_clear.count %> answers to clear</p>
 
-    <%= govuk_warning_text(text: "You will not be able to undo this action") %>
+    <%= govuk_warning_text(text: "Dependent answers related to this question may also get cleared. You will not be able to undo this action") %>
       <%= form_with model: @log, url: send("#{@log.model_name.param_key}_#{@page.id}_path", @log), method: "post", local: true do |f| %>
 
       <% @related_question_ids.each do |id| %>
diff --git a/app/views/form/page.html.erb b/app/views/form/page.html.erb
index 8a545da0c..95dc38ec6 100644
--- a/app/views/form/page.html.erb
+++ b/app/views/form/page.html.erb
@@ -78,7 +78,7 @@
 
       <% if all_questions_with_errors.count > 1 %>
         <div class="govuk-button-group">
-          <%= f.govuk_submit "See all related answers", name: "check_errors", class: "govuk-body govuk-link submit-button-link" %>
+          <%= f.submit "See all related answers", name: "check_errors", class: "govuk-body govuk-link submit-button-link" %>
         </div>
       <% end %>
 
diff --git a/spec/requests/check_errors_controller_spec.rb b/spec/requests/check_errors_controller_spec.rb
index f0f1887aa..1baaf956f 100644
--- a/spec/requests/check_errors_controller_spec.rb
+++ b/spec/requests/check_errors_controller_spec.rb
@@ -52,13 +52,13 @@ RSpec.describe CheckErrorsController, type: :request do
         end
 
         before do
-          lettings_log.update!(needstype: 1, declaration: 1, ecstat1: 10, hhmemb: 2, net_income_known: 0, incfreq: 1, earnings: 1000)
+          lettings_log.update!(needstype: 1, declaration: 1, ecstat1: 10, hhmemb: 2, net_income_known: 0, incfreq: nil, earnings: nil)
           sign_in user
           post "/lettings-logs/#{lettings_log.id}/income-amount", params: params
         end
 
         it "displays correct clear links" do
-          expect(page).to have_selector("input[type=submit][value='Clear']", count: 3)
+          expect(page).to have_selector("input[type=submit][value='Clear']", count: 2)
           expect(page).to have_button("Clear all")
         end
       end