Merge pull request #6114 from NHSDigital/next

Version 6.21.0

Author: thomasleese

.github/CODEOWNERS

@@ -1,3 +1 @@
-* @nhsuk/mavis-devs-application
-.github/ @nhsuk/vaccine-digital-service
-docs/ @nhsuk/vaccine-digital-service
+* @NHSDigital/mavis

.github/workflows/end-to-end-tests.yml

@@ -345,12 +345,3 @@ jobs:
           aws-region: eu-west-2
       - name: Stop dockerized dev image
         run: aws ecs stop-task --cluster assurance-testing --task ${{ needs.wait-for-task-stability.outputs.task_arn }}
-  enforce-end-to-end-tests:
-    name: Check if end-to-end tests passed if required
-    needs: [ call-end-to-end-tests ]
-    if: ${{ always() && github.event_name == 'pull_request' }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check end-to-end tests passed or were skipped
-        run: |
-          echo "All good" # TODO: Remove in followup PR

.github/workflows/lint.yml

@@ -24,3 +24,4 @@ jobs:
       - uses: jdx/mise-action@v3
         with:
           install_args: hk pkl
+      - run: hk check --all

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/citizensadvice/capybara_accessible_selectors.git
-  revision: 3feb17c2e2723bc2e177ce00765a50d6cddf479e
+  revision: b01f8eae5cc083b9151d5e711c36713e28c487e7
   specs:
     capybara_accessible_selectors (0.15.0)
       capybara (~> 3.36)
@@ -122,7 +122,7 @@ GEM
       public_suffix (>= 2.0.2, < 8.0)
     aes_key_wrap (1.1.0)
     amazing_print (2.0.0)
-    annotaterb (4.21.0)
+    annotaterb (4.22.0)
       activerecord (>= 6.0.0)
       activesupport (>= 6.0.0)
     array_enum (1.6.0)
@@ -134,7 +134,7 @@ GEM
     ast (2.4.3)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1213.0)
+    aws-partitions (1.1219.0)
     aws-sdk-accessanalyzer (1.85.0)
       aws-sdk-core (~> 3, >= 3.241.4)
       aws-sigv4 (~> 1.5)
@@ -146,10 +146,10 @@ GEM
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-ec2 (1.598.0)
+    aws-sdk-ec2 (1.604.0)
       aws-sdk-core (~> 3, >= 3.241.4)
       aws-sigv4 (~> 1.5)
-    aws-sdk-ecr (1.119.0)
+    aws-sdk-ecr (1.121.0)
       aws-sdk-core (~> 3, >= 3.241.4)
       aws-sigv4 (~> 1.5)
     aws-sdk-iam (1.140.0)
@@ -158,7 +158,7 @@ GEM
     aws-sdk-kms (1.121.0)
       aws-sdk-core (~> 3, >= 3.241.4)
       aws-sigv4 (~> 1.5)
-    aws-sdk-rds (1.307.0)
+    aws-sdk-rds (1.308.0)
       aws-sdk-core (~> 3, >= 3.241.4)
       aws-sigv4 (~> 1.5)
     aws-sdk-s3 (1.213.0)
@@ -176,7 +176,7 @@ GEM
     bigdecimal (4.0.1)
     bindata (2.5.1)
     bindex (0.8.1)
-    bootsnap (1.22.0)
+    bootsnap (1.23.0)
       msgpack (~> 1.2)
     brakeman (8.0.2)
       racc
@@ -229,7 +229,7 @@ GEM
       irb (~> 1.10)
       reline (>= 0.3.8)
     deep_merge (1.2.2)
-    devise (5.0.0)
+    devise (5.0.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 7.0)
@@ -244,7 +244,7 @@ GEM
     dry-cli (1.4.1)
     email_validator (2.2.4)
       activemodel
-    erb (6.0.1)
+    erb (6.0.2)
     erubi (1.13.1)
     et-orbi (1.4.0)
       tzinfo
@@ -324,8 +324,9 @@ GEM
     indefinite_article (0.2.5)
       activesupport
     io-console (0.8.2)
-    irb (1.16.0)
+    irb (1.17.0)
       pp (>= 0.6.0)
+      prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     its (0.2.0)
@@ -342,7 +343,7 @@ GEM
       bindata
       faraday (~> 2.0)
       faraday-follow_redirects
