From 9ca771cdbfd3f96d49527fb29b1cc78ddc29ca57 Mon Sep 17 00:00:00 2001
From: natdeanlewissoftwire <nat.dean-lewis@softwire.com>
Date: Thu, 18 Jan 2024 15:59:20 +0000
Subject: [PATCH] feat: update routing and only display warnign text when
 errors will be cleared

---
 .../forms/bulk_upload_lettings_resume/confirm.rb   |  8 ++++++++
 .../bulk_upload_lettings_resume/fix_choice.rb      | 14 +++++++++-----
 .../forms/bulk_upload_sales_resume/confirm.rb      |  8 ++++++++
 .../forms/bulk_upload_sales_resume/fix_choice.rb   | 14 +++++++++-----
 .../bulk_upload_lettings_resume/confirm.html.erb   | 10 ++++++----
 .../fix_choice.html.erb                            |  2 +-
 .../bulk_upload_sales_resume/confirm.html.erb      | 10 ++++++----
 .../bulk_upload_sales_resume/fix_choice.html.erb   |  2 +-
 8 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/app/models/forms/bulk_upload_lettings_resume/confirm.rb b/app/models/forms/bulk_upload_lettings_resume/confirm.rb
index c109cd1b1..3419e794f 100644
--- a/app/models/forms/bulk_upload_lettings_resume/confirm.rb
+++ b/app/models/forms/bulk_upload_lettings_resume/confirm.rb
@@ -19,6 +19,14 @@ module Forms
         resume_bulk_upload_lettings_result_path(bulk_upload)
       end
 
+      def error_report_path
+        if BulkUploadErrorSummaryTableComponent.new(bulk_upload:).errors?
+          summary_bulk_upload_lettings_result_path(bulk_upload)
+        else
+          bulk_upload_lettings_result_path(bulk_upload)
+        end
+      end
+
       def save!
         ApplicationRecord.transaction do
           processor = BulkUpload::Processor.new(bulk_upload:)
diff --git a/app/models/forms/bulk_upload_lettings_resume/fix_choice.rb b/app/models/forms/bulk_upload_lettings_resume/fix_choice.rb
index cf86f2e16..a97d6e3b9 100644
--- a/app/models/forms/bulk_upload_lettings_resume/fix_choice.rb
+++ b/app/models/forms/bulk_upload_lettings_resume/fix_choice.rb
@@ -27,16 +27,20 @@ module Forms
         when "create-fix-inline"
           page_bulk_upload_lettings_resume_path(bulk_upload, page: "confirm")
         when "upload-again"
-          if BulkUploadErrorSummaryTableComponent.new(bulk_upload:).errors?
-            summary_bulk_upload_lettings_result_path(bulk_upload)
-          else
-            bulk_upload_lettings_result_path(bulk_upload)
-          end
+          error_report_path
         else
           raise "invalid choice"
         end
       end
 
+      def error_report_path
+        if BulkUploadErrorSummaryTableComponent.new(bulk_upload:).errors?
+          summary_bulk_upload_lettings_result_path(bulk_upload)
+        else
+          bulk_upload_lettings_result_path(bulk_upload)
+        end
+      end
+
       def recommendation
         if BulkUploadErrorSummaryTableComponent.new(bulk_upload:).errors?
           "We recommend fixing these errors in the CSV, as you may be able to edit multiple fields at once. However, you can also upload these logs and fix the errors on the CORE site."
diff --git a/app/models/forms/bulk_upload_sales_resume/confirm.rb b/app/models/forms/bulk_upload_sales_resume/confirm.rb
index 1211ef3f0..a84272682 100644
--- a/app/models/forms/bulk_upload_sales_resume/confirm.rb
+++ b/app/models/forms/bulk_upload_sales_resume/confirm.rb
@@ -19,6 +19,14 @@ module Forms
         resume_bulk_upload_sales_result_path(bulk_upload)
       end
 
+      def error_report_path
+        if BulkUploadErrorSummaryTableComponent.new(bulk_upload:).errors?
+          summary_bulk_upload_sales_result_path(bulk_upload)
+        else
+          bulk_upload_sales_result_path(bulk_upload)
+        end
+      end
+
       def save!
         ApplicationRecord.transaction do
           processor = BulkUpload::Processor.new(bulk_upload:)
diff --git a/app/models/forms/bulk_upload_sales_resume/fix_choice.rb b/app/models/forms/bulk_upload_sales_resume/fix_choice.rb
index d26cd073d..0cd2ae0f5 100644
--- a/app/models/forms/bulk_upload_sales_resume/fix_choice.rb
+++ b/app/models/forms/bulk_upload_sales_resume/fix_choice.rb
@@ -27,16 +27,20 @@ module Forms
         when "create-fix-inline"
           page_bulk_upload_sales_resume_path(bulk_upload, page: "confirm")
         when "upload-again"
