Merge pull request #4000 from nhsuk/next

Version 2.10.0

Author: thomasleese

.github/workflows/lint.yml

@@ -26,5 +26,6 @@ jobs:
       - run: tflint --chdir=terraform --init
       - uses: jdx/mise-action@v2
         with:
+          version: v2025.7.12
           install_args: hk pkl
       - run: hk check --all

Gemfile.lock

@@ -113,18 +113,18 @@ GEM
     ast (2.4.3)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1126.0)
+    aws-partitions (1.1130.0)
     aws-sdk-accessanalyzer (1.73.0)
       aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-core (3.226.2)
+    aws-sdk-core (3.226.3)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-ec2 (1.537.0)
+    aws-sdk-ec2 (1.539.0)
       aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-ecr (1.104.0)
@@ -139,7 +139,7 @@ GEM
     aws-sdk-rds (1.283.0)
       aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.192.0)
+    aws-sdk-s3 (1.193.0)
       aws-sdk-core (~> 3, >= 3.225.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -217,7 +217,7 @@ GEM
     dry-cli (1.2.0)
     email_validator (2.2.4)
       activemodel
-    erb (5.0.1)
+    erb (5.0.2)
     erubi (1.13.1)
     et-orbi (1.2.11)
       tzinfo
@@ -305,7 +305,7 @@ GEM
       domain_name (~> 0.5)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    io-console (0.8.0)
+    io-console (0.8.1)
     irb (1.15.2)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
@@ -435,11 +435,10 @@ GEM
     prettier_print (1.2.1)
     prettyprint (0.2.0)
     prism (1.4.0)
-    propshaft (1.1.0)
+    propshaft (1.2.0)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
       rack
-      railties (>= 7.0.0)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -651,7 +650,7 @@ GEM
       attr_required (>= 0.0.5)
       faraday (~> 2.0)
       faraday-follow_redirects
-    syntax_tree (6.2.0)
+    syntax_tree (6.3.0)
       prettier_print (>= 1.2.0)
     syntax_tree-haml (4.0.3)
       haml (>= 5.2)

README.md

@@ -340,7 +340,6 @@ See the [releasing documentation](docs/releasing.md) for more information.
 - `access_log:for_patient[id]`
 - `access_log:for_user[id]`
 - `clinics:create[name,address,town,postcode,ods_code,organisation_ods_code]`
-- `schools:add_to_organisation[ods_code,team_name,urn,...]`
 - `teams:create[ods_code,name,email,phone]`
 - `users:create[email,password,given_name,family_name,organisation_ods_code]`
 - `vaccines:seed[type]`
@@ -351,13 +350,6 @@ See the [Rake tasks documentation](docs/rake-tasks.md) for more information.
 
 See the [Ops tasks documentation](docs/ops-tasks.md) for more information.
 
-## MESH Connection
-
-Mavis connects to the NHS MESH (Message Exchange for Social Care and Health) to
-send data to DPS for upstream reporting of vaccination records.
-
-See the [MESH documentation](docs/mesh.md) for more information.
-
 ## NHS Personal Demographic Service (PDS) Connection
 
 Mavis is also configured to connect to PDS to retrieve patient information such

app/assets/stylesheets/_card.scss

@@ -49,6 +49,10 @@
     }
   }
 
+  &--offset {
+    background-color: rgba($color_nhsuk-grey-5, 0.5);
+  }
+
   &--data {
     display: flex;
 
@@ -132,3 +136,22 @@
     color: $nhsuk-link-active-color;
   }
 }
+
+.app-card--compact {
+  @include nhsuk-responsive-margin(3, "bottom");
+
+  .app-button-group {
+    gap: nhsuk-spacing(2);
+    margin-bottom: nhsuk-spacing(1);
+    margin-top: nhsuk-spacing(-4);
+  }
+
+  .nhsuk-card__heading {
+    @include nhsuk-responsive-margin(1, "bottom");
+  }
+
+  .nhsuk-card__content {
+    @include nhsuk-responsive-padding(4);
+    @include nhsuk-responsive-padding(3, "bottom");
+  }
+}

app/components/app_activity_log_component.rb

@@ -215,12 +215,17 @@ def session_events
 
   def triage_events
     triages.map do |triage|
+      programmes = programmes_for(triage)
+      title = "Triaged decision: #{triage.human_enum_name(:status)}"
+      title +=
+        " with #{triage.human_enum_name(:vaccine_method)}" if triage.vaccine_method.present? &&
+        programmes.first.has_multiple_vaccine_methods?
       {
-        title: "Triaged decision: #{triage.human_enum_name(:status)}",
+        title:,
         body: triage.notes,
         at: triage.created_at,
         by: triage.performed_by,
-        programmes: programmes_for(triage)
+        programmes:
       }
     end
   end

app/components/app_card_component.rb

@@ -34,6 +34,7 @@ def initialize(
     secondary: false,
     data: false,
     patient: false,
+    compact: false,
     filters: false,
     section: false
   )
@@ -44,10 +45,11 @@ def initialize(
     @secondary = secondary
     @data = data
     @patient = patient
+    @compact = compact
     @filters = filters
     @section = section
 
-    @feature = (colour.present? && !data) || filters
+    @feature = (colour.present? && !data && !compact) || filters
   end
 
   private
@@ -64,6 +66,7 @@ def card_classes
       ("nhsuk-card--secondary" if @secondary),
       ("app-card--data" if @data),
       ("app-card--patient" if @patient),
+      ("app-card--compact" if @compact),
       ("app-filters" if @filters)
     ].compact.join(" ")
   end
@@ -80,7 +83,7 @@ def content_classes
   def heading_size
     if @data
       "xs"
-    elsif @feature || @secondary || @patient
+    elsif @feature || @secondary || @patient || @compact
       "s"
     else
       "m"

