Move archive and merge activity to the child record tab

Archive and patient merge events are not specific to any programme, so they shouldn't appear on every programme tab. Extract them into a new AppPatientActivityComponent ("Activity log" card) rendered on the Child record tab instead.

Author: murugapl

app/components/app_activity_log_component.rb

@@ -41,9 +41,17 @@ class AppActivityLogComponent < ViewComponent::Base
 
   def initialize(team:, patient:, programme_type: nil, session: nil)
     @patient = patient
+    @patient_level = programme_type.nil? && session.nil?
 
-    @archive_reasons =
-      @patient.archive_reasons.where(team:).includes(:created_by)
+    if @patient_level
+      @archive_reasons =
+        @patient.archive_reasons.where(team:).includes(:created_by)
+
+      @patient_merge_log_entries =
+        @patient.patient_merge_log_entries.includes(:user)
+
+      return
+    end
 
     @attendance_records =
       patient
@@ -116,9 +124,6 @@ def initialize(team:, patient:, programme_type: nil, session: nil)
           session ? scope.where(location: session.location) : scope
         end
 
-    @patient_merge_log_entries =
-      @patient.patient_merge_log_entries.includes(:user)
-
     @patient_specific_directions =
       @patient
         .patient_specific_directions
@@ -184,21 +189,23 @@ def initialize(team:, patient:, programme_type: nil, session: nil)
               :vaccination_records
 
   def all_events
-    [
-      archive_events,
-      attendance_events,
-      consent_events,
-      expiration_events,
-      gillick_assessment_events,
-      note_events,
-      notify_events,
-      patient_merge_events,
-      patient_specific_direction_events,
-      pre_screening_events,
-      session_events,
-      triage_events,
-      vaccination_events
-    ].flatten.sort_by { it[:at] }.reverse
+    if @patient_level
+      [archive_events, patient_merge_events]
+    else
+      [
+        attendance_events,
+        consent_events,
+        expiration_events,
+        gillick_assessment_events,
+        note_events,
+        notify_events,
+        patient_specific_direction_events,
+        pre_screening_events,
+        session_events,
+        triage_events,
+        vaccination_events
+      ]
+    end.flatten.sort_by { it[:at] }.reverse
   end
 
   def archive_events

app/components/app_patient_activity_component.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class AppPatientActivityComponent < ViewComponent::Base
+  def initialize(patient, team:)
+    @patient = patient
+    @team = team
+  end
+
+  def call
+    render AppCardComponent.new(section: true) do |card|
+      card.with_heading { "Activity log" }
+      render AppActivityLogComponent.new(patient:, team:)
+    end
+  end
+
+  private
+
+  attr_reader :patient, :team
+end

app/views/patients/show.html.erb

@@ -38,3 +38,5 @@
         ) %>
   <% end %>
 <% end %>
+
+<%= render AppPatientActivityComponent.new(@patient, team: current_team) %>

spec/components/app_activity_log_component_spec.rb

@@ -76,6 +76,8 @@
   end
 
   describe "archive reasons" do
+    let(:component) { described_class.new(patient:, team:) }
+
     before do
       create(
         :archive_reason,
@@ -787,6 +789,8 @@
   end
 
   describe "patient merge events" do
+    let(:component) { described_class.new(patient:, team:) }
+
     before do
       create(
         :patient_merge_log_entry,

spec/features/archive_children_spec.rb

@@ -224,7 +224,6 @@ def and_i_see_an_archived_tag
   end
 
   def and_i_see_an_activity_log_entry
-    within(".app-secondary-navigation") { click_on "HPV" }
     expect(page).to have_content("Record archived:")
   end
 

spec/features/manage_children_spec.rb

@@ -75,7 +75,6 @@
     and_the_vaccination_record_is_updated_with_the_nhs
 
     when_i_go_back_to_the_patient_page
-    and_i_click_on_a_programme
     then_i_see_the_patient_merge_in_the_activity_log
   end
 

spec/features/national_reporting_team_spec.rb

@@ -182,7 +182,7 @@ def then_i_should_see_the_childs_card
 
   def then_i_should_see_vaccinations_then_child_details
     app_cards = page.all(".app-card")
-    expect(app_cards.count).to eq(2)
+    expect(app_cards.count).to eq(3)
     expect(app_cards[0]).to have_content("Vaccinations")
     expect(app_cards[1]).to have_content("Child record")
   end