CLDC-3677 Update BU content (#2845)

* Change instances of “reupload” to “upload again”, remove inset text

* Change bu filter wording

* Update heading

* Update fix choice content

app/components/bulk_upload_error_row_component.html.erb

@@ -38,7 +38,7 @@
 
     <% 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 reupload the file. You'll need to confirm that the following data is correct when the file only contains potential errors.</p>
+      <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>
         <%= govuk_table(html_attributes: { class: "no-bottom-border" })  do |table| %>
           <%= table.with_head do |head| %>
             <% head.with_row do |row| %>

app/helpers/logs_helper.rb

@@ -10,7 +10,7 @@ module LogsHelper
 
   def bulk_upload_options(bulk_upload)
     array = bulk_upload ? [bulk_upload.id] : []
-    array.index_with { |_bulk_upload_id| "With logs from bulk upload" }
+    array.index_with { |_bulk_upload_id| "Only logs from this bulk upload" }
   end
 
   def search_label_for_controller(controller)

app/models/forms/bulk_upload_lettings_resume/fix_choice.rb

@@ -14,7 +14,7 @@ module Forms
       def options
         [
           OpenStruct.new(id: "create-fix-inline", name: "Upload these logs and fix errors on CORE site"),
-          OpenStruct.new(id: "upload-again", name: "Fix errors in the CSV and re-upload"),
+          OpenStruct.new(id: "upload-again", name: "Fix errors in the CSV and upload the file again"),
         ]
       end
 

app/models/forms/bulk_upload_sales_resume/fix_choice.rb

@@ -14,7 +14,7 @@ module Forms
       def options
         [
           OpenStruct.new(id: "create-fix-inline", name: "Upload these logs and fix errors on CORE site"),
-          OpenStruct.new(id: "upload-again", name: "Fix errors in the CSV and re-upload"),
+          OpenStruct.new(id: "upload-again", name: "Fix errors in the CSV and upload the file again"),
         ]
       end
 

app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2024.html.erb

@@ -27,8 +27,6 @@
         "If you have reordered the headers, keep the headers in the file.",
         ], type: :bullet %>
 
-      <%= govuk_inset_text(text: "You can upload both general needs and supported housing logs in the same file for 2024 to 2025 data.") %>
-
       <h2 class="govuk-heading-s">Save your file</h2>
 
       <%= govuk_list ["Save your file as a CSV.", "Your file should now be ready to upload."], type: :bullet %>

app/views/bulk_upload_lettings_resume/deletion_report.html.erb

@@ -28,6 +28,6 @@
 <div class="govuk-button-group">
   <%= form_with model: @form, scope: :form, url: page_bulk_upload_lettings_resume_path(@bulk_upload, "confirm"), method: :patch do |f| %>
     <%= f.govuk_submit "Clear this data and upload the logs" %>
-    <%= govuk_button_link_to "I have fixed these errors and I want to reupload the file", start_bulk_upload_lettings_logs_path, secondary: true %>
+    <%= govuk_button_link_to "I have fixed these errors and I want to upload the file again", start_bulk_upload_lettings_logs_path, secondary: true %>
   <% end %>
 </div>

app/views/bulk_upload_lettings_soft_validations_check/confirm.html.erb

@@ -5,7 +5,7 @@
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
     <span class="govuk-caption-l">Upload lettings logs in bulk (<%= @bulk_upload.year_combo %>)</span>
-    <h1 class="govuk-heading-l">You have chosen to upload all logs from this bulk upload.</h1>
+    <h1 class="govuk-heading-l">Are you sure you want to upload all logs from this bulk upload?</h1>
 
     <p class="govuk-body"><%= logs_and_soft_validations_warning(@bulk_upload) %></p>
 

app/views/bulk_upload_sales_resume/deletion_report.html.erb

@@ -28,6 +28,6 @@
 <div class="govuk-button-group">
   <%= form_with model: @form, scope: :form, url: page_bulk_upload_sales_resume_path(@bulk_upload, "confirm"), method: :patch do |f| %>
     <%= f.govuk_submit "Clear this data and upload the logs" %>
-    <%= govuk_button_link_to "I have fixed these errors and I want to reupload the file", start_bulk_upload_sales_logs_path, secondary: true %>
+    <%= govuk_button_link_to "I have fixed these errors and I want to upload the file again", start_bulk_upload_sales_logs_path, secondary: true %>
   <% end %>
 </div>

app/views/bulk_upload_sales_soft_validations_check/confirm.html.erb

@@ -5,7 +5,7 @@
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
     <span class="govuk-caption-l">Upload sales logs in bulk (<%= @bulk_upload.year_combo %>)</span>
-    <h1 class="govuk-heading-l">You have chosen to upload all logs from this bulk upload.</h1>
+    <h1 class="govuk-heading-l">Are you sure you want to upload all logs from this bulk upload?</h1>
 
     <p class="govuk-body"><%= logs_and_soft_validations_warning(@bulk_upload) %></p>
 

