Merge pull request #4833 from nhsuk/next

Version 5.1.0

Author: thomasleese

.github/workflows/deploy-application.yml

@@ -47,8 +47,11 @@ on:
           (Git ref to deploy, for example, a tag, branch name or commit SHA. Will use workflow ref if not provided.)
         required: true
         type: string
+      app_version:
+        required: true
+        type: string
 
-permissions: {}
+permissions: { }
 
 env:
   environment: ${{ inputs.environment }}
@@ -58,15 +61,15 @@ env:
     || 'arn:aws:iam::393416225559:role/GithubDeployECSService' }}
   aws_account_id: ${{ inputs.environment == 'production' && '820242920762' || '393416225559' }}
   cluster_name: mavis-${{ inputs.environment }}
-  app_version: ${{ inputs.git_ref_to_deploy == '' && 'unknown' || inputs.git_ref_to_deploy }}
+  app_version: ${{ inputs.app_version || inputs.git_ref_to_deploy || 'unknown' }}
 
 concurrency:
   group: deploy-application-${{ inputs.environment }}
 
 jobs:
   determine-git-sha:
     runs-on: ubuntu-latest
-    permissions: {}
+    permissions: { }
     outputs:
       git-sha: ${{ steps.get-git-sha.outputs.git-sha }}
     steps:
@@ -89,7 +92,7 @@ jobs:
   prepare-deployment:
     name: Prepare deployment
     runs-on: ubuntu-latest
-    needs: [determine-git-sha, build-and-push-image]
+    needs: [ determine-git-sha, build-and-push-image ]
     permissions:
       id-token: write
     strategy:
@@ -141,84 +144,39 @@ jobs:
     needs: prepare-deployment
     environment: ${{ inputs.environment }}
     steps:
-      - run: echo "Proceeding with deployment to $environment environment"
+      - run: echo "Proceeding with deployment to $environment"
 
-  deploy-web:
-    name: Deploy web service
+  deploy-service:
+    name: Deploy service
     runs-on: ubuntu-latest
-    if: ${{ inputs.server_types == 'web' || inputs.server_types == 'all' }}
-    needs: [prepare-deployment, approve-deployments]
-    permissions:
-      id-token: write
-    steps:
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v5
-        with:
-          role-to-assume: ${{ env.aws_role }}
-          aws-region: eu-west-2
-      - name: Checkout code
-        uses: actions/checkout@v5
-      - name: Download web task definition artifact
-        uses: actions/download-artifact@v5
-        with:
-          path: ${{ runner.temp }}
-          name: ${{ inputs.environment }}-web-task-definition
-      - name: Change family of task definition
-        run: |
-          file_path="${{ runner.temp }}/web-task-definition.json"
-          family_name="mavis-web-task-definition-$environment"
-          echo "$(jq --arg f "$family_name" '.family = $f' "$file_path")" > "$file_path"
-      - name: Register web task definition
-        uses: aws-actions/amazon-ecs-deploy-task-definition@v2
-        with:
-          task-definition: ${{ runner.temp }}/web-task-definition.json
-      - name: Create appspec.yml
-        run: |
-          cp config/templates/appspec.yaml.tpl appspec.yaml
-          sed -i "s#TASK_DEFINITION_ARN#${{ steps.register-task-definition.outputs.task-definition-arn }}#g" appspec.yaml
-      - name: Deploy web service with CodeDeploy
-        id: deploy-web-service
-        uses: aws-actions/amazon-ecs-deploy-task-definition@v2
-        with:
-          task-definition: ${{ runner.temp }}/web-task-definition.json
-          cluster: ${{ env.cluster_name }}
-          service: mavis-${{ inputs.environment }}-web
-          codedeploy-application: mavis-${{ inputs.environment }}
-          codedeploy-deployment-group: blue-green-group-${{ inputs.environment }}
-      - name: Wait for deployment to complete
-        run: |
-          echo "Waiting for CodeDeploy deployment ${{ steps.deploy-web-service.outputs.codedeploy-deployment-id }} to complete..."
-          aws deploy wait deployment-successful --deployment-id "${{ steps.deploy-web-service.outputs.codedeploy-deployment-id }}"
-          echo "Deployment successful"
-
-  deploy-sidekiq:
-    name: Deploy sidekiq service
-    runs-on: ubuntu-latest
-    if: ${{ inputs.server_types == 'sidekiq' || inputs.server_types == 'all' }}
-    needs: [prepare-deployment, approve-deployments]
+    needs: [ prepare-deployment, approve-deployments ]
     permissions:
       id-token: write
