-
) => {
+ const handleChangeCheckboxes = (e: React.FormEvent
) => {
const target = e.target as HTMLInputElement;
const toggledDocumentId = target.value;
if (target.checked) {
@@ -122,19 +122,18 @@ const AvailableFilesTable = ({
>
{allowSelectDocument && (
-
-
-
- {result.fileName}
-
-
-
+ handleChangeCheckboxes(e)}
+ >
+
+ {result.fileName}
+
+
)}
{
});
});
- it('navigates to specified location when the "toLocation" property is defined' , async () => {
-
+ it('navigates to specified location when the "toLocation" property is defined', async () => {
render();
- userEvent.click( screen.getByText('Go back'));
+ userEvent.click(screen.getByText('Go back'));
await waitFor(() => {
expect(mockUseNavigate).toHaveBeenCalledWith('/specified-location');
});
-
});
it('displays default back link text when "backLinkText" is not provided', async () => {
-
render();
- expect(screen.getByText('Go back')).toBeInTheDocument();
-
+ expect(screen.getByText('Go back')).toBeInTheDocument();
});
it('displays custom back link text when "backLinkText" is defined', async () => {
-
render();
expect(screen.getByText('navigate to ...')).toBeInTheDocument();
-
});
-
});
diff --git a/app/src/components/layout/header/Header.test.tsx b/app/src/components/layout/header/Header.test.tsx
index 0ef5318b6..927868b69 100644
--- a/app/src/components/layout/header/Header.test.tsx
+++ b/app/src/components/layout/header/Header.test.tsx
@@ -46,7 +46,7 @@ describe('Header', () => {
mockedUseRole.mockReturnValue(REPOSITORY_ROLE.GP_ADMIN);
renderHeaderWithRouter();
- userEvent.click(screen.getByRole('img', { name: 'NHS Logo' }));
+ userEvent.click(screen.getByText('NHS Logo'));
await waitFor(() => {
expect(mockedUseNavigate).toHaveBeenCalledWith(routes.HOME);
@@ -57,7 +57,7 @@ describe('Header', () => {
mockedUseRole.mockReturnValue(null);
renderHeaderWithRouter();
- userEvent.click(screen.getByRole('img', { name: 'NHS Logo' }));
+ userEvent.click(screen.getByText('NHS Logo'));
await waitFor(() => {
expect(mockedUseNavigate).toHaveBeenCalledWith(routes.START);
diff --git a/app/src/components/layout/navLinks/NavLinks.tsx b/app/src/components/layout/navLinks/NavLinks.tsx
index 4433aeae6..10c069e0e 100644
--- a/app/src/components/layout/navLinks/NavLinks.tsx
+++ b/app/src/components/layout/navLinks/NavLinks.tsx
@@ -1,4 +1,3 @@
-import React, { useEffect, useState } from 'react';
import type { MouseEvent as ReactEvent } from 'react';
import { Header } from 'nhsuk-react-components';
import { useNavigate } from 'react-router-dom';
@@ -8,69 +7,31 @@ import { useSessionContext } from '../../../providers/sessionProvider/SessionPro
const NavLinks = () => {
const navigate = useNavigate();
const [session] = useSessionContext();
- const [width, setWidth] = useState(window.innerWidth);
const nav = (e: ReactEvent, link: string) => {
e.preventDefault();
navigate(link);
};
- useEffect(() => {
- const handleResizeWindow = () => setWidth(window.innerWidth);
- window.addEventListener('resize', handleResizeWindow);
- return () => {
- window.removeEventListener('resize', handleResizeWindow);
- };
- }, []);
-
const appLinks = [
+ { href: routes.START, label: 'Home', id: 'home-btn' },
{ href: routes.SEARCH_PATIENT, label: 'Search for a patient', id: 'search-btn' },
{ href: routes.LOGOUT, label: 'Sign out', id: 'logout-btn' },
];
return session.isLoggedIn ? (
-
- nav(e, routes.START)}
- >
- Home
-
- {width <= 990 ? (
- <>
- {appLinks.map((l) => (
- nav(e, l.href)}
- >
- {l.label}
-
- ))}
-
- ) : (
-
- {appLinks.map((l) => (
- nav(e, l.href)}
- >
- {l.label}
-
- ))}
-
- )}
+
+ {appLinks.map((l) => (
+ nav(e, l.href)}
+ >
+ {l.label}
+
+ ))}
) : null;
};
diff --git a/app/src/pages/feedbackPage/FeedbackPage.tsx b/app/src/pages/feedbackPage/FeedbackPage.tsx
index aebd74b72..2d8f85ed5 100644
--- a/app/src/pages/feedbackPage/FeedbackPage.tsx
+++ b/app/src/pages/feedbackPage/FeedbackPage.tsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
import { SubmitHandler, useForm, UseFormRegisterReturn } from 'react-hook-form';
import isEmail from 'validator/lib/isEmail';
-import { Button, Fieldset, Input, Radios, Textarea } from 'nhsuk-react-components';
+import { Button, Fieldset, TextInput, Radios, Textarea } from 'nhsuk-react-components';
import { useNavigate } from 'react-router-dom';
import { AxiosError } from 'axios';
import {
@@ -133,7 +133,7 @@ function FeedbackPage() {
us in developing this service.
-
- {
beforeEach(() => {
@@ -50,14 +51,11 @@ describe('PatientResultPage', () => {
render();
- expect(
- screen.getByRole('heading', { name: PAGE_HEADER_TEXT }),
- ).toBeInTheDocument();
+ expect(screen.getByRole('heading', { name: PAGE_HEADER_TEXT })).toBeInTheDocument();
expect(screen.getByText(familyName)).toBeInTheDocument();
expect(
screen.getByRole('button', { name: CONFIRM_BUTTON_TEXT }),
).toBeInTheDocument();
-
},
);
@@ -72,14 +70,8 @@ describe('PatientResultPage', () => {
render();
- expect(
- screen.getByRole('heading', { name: PAGE_HEADER_TEXT }),
- ).toBeInTheDocument();
- expect(
- screen.getByText(
- PAGE_TEXT ,
- ),
- ).toBeInTheDocument();
+ expect(screen.getByRole('heading', { name: PAGE_HEADER_TEXT })).toBeInTheDocument();
+ expect(screen.getByText(PAGE_TEXT)).toBeInTheDocument();
},
);
@@ -93,20 +85,14 @@ describe('PatientResultPage', () => {
render();
- expect(
- screen.getByRole('heading', { name: PAGE_HEADER_TEXT }),
- ).toBeInTheDocument();
+ expect(screen.getByRole('heading', { name: PAGE_HEADER_TEXT })).toBeInTheDocument();
expect(screen.queryByText('Select patient status')).not.toBeInTheDocument();
expect(screen.queryByRole('radio', { name: 'Active patient' })).not.toBeInTheDocument();
expect(
screen.queryByRole('radio', { name: 'Inactive patient' }),
).not.toBeInTheDocument();
- expect(
- screen.queryByText(
- PAGE_TEXT,
- ),
- ).not.toBeInTheDocument();
+ expect(screen.queryByText(PAGE_TEXT)).not.toBeInTheDocument();
});
it.each([REPOSITORY_ROLE.GP_ADMIN, REPOSITORY_ROLE.GP_CLINICAL])(
@@ -141,9 +127,7 @@ describe('PatientResultPage', () => {
render();
- expect(
- screen.getByRole('heading', { name: PAGE_HEADER_TEXT }),
- ).toBeInTheDocument();
+ expect(screen.getByRole('heading', { name: PAGE_HEADER_TEXT })).toBeInTheDocument();
expect(
screen.getByText('The NHS number for this patient has changed.'),
).toBeInTheDocument();
@@ -160,9 +144,7 @@ describe('PatientResultPage', () => {
render();
- expect(
- screen.getByRole('heading', { name: PAGE_HEADER_TEXT }),
- ).toBeInTheDocument();
+ expect(screen.getByRole('heading', { name: PAGE_HEADER_TEXT })).toBeInTheDocument();
expect(
screen.getByText(
'Certain details about this patient cannot be displayed without the necessary access.',
@@ -183,9 +165,7 @@ describe('PatientResultPage', () => {
render();
- expect(
- screen.getByRole('heading', { name: PAGE_HEADER_TEXT }),
- ).toBeInTheDocument();
+ expect(screen.getByRole('heading', { name: PAGE_HEADER_TEXT })).toBeInTheDocument();
const results = await runAxeTest(document.body);
expect(results).toHaveNoViolations();
@@ -252,9 +232,7 @@ describe('PatientResultPage', () => {
render();
act(() => {
- userEvent.click(
- screen.getByRole('button', { name: CONFIRM_BUTTON_TEXT }),
- );
+ userEvent.click(screen.getByRole('button', { name: CONFIRM_BUTTON_TEXT }));
});
await waitFor(() => {
diff --git a/app/src/pages/patientSearchPage/PatientSearchPage.test.tsx b/app/src/pages/patientSearchPage/PatientSearchPage.test.tsx
index ab0cc84ba..5ddc6c91f 100644
--- a/app/src/pages/patientSearchPage/PatientSearchPage.test.tsx
+++ b/app/src/pages/patientSearchPage/PatientSearchPage.test.tsx
@@ -350,16 +350,13 @@ describe('PatientSearchPage', () => {
);
it('a defined width class is applied to the NHS number input field', async () => {
-
const definedWidthClass = 'nhsuk-input--width-10';
renderPatientSearchPage();
const input = screen.getByTestId('nhs-number-input');
expect(input).toHaveClass(definedWidthClass);
-
});
-
});
});
diff --git a/app/src/pages/patientSearchPage/PatientSearchPage.tsx b/app/src/pages/patientSearchPage/PatientSearchPage.tsx
index 696f7a60a..c11f5d74b 100644
--- a/app/src/pages/patientSearchPage/PatientSearchPage.tsx
+++ b/app/src/pages/patientSearchPage/PatientSearchPage.tsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
import { routes } from '../../types/generic/routes';
import { FieldValues, useForm } from 'react-hook-form';
import ErrorBox from '../../components/layout/errorBox/ErrorBox';
-import { Button, Input } from 'nhsuk-react-components';
+import { Button, Fieldset, TextInput } from 'nhsuk-react-components';
import SpinnerButton from '../../components/generic/spinnerButton/SpinnerButton';
import { InputRef } from '../../types/generic/inputRef';
import { useNavigate } from 'react-router-dom';
@@ -107,30 +107,31 @@ function PatientSearchPage() {
)}
)}
- {pageTitle}