Update review flow content

Updates statuses and colours based off UR findings.

MAV-2515

Author: murugapl

app/components/app_import_review_component.rb

@@ -105,9 +105,16 @@ def import_issues_message
 
   def school_moves_message
     count = @school_moves.count
-    "This upload includes #{count > 1 ? "children" : "child"} with a different school to " \
-      "the one on their Mavis record. If you approve the upload, these will be flagged as " \
-      "school moves needing review."
+    if @import.is_a?(ClassImport)
+      "This upload will change the school of the #{count > 1 ? "children" : "child"} listed below. " \
+        "Children present in the class list will be moved into the school, and those who are not in the " \
+        "class list will be moved out of the school. If you approve the upload, these will be flagged as " \
+        "school moves needing review."
+    else
+      "This upload includes #{count} #{count > 1 ? "children" : "child"} with a different school to " \
+        "the one on their Mavis record. If you approve the upload, these will be flagged as " \
+        "school moves needing review."
+    end
   end
 
   def cancel_button_text

app/components/app_import_status_component.rb

@@ -15,9 +15,9 @@ def status_text
       "pending_import" => "Processing",
       "rows_are_invalid" => "Invalid",
       "changesets_are_invalid" => "Failed",
-      "in_review" => "Needs review",
+      "in_review" => "Review and approve",
       "calculating_re_review" => "Processing",
-      "in_re_review" => "Needs re-review",
+      "in_re_review" => "Review",
       "committing" => "Importing",
       "processed" => "Completed",
       "partially_processed" => "Partially completed",
@@ -31,9 +31,9 @@ def status_color
       "pending_import" => "blue",
       "rows_are_invalid" => "red",
       "changesets_are_invalid" => "red",
-      "in_review" => "yellow",
+      "in_review" => "blue",
       "calculating_re_review" => "blue",
-      "in_re_review" => "yellow",
+      "in_re_review" => "blue",
       "committing" => "blue",
       "processed" => "green",
       "partially_processed" => "green",

app/views/imports/imported_records.html.erb

@@ -5,27 +5,27 @@
                                         ]) %>
 <% end %>
 
-<%= h1 "Upload (#{import.created_at.to_fs(:long)})" %>
+<%= h1 "Further review and approve upload (#{import.created_at.to_fs(:long)})" %>
 
 <%= render AppImportSummaryComponent.new(import:) %>
 
-<%= render AppSecondaryNavigationComponent.new do |nav| %>
-  <%= nav.with_item(
-        href: polymorphic_path([:re_review, import]),
-        text: "Needs re-review",
-        selected: request.path.ends_with?("/re_review"),
-      ) %>
-  <% if @patients.present? %>
+<% if @patients.present? %>
+  <%= render AppSecondaryNavigationComponent.new do |nav| %>
     <%= nav.with_item(
-          href: polymorphic_path([:imported_records, import]),
-          text: "Imported",
-          selected: request.path.ends_with?("/imported_records"),
+          href: polymorphic_path([:re_review, import]),
+          text: "Needs further review",
+          selected: request.path.ends_with?("/re_review"),
         ) %>
+      <%= nav.with_item(
+            href: polymorphic_path([:imported_records, import]),
+            text: "Imported",
+            selected: request.path.ends_with?("/imported_records"),
+          ) %>
   <% end %>
 <% end %>
 
 <% if @patients.present? %>
-<%= render AppPatientTableComponent.new(@patients, current_user:, count: @pagy.count) %>
+  <%= render AppPatientTableComponent.new(@patients, current_user:, count: @pagy.count) %>
 <% else %>
   <p>No patients have been imported.</p>
 <% end %>

app/views/imports/re_review.html.erb

@@ -5,27 +5,27 @@
                                         ]) %>
 <% end %>
 
-<%= h1 "Upload (#{import.created_at.to_fs(:long)})" %>
+<%= h1 "Further review and approve upload (#{import.created_at.to_fs(:long)})" %>
 
 <%= render AppImportSummaryComponent.new(import:) %>
 
-<%= render AppSecondaryNavigationComponent.new do |nav| %>
-  <%= nav.with_item(
-        href: polymorphic_path([:re_review, import]),
-        text: "Needs re-review",
-        selected: request.path.ends_with?("/re_review"),
-      ) %>
-  <% if @patients.present? %>
+<% if @patients.present? %>
+  <%= render AppSecondaryNavigationComponent.new do |nav| %>
     <%= nav.with_item(
-          href: polymorphic_path([:imported_records, import]),
-          text: "Imported",
-          selected: request.path.ends_with?("/imported_records"),
+          href: polymorphic_path([:re_review, import]),
+          text: "Needs further review",
+          selected: request.path.ends_with?("/re_review"),
         ) %>
