diff --git a/app/components/bulk_upload_error_row_component.html.erb b/app/components/bulk_upload_error_row_component.html.erb index db1ceab7a..8cfdb674e 100644 --- a/app/components/bulk_upload_error_row_component.html.erb +++ b/app/components/bulk_upload_error_row_component.html.erb @@ -37,14 +37,14 @@ <% end %> <% if potential_errors.any? %> -

Potential errors

-

The following groups of cells might have conflicting data. Check the answers and fix any incorrect data.

If the answers are correct, fix the critical errors and upload the file again. You'll need to confirm that the following data is correct when the file only contains potential errors.

+

Confirmation needed

+

Potential data discrepancies exist in the following cells.

Please resolve all critical errors and review the cells with data discrepancies before re-uploading the file. Bulk confirmation of potential discrepancies is accessible only after all critical errors have been resolved.

<%= govuk_table(html_attributes: { class: "no-bottom-border" }) do |table| %> <%= table.with_head do |head| %> <% head.with_row do |row| %> <% row.with_cell(header: true, text: "Cell") %> <% row.with_cell(header: true, text: "Question") %> - <% row.with_cell(header: true, text: "Potential error") %> + <% row.with_cell(header: true, text: "Confirmation needed") %> <% row.with_cell(header: true, text: "Specification") %> <% end %> <% end %> diff --git a/app/components/bulk_upload_summary_component.html.erb b/app/components/bulk_upload_summary_component.html.erb index a7ac57da3..77192eaee 100644 --- a/app/components/bulk_upload_summary_component.html.erb +++ b/app/components/bulk_upload_summary_component.html.erb @@ -28,7 +28,7 @@ [bulk_upload.total_logs_count, "total log"], [setup_errors_count, "error on important questions", "errors on important questions"], [critical_errors_count, "critical error"], - [potential_errors_count, "potential error"], + [potential_errors_count, "confirmation needed", "confirmations needed"], ) %> <% end %> diff --git a/app/helpers/tag_helper.rb b/app/helpers/tag_helper.rb index 3ecea6d25..110198550 100644 --- a/app/helpers/tag_helper.rb +++ b/app/helpers/tag_helper.rb @@ -24,7 +24,7 @@ module TagHelper processing_error: "Error processing CSV", important_errors: "Errors on important questions in CSV", critical_errors: "Critical errors in CSV", - potential_errors: "Potential errors in CSV", + potential_errors: "Confirmation needed in CSV", logs_uploaded_with_errors: "Logs uploaded with errors", errors_fixed_in_service: "Errors fixed on site", logs_uploaded_no_errors: "Logs uploaded with no errors", diff --git a/app/mailers/bulk_upload_mailer.rb b/app/mailers/bulk_upload_mailer.rb index 7c62f71a1..3029a7998 100644 --- a/app/mailers/bulk_upload_mailer.rb +++ b/app/mailers/bulk_upload_mailer.rb @@ -29,7 +29,7 @@ class BulkUploadMailer < NotifyMailer def send_check_soft_validations_mail(bulk_upload:) title = "Check your file data" - description = "Some of your #{bulk_upload.year_combo} #{bulk_upload.log_type} data might not be right. Click the link below to review the potential errors, and check your file to see if the data is correct." + description = "We’ve identified potential discrepancies in your #{bulk_upload.year_combo} #{bulk_upload.log_type} data. Please review the flagged information via the link below and cross-reference it with your records to confirm data accuracy." cta_link = if bulk_upload.lettings? bulk_upload_lettings_soft_validations_check_url(bulk_upload, page: "confirm-soft-errors") else diff --git a/app/models/bulk_upload_error.rb b/app/models/bulk_upload_error.rb index 154fca2fc..85c362e7c 100644 --- a/app/models/bulk_upload_error.rb +++ b/app/models/bulk_upload_error.rb @@ -6,6 +6,7 @@ class BulkUploadError < ApplicationRecord scope :order_by_col, -> { order(Arel.sql("LPAD(col, 10, '0')")) } scope :important, -> { where(category: "setup") } scope :potential, -> { where(category: "soft_validation") } + scope :not_potential, -> { where.not(category: "soft_validation").or(where(category: nil)) } scope :critical, -> { where(category: nil).or(where.not(category: %w[setup soft_validation])) } scope :critical_or_important, -> { critical.or(important) } end diff --git a/app/views/bulk_upload_lettings_results/show.html.erb b/app/views/bulk_upload_lettings_results/show.html.erb index 8aba5eaf7..5eedefe49 100644 --- a/app/views/bulk_upload_lettings_results/show.html.erb +++ b/app/views/bulk_upload_lettings_results/show.html.erb @@ -7,7 +7,8 @@
Upload lettings logs in bulk (<%= @bulk_upload.year_combo %>) -

