Merge pull request #6617 from NHSDigital/next

Version 7.9.0

Author: thomasleese

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

@@ -16,9 +16,6 @@ on:
       HTTP_AUTH_TOKEN_FOR_TESTS:
         description: HTTP Basic Auth token for the environment under test
         required: false
-      MAVIS_TESTING_REPO_ACCESS_TOKEN:
-        description: Access token for the manage-vaccinations-in-schools-testing repository
-        required: false
       IMMS_API_KEY_FOR_TESTS:
         description: API key to use NHS Immunisations API
         required: false
@@ -39,7 +36,6 @@ jobs:
       endpoint: ${{ inputs.endpoint }}
     secrets:
       HTTP_AUTH_TOKEN_FOR_TESTS: ${{ secrets.HTTP_AUTH_TOKEN_FOR_TESTS }}
-      MAVIS_TESTING_REPO_ACCESS_TOKEN: ${{ secrets.MAVIS_TESTING_REPO_ACCESS_TOKEN }}
       IMMS_API_KEY: ${{ secrets.IMMS_API_KEY_FOR_TESTS }}
       IMMS_API_KID: ${{ secrets.IMMS_API_KID_FOR_TESTS }}
       IMMS_API_PEM: ${{ secrets.IMMS_API_PEM_FOR_TESTS }}

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

@@ -12,13 +12,6 @@ on:
         type: string
         required: false
         default: next
-    secrets:
-      HTTP_AUTH_TOKEN_FOR_TESTS:
-        description: HTTP Basic Auth token for the environment under test
-        required: true
-      MAVIS_TESTING_REPO_ACCESS_TOKEN:
-        description: Access token for the manage-vaccinations-in-schools-testing repository
-        required: true
 
 permissions: {}
 

.github/workflows/end-to-end-tests-on-pull-request.yml

@@ -19,7 +19,6 @@ jobs:
     with:
       git_reference_for_database_image: ${{ github.base_ref }}
       git_reference_for_application_image: ${{ github.head_ref }}
-    secrets: inherit
 
   local-e2e-flow:
     if: github.event.pull_request.head.repo.full_name != github.repository

Gemfile.lock

@@ -175,11 +175,11 @@ GEM
       protocol-websocket (~> 0.17)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1233.0)
-    aws-sdk-accessanalyzer (1.86.0)
+    aws-partitions (1.1238.0)
+    aws-sdk-accessanalyzer (1.88.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-cloudwatch (1.132.0)
+    aws-sdk-cloudwatch (1.133.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-core (3.244.0)
@@ -190,10 +190,10 @@ GEM
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-ec2 (1.610.0)
+    aws-sdk-ec2 (1.611.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-ecr (1.124.0)
+    aws-sdk-ecr (1.125.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-iam (1.142.0)
@@ -205,7 +205,7 @@ GEM
     aws-sdk-rds (1.310.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.218.0)
+    aws-sdk-s3 (1.219.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -220,7 +220,7 @@ GEM
       i18n
     bcrypt (3.1.22)
     benchmark (0.5.0)
-    bigdecimal (4.1.0)
+    bigdecimal (4.1.1)
     bindata (2.5.1)
     bindex (0.8.1)
     bootsnap (1.23.0)
@@ -380,11 +380,11 @@ GEM
       raabro (~> 1.4)
     globalid (1.3.0)
       activesupport (>= 6.1)
-    govuk-components (6.0.0)
+    govuk-components (6.1.0)
       html-attributes-utils (~> 1.0.0, >= 1.0.0)
       pagy (>= 6, < 10)
-      view_component (>= 4.0, < 4.3)
-    govuk_design_system_formbuilder (6.0.0)
+      view_component (>= 4.0, < 4.7)
+    govuk_design_system_formbuilder (6.1.0)
       actionview (>= 6.1)
       activemodel (>= 6.1)
       activesupport (>= 6.1)
@@ -493,7 +493,7 @@ GEM
       mime-types-data (~> 3.2025, >= 3.2025.0507)
     mime-types-data (3.2025.0924)
     mini_mime (1.1.5)
-    minitest (6.0.2)
+    minitest (6.0.3)
       drb (~> 2.0)
       prism (~> 1.5)
     msgpack (1.8.0)
@@ -560,7 +560,7 @@ GEM
       racc
     pg (1.6.3-arm64-darwin)
     pg (1.6.3-x86_64-linux)
-    phonelib (0.10.17)
+    phonelib (0.10.18)
     pp (0.6.3)
       prettyprint
     prettier_print (1.2.1)
@@ -879,7 +879,7 @@ GEM
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
-    view_component (4.2.0)
+    view_component (4.6.0)
       actionview (>= 7.1.0)
       activesupport (>= 7.1.0)
       concurrent-ruby (~> 1)

app/components/app_action_link_component.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class AppActionLinkComponent < ViewComponent::Base
+  erb_template <<-ERB
+    <%= link_to @href, class: "nhsuk-action-link", **@options do %>
+      <svg class="nhsuk-icon nhsuk-icon--arrow-right-circle" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16" focusable="false" aria-hidden="true">
+        <path d="M12 2a10 10 0 0 0-10 9h11.7l-4-4a1 1 0 0 1 1.5-1.4l5.6 5.7a1 1 0 0 1 0 1.4l-5.6 5.7a1 1 0 0 1-1.5 0 1 1 0 0 1 0-1.4l4-4H2A10 10 0 1 0 12 2z"></path>
+      </svg>
+      <span class="nhsuk-action-link__text"><%= @text %></span>
+    <% end %>
+  ERB
+
+  def initialize(text:, href:, **options)
+    @text = text
+    @href = href
+    @options = options
+    @options[:class] = ["nhsuk-action-link", options[:class]].compact.join(" ")
+  end
+end

app/components/app_import_format_details_component.html.erb

@@ -1,4 +1,4 @@
-<%= govuk_details(summary_text:) do %>
+<%= govuk_details(summary_text: "What your CSV file must include") do %>
   <p>Make sure the CSV you upload uses the following columns:</p>
 
   <%= govuk_table(classes: "app-table--csv app-table--small") do |table|