+    strategy:
+      fail-fast: false
+      matrix:
+        service: ${{ inputs.server_types == 'all' && fromJSON('["web", "sidekiq"]') || fromJSON(format('["{0}"]', inputs.server_types)) }}
     steps:
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v5
         with:
           role-to-assume: ${{ env.aws_role }}
           aws-region: eu-west-2
-      - name: Download sidekiq task definition artifact
+      - name: Download ${{ matrix.service }} task definition artifact
         uses: actions/download-artifact@v5
         with:
           path: ${{ runner.temp }}
-          name: ${{ inputs.environment }}-sidekiq-task-definition
+          name: ${{ inputs.environment }}-${{ matrix.service }}-task-definition
       - name: Change family of task definition
         run: |
-          file_path="${{ runner.temp }}/sidekiq-task-definition.json"
-          family_name="mavis-sidekiq-task-definition-$environment"
+          file_path="${{ runner.temp }}/${{ matrix.service }}-task-definition.json"
+          family_name="mavis-${{ matrix.service }}-task-definition-$environment"
           echo "$(jq --arg f "$family_name" '.family = $f' "$file_path")" > "$file_path"
-      - name: Deploy sidekiq service
+      - name: Deploy ${{ matrix.service }} service
         uses: aws-actions/amazon-ecs-deploy-task-definition@v2
         with:
-          task-definition: ${{ runner.temp }}/sidekiq-task-definition.json
+          task-definition: ${{ runner.temp }}/${{ matrix.service }}-task-definition.json
           cluster: ${{ env.cluster_name }}
-          service: mavis-${{ inputs.environment }}-sidekiq
+          service: mavis-${{ inputs.environment }}-${{ matrix.service }}
           force-new-deployment: true
           wait-for-service-stability: true

.github/workflows/deploy-infrastructure.yml

@@ -61,8 +61,6 @@ jobs:
         uses: hashicorp/setup-terraform@v3
         with:
           terraform_version: 1.13.3
-      - name: Check if any deployments are running
-        run: ../scripts/check-for-running-deployments.sh $environment
       - name: Terraform Plan
         id: plan
         run: |

.github/workflows/deploy.yml

@@ -146,7 +146,7 @@ jobs:
     uses: ./.github/workflows/deploy-infrastructure.yml
     with:
       environment: ${{ inputs.environment }}
-      git_ref_to_deploy: ${{ inputs.git_ref_to_deploy || github.ref_name }}
+      git_ref_to_deploy: ${{ needs.determine-git-sha.outputs.git-sha }}
   deploy-application:
     permissions:
       id-token: write
@@ -156,4 +156,5 @@ jobs:
     with:
       environment: ${{ inputs.environment }}
       server_types: ${{ inputs.server_types }}
-      git_ref_to_deploy: ${{ inputs.git_ref_to_deploy || github.ref_name }}
+      git_ref_to_deploy: ${{ needs.determine-git-sha.outputs.git-sha }}
+      app_version: ${{ inputs.git_ref_to_deploy == '' && github.ref_name || inputs.git_ref_to_deploy }}

.rubocop.yml

@@ -42,6 +42,7 @@ Rails/LexicallyScopedActionFilter:
 Rails/Output:
   Exclude:
     - app/lib/mavis_cli/**/*.rb
+    - app/lib/timeline_records.rb
 
 Rails/UnknownEnv:
   Environments:

Gemfile.lock

@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/citizensadvice/capybara_accessible_selectors
-  revision: 556f423037c337df588066eca89e13e7c4184a1f
+  revision: b7153d7e682c5093dd6c40ce35ae4fa61f583ef1
   branch: main
   specs:
-    capybara_accessible_selectors (0.13.0)
+    capybara_accessible_selectors (0.14.0)
       capybara (~> 3.36)
 
 GIT
