Merge pull request #6001 from nhsuk/next

Version 6.18.0

Author: misaka

.github/workflows/build-and-push-image.yml

@@ -37,7 +37,7 @@ jobs:
       ops-build-needed: ${{ steps.check-dev-image.outputs.ops-build-needed || steps.check-prod-image.outputs.ops-build-needed }}
     steps:
       - name: Configure AWS Dev Credentials
-        uses: aws-actions/configure-aws-credentials@v5
+        uses: aws-actions/configure-aws-credentials@v6
         with:
           role-to-assume: arn:aws:iam::393416225559:role/GithubDeployECSService
           aws-region: eu-west-2
@@ -52,7 +52,7 @@ jobs:
           fi
       - name: Configure AWS Production credentials
         if: env.PUSH_IMAGE_TO_PRODUCTION == 'true'
-        uses: aws-actions/configure-aws-credentials@v5
+        uses: aws-actions/configure-aws-credentials@v6
         with:
           role-to-assume: arn:aws:iam::820242920762:role/GithubDeployECSService
           aws-region: eu-west-2
@@ -127,7 +127,7 @@ jobs:
         with:
           name: ${{ matrix.image_type }}-image
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v5
+        uses: aws-actions/configure-aws-credentials@v6
         with:
           role-to-assume: ${{ matrix.aws-role }}
           aws-region: eu-west-2

.github/workflows/create_dockerized_db.yml

@@ -65,7 +65,7 @@ jobs:
           bin/rails feature_flags:enable_for_development
           bin/mavis gias import
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v5
+        uses: aws-actions/configure-aws-credentials@v6
         with:
           role-to-assume: arn:aws:iam::393416225559:role/GitHubAssuranceTestRole
           aws-region: eu-west-2

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

@@ -94,7 +94,7 @@ jobs:
         with:
           ref: ${{ env.git_ref_to_deploy }}
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v5
+        uses: aws-actions/configure-aws-credentials@v6
         with:
           role-to-assume: ${{ env.aws_role }}
           aws-region: eu-west-2
@@ -178,7 +178,7 @@ jobs:
       id-token: write
     steps:
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v5
+        uses: aws-actions/configure-aws-credentials@v6
         with:
           role-to-assume: ${{ env.aws_role }}
           aws-region: eu-west-2

.github/workflows/deploy.yml

@@ -107,7 +107,7 @@ jobs:
         with:
           ref: ${{ needs.determine-git-sha.outputs.git-sha }}
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v5
+        uses: aws-actions/configure-aws-credentials@v6
         with:
           role-to-assume: arn:aws:iam::${{ env.aws_account_id }}:role/GithubDeployECSService
           aws-region: eu-west-2
@@ -181,7 +181,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v6
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v5
+        uses: aws-actions/configure-aws-credentials@v6
         with:
           role-to-assume: arn:aws:iam::${{ env.aws_account_id }}:role/GithubDeployECSService
           aws-region: eu-west-2
@@ -308,7 +308,7 @@ jobs:
         service: ${{ inputs.server_types == 'all' && fromJSON('["web", "sidekiq", "ops"]') || fromJSON(format('["{0}"]', inputs.server_types)) }}
     steps:
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v5
+        uses: aws-actions/configure-aws-credentials@v6
         with:
           role-to-assume: arn:aws:iam::${{ env.aws_account_id }}:role/GithubDeployECSService
           aws-region: eu-west-2

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

@@ -45,7 +45,7 @@ jobs:
       application-image-git-ref: ${{ steps.check-image.outputs.GIT_REF_SHA }}
     steps:
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v5
+        uses: aws-actions/configure-aws-credentials@v6
         with:
           role-to-assume: arn:aws:iam::393416225559:role/GitHubAssuranceTestRole
           aws-region: eu-west-2
@@ -80,7 +80,7 @@ jobs:
           ref: ${{ needs.check-development-image-presence.outputs.application-image-git-ref }}
           repository: nhsuk/manage-vaccinations-in-schools
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v5
+        uses: aws-actions/configure-aws-credentials@v6
         with:
           role-to-assume: arn:aws:iam::393416225559:role/GitHubAssuranceTestRole
           aws-region: eu-west-2
@@ -105,7 +105,7 @@ jobs:
       db_git_ref_sha: ${{ steps.check-image.outputs.GIT_REF_SHA }}
     steps:
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v5
+        uses: aws-actions/configure-aws-credentials@v6
         with:
           role-to-assume: arn:aws:iam::393416225559:role/GitHubAssuranceTestRole
           aws-region: eu-west-2
@@ -155,7 +155,7 @@ jobs:
       run_task_arn: ${{ steps.run-task.outputs.run-task-arn }}
     steps:
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v5
+        uses: aws-actions/configure-aws-credentials@v6
         with:
           role-to-assume: arn:aws:iam::393416225559:role/GitHubAssuranceTestRole
           aws-region: eu-west-2
@@ -214,7 +214,7 @@ jobs:
       container_ip: ${{ steps.compile-outputs.outputs.container_ip }}
     steps:
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v5
+        uses: aws-actions/configure-aws-credentials@v6
         with:
           role-to-assume: arn:aws:iam::393416225559:role/GitHubAssuranceTestRole
           aws-region: eu-west-2
@@ -339,7 +339,7 @@ jobs:
       id-token: write
     steps:
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v5
+        uses: aws-actions/configure-aws-credentials@v6
         with:
           role-to-assume: arn:aws:iam::393416225559:role/GitHubAssuranceTestRole
           aws-region: eu-west-2