-    jsonb_accessor (1.4)
+    jsonb_accessor (1.4.1)
       activerecord (>= 6.1)
       activesupport (>= 6.1)
       pg (>= 0.18.1)
@@ -393,7 +394,8 @@ GEM
       mime-types-data (~> 3.2025, >= 3.2025.0507)
     mime-types-data (3.2025.0924)
     mini_mime (1.1.5)
-    minitest (6.0.1)
+    minitest (6.0.2)
+      drb (~> 2.0)
       prism (~> 1.5)
     msgpack (1.8.0)
     net-http (0.9.1)
@@ -412,9 +414,9 @@ GEM
       net-protocol
     nio4r (2.7.5)
     nkf (0.2.0)
-    nokogiri (1.19.0-arm64-darwin)
+    nokogiri (1.19.1-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.0-x86_64-linux-gnu)
+    nokogiri (1.19.1-x86_64-linux-gnu)
       racc (~> 1.4)
     notifications-ruby-client (6.3.0)
       jwt (>= 1.5, < 4)
@@ -485,7 +487,7 @@ GEM
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (3.2.4)
+    rack (3.2.5)
     rack-oauth2 (2.3.0)
       activesupport
       attr_required
@@ -548,14 +550,14 @@ GEM
       ffi (~> 1.0)
     rbs (3.10.2)
       logger
-    rdoc (7.1.0)
+    rdoc (7.2.0)
       erb
       psych (>= 4.0.0)
       tsort
     redcarpet (3.6.1)
     redis (5.4.1)
       redis-client (>= 0.22.0)
-    redis-client (0.26.3)
+    redis-client (0.26.4)
       connection_pool
     redis-prescription (2.6.0)
     regexp_parser (2.11.3)
