Merge pull request #5298 from nhsuk/revert-imports-redesign

Revert imports redesign

Author: murugapl

app/components/app_import_review_component.rb

@@ -51,8 +51,7 @@ def call
         ) do
           render(
             AppImportReviewIssuesSummaryComponent.new(
-              import: @import,
-              records: @import_issues
+              changesets: @import_issues
             )
           )
         end,
@@ -105,16 +104,9 @@ def import_issues_message
 
   def school_moves_message
     count = @school_moves.count
-    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
+    "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."
   end
 
   def cancel_button_text

app/components/app_import_review_issues_summary_component.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
 class AppImportReviewIssuesSummaryComponent < ViewComponent::Base
-  def initialize(import: nil, records: nil, show_actions: false)
-    @import = import
-    @records = Array(records).sort_by { it.try(:row_number) || 0 }
-    @show_actions = show_actions
+  def initialize(changesets: nil)
+    @changesets = changesets.sort_by(&:row_number) || []
   end
 
   def call
@@ -17,145 +15,57 @@ def call
         head.with_row do |row|
           row.with_cell(text: "Name and NHS number")
           row.with_cell(text: "Issue to review")
-          row.with_cell(text: "Actions") if @show_actions
         end
       end
+
       table.with_body do |body|
-        @records.each do |record|
+        @changesets.each do |changeset|
           body.with_row do |row|
-            row.with_cell { render_name_cell(record) }
-            row.with_cell { render_issue_cell(record) }
-            row.with_cell { render_action_cell(record) } if @show_actions
-          end
-        end
-      end
-    end
-  end
-
-  private
-
-  def render_name_cell(record)
-    heading =
-      tag.span("Name and NHS number", class: "nhsuk-table-responsive__heading")
-    name = format_name(record)
-    nhs_number = format_nhs_number(record)
-
-    helpers.safe_join(
-      [
-        heading,
-        tag.span(name),
-        tag.br,
-        tag.span(
-          nhs_number,
-          class: "nhsuk-u-secondary-text-colour nhsuk-u-font-size-16"
-        )
-      ]
-    )
-  end
-
-  def render_issue_cell(record)
-    heading =
-      tag.span("Issue to review", class: "nhsuk-table-responsive__heading")
-    issue_text = determine_issue_text(record)
-    helpers.safe_join([heading, tag.span(issue_text)])
-  end
-
-  def render_action_cell(record)
-    heading = tag.span("Actions", class: "nhsuk-table-responsive__heading")
-    action_link = generate_action_link(record)
-    helpers.safe_join([heading, action_link])
-  end
-
-  def format_name(record)
-    case record
-    when PatientChangeset
-      FullNameFormatter.call(record, context: :internal)
-    when Patient
-      record.full_name
-    when VaccinationRecord
-      record.patient&.full_name || "Unknown"
-    else
-      raise "Unknown record type: #{record.class.name}"
-    end
-  end
+            row.with_cell do
+              heading =
+                tag.span(
+                  "Name and NHS number",
+                  class: "nhsuk-table-responsive__heading"
+                )
 
-  def format_nhs_number(record)
-    case record
-    when PatientChangeset
-      helpers.format_nhs_number(record.nhs_number)
-    when Patient
-      helpers.format_nhs_number(record.nhs_number)
-    when VaccinationRecord
-      helpers.format_nhs_number(record.patient&.nhs_number)
-    else
-      raise "Unknown record type: #{record.class.name}"
-    end
-  end
+              helpers.safe_join(
+                [
+                  heading,
+                  tag.span(
+                    FullNameFormatter.call(changeset, context: :internal)
+                  ),
+                  tag.br,
+                  tag.span(
+                    helpers.format_nhs_number(changeset.nhs_number),
+                    class: "nhsuk-u-secondary-text-colour nhsuk-u-font-size-16"
+                  )
+                ]
+              )
+            end
 
-  def determine_issue_text(record)
-    case record
-    when PatientChangeset, Patient
-      patient_import_issue_text(record)
-    when VaccinationRecord
-      "Imported record closely matches an existing record. Review and confirm."
-    else
-      raise "Unknown record type: #{record.class.name}"
-    end
-  end
+            row.with_cell do
+              heading =
+                tag.span(
+                  "Issue to review",
+                  class: "nhsuk-table-responsive__heading"
+                )
 
-  def patient_import_issue_text(record)
-    pending_changes =
-      if record.is_a?(PatientChangeset)
-        record.review_data["patient"]["pending_changes"] || {}
-      else
-        record.pending_changes || {}
-      end
-    issue_groups = helpers.issue_categories_for(pending_changes.keys)
+              pending_changes = changeset.review_data["pending_changes"] || {}
+              issue_groups = helpers.issue_categories_for(pending_changes.keys)
 
-    if issue_groups.any? && matched_on_nhs_number?(record)
-      "Matched on NHS number. " \
-        "#{issue_groups.to_sentence.capitalize} #{issue_groups.size == 1 ? "does not" : "do not"} match."
-    else
-      "Possible match found. Review and confirm."
-    end
-  end
-
-  def matched_on_nhs_number?(record)
-    if record.is_a?(PatientChangeset)
-      record.matched_on_nhs_number?
-    elsif record.is_a?(Patient)
-      @import
-        &.changesets
-        &.find_by(patient_id: record.id)
-        &.matched_on_nhs_number?
-    end
-  end
+              issue_text =
+                if changeset.matched_on_nhs_number?
+                  "Matched on NHS number. " \
+                    "#{issue_groups.to_sentence.capitalize} #{issue_groups.size == 1 ? "does not" : "do not"} match."
+                else
+                  "Possible match found. Review and confirm."
+                end
 
-  def generate_action_link(record)
-    case record
-    when Patient
-      helpers.link_to(imports_issue_path(record, type: "patient")) do
-        helpers.safe_join(
-          [
-            "Review ",
-            tag.span(record.full_name, class: "nhsuk-u-visually-hidden")
-          ]
-        )
-      end
-    when VaccinationRecord
-      helpers.link_to(imports_issue_path(record, type: "vaccination-record")) do
-        helpers.safe_join(
-          [
-            "Review ",
-            tag.span(
-              record.patient&.full_name,
-              class: "nhsuk-u-visually-hidden"
-            )
-          ]
-        )
+              helpers.safe_join([heading, tag.span(issue_text)])
+            end
+          end
+        end
       end
-    else
-      ""
     end
   end
 end

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" => "Review and approve",
+      "in_review" => "Needs review",
       "calculating_re_review" => "Processing",
-      "in_re_review" => "Review",
+      "in_re_review" => "Needs re-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" => "blue",
+      "in_review" => "yellow",
       "calculating_re_review" => "blue",
-      "in_re_review" => "blue",
+      "in_re_review" => "yellow",
       "committing" => "blue",
       "processed" => "green",
       "partially_processed" => "green",