Merge pull request #4444 from nhsuk/next

Version 3.3.0

Author: thomasleese

.github/workflows/data-replication-pipeline.yml

@@ -35,11 +35,18 @@ on:
         type: string
         required: true
         default: "[]"
+      take_db_snapshot:
+        description: Take a new DB snapshot before creating the environment
+        type: boolean
+        default: false
 
 env:
   aws_role: ${{ inputs.environment == 'production'
     && 'arn:aws:iam::820242920762:role/GithubDeployDataReplicationInfrastructure'
     || 'arn:aws:iam::393416225559:role/GithubDeployDataReplicationInfrastructure' }}
+  db_snapshot_role: ${{ inputs.environment == 'production'
+    && 'arn:aws:iam::820242920762:role/DatabaseSnapshotRole'
+    || 'arn:aws:iam::393416225559:role/DatabaseSnapshotRole' }}
 
 defaults:
   run:
@@ -58,12 +65,27 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
+      - name: Assume DB Snapshot role
+        if: inputs.take_db_snapshot
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ env.db_snapshot_role }}
+          aws-region: eu-west-2
+      - name: Take DB snapshot
+        if: inputs.take_db_snapshot
+        run: |
+          set -e
+          snapshot_identifier=snapshot-for-data-replication-$(date +"%Y-%m-%d-%H-%M-%S")
+          aws rds create-db-cluster-snapshot --db-cluster-identifier mavis-${{ inputs.environment }} --db-cluster-snapshot-identifier $snapshot_identifier
+          echo "Waiting for snapshot to be available. This can take a while."
+          aws rds wait db-cluster-snapshot-available --db-cluster-snapshot-identifier $snapshot_identifier
+          echo "New snapshot is now available"
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ env.aws_role }}
           aws-region: eu-west-2
-      - name: get latest snapshot
+      - name: Get latest snapshot
         id: get-latest-snapshot
         run: |
           set -e

Gemfile

@@ -61,6 +61,7 @@ gem "ruby-progressbar"
 gem "rubyzip"
 gem "sentry-rails"
 gem "sentry-ruby"
+gem "sentry-sidekiq"
 gem "sidekiq"
 gem "sidekiq-throttled"
 gem "splunk-sdk-ruby"

Gemfile.lock

@@ -101,7 +101,7 @@ GEM
       public_suffix (>= 2.0.2, < 7.0)
     aes_key_wrap (1.1.0)
     amazing_print (1.8.1)
-    annotaterb (4.18.0)
+    annotaterb (4.19.0)
       activerecord (>= 6.0.0)
       activesupport (>= 6.0.0)
     array_enum (1.6.0)
@@ -113,35 +113,35 @@ GEM
     ast (2.4.3)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1150.0)