@@ -137,7 +137,7 @@ GEM
     aws-sdk-kms (1.113.0)
       aws-sdk-core (~> 3, >= 3.231.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-rds (1.294.0)
+    aws-sdk-rds (1.295.0)
       aws-sdk-core (~> 3, >= 3.231.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-s3 (1.199.1)
@@ -312,7 +312,7 @@ GEM
     jmespath (1.6.2)
     jsbundling-rails (1.3.1)
       railties (>= 6.0.0)
-    json (2.15.0)
+    json (2.15.1)
     json-jwt (1.16.6)
       activesupport (>= 4.2)
       aes_key_wrap
@@ -453,7 +453,7 @@ GEM
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (3.2.1)
+    rack (3.2.2)
     rack-oauth2 (2.2.1)
       activesupport
       attr_required
@@ -520,7 +520,7 @@ GEM
       erb
       psych (>= 4.0.0)
     redcarpet (3.6.1)
-    redis-client (0.25.3)
+    redis-client (0.26.1)
       connection_pool
     redis-prescription (2.6.0)
     regexp_parser (2.11.3)
@@ -627,7 +627,7 @@ GEM
       sidekiq (>= 3.0)
     shoulda-matchers (6.5.0)
       activesupport (>= 5.2.0)
-    sidekiq (8.0.7)
+    sidekiq (8.0.8)
       connection_pool (>= 2.5.0)
       json (>= 2.9.0)
       logger (>= 1.6.2)

app/assets/stylesheets/application.scss

@@ -2,6 +2,7 @@
 @forward "vendor/nhsuk-frontend" with (
   $nhsuk-page-width: 1100px,
   $nhsuk-grid-widths: (
+    one-fifth: 20%,
     one-quarter: 25%,
     one-third: 33.3333%,
     one-half: 50%,

app/assets/stylesheets/components/_filters.scss

@@ -73,4 +73,9 @@
       transform: rotate(-45deg) scale(0.6667);
     }
   }
+
+  & .nhsuk-hint {
+    margin: 0;
+    padding: 0;
+  }
 }

app/components/app_consent_card_component.rb

@@ -18,7 +18,7 @@ def call
   attr_reader :consent, :session
 
   delegate :patient, :programme, to: :consent
-  delegate :consent_status_tag, :govuk_summary_list, to: :helpers
+  delegate :consent_response_tag, :govuk_summary_list, to: :helpers
 
   def link_to
     session_patient_programme_consent_path(session, patient, programme, consent)
@@ -52,10 +52,10 @@ def rows
       },
       {
         key: {
-          text: "Decision"
+          text: "Response"
         },
         value: {
-          text: consent_status_tag(consent)
+          text: consent_response_tag(consent)
         }
       },
       if consent.vaccine_method_nasal?

app/components/app_consent_summary_component.rb

@@ -34,8 +34,8 @@ def call
       end
 
       summary_list.with_row do |row|
-        row.with_key { "Decision" }
-        row.with_value { consent_status_tag(consent) }
+        row.with_key { "Response" }
+        row.with_value { consent_response_tag(consent) }
         if (href = change_links[:response])
           row.with_action(
             text: "Change",
@@ -96,5 +96,5 @@ def call
   attr_reader :consent, :change_links
 
   delegate :programme, to: :consent
-  delegate :consent_status_tag, :govuk_summary_list, to: :helpers
+  delegate :consent_response_tag, :govuk_summary_list, to: :helpers
 end

app/components/app_patient_search_form_component.rb

@@ -31,6 +31,18 @@ class AppPatientSearchFormComponent < ViewComponent::Base
             <% end %>
           <% end %>
         <% end %>
+        
+        <% if tallying_enabled? && show_still_to_vaccinate %>
+          <%= f.govuk_check_boxes_fieldset :show_only, multiple: false, legend: { text: "Show only", size: "s" } do %>
+            <%= f.govuk_check_box :still_to_vaccinate,
+                        1, 0,
+                        checked: form.still_to_vaccinate,
+                        multiple: false,
+                        link_errors: true,
+                        label: { text: "Still to vaccinate" },
+                        hint: { text: "With consent, not refused vaccine, not vaccinated yet" }%>
+          <% end %>
+        <% end %>
 
         <% if consent_statuses.any? %>
           <%= f.govuk_check_boxes_fieldset :consent_statuses, legend: { text: "Consent status", size: "s" } do %>
@@ -199,7 +211,8 @@ def initialize(
     vaccine_methods: [],
     year_groups: [],
     heading_level: 3,
-    show_aged_out_of_programmes: false
+    show_aged_out_of_programmes: false,
+    show_still_to_vaccinate: false
   )
     @form = form
     @url = url
@@ -214,6 +227,7 @@ def initialize(
     @year_groups = year_groups
     @heading_level = heading_level
     @show_aged_out_of_programmes = show_aged_out_of_programmes
+    @show_still_to_vaccinate = show_still_to_vaccinate
   end
 
   private
@@ -229,11 +243,13 @@ def initialize(
               :vaccine_methods,
               :year_groups,
               :heading_level,
-              :show_aged_out_of_programmes
+              :show_aged_out_of_programmes,
+              :show_still_to_vaccinate
 
   delegate :format_year_group,
            :govuk_button_link_to,
            :govuk_details,
+           :tallying_enabled?,
            to: :helpers
 
   def open_details?