Merge pull request #5018 from nhsuk/next

Version 5.3.0

Author: thomasleese

.github/workflows/deploy-monitoring.yml

@@ -27,6 +27,7 @@ env:
     || 'arn:aws:iam::393416225559:role/GithubDeployMonitoring' }}
   aws_account_id: ${{ inputs.environment == 'production'
     && '820242920762' || '393416225559' }}
+  environment: ${{ inputs.environment }}
   git_ref_to_deploy: ${{ inputs.git_ref_to_deploy || github.ref_name }}
 
 jobs:
@@ -147,5 +148,6 @@ jobs:
           sudo apt-get install -y jq uuid-runtime
       - name: Deploy Grafana using tf_grafana.sh
         run: |
+          export TF_VAR_slack_webhook_url=${{ inputs.environment == 'production' && secrets.GRAFANA_ALERTS_SLACK_WEBHOOK || secrets.GRAFANA_TEST_ALERTS_SLACK_WEBHOOK }}
           ./tf_grafana.sh "$environment" plan --plan-file ${{ runner.temp }}/out
           ./tf_grafana.sh "$environment" apply --plan-file ${{ runner.temp }}/out

.rubocop.yml

@@ -19,7 +19,7 @@ Layout/EmptyLineAfterMagicComment:
   Enabled: true
 
 Layout/LineLength:
-  AllowedPatterns: [idx_on]
+  AllowedPatterns: [idx_on,index_]
   Exclude:
     - db/schema.rb
 

Gemfile

@@ -24,7 +24,7 @@ gem "activerecord-import"
 gem "activerecord-session_store"
 gem "amazing_print"
 gem "array_enum"
-gem "audited", git: "https://github.com/tvararu/audited", branch: "encryption"
+gem "audited", github: "tvararu/audited", branch: "encryption"
 gem "caxlsx"
 gem "charlock_holmes"
 gem "config"
@@ -74,24 +74,21 @@ gem "with_advisory_lock"
 group :development, :test do
   gem "brakeman", require: false
   gem "debug", platforms: %i[mri mingw x64_mingw]
-
   gem "factory_bot_instruments"
   gem "pry-rails"
   gem "rspec-rails"
 end
 
 group :development do
-  gem "web-console"
-
   gem "annotaterb", require: false
   gem "asciidoctor"
   gem "asciidoctor-diagram"
-  gem "aws-sdk-accessanalyzer", "~> 1"
-  gem "aws-sdk-ec2", "~> 1"
-  gem "aws-sdk-ecr", "~> 1"
-  gem "aws-sdk-iam", "~> 1"
-  gem "aws-sdk-rds", "~> 1"
-  gem "aws-sdk-s3", "~> 1"
+  gem "aws-sdk-accessanalyzer"
+  gem "aws-sdk-ec2"
+  gem "aws-sdk-ecr"
+  gem "aws-sdk-iam"
+  gem "aws-sdk-rds"
+  gem "aws-sdk-s3"
   gem "hotwire-livereload"
   gem "prettier_print", require: false
   gem "rladr"
@@ -103,24 +100,23 @@ group :development do
   gem "syntax_tree", require: false
   gem "syntax_tree-haml", require: false
   gem "syntax_tree-rbs", require: false
+  gem "web-console"
 end
 
 group :test do
   gem "capybara"
-
   gem "capybara_accessible_selectors",
-      git: "https://github.com/citizensadvice/capybara_accessible_selectors",
-      branch: "main"
+      github: "citizensadvice/capybara_accessible_selectors"
   gem "capybara-screenshot"
   gem "climate_control"
   gem "cuprite"
   gem "its"
+  gem "rack_session_access"
   gem "rspec"
   gem "rspec-html-matchers"
   gem "rspec-sidekiq"
   gem "rubyXL"
   gem "shoulda-matchers"
   gem "simplecov", require: false
   gem "webmock"
-  gem "rack_session_access"
 end

Gemfile.lock

@@ -1,13 +1,12 @@
 GIT