app/components/app_consent_card_component.rb

@@ -1,57 +1,74 @@
 # frozen_string_literal: true
 
 class AppConsentCardComponent < ViewComponent::Base
-  def initialize(patient_session:, programme:)
+  def initialize(consent, session:)
     super
 
-    @patient_session = patient_session
-    @programme = programme
+    @consent = consent
+    @session = session
   end
 
-  attr_reader :patient_session, :programme
-
-  delegate :patient, :session, to: :patient_session
-
-  def colour
-    I18n.t(status, scope: %i[status consent colour])
-  end
-
-  def heading
-    "#{programme.name}: #{I18n.t(status, scope: %i[status consent label])}"
+  def call
+    render AppCardComponent.new(**card_options) do |card|
+      card.with_heading { heading }
+      govuk_summary_list(rows:)
+    end
   end
 
-  def latest_consent_request
-    @latest_consent_request ||=
-      patient
-        .consent_notifications
-        .request
-        .has_programme(programme)
-        .order(sent_at: :desc)
-        .first
-  end
+  private
 
-  def consent_status
-    @consent_status ||= patient.consent_status(programme:)
-  end
+  attr_reader :consent, :session
 
-  def vaccination_status
-    @vaccination_status ||= patient.vaccination_status(programme:)
-  end
+  delegate :patient, :programme, to: :consent
 
-  def can_send_consent_request?
-    consent_status.no_response? && patient.send_notifications? &&
-      session.open_for_consent? && patient.parents.any?
+  def link_to
+    session_patient_programme_consent_path(session, patient, programme, consent)
   end
 
-  def who_refused
-    consents =
-      patient.consents.where(programme:).not_invalidated.includes(:parent)
+  def card_options = { link_to:, colour: "offset", compact: true }
 
-    ConsentGrouper
-      .call(consents, programme:)
-      .find(&:response_refused?)
-      &.who_responded
+  def heading
+    if consent.via_self_consent?
+      consent.who_responded
+    else
+      "#{consent.name} (#{consent.who_responded})"
+    end
   end
 
-  delegate :status, to: :consent_status
+  def rows
+    [
+      if (phone = consent.parent&.phone).present?
+        { key: { text: "Phone number" }, value: { text: phone } }
+      end,
+      if (email = consent.parent&.email).present?
+        { key: { text: "Email address" }, value: { text: email } }
+      end,
+      {
+        key: {
+          text: "Date"
+        },
+        value: {
+          text: consent.responded_at.to_fs(:long)
+        }
+      },
+      {
+        key: {
+          text: "Decision"
+        },
+        value: {
+          text: helpers.consent_status_tag(consent)
+        }
+      },
+      if consent.vaccine_method_nasal?
+        {
+          key: {
+            text: "Consent also given for injected vaccine?"
+          },
+          value: {
+            text: consent.vaccine_method_injection? ? "Yes" : "No"
+          }
+        }
+      end
+    ].compact
+  end
 end

app/components/app_consent_summary_component.rb

@@ -10,17 +10,35 @@ def initialize(consent, change_links: {})
 
   def call
     govuk_summary_list(actions: @change_links.present?) do |summary_list|
-      if @consent.responded_at.present?
+      summary_list.with_row do |row|
+        row.with_key { "Programme" }
+        row.with_value do
+          tag.strong(
+            programme.name,
+            class: "nhsuk-tag app-tag--attached nhsuk-tag--white"
+          )
+        end
+      end
+
+      if consent.responded_at.present?
         summary_list.with_row do |row|
-          row.with_key { "Response date" }
-          row.with_value { @consent.responded_at.to_fs(:long) }
+          row.with_key { "Date" }
+          row.with_value { consent.responded_at.to_fs(:long) }
+        end
+      end
+
+      summary_list.with_row do |row|
+        row.with_key { "Method" }
+        row.with_value { consent.human_enum_name(:route).humanize }
+        if (href = change_links[:route])
+          row.with_action(text: "Change", visually_hidden_text: "method", href:)
         end
       end
 
       summary_list.with_row do |row|
         row.with_key { "Decision" }
-        row.with_value { helpers.consent_status_tag(@consent) }
-        if (href = @change_links[:response])
+        row.with_value { helpers.consent_status_tag(consent) }
+        if (href = change_links[:response])
           row.with_action(
             text: "Change",
             visually_hidden_text: "decision",
@@ -29,38 +47,32 @@ def call
         end
       end
 
-      summary_list.with_row do |row|
-        row.with_key { "Response method" }
-        row.with_value do
-          Consent.human_enum_name(:route, @consent.route).humanize
-        end
-        if (href = @change_links[:route])
-          row.with_action(
-            text: "Change",
-            visually_hidden_text: "response method",
-            href:
-          )
+      if consent.vaccine_method_nasal?
+        summary_list.with_row do |row|
+          row.with_key { "Consent also given for injected vaccine?" }
+          row.with_value { consent.vaccine_method_injection? ? "Yes" : "No" }
         end
       end
 
-      if @consent.reason_for_refusal.present?
+      if consent.reason_for_refusal.present?
         summary_list.with_row do |row|
           row.with_key { "Reason for refusal" }
-          row.with_value do
-            Consent.human_enum_name(
-              :reason_for_refusal,
-              @consent.reason_for_refusal
-            )
-          end
+          row.with_value { consent.human_enum_name(:reason_for_refusal) }
         end
       end
 
-      if @consent.notes.present?
+      if consent.notes.present?
         summary_list.with_row do |row|
           row.with_key { "Notes" }
-          row.with_value { @consent.notes }
+          row.with_value { consent.notes }
         end
       end
     end
   end
+
+  private
+
+  attr_reader :consent, :change_links
+
+  delegate :programme, to: :consent
 end