From 08e58f2f12a86ac0cb54b0a6a6861857ffd7f9cf Mon Sep 17 00:00:00 2001
From: Mohammad Iqbal <mohammad.iqbal27@nhs.net>
Date: Tue, 17 Dec 2024 07:26:38 +0000
Subject: [PATCH 1/5] [PRMP-1330] - Add service-updates-link to footer

---
 .../ServiceUpdatesLink.test.tsx                | 18 ++++++++++++++++++
 .../serviceUpdatesLink/ServiceUpdatesLink.tsx  | 17 +++++++++++++++++
 app/src/components/layout/footer/Footer.tsx    |  2 ++
 3 files changed, 37 insertions(+)
 create mode 100644 app/src/components/generic/serviceUpdatesLink/ServiceUpdatesLink.test.tsx
 create mode 100644 app/src/components/generic/serviceUpdatesLink/ServiceUpdatesLink.tsx

diff --git a/app/src/components/generic/serviceUpdatesLink/ServiceUpdatesLink.test.tsx b/app/src/components/generic/serviceUpdatesLink/ServiceUpdatesLink.test.tsx
new file mode 100644
index 000000000..c40360b83
--- /dev/null
+++ b/app/src/components/generic/serviceUpdatesLink/ServiceUpdatesLink.test.tsx
@@ -0,0 +1,18 @@
+import { render, screen } from '@testing-library/react';
+import ServiceUpdatesLink from './ServiceUpdatesLink';
+
+describe('Service updates link', () => {
+    it('renders a service updates link that opens in a new tab', () => {
+        render(<ServiceUpdatesLink />);
+
+        const serviceUpdatesLink = screen.getByRole('link', {
+            name: /Service updates/i,
+        });
+
+        expect(serviceUpdatesLink).toHaveAttribute(
+            'href',
+            'https://digital.nhs.uk/services/access-and-store-digital-patient-documents/service-updates',
+        );
+        expect(serviceUpdatesLink).toHaveAttribute('target', '_blank');
+    });
+});
diff --git a/app/src/components/generic/serviceUpdatesLink/ServiceUpdatesLink.tsx b/app/src/components/generic/serviceUpdatesLink/ServiceUpdatesLink.tsx
new file mode 100644
index 000000000..bdba742db
--- /dev/null
+++ b/app/src/components/generic/serviceUpdatesLink/ServiceUpdatesLink.tsx
@@ -0,0 +1,17 @@
+import { Footer as NHSFooter } from 'nhsuk-react-components';
+
+const ServiceUpdatesLink = () => {
+    return (
+        <NHSFooter.ListItem
+            href="https://digital.nhs.uk/services/access-and-store-digital-patient-documents/service-updates"
+            data-testid="service-updates-link"
+            rel="noopener"
+            target="_blank"
+            aria-label="(Service updates - Opens in a new tab)"
+        >
+            Service updates
+        </NHSFooter.ListItem>
+    );
+};
+
+export default ServiceUpdatesLink;
diff --git a/app/src/components/layout/footer/Footer.tsx b/app/src/components/layout/footer/Footer.tsx
index f1a0e46e4..1c93fb6e8 100644
--- a/app/src/components/layout/footer/Footer.tsx
+++ b/app/src/components/layout/footer/Footer.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { Footer as NHSFooter } from 'nhsuk-react-components';
 import { routes } from '../../../types/generic/routes';