@@ -591,12 +593,12 @@ GEM
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
-    rspec-sidekiq (5.2.0)
+    rspec-sidekiq (5.3.0)
       rspec-core (~> 3.0)
       rspec-expectations (~> 3.0)
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 9)
-    rspec-support (3.13.6)
+    rspec-support (3.13.7)
     rubocop (1.82.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
@@ -633,8 +635,9 @@ GEM
     rubocop-rspec (3.9.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.81)
-    ruby-prof (1.7.2)
+    ruby-prof (2.0.2)
       base64
+      ostruct
     ruby-progressbar (1.13.0)
     rubyXL (3.4.35)
       nokogiri (>= 1.10.8)
@@ -654,18 +657,19 @@ GEM
     securerandom (0.4.1)
     semantic_logger (4.17.0)
       concurrent-ruby (~> 1.0)
-    sentry-rails (6.3.0)
+    sentry-rails (6.3.1)
       railties (>= 5.2.0)
-      sentry-ruby (~> 6.3.0)
-    sentry-ruby (6.3.0)
+      sentry-ruby (~> 6.3.1)
+    sentry-ruby (6.3.1)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
-    sentry-sidekiq (6.3.0)
-      sentry-ruby (~> 6.3.0)
+      logger
+    sentry-sidekiq (6.3.1)
+      sentry-ruby (~> 6.3.1)
       sidekiq (>= 5.0)
     shoulda-matchers (7.0.1)
       activesupport (>= 7.1)
-    sidekiq (8.1.0)
+    sidekiq (8.1.1)
       connection_pool (>= 3.0.0)
       json (>= 2.16.0)
       logger (>= 1.7.0)
@@ -715,7 +719,7 @@ GEM
       activesupport
       solargraph (>= 0.48.0)
     splunk-sdk-ruby (1.0.5)
-    stackprof (0.2.27)
+    stackprof (0.2.28)
     stringio (3.2.0)
     swd (2.0.3)
       activesupport (>= 3)
@@ -765,11 +769,10 @@ GEM
       concurrent-ruby (~> 1)
     warden (1.2.9)
       rack (>= 2.0.9)
-    web-console (4.2.1)
-      actionview (>= 6.0.0)
-      activemodel (>= 6.0.0)
+    web-console (4.3.0)
+      actionview (>= 8.0.0)
       bindex (>= 0.4.0)
-      railties (>= 6.0.0)
+      railties (>= 8.0.0)
     webfinger (2.1.3)
       activesupport
       faraday (~> 2.0)
@@ -796,7 +799,7 @@ GEM
       yard (>= 0.8)
     yard-solargraph (0.1.0)
       yard (~> 0.9)
-    zeitwerk (2.7.4)
+    zeitwerk (2.7.5)
 
 PLATFORMS
   arm64-darwin-22

app/components/app_activity_log_component.rb

@@ -400,19 +400,38 @@ def vaccination_events
         if vaccination_record.administered?
           if (vaccine = vaccination_record.vaccine)
             "Vaccinated with #{vaccine.brand}"
+          elsif vaccination_record.sourced_from_manual_report?
+            "Vaccination record added manually"
+          elsif vaccination_record.sourced_from_historical_upload?
+            "Vaccination record uploaded"
           else
             "Vaccinated"
           end
         else
           "Vaccination not given: #{vaccination_record.human_enum_name(:outcome)}"
         end
 
+      subtitle =
+        if historical_vaccination_event?(vaccination_record)
+          "Record added to Mavis #{vaccination_record.reported_at.to_fs(:long)}. " \
+            "Vaccination given #{vaccination_record.performed_at.to_date.to_fs(:long)}."
+        end
+      at =
+        (
+          if historical_vaccination_event?(vaccination_record)
+            vaccination_record.reported_at
+          else
+            vaccination_record.performed_at
+          end
+        )
+
       kept = {
         title:,
         body: vaccination_record.notes,
-        at: vaccination_record.performed_at,
+        at:,
         by: vaccination_record.performed_by,
-        programmes: [vaccination_record.programme]
+        programmes: [vaccination_record.programme],
+        subtitle:
       }
 
       discarded =
@@ -428,6 +447,14 @@ def vaccination_events
     end
   end
 
+  def historical_vaccination_event?(vaccination_record)
+    vaccination_record.reported_at.present? &&
+      (
+        vaccination_record.sourced_from_manual_report? ||
+          vaccination_record.sourced_from_historical_upload?
+      )
+  end
+
   def attendance_events
     attendance_records.map do |attendance_record|
       title =

app/components/app_import_review_issues_summary_component.rb

@@ -132,7 +132,9 @@ def review_link(record, type)
     full_name =
       record.is_a?(Patient) ? record.full_name : record.patient&.full_name
 
-    helpers.link_to(imports_issue_path(record, type:)) do
+    helpers.link_to(
+      imports_issue_path(record, type:, return_to: url_for(import))
+    ) do
       helpers.safe_join(
         ["Review ", tag.span(full_name, class: "nhsuk-u-visually-hidden")]
       )

app/components/app_imports_table_component.html.erb

@@ -1,14 +1,14 @@
 <%= render AppCardComponent.new(feature: true) do |card| %>
   <% card.with_heading(level: 3) do %>
-    <%= pluralize(imports.count, "import") %>
+    <%= pluralize(imports.count, "upload") %>
   <% end %>
 
   <%= govuk_table(html_attributes: {
                     class: "nhsuk-table-responsive",
                   }) do |table| %>
     <% table.with_head do |head| %>
       <% head.with_row do |row| %>
-        <% row.with_cell(text: "Imported on") %>
+        <% row.with_cell(text: "Uploaded on") %>
         <% unless @team.has_national_reporting_access? %>
           <% row.with_cell(text: "Type") %>
         <% end %>
@@ -21,7 +21,7 @@
       <% imports.each do |import| %>
         <% body.with_row do |row| %>
           <% row.with_cell do %>
-            <span class="nhsuk-table-responsive__heading">Imported on</span>
+            <span class="nhsuk-table-responsive__heading">Uploaded on</span>
             <%= link_to import.created_at.to_fs(:long), path(import) %>
             <br />
             <span class="nhsuk-u-secondary-text-color nhsuk-u-font-size-16">

app/components/app_log_event_component.rb

@@ -38,7 +38,8 @@ def initialize(
     by: nil,
     programmes: [],
     invalidated: false,
-    card: false
+    card: false,
+    subtitle: nil
   )
     @title = title
     @body = body
@@ -47,13 +48,14 @@ def initialize(
     @programmes = programmes
     @invalidated = invalidated
     @card = card
+    @subtitle = subtitle
   end
 
   private
 
   attr_reader :title, :body, :programmes, :invalidated, :card
 
   def subtitle
-    safe_join([@at, @by].compact, " · ".html_safe)
+    @subtitle || safe_join([@at, @by].compact, " · ".html_safe)
   end
 end