+      <%= nav.with_item(
+            href: polymorphic_path([:imported_records, import]),
+            text: "Imported",
+            selected: request.path.ends_with?("/imported_records"),
+          ) %>
   <% end %>
 <% end %>
 
-<%= render AppWarningCalloutComponent.new(heading: "Changes since you approved this import") do %>
-    <p>Since you approved this import, some records have been updated. Confirm that you want to import the following and override later changes.</p>
+<%= render AppWarningCalloutComponent.new(heading: "Changes since you uploaded this file") do %>
+    <p>The records listed below have changed since you uploaded this file. This may be because another import was approved that includes some or all of the records in your file, or a child's school or NHS number may have changed in Mavis. You need to review these records again and confirm you still want to import the remaining changes from your file.</p>
 <% end %>
 
 <%= render AppImportReviewComponent.new(

app/views/imports/show.html.erb

@@ -5,7 +5,13 @@
                                         ]) %>
 <% end %>
 
-<%= h1 "Upload (#{import.created_at.to_fs(:long)})" %>
+<% if import.in_review? %>
+  <%= h1 "Review and approve upload (#{import.created_at.to_fs(:long)})" %>
+<% elsif import.in_re_review? %>
+  <%= h1 "Further review and approve upload (#{import.created_at.to_fs(:long)})" %>
+<% else %>
+  <%= h1 "Upload (#{import.created_at.to_fs(:long)})" %>
+<% end %>
 
 <%= render AppImportSummaryComponent.new(import: import) %>
 

spec/features/import_class_list_review_spec.rb

@@ -343,7 +343,7 @@ def when_a_patient_is_moved_into_the_school
   def then_i_should_see_the_import_review_screen
     page.refresh
     click_on_most_recent_import(ClassImport)
-    expect(page).to have_content("Needs review")
+    expect(page).to have_content("Review and approve")
 
     find(".nhsuk-details__summary", text: "1 new record").click
     expect(page).to have_content("KORS, Michael")
@@ -367,7 +367,7 @@ def then_i_should_see_the_import_review_screen
 
   def then_i_should_see_the_first_import_review_screen
     click_on_most_recent_import(ClassImport)
-    expect(page).to have_content("Needs review")
+    expect(page).to have_content("Review and approve")
 
     find(".nhsuk-details__summary", text: "4 new records").click
     expect(page).to have_content("KORS, Michael")
@@ -399,7 +399,7 @@ def then_i_should_see_the_second_import_review_screen
 
   def then_i_should_see_the_import_review_screen_with_new_patients_only
     visit class_import_path(ClassImport.order(:created_at).last)
-    expect(page).to have_content("Needs review")
+    expect(page).to have_content("Review and approve")
 
     find(".nhsuk-details__summary", text: "1 new record").click
     expect(page).to have_content("KLEIN, Calvin")
@@ -411,7 +411,7 @@ def then_i_should_see_the_import_review_screen_with_new_patients_only
 
   def then_i_see_the_re_review_screen_for_school_moves_out_only
     visit class_import_path(ClassImport.order(:created_at).last)
-    expect(page).to have_content("Needs re-review")
+    expect(page).to have_content("Further review and approve")
 
     find(".nhsuk-details__summary", text: "1 school move").click
     expect(page).to have_content("SMITH, John")
@@ -423,7 +423,7 @@ def then_i_see_the_re_review_screen_for_school_moves_out_only
   def and_the_import_is_in_re_review_again
     wait_for_import_to_complete_until_review(ClassImport)
     visit class_import_path(ClassImport.order(:created_at).first)
-    expect(page).to have_content("Needs re-review")
+    expect(page).to have_content("Further review and approve")
 
     find(".nhsuk-details__summary", text: "3 school moves").click
     expect(page).to have_content("KLEIN, Calvin")
@@ -498,7 +498,7 @@ def when_i_go_back_to_the_first_import
   def then_i_see_the_import_needs_re_review
     wait_for_import_to_complete_until_review(ClassImport)
     visit class_import_path(ClassImport.order(:created_at).first)
-    expect(page).to have_content("Needs re-review")
+    expect(page).to have_content("Further review and approve")
     expect(ClassImport.first.changesets.processed.count).to eq(2)
     expect(ClassImport.first.changesets.ready_for_review.count).to eq(4)
     expect(ClassImport.first.changesets.from_file.ready_for_review.count).to eq(