+import ServiceUpdatesLink from '../../generic/serviceUpdatesLink/ServiceUpdatesLink';
 
 function Footer() {
     return (
@@ -15,6 +16,7 @@ function Footer() {
                 >
                     Privacy notice
                 </NHSFooter.ListItem>
+                <ServiceUpdatesLink />
             </NHSFooter.List>
             <NHSFooter.Copyright>&copy; {'Crown copyright'}</NHSFooter.Copyright>
         </NHSFooter>

From 9eabba86acbe4338bec8de7fd068b6f11e51b5e3 Mon Sep 17 00:00:00 2001
From: Mohammad Iqbal <mohammad.iqbal27@nhs.net>
Date: Wed, 18 Dec 2024 11:22:48 +0000
Subject: [PATCH 2/5] [PRMP-1330] - Remove brackets in aria-label for screen
 readers

---
 .../generic/serviceUpdatesLink/ServiceUpdatesLink.tsx           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/components/generic/serviceUpdatesLink/ServiceUpdatesLink.tsx b/app/src/components/generic/serviceUpdatesLink/ServiceUpdatesLink.tsx
index bdba742db..fef1f81d9 100644
--- a/app/src/components/generic/serviceUpdatesLink/ServiceUpdatesLink.tsx
+++ b/app/src/components/generic/serviceUpdatesLink/ServiceUpdatesLink.tsx
@@ -7,7 +7,7 @@ const ServiceUpdatesLink = () => {
             data-testid="service-updates-link"
             rel="noopener"
             target="_blank"
-            aria-label="(Service updates - Opens in a new tab)"
+            aria-label="Service updates - Opens in a new tab"
         >
             Service updates
         </NHSFooter.ListItem>

From e23cdd1377ed6e9208055cdf9044ee49260c2f4e Mon Sep 17 00:00:00 2001
From: Mohammad Iqbal <mohammad.iqbal27@nhs.net>
Date: Thu, 19 Dec 2024 15:58:02 +0000
Subject: [PATCH 3/5] [PRMP-1330] - Add test for rendering service-updates-link

---
 app/src/components/layout/footer/Footer.test.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/components/layout/footer/Footer.test.tsx b/app/src/components/layout/footer/Footer.test.tsx
index 258b5728c..40450f578 100644
--- 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', () => {

From 7bdb72b92ad76ce4eb32543b57ce7ce085f1340a Mon Sep 17 00:00:00 2001
From: Mohammad Iqbal <mohammad.iqbal27@nhs.net>
Date: Fri, 20 Dec 2024 11:04:46 +0000
Subject: [PATCH 4/5] [PRMP-1330] - Modify footer to use constant instead of
 react component

---
 .../ServiceUpdatesLink.test.tsx                | 18 ------------------
 .../serviceUpdatesLink/ServiceUpdatesLink.tsx  | 17 -----------------
 .../components/layout/footer/Footer.test.tsx   |  2 +-
 app/src/components/layout/footer/Footer.tsx    | 18 ++++++++++++++----
 4 files changed, 15 insertions(+), 40 deletions(-)
 delete mode 100644 app/src/components/generic/serviceUpdatesLink/ServiceUpdatesLink.test.tsx
 delete mode 100644 app/src/components/generic/serviceUpdatesLink/ServiceUpdatesLink.tsx

diff --git a/app/src/components/generic/serviceUpdatesLink/ServiceUpdatesLink.test.tsx b/app/src/components/generic/serviceUpdatesLink/ServiceUpdatesLink.test.tsx
deleted file mode 100644
index c40360b83..000000000
--- a/app/src/components/generic/serviceUpdatesLink/ServiceUpdatesLink.test.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import ServiceUpdatesLink from './ServiceUpdatesLink';
-
-describe('Service updates link', () => {
-    it('renders a service updates link that opens in a new tab', () => {
-        render(<ServiceUpdatesLink />);
-
-        const serviceUpdatesLink = screen.getByRole('link', {
-            name: /Service updates/i,
-        });
-
-        expect(serviceUpdatesLink).toHaveAttribute(
-            'href',
-            'https://digital.nhs.uk/services/access-and-store-digital-patient-documents/service-updates',
-        );
-        expect(serviceUpdatesLink).toHaveAttribute('target', '_blank');
-    });
-});
diff --git a/app/src/components/generic/serviceUpdatesLink/ServiceUpdatesLink.tsx b/app/src/components/generic/serviceUpdatesLink/ServiceUpdatesLink.tsx
deleted file mode 100644
index fef1f81d9..000000000
--- a/app/src/components/generic/serviceUpdatesLink/ServiceUpdatesLink.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Footer as NHSFooter } from 'nhsuk-react-components';
-
-const ServiceUpdatesLink = () => {
-    return (
-        <NHSFooter.ListItem
-            href="https://digital.nhs.uk/services/access-and-store-digital-patient-documents/service-updates"
-            data-testid="service-updates-link"
-            rel="noopener"
-            target="_blank"
-            aria-label="Service updates - Opens in a new tab"
-        >
-            Service updates
-        </NHSFooter.ListItem>
-    );
-};
-
-export default ServiceUpdatesLink;
diff --git a/app/src/components/layout/footer/Footer.test.tsx b/app/src/components/layout/footer/Footer.test.tsx
index 40450f578..2e2f60f09 100644
--- a/app/src/components/layout/footer/Footer.test.tsx
+++ b/app/src/components/layout/footer/Footer.test.tsx
@@ -22,7 +22,7 @@ describe('Footer', () => {
                 'href',
                 routes.PRIVACY_POLICY,
             );
-            expect(screen.getByTestId('privacy-link')).toHaveAttribute('rel', 'opener');
+            expect(screen.getByTestId('privacy-link')).toHaveAttribute('rel', 'noopener');
             expect(screen.getByTestId('privacy-link')).toHaveAttribute('target', '_blank');
         });
     });