-    aws-sdk-accessanalyzer (1.77.0)
-      aws-sdk-core (~> 3, >= 3.228.0)
+    aws-partitions (1.1152.0)
+    aws-sdk-accessanalyzer (1.78.0)
+      aws-sdk-core (~> 3, >= 3.231.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-core (3.230.0)
+    aws-sdk-core (3.232.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-ec2 (1.550.0)
-      aws-sdk-core (~> 3, >= 3.228.0)
+    aws-sdk-ec2 (1.553.0)
+      aws-sdk-core (~> 3, >= 3.231.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-ecr (1.108.0)
-      aws-sdk-core (~> 3, >= 3.228.0)
+    aws-sdk-ecr (1.110.0)
+      aws-sdk-core (~> 3, >= 3.231.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-iam (1.128.0)
-      aws-sdk-core (~> 3, >= 3.228.0)
+    aws-sdk-iam (1.129.0)
+      aws-sdk-core (~> 3, >= 3.231.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-kms (1.110.0)
-      aws-sdk-core (~> 3, >= 3.228.0)
+    aws-sdk-kms (1.111.0)
+      aws-sdk-core (~> 3, >= 3.231.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-rds (1.287.0)
-      aws-sdk-core (~> 3, >= 3.228.0)
+    aws-sdk-rds (1.290.0)
+      aws-sdk-core (~> 3, >= 3.231.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.197.0)
-      aws-sdk-core (~> 3, >= 3.228.0)
+    aws-sdk-s3 (1.198.0)
+      aws-sdk-core (~> 3, >= 3.231.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
@@ -426,7 +426,7 @@ GEM
       validate_url
       webfinger (~> 2.0)
     orm_adapter (0.5.0)
-    ostruct (0.6.2)
+    ostruct (0.6.3)
     pagy (9.4.0)
     paint (2.3.0)
     parallel (1.27.0)
@@ -534,7 +534,7 @@ GEM
       railties (>= 5.2)
     reverse_markdown (3.0.0)
       nokogiri
-    rexml (3.4.1)
+    rexml (3.4.2)
     rladr (1.2.0)
     rspec (3.13.1)
       rspec-core (~> 3.13.0)
@@ -618,6 +618,9 @@ GEM
     sentry-ruby (5.26.0)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+    sentry-sidekiq (5.26.0)
+      sentry-ruby (~> 5.26.0)
+      sidekiq (>= 3.0)
     shoulda-matchers (6.5.0)
       activesupport (>= 5.2.0)
     sidekiq (8.0.7)
@@ -656,9 +659,9 @@ GEM
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
       yard-solargraph (~> 0.1)
-    solargraph-rails (1.2.0)
+    solargraph-rails (1.2.2)
       activesupport
-      solargraph (= 0.56.0)
+      solargraph (>= 0.48.0, < 0.57)
     splunk-sdk-ruby (1.0.5)
     stackprof (0.2.27)
     stimulus-rails (1.3.4)
@@ -689,7 +692,7 @@ GEM
     thor (1.4.0)
     thruster (0.1.15-arm64-darwin)
     thruster (0.1.15-x86_64-linux)
-    tilt (2.6.0)
+    tilt (2.6.1)
     timeout (0.4.3)
     turbo-rails (2.0.16)
       actionpack (>= 7.1.0)
@@ -825,6 +828,7 @@ DEPENDENCIES
   rufo
   sentry-rails
   sentry-ruby
+  sentry-sidekiq
   shoulda-matchers
   sidekiq
   sidekiq-throttled

app/assets/stylesheets/components/_index.scss

@@ -17,3 +17,4 @@
 @forward "summary-list";
 @forward "tables";
 @forward "tag";
+@forward "vaccine-method";

app/assets/stylesheets/components/_summary-list.scss

@@ -23,4 +23,8 @@
     margin-bottom: 0;
     padding-bottom: 0;
   }
+
+  .nhsuk-summary-list__value {
+    padding-top: nhsuk-spacing(1);
+  }
 }

app/assets/stylesheets/components/_vaccine-method.scss

@@ -0,0 +1,28 @@
+@use "../vendor/nhsuk-frontend" as *;
+@use "../core" as app;
+
+.app-vaccine-method {
+  align-items: center;
+  column-gap: nhsuk-spacing(2);
+  display: inline-flex;
+
+  &::before {
+    content: "";
+    height: 1em;
+    width: 1em;
+  }
+
+  &[data-method="injection"]::before {
+    background-color: currentcolor;
+    rotate: 45deg;
+    scale: 0.75;
+    transform-origin: center;
+  }
+
+  &[data-method="nasal"]::before {
+    border: 0.25em solid currentcolor;
+    border-radius: 100%;
+    height: 1em;
+    width: 1em;
+  }
+}

app/components/app_activity_log_component.rb

@@ -37,7 +37,10 @@ def initialize(team:, patient: nil, patient_session: nil)
       )
 
     @gillick_assessments =
-      (patient || patient_session).gillick_assessments.includes(:performed_by)
+      (patient || patient_session)
+        .gillick_assessments
+        .includes(:performed_by)
+        .order(:created_at)
 
     @notes =
       (patient || patient_session).notes.includes(

app/components/app_import_format_details_component.rb

@@ -124,10 +124,34 @@ def immunisation_import_columns
 
   def child_columns
     [
-      { name: "CHILD_FIRST_NAME", notes: tag.strong("Required") },
-      { name: "CHILD_LAST_NAME", notes: tag.strong("Required") },
-      { name: "CHILD_PREFERRED_FIRST_NAME", notes: "Optional" },
-      { name: "CHILD_PREFERRED_LAST_NAME", notes: "Optional" },
+      {
+        name: "CHILD_FIRST_NAME",
+        notes:
+          "#{tag.strong("Required")}, must use alphabetical characters (you" \
+            " can include accents like Chloë, hyphens like Anne-Marie or" \
+            " apostrophes like D'Arcy but no other special characters)."
+      },
+      {
+        name: "CHILD_LAST_NAME",
+        notes:
+          "#{tag.strong("Required")}, must use alphabetical characters (you" \
+            " can include accents like Jiménez, hyphens like Burne-Jones or" \
+            " apostrophes like O'Hare but no other special characters)."
+      },
+      {
+        name: "CHILD_PREFERRED_FIRST_NAME",
+        notes:
+          "Optional, must use alphabetical characters (you can include" \
+            " accents like Chloë, hyphens like Anne-Marie or apostrophes like" \
+            " D'Arcy but no other special characters)."
+      },
+      {
+        name: "CHILD_PREFERRED_LAST_NAME",
+        notes:
+          "Optional, must use alphabetical characters (you can include" \
+            " accents like Jiménez, hyphens like Burne-Jones or apostrophes" \
+            " like O'Hare but no other special characters)."
+      },
       {
         name: "CHILD_DATE_OF_BIRTH",
         notes:
@@ -164,7 +188,13 @@ def child_columns
   def parent_columns
     %w[PARENT_1 PARENT_2].flat_map do |prefix|
       [
-        { name: "#{prefix}_NAME", notes: "Optional" },
+        {
+          name: "#{prefix}_NAME",
+          notes:
+            "Optional, must use alphabetical characters (you can include" \
+              " accents like Chloë, hyphens like Anne-Marie or apostrophes" \
+              " like D'Arcy but no other special characters)."
+        },
         {
           name: "#{prefix}_RELATIONSHIP",
           notes:

app/components/app_patient_session_record_component.rb

@@ -51,6 +51,8 @@ def heading
         "vaccination"
       end
 
-    "Record #{programme.name_in_sentence} #{vaccination}"
+    tag.span(class: "app-vaccine-method", data: { method: vaccine_method }) do
+      "Record #{programme.name_in_sentence} #{vaccination}"
+    end
   end
 end

app/components/app_patient_session_search_result_card_component.rb

@@ -119,7 +119,7 @@ def action_required
   end
 
   def vaccination_method
-    return if context == :patients
+    return unless %i[register record].include?(context)
 
     programmes_to_check = programmes.select(&:has_multiple_vaccine_methods?)
 
@@ -139,7 +139,12 @@ def vaccination_method
 
     return if vaccine_methods.empty?
 
-    Vaccine.human_enum_name(:method, vaccine_methods.first)
+    tag.span(
+      class: "app-vaccine-method",
+      data: {
+        method: vaccine_methods.first
+      }
+    ) { Vaccine.human_enum_name(:method, vaccine_methods.first) }
   end
 
   def status_tags