We found <%= pluralize(@bulk_upload.bulk_upload_errors.count, "error") %> in your file

+ <% error_word = @bulk_upload.bulk_upload_errors.not_potential.any? ? "error" : "discrepancy" %> +

We found <%= pluralize(@bulk_upload.bulk_upload_errors.count, error_word) %> in your file

Here’s a list of everything that you need to fix your spreadsheet. You can download the <%= govuk_link_to "specification", Forms::BulkUploadForm::PrepareYourFile.new(year: @bulk_upload.year, log_type: "lettings").specification_path, target: "_blank" %> to help you fix the cells in your CSV file. diff --git a/app/views/bulk_upload_sales_results/show.html.erb b/app/views/bulk_upload_sales_results/show.html.erb index f455ad849..2276285fe 100644 --- a/app/views/bulk_upload_sales_results/show.html.erb +++ b/app/views/bulk_upload_sales_results/show.html.erb @@ -7,7 +7,8 @@
Upload sales logs in bulk (<%= @bulk_upload.year_combo %>) -

We found <%= pluralize(@bulk_upload.bulk_upload_errors.count, "error") %> in your file

+ <% error_word = @bulk_upload.bulk_upload_errors.not_potential.any? ? "error" : "discrepancy" %> +

We found <%= pluralize(@bulk_upload.bulk_upload_errors.count, error_word) %> in your file

Here’s a list of everything that you need to fix your spreadsheet. You can download the <%= govuk_link_to "specification", Forms::BulkUploadForm::PrepareYourFile.new(year: @bulk_upload.year, log_type: "sales").specification_path, target: "_blank" %> to help you fix the cells in your CSV file. diff --git a/spec/components/bulk_upload_error_row_component_spec.rb b/spec/components/bulk_upload_error_row_component_spec.rb index b593a0048..2576e7801 100644 --- a/spec/components/bulk_upload_error_row_component_spec.rb +++ b/spec/components/bulk_upload_error_row_component_spec.rb @@ -148,7 +148,7 @@ RSpec.describe BulkUploadErrorRowComponent, type: :component do it "renders the potential errors section" do result = render_inline(described_class.new(bulk_upload_errors:)) - expect(result).to have_content("Potential errors") + expect(result).to have_content("Confirmation needed") end it "renders the potential error message" do diff --git a/spec/components/bulk_upload_summary_component_spec.rb b/spec/components/bulk_upload_summary_component_spec.rb index 544befcb3..b68d8a5a2 100644 --- a/spec/components/bulk_upload_summary_component_spec.rb +++ b/spec/components/bulk_upload_summary_component_spec.rb @@ -64,8 +64,8 @@ RSpec.describe BulkUploadSummaryComponent, type: :component do it "shows the potential errors status and error count" do result = render_inline(described_class.new(bulk_upload:)) - expect(result).to have_content("Potential errors in CSV") - expect(result).to have_content("2 potential errors") + expect(result).to have_content("Confirmation needed in CSV") + expect(result).to have_content("2 confirmations needed") expect(result).to have_content("16 total logs") expect(result).to have_no_content("errors on important") expect(result).to have_no_content("critical") diff --git a/spec/mailers/bulk_upload_mailer_spec.rb b/spec/mailers/bulk_upload_mailer_spec.rb index 910bca4a9..de9321650 100644 --- a/spec/mailers/bulk_upload_mailer_spec.rb +++ b/spec/mailers/bulk_upload_mailer_spec.rb @@ -113,7 +113,7 @@ RSpec.describe BulkUploadMailer do title: "Check your file data", filename: bulk_upload.filename, upload_timestamp: bulk_upload.created_at.to_fs(:govuk_date_and_time), - description: "Some of your #{bulk_upload.year_combo} lettings data might not be right. Click the link below to review the potential errors, and check your file to see if the data is correct.", + description: "We’ve identified potential discrepancies in your #{bulk_upload.year_combo} lettings data. Please review the flagged information via the link below and cross-reference it with your records to confirm data accuracy.", cta_link: bulk_upload_lettings_soft_validations_check_url(bulk_upload, page: "confirm-soft-errors"), }, )