diff --git a/app/src/components/layout/footer/Footer.tsx b/app/src/components/layout/footer/Footer.tsx
index 1c93fb6e8..e6408cdf2 100644
--- a/app/src/components/layout/footer/Footer.tsx
+++ b/app/src/components/layout/footer/Footer.tsx
@@ -1,7 +1,9 @@
 import React from 'react';
 import { Footer as NHSFooter } from 'nhsuk-react-components';
 import { routes } from '../../../types/generic/routes';
-import ServiceUpdatesLink from '../../generic/serviceUpdatesLink/ServiceUpdatesLink';
+
+const serviceUpdatesLink =
+    'https://digital.nhs.uk/services/access-and-store-digital-patient-documents/service-updates';
 
 function Footer() {
     return (
@@ -10,13 +12,21 @@ function Footer() {
                 <NHSFooter.ListItem
                     href={routes.PRIVACY_POLICY}
                     data-testid="privacy-link"
-                    rel="opener"
+                    rel="noopener"
                     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>
-                <ServiceUpdatesLink />
+                <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>
             <NHSFooter.Copyright>&copy; {'Crown copyright'}</NHSFooter.Copyright>
         </NHSFooter>

From b887be933be08a8d74ee4f8adab3b816813a4e42 Mon Sep 17 00:00:00 2001
From: Mohammad Iqbal <mohammad.iqbal27@nhs.net>
Date: Fri, 20 Dec 2024 13:12:59 +0000
Subject: [PATCH 5/5] [PRMP-1330] - Undo privacy-link modification

---
 app/src/components/layout/footer/Footer.test.tsx | 2 +-
 app/src/components/layout/footer/Footer.tsx      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/components/layout/footer/Footer.test.tsx b/app/src/components/layout/footer/Footer.test.tsx
index 2e2f60f09..40450f578 100644
--- a/app/src/components/layout/footer/Footer.test.tsx
+++ b/app/src/components/layout/footer/Footer.test.tsx
@@ -22,7 +22,7 @@ describe('Footer', () => {
                 'href',
                 routes.PRIVACY_POLICY,
             );
-            expect(screen.getByTestId('privacy-link')).toHaveAttribute('rel', 'noopener');
+            expect(screen.getByTestId('privacy-link')).toHaveAttribute('rel', 'opener');
             expect(screen.getByTestId('privacy-link')).toHaveAttribute('target', '_blank');
         });
     });
diff --git a/app/src/components/layout/footer/Footer.tsx b/app/src/components/layout/footer/Footer.tsx
index e6408cdf2..a8f555785 100644
--- a/app/src/components/layout/footer/Footer.tsx
+++ b/app/src/components/layout/footer/Footer.tsx
@@ -12,7 +12,7 @@ function Footer() {
                 <NHSFooter.ListItem
                     href={routes.PRIVACY_POLICY}
                     data-testid="privacy-link"
-                    rel="noopener"
+                    rel="opener"
                     target="_blank"
                     aria-label="Privacy notice - Opens in a new tab"
                 >