app/views/bulk_upload_shared/_moved_user_banner.html.erb

@@ -4,9 +4,9 @@
       This error report is out of date.
     <p>
     <% if current_user.id == @bulk_upload.moved_user_id %>
-      You moved to a different organisation since this file was uploaded. Reupload the file to get an accurate error report.
+      You moved to a different organisation since this file was uploaded. Upload the file again to get an accurate error report.
     <% else %>
-      Some logs in this upload are assigned to <%= @bulk_upload.moved_user_name %>, who has moved to a different organisation since this file was uploaded. Reupload the file to get an accurate error report.
+      Some logs in this upload are assigned to <%= @bulk_upload.moved_user_name %>, who has moved to a different organisation since this file was uploaded. Upload the file again to get an accurate error report.
     <% end %>
   <% end %>
 <% end %>

app/views/bulk_upload_shared/guidance.html.erb

@@ -75,7 +75,7 @@
         <p class="govuk-body">Once you've saved your CSV file, you can upload it via a button at the top of the lettings and sales logs pages.</p>
         <p class="govuk-body">When your file is done processing, you will receive an email explaining your next steps. If all your data is valid, your logs will be created. If some data is invalid, you’ll receive an email with instructions about how to resolve the errors.</p>
         <p class="govuk-body">If your file has errors on fields 1 through 15 for lettings, or 1 through 18 for sales, you must fix these in the CSV. This is because we need to know these answers to validate the rest of the data. Any errors in these fields will be featured in the error report’s summary tab.</p>
-        <p class="govuk-body">If none of your errors are in fields 1 through 15 for lettings, or 1 through 18 for sales, you can choose how to fix the errors. You can either fix them in the CSV and reupload, or create partially complete logs and answer the remaining questions on the CORE site. Any errors that affect a significant number of logs will be featured in the error report’s summary tab to help you decide.</p>
+        <p class="govuk-body">If none of your errors are in fields 1 through 15 for lettings, or 1 through 18 for sales, you can choose how to fix the errors. You can either fix them in the CSV and upload the file again, or create partially complete logs and answer the remaining questions on the CORE site. Any errors that affect a significant number of logs will be featured in the error report’s summary tab to help you decide.</p>
         <p class="govuk-body"></p>
       <% end %>
 

spec/requests/bulk_upload_lettings_results_controller_spec.rb

@@ -68,7 +68,7 @@ RSpec.describe BulkUploadLettingsResultsController, type: :request do
           get "/lettings-logs/bulk-upload-results/#{bulk_upload.id}/summary"
 
           expect(response.body).to include("This error report is out of date.")
-          expect(CGI.unescapeHTML(response.body)).to include("Some logs in this upload are assigned to #{user.name}, who has moved to a different organisation since this file was uploaded. Reupload the file to get an accurate error report.")
+          expect(CGI.unescapeHTML(response.body)).to include("Some logs in this upload are assigned to #{user.name}, who has moved to a different organisation since this file was uploaded. Upload the file again to get an accurate error report.")
         end
       end
 
@@ -79,7 +79,7 @@ RSpec.describe BulkUploadLettingsResultsController, type: :request do
           get "/lettings-logs/bulk-upload-results/#{bulk_upload.id}/summary"
 
           expect(response.body).to include("This error report is out of date.")
-          expect(response.body).to include("You moved to a different organisation since this file was uploaded. Reupload the file to get an accurate error report.")
+          expect(response.body).to include("You moved to a different organisation since this file was uploaded. Upload the file again to get an accurate error report.")
         end
       end
     end
@@ -138,7 +138,7 @@ RSpec.describe BulkUploadLettingsResultsController, type: :request do
         get "/lettings-logs/bulk-upload-results/#{bulk_upload.id}/summary"
 
         expect(response.body).to include("This error report is out of date.")
-        expect(response.body).to include("Some logs in this upload are assigned to #{other_user.name}, who has moved to a different organisation since this file was uploaded. Reupload the file to get an accurate error report.")
+        expect(response.body).to include("Some logs in this upload are assigned to #{other_user.name}, who has moved to a different organisation since this file was uploaded. Upload the file again to get an accurate error report.")
       end
     end
 
@@ -149,7 +149,7 @@ RSpec.describe BulkUploadLettingsResultsController, type: :request do
         get "/lettings-logs/bulk-upload-results/#{bulk_upload.id}/summary"
 
         expect(response.body).to include("This error report is out of date.")
-        expect(response.body).to include("You moved to a different organisation since this file was uploaded. Reupload the file to get an accurate error report.")
+        expect(response.body).to include("You moved to a different organisation since this file was uploaded. Upload the file again to get an accurate error report.")
       end
     end
   end

spec/requests/bulk_upload_lettings_soft_validations_check_controller_spec.rb

@@ -98,7 +98,7 @@ RSpec.describe BulkUploadLettingsSoftValidationsCheckController, type: :request
 
       expect(response).to be_successful
 