-          if BulkUploadErrorSummaryTableComponent.new(bulk_upload:).errors?
-            summary_bulk_upload_sales_result_path(bulk_upload)
-          else
-            bulk_upload_sales_result_path(bulk_upload)
-          end
+          error_report_path
         else
           raise "invalid choice"
         end
       end
 
+      def error_report_path
+        if BulkUploadErrorSummaryTableComponent.new(bulk_upload:).errors?
+          summary_bulk_upload_sales_result_path(bulk_upload)
+        else
+          bulk_upload_sales_result_path(bulk_upload)
+        end
+      end
+
       def recommendation
         if BulkUploadErrorSummaryTableComponent.new(bulk_upload:).errors?
           "We recommend fixing these errors in the CSV, as you may be able to edit multiple fields at once. However, you can also upload these logs and fix the errors on the CORE site."
diff --git a/app/views/bulk_upload_lettings_resume/confirm.html.erb b/app/views/bulk_upload_lettings_resume/confirm.html.erb
index 9336b3eb8..040ab8df1 100644
--- a/app/views/bulk_upload_lettings_resume/confirm.html.erb
+++ b/app/views/bulk_upload_lettings_resume/confirm.html.erb
@@ -9,12 +9,14 @@
 
     <p class="govuk-body">
       <%= logs_and_errors_warning(@bulk_upload) %>
-      <%= govuk_link_to "View the error report", deletion_report_bulk_upload_lettings_result_path %>
+      <%= govuk_link_to "View the error report", @form.error_report_path %>
     </p>
 
-    <%= govuk_warning_text do %>
-      <%= deleted_errors_warning_text(@bulk_upload) %>
-      <%= govuk_link_to "See which answers will be deleted", deletion_report_bulk_upload_lettings_result_path %>
+    <% if unique_answers_to_be_cleared(@bulk_upload).present? %>
+      <%= govuk_warning_text do %>
+        <%= deleted_errors_warning_text(@bulk_upload) %>
+        <%= govuk_link_to "See which answers will be deleted", deletion_report_bulk_upload_lettings_result_path %>
+      <% end %>
     <% end %>
 
     <div class="govuk-button-group">
diff --git a/app/views/bulk_upload_lettings_resume/fix_choice.html.erb b/app/views/bulk_upload_lettings_resume/fix_choice.html.erb
index b0293e5cb..87aff25ae 100644
--- a/app/views/bulk_upload_lettings_resume/fix_choice.html.erb
+++ b/app/views/bulk_upload_lettings_resume/fix_choice.html.erb
@@ -19,7 +19,7 @@
       </div>
 
       <div class="govuk-body">
-        <%= govuk_link_to "View the error report", deletion_report_bulk_upload_lettings_result_path %>
+        <%= govuk_link_to "View the error report", @form.error_report_path %>
       </div>
 
       <%= govuk_details(summary_text: "How to choose between fixing errors on the CORE site or in the CSV") do %>
diff --git a/app/views/bulk_upload_sales_resume/confirm.html.erb b/app/views/bulk_upload_sales_resume/confirm.html.erb
index 0e4e73d9c..16d0d5a91 100644
--- a/app/views/bulk_upload_sales_resume/confirm.html.erb
+++ b/app/views/bulk_upload_sales_resume/confirm.html.erb
@@ -9,12 +9,14 @@
 
     <p class="govuk-body">
       <%= logs_and_errors_warning(@bulk_upload) %>
-      <%= govuk_link_to "View the error report", deletion_report_bulk_upload_sales_result_path %>
+      <%= govuk_link_to "View the error report", @form.error_report_path %>
     </p>
 
-    <%= govuk_warning_text do %>
-      <%= deleted_errors_warning_text(@bulk_upload) %>
-      <%= govuk_link_to "See which answers will be deleted", deletion_report_bulk_upload_sales_result_path %>
+    <% if unique_answers_to_be_cleared(@bulk_upload).present? %>
+      <%= govuk_warning_text do %>
+        <%= deleted_errors_warning_text(@bulk_upload) %>
+        <%= govuk_link_to "See which answers will be deleted", deletion_report_bulk_upload_sales_result_path %>
+      <% end %>
     <% end %>
 
     <div class="govuk-button-group">
diff --git a/app/views/bulk_upload_sales_resume/fix_choice.html.erb b/app/views/bulk_upload_sales_resume/fix_choice.html.erb
index 850bd54f0..5fcc1d5ea 100644
--- a/app/views/bulk_upload_sales_resume/fix_choice.html.erb
+++ b/app/views/bulk_upload_sales_resume/fix_choice.html.erb
@@ -19,7 +19,7 @@
       </div>
 
       <div class="govuk-body">
-        <%= govuk_link_to "View the error report", deletion_report_bulk_upload_sales_result_path %>
+        <%= govuk_link_to "View the error report", @form.error_report_path %>
       </div>
 
       <%= govuk_details(summary_text: "How to choose between fixing errors on the CORE site or in the CSV") do %>