-  remote: https://github.com/citizensadvice/capybara_accessible_selectors
-  revision: 2c13c0ee6614c65434d504ed8d9cb80f5c20ece7
-  branch: main
+  remote: https://github.com/citizensadvice/capybara_accessible_selectors.git
+  revision: 3b65e97d49a46a210be4397e3e162d6b177f4125
   specs:
     capybara_accessible_selectors (0.14.0)
       capybara (~> 3.36)
 
 GIT
-  remote: https://github.com/tvararu/audited
+  remote: https://github.com/tvararu/audited.git
   revision: e089773f10f8ef5e5e92a2052a2fea55f83091d2
   branch: encryption
   specs:
@@ -106,18 +105,18 @@ GEM
       activesupport (>= 6.0.0)
     array_enum (1.6.0)
       activemodel
-    asciidoctor (2.0.25)
+    asciidoctor (2.0.26)
     asciidoctor-diagram (3.0.1)
       asciidoctor (>= 1.5.7, < 3.x)
       rexml
     ast (2.4.3)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1174.0)
-    aws-sdk-accessanalyzer (1.78.0)
-      aws-sdk-core (~> 3, >= 3.231.0)
+    aws-partitions (1.1177.0)
+    aws-sdk-accessanalyzer (1.80.0)
+      aws-sdk-core (~> 3, >= 3.234.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-core (3.233.0)
+    aws-sdk-core (3.235.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -131,17 +130,17 @@ GEM
     aws-sdk-ecr (1.110.0)
       aws-sdk-core (~> 3, >= 3.231.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-iam (1.129.0)
-      aws-sdk-core (~> 3, >= 3.231.0)
+    aws-sdk-iam (1.132.0)
+      aws-sdk-core (~> 3, >= 3.234.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-kms (1.113.0)
-      aws-sdk-core (~> 3, >= 3.231.0)
+    aws-sdk-kms (1.115.0)
+      aws-sdk-core (~> 3, >= 3.234.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-rds (1.296.0)
-      aws-sdk-core (~> 3, >= 3.231.0)
+    aws-sdk-rds (1.297.0)
+      aws-sdk-core (~> 3, >= 3.234.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.200.0)
-      aws-sdk-core (~> 3, >= 3.231.0)
+    aws-sdk-s3 (1.201.0)
+      aws-sdk-core (~> 3, >= 3.234.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
@@ -534,19 +533,19 @@ GEM
       nokogiri
     rexml (3.4.4)
     rladr (1.2.0)
-    rspec (3.13.1)
+    rspec (3.13.2)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.5)
+    rspec-core (3.13.6)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-html-matchers (0.10.0)
       nokogiri (~> 1)
       rspec (>= 3.0.0.a)
-    rspec-mocks (3.13.5)
+    rspec-mocks (3.13.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-rails (8.0.2)
@@ -562,7 +561,7 @@ GEM
       rspec-expectations (~> 3.0)
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 9)
-    rspec-support (3.13.4)
+    rspec-support (3.13.6)
     rubocop (1.79.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
@@ -607,7 +606,7 @@ GEM
       rubyzip (>= 1.3.0)
     rubyntlm (0.6.5)
       base64
-    rubyzip (3.2.0)
+    rubyzip (3.2.1)
     rufo (0.18.1)
     rufus-scheduler (3.9.2)
       fugit (~> 1.1, >= 1.11.1)
@@ -623,11 +622,11 @@ GEM
     sentry-rails (5.28.0)
       railties (>= 5.0)
       sentry-ruby (~> 5.28.0)
-    sentry-ruby (5.28.0)
+    sentry-ruby (5.28.1)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
-    sentry-sidekiq (5.28.0)
-      sentry-ruby (~> 5.28.0)
+    sentry-sidekiq (5.28.1)
+      sentry-ruby (~> 5.28.1)
       sidekiq (>= 3.0)
     shoulda-matchers (6.5.0)
       activesupport (>= 5.2.0)
@@ -773,12 +772,12 @@ DEPENDENCIES
   asciidoctor
   asciidoctor-diagram
   audited!
-  aws-sdk-accessanalyzer (~> 1)
-  aws-sdk-ec2 (~> 1)
-  aws-sdk-ecr (~> 1)
-  aws-sdk-iam (~> 1)
-  aws-sdk-rds (~> 1)
-  aws-sdk-s3 (~> 1)
+  aws-sdk-accessanalyzer
+  aws-sdk-ec2
+  aws-sdk-ecr
+  aws-sdk-iam
+  aws-sdk-rds
+  aws-sdk-s3
   bootsnap
   brakeman
   capybara

app/assets/stylesheets/components/_filters.scss

@@ -33,6 +33,9 @@
   .nhsuk-details__text {
     border-left: 0;
 
+    // Remove once https://github.com/nhsuk/nhsuk-frontend/pull/1633 released
+    box-sizing: border-box;
+
     @include nhsuk-responsive-padding(5, "left");
     @include nhsuk-responsive-padding(5, "right");
   }
@@ -45,37 +48,4 @@
   & .nhsuk-date-input__item:last-child {
     margin-right: 0;
   }
-
-  // Adjust sizing of checkbox and radio items
-  .nhsuk-fieldset__legend--s {
-    margin-bottom: nhsuk-spacing(2);
-  }
-
-  & .nhsuk-checkboxes__item,
-  & .nhsuk-radios__item {
-    margin-bottom: 0;
-  }
-
-  & .nhsuk-checkboxes__label,
-  & .nhsuk-radios__label {
-    padding-left: 0;
-
-    &::before {
-      border-width: 3px;
-      padding: 0;
-      transform: scale(0.6667);
-      transform-origin: center left;
-    }
-
-    &::after {
-      box-sizing: border-box;
-      left: 3px;
-      transform: rotate(-45deg) scale(0.6667);
-    }
-  }
-
-  & .nhsuk-hint {
-    margin: 0;
-    padding: 0;
-  }
 }

app/assets/stylesheets/vendor/govuk-frontend/components/_index.scss

@@ -1,2 +1 @@
 @forward "file-upload";
-@forward "pagination";

app/assets/stylesheets/vendor/govuk-frontend/components/pagination/_index.scss

@@ -16,6 +16,7 @@
 @forward "pkg:nhsuk-frontend/dist/nhsuk/components/inset-text";
 @forward "pkg:nhsuk-frontend/dist/nhsuk/components/label";
 @forward "pkg:nhsuk-frontend/dist/nhsuk/components/notification-banner";
+@forward "pkg:nhsuk-frontend/dist/nhsuk/components/pagination";
 @forward "pkg:nhsuk-frontend/dist/nhsuk/components/panel";
 @forward "pkg:nhsuk-frontend/dist/nhsuk/components/radios";
 @forward "pkg:nhsuk-frontend/dist/nhsuk/components/select";
@@ -32,6 +33,5 @@
 // - do-dont-list
 // - hero
 // - images
-// - pagination
 // - tabs
 // - task-list

app/assets/stylesheets/vendor/nhsuk-frontend/components/_index.scss

@@ -67,6 +67,16 @@ def rows
             text: consent.vaccine_method_injection? ? "Yes" : "No"
           }
         }
+      end,
+      unless consent.without_gelatine.nil?
+        {
+          key: {
+            text: "Consent given for gelatine-free vaccine only?"
+          },
+          value: {
+            text: consent.without_gelatine? ? "Yes" : "No"
+          }
+        }
       end
     ].compact
   end

app/components/app_consent_card_component.rb

@@ -52,6 +52,13 @@ def call
         end
       end
 
+      unless consent.without_gelatine.nil?
+        summary_list.with_row do |row|
+          row.with_key { "Consent given for gelatine-free vaccine only?" }
+          row.with_value { consent.without_gelatine ? "Yes" : "No" }
+        end
+      end
+
       unless consent.notify_parents_on_vaccination.nil?
         summary_list.with_row do |row|
           row.with_key { "Confirmation of vaccination sent to parent?" }