Merge branch 'main' into PRMP-1257

nhsconnect · Jan 8, 2025 · 90758bc · 90758bc
2 parents d754159 + bc66a60
commit 90758bc
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 4 deletions.
diff --git a/.github/workflows/base-lambdas-reusable-deploy-all.yml b/.github/workflows/base-lambdas-reusable-deploy-all.yml
@@ -14,9 +14,14 @@ on:
         required: true
         type: 'string'
       sandbox:
-        description: 'Which Sandbox to push to'
+        description: 'Which Sandbox to push to?'
         required: true
         type: 'string'
+      is_sandbox:
+        description: 'Is this deploying to a sandbox?'
+        required: false
+        default: false
+        type: boolean
     secrets:
       AWS_ASSUME_ROLE:
         required: true
@@ -403,6 +408,7 @@ jobs:
       AWS_ASSUME_ROLE: ${{ secrets.AWS_ASSUME_ROLE }}
 
   deploy_mns_notification_lambda:
+    if: ${{ ! inputs.is_sandbox }}
     name: Deploy mns notification lambda
     uses: ./.github/workflows/base-lambdas-reusable-deploy.yml
     with:

diff --git a/.github/workflows/full-deploy-to-sandbox.yml b/.github/workflows/full-deploy-to-sandbox.yml
@@ -85,6 +85,7 @@ jobs:
       sandbox: ${{ inputs.sandbox }}
       environment: ${{ inputs.environment }}
       python_version: "3.11"
+      is_sandbox: true
     secrets:
       AWS_ASSUME_ROLE: ${{ secrets.AWS_ASSUME_ROLE }}
 

diff --git a/.github/workflows/lambdas-deploy-feature-to-sandbox.yml b/.github/workflows/lambdas-deploy-feature-to-sandbox.yml
@@ -72,6 +72,7 @@ jobs:
       python_version: "3.11"
       build_branch: ${{ inputs.build_branch }}
       sandbox: ${{ inputs.sandbox }}
+      is_sandbox: true
     secrets:
       AWS_ASSUME_ROLE: ${{ secrets.AWS_ASSUME_ROLE }}
 

diff --git a/app/src/components/layout/footer/Footer.test.tsx b/app/src/components/layout/footer/Footer.test.tsx
@@ -8,6 +8,10 @@ describe('Footer', () => {
             render(<Footer />);
             expect(screen.getByTestId('privacy-link')).toBeInTheDocument();
         });
+        it('renders service updates link', () => {
+            render(<Footer />);
+            expect(screen.getByTestId('service-updates-link')).toBeInTheDocument();
+        });
     });
 
     describe('Navigation', () => {

diff --git a/app/src/components/layout/footer/Footer.tsx b/app/src/components/layout/footer/Footer.tsx
@@ -2,6 +2,9 @@ import React from 'react';
 import { Footer as NHSFooter } from 'nhsuk-react-components';
 import { routes } from '../../../types/generic/routes';
 
+const serviceUpdatesLink =
+    'https://digital.nhs.uk/services/access-and-store-digital-patient-documents/service-updates';
+
 function Footer() {
     return (
         <NHSFooter>
@@ -11,10 +14,19 @@ function Footer() {
                     data-testid="privacy-link"
                     rel="opener"
                     target="_blank"
-                    aria-label="(Privacy notice - this link will open in a new tab)"
+                    aria-label="Privacy notice - Opens in a new tab"
                 >
                     Privacy notice
                 </NHSFooter.ListItem>
+                <NHSFooter.ListItem
+                    href={serviceUpdatesLink}
+                    data-testid="service-updates-link"
+                    rel="noopener"
+                    target="_blank"
+                    aria-label="Service updates - Opens in a new tab"
+                >
+                    Service updates
+                </NHSFooter.ListItem>
             </NHSFooter.List>
             {/* TODO - PRMP-1348: Remove hardcoded styling below if no longer required */}
             <NHSFooter.Copyright style={{ color: '#231f20' }}>

diff --git a/lambdas/requirements/requirements_test.txt b/lambdas/requirements/requirements_test.txt
@@ -1,4 +1,3 @@
-Jinja2==3.1.5
 MarkupSafe==2.1.3
 black==24.3.0
 freezegun==1.2.2

diff --git a/lambdas/tests/unit/conftest.py b/lambdas/tests/unit/conftest.py
@@ -176,7 +176,6 @@ def set_env(monkeypatch):
     monkeypatch.setenv("NRL_SQS_QUEUE_URL", NRL_SQS_URL)
 
 
-
 EXPECTED_PARSED_PATIENT_BASE_CASE = PatientDetails(
     givenName=["Jane"],
     familyName="Smith",