Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLDC-3862 Update potential errors wording #2933

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/components/bulk_upload_error_row_component.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@
<% end %>

<% if potential_errors.any? %>
<h2 class="govuk-heading-m">Potential errors</h2>
<p class="govuk-body">The following groups of cells might have conflicting data. Check the answers and fix any incorrect data.<br><br>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.</p>
<h2 class="govuk-heading-m">Confirmation needed</h2>
<p class="govuk-body">The following groups of cells might have conflicting data. Check the answers and fix any incorrect data.<br><br>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 data that needs confirmation.</p>
<%= 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 %>
Expand Down
2 changes: 1 addition & 1 deletion app/components/bulk_upload_summary_component.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
) %>
</div>
<% end %>
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/tag_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion app/mailers/bulk_upload_mailer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def send_how_to_fix_upload_mail(bulk_upload:)

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 = "Some of your #{bulk_upload.year_combo} #{bulk_upload.log_type} data might not be right. Click the link below to review the data that needs confirmation, and check your file to see if the data is correct."
cta_link = if bulk_upload.lettings?
bulk_upload_lettings_soft_validations_check_url(bulk_upload, page: "confirm-soft-errors")
else
Expand Down
2 changes: 1 addition & 1 deletion spec/components/bulk_upload_error_row_component_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@

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
Expand Down
4 changes: 2 additions & 2 deletions spec/components/bulk_upload_summary_component_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@

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")
Expand Down
2 changes: 1 addition & 1 deletion spec/mailers/bulk_upload_mailer_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
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: "Some of your #{bulk_upload.year_combo} lettings data might not be right. Click the link below to review the data that needs confirmation, and check your file to see if the data is correct.",
cta_link: bulk_upload_lettings_soft_validations_check_url(bulk_upload, page: "confirm-soft-errors"),
},
)
Expand Down
Loading