Gemfile

@@ -40,7 +40,9 @@ gem "flipper"
 gem "flipper-active_record"
 gem "flipper-ui"
 gem "govuk-components"
-gem "govuk_design_system_formbuilder"
+gem "govuk_design_system_formbuilder",
+    github: "x-govuk/govuk-form-builder",
+    ref: "main" #TODO: replace with version > 5.13.0 when released
 gem "govuk_markdown"
 gem "indefinite_article"
 gem "jsonb_accessor"

Gemfile.lock

@@ -22,6 +22,17 @@ GIT
       activerecord (>= 5.2, < 8.2)
       activesupport (>= 5.2, < 8.2)
 
+GIT
+  remote: https://github.com/x-govuk/govuk-form-builder.git
+  revision: 8fb16627dec7d2786e481029e1645a85e4d7df15
+  ref: main
+  specs:
+    govuk_design_system_formbuilder (5.13.0)
+      actionview (>= 6.1)
+      activemodel (>= 6.1)
+      activesupport (>= 6.1)
+      html-attributes-utils (~> 1)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -111,7 +122,7 @@ GEM
       public_suffix (>= 2.0.2, < 8.0)
     aes_key_wrap (1.1.0)
     amazing_print (2.0.0)
-    annotaterb (4.20.0)
+    annotaterb (4.21.0)
       activerecord (>= 6.0.0)
       activesupport (>= 6.0.0)
     array_enum (1.6.0)
@@ -165,9 +176,9 @@ GEM
     bigdecimal (4.0.1)
     bindata (2.5.1)
     bindex (0.8.1)
-    bootsnap (1.21.1)
+    bootsnap (1.22.0)
       msgpack (~> 1.2)
-    brakeman (8.0.0)
+    brakeman (8.0.2)
       racc
     builder (3.3.0)
     capybara (3.40.0)
@@ -289,11 +300,6 @@ GEM
       html-attributes-utils (~> 1.0.0, >= 1.0.0)
       pagy (>= 6, < 10)
       view_component (>= 4.0, < 4.2)
-    govuk_design_system_formbuilder (5.13.0)
-      actionview (>= 6.1)
-      activemodel (>= 6.1)
-      activesupport (>= 6.1)
-      html-attributes-utils (~> 1)
     govuk_markdown (2.0.3)
       activesupport
       redcarpet
@@ -452,7 +458,7 @@ GEM
       racc
     pg (1.6.3-arm64-darwin)
     pg (1.6.3-x86_64-linux)
-    phonelib (0.10.15)
+    phonelib (0.10.16)
     pp (0.6.3)
       prettyprint
     prettier_print (1.2.1)
@@ -734,8 +740,8 @@ GEM
       unicode-display_width (~> 3.1)
     temple (0.10.4)
     thor (1.5.0)
-    thruster (0.1.17-arm64-darwin)
-    thruster (0.1.17-x86_64-linux)
+    thruster (0.1.18-arm64-darwin)
+    thruster (0.1.18-x86_64-linux)
     tilt (2.7.0)
     timeout (0.6.0)
     tsort (0.2.0)
@@ -840,7 +846,7 @@ DEPENDENCIES
   flipper-active_record
   flipper-ui
   govuk-components
-  govuk_design_system_formbuilder
+  govuk_design_system_formbuilder!
   govuk_markdown
   hotwire-livereload
   indefinite_article

app/components/app_child_summary_component.rb

@@ -63,6 +63,19 @@ def call
               row.with_key { "Date of birth" }
               row.with_value { format_date_of_birth }
             end
+            if @child.ethnic_group.present?
+              summary_list.with_row do |row|
+                row.with_key { "Ethnicity" }
+                row.with_value { format_ethnic_group_and_background(@child) }
+                if (href = @change_links[:ethnicity])
+                  row.with_action(
+                    text: "Change",
+                    href:,
+                    visually_hidden_text: "Ethnicity"
+                  )
+                end
+              end
+            end
             if @child.try(:deceased?)
               summary_list.with_row do |row|
                 row.with_key { "Date of death" }
@@ -156,6 +169,7 @@ def call
   private
 
   delegate :format_address_multi_line,
+           :format_ethnic_group_and_background,
            :format_parent_with_relationship,
            :govuk_button_to,
            :govuk_summary_list,

app/components/app_consent_patient_summary_component.rb

@@ -17,6 +17,15 @@ def call
         row.with_value { consent_form_or_patient.date_of_birth.to_fs(:long) }
       end
 
+      if consent_form_or_patient.ethnic_group.present?
+        summary_list.with_row do |row|
+          row.with_key { "Ethnicity" }
+          row.with_value do
+            format_ethnic_group_and_background(consent_form_or_patient)
+          end
+        end
+      end
+
       unless restricted?
         summary_list.with_row do |row|
           row.with_key { "Home address" }
@@ -34,6 +43,7 @@ def call
   private
 
   delegate :format_address_multi_line,
+           :format_ethnic_group_and_background,
            :govuk_summary_list,
            :patient_school,
            to: :helpers

app/components/app_import_errors_component.rb

@@ -35,7 +35,7 @@ class AppImportErrorsComponent < ViewComponent::Base
     <% end %>
   ERB
 
-  def initialize(errors: nil, title: "Records could not be imported")
+  def initialize(errors: nil, title: "Upload failed")
     @errors = errors
     @title = title
   end