-      expect(response.body).to include("You have chosen to upload all logs from this bulk upload.")
+      expect(response.body).to include("Are you sure you want to upload all logs from this bulk upload?")
       expect(response.body).to include("You will upload 2 logs. There are unexpected answers in 2 logs, and 2 unexpected answers in total. These unexpected answers will be marked as correct.")
       expect(response.body).not_to include("You’ve successfully uploaded")
     end

spec/requests/bulk_upload_sales_results_controller_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe BulkUploadSalesResultsController, type: :request do
           get "/sales-logs/bulk-upload-results/#{bulk_upload.id}/summary"
 
           expect(response.body).to include("This error report is out of date.")
-          expect(response.body).to include("Some logs in this upload are assigned to #{user.name}, who has moved to a different organisation since this file was uploaded. Reupload the file to get an accurate error report.")
+          expect(response.body).to include("Some logs in this upload are assigned to #{user.name}, who has moved to a different organisation since this file was uploaded. Upload the file again to get an accurate error report.")
         end
       end
 
@@ -41,7 +41,7 @@ RSpec.describe BulkUploadSalesResultsController, type: :request do
           get "/sales-logs/bulk-upload-results/#{bulk_upload.id}/summary"
 
           expect(response.body).to include("This error report is out of date.")
-          expect(response.body).to include("You moved to a different organisation since this file was uploaded. Reupload the file to get an accurate error report.")
+          expect(response.body).to include("You moved to a different organisation since this file was uploaded. Upload the file again to get an accurate error report.")
         end
       end
     end
@@ -113,7 +113,7 @@ RSpec.describe BulkUploadSalesResultsController, type: :request do
         get "/sales-logs/bulk-upload-results/#{bulk_upload.id}/summary"
 
         expect(response.body).to include("This error report is out of date.")
-        expect(response.body).to include("Some logs in this upload are assigned to #{other_user.name}, who has moved to a different organisation since this file was uploaded. Reupload the file to get an accurate error report.")
+        expect(response.body).to include("Some logs in this upload are assigned to #{other_user.name}, who has moved to a different organisation since this file was uploaded. Upload the file again to get an accurate error report.")
       end
     end
 
@@ -124,7 +124,7 @@ RSpec.describe BulkUploadSalesResultsController, type: :request do
         get "/sales-logs/bulk-upload-results/#{bulk_upload.id}/summary"
 
         expect(response.body).to include("This error report is out of date.")
-        expect(response.body).to include("You moved to a different organisation since this file was uploaded. Reupload the file to get an accurate error report.")
+        expect(response.body).to include("You moved to a different organisation since this file was uploaded. Upload the file again to get an accurate error report.")
       end
     end
   end

spec/requests/bulk_upload_sales_soft_validations_check_controller_spec.rb

@@ -98,7 +98,7 @@ RSpec.describe BulkUploadSalesSoftValidationsCheckController, type: :request do
 
       expect(response).to be_successful
 
-      expect(response.body).to include("You have chosen to upload all logs from this bulk upload.")
+      expect(response.body).to include("Are you sure you want to upload all logs from this bulk upload?")
       expect(response.body).to include("You will upload 2 logs. There are unexpected answers in 2 logs, and 2 unexpected answers in total. These unexpected answers will be marked as correct.")
       expect(response.body).not_to include("You’ve successfully uploaded")
     end

spec/requests/lettings_logs_controller_spec.rb

@@ -609,7 +609,7 @@ RSpec.describe LettingsLogsController, type: :request do
 
               it "displays filter" do
                 get "/lettings-logs?bulk_upload_id[]=#{bulk_upload.id}"
-                expect(page).to have_content("With logs from bulk upload")
+                expect(page).to have_content("Only logs from this bulk upload")
               end
 
               it "hides collection year filter" do
@@ -695,7 +695,7 @@ RSpec.describe LettingsLogsController, type: :request do
           context "without bulk_upload_id" do
             it "does not display filter" do
               get "/lettings-logs"
-              expect(page).not_to have_content("With logs from bulk upload")
+              expect(page).not_to have_content("Only logs from this bulk upload")
             end
 
             it "displays button to create a new log" do

spec/requests/sales_logs_controller_spec.rb

@@ -452,7 +452,7 @@ RSpec.describe SalesLogsController, type: :request do
 
               it "displays filter" do
                 get "/sales-logs?bulk_upload_id[]=#{bulk_upload.id}"
-                expect(page).to have_content("With logs from bulk upload")
+                expect(page).to have_content("Only logs from this bulk upload")
               end
 
               it "hides collection year filter" do
@@ -536,7 +536,7 @@ RSpec.describe SalesLogsController, type: :request do
           context "without bulk_upload_id" do
             it "does not display filter" do
               get "/sales-logs"
-              expect(page).not_to have_content("With logs from bulk upload")
+              expect(page).not_to have_content("Only logs from this bulk upload")
             end
 
             it "displays button to create a new log" do