Fix remaining sonarcloud issues

nhsconnect · Feb 15, 2024 · 9a8d7ef · 9a8d7ef
1 parent 8c91a5e
commit 9a8d7ef
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 48 deletions.
diff --git a/app/src/components/blocks/_arf/documentInputForm/DocumentInputForm.tsx b/app/src/components/blocks/_arf/documentInputForm/DocumentInputForm.tsx
@@ -72,7 +72,7 @@ const DocumentInputForm = ({
                                 >
                                     Primary Care Support England
                                 </a>
-                                .
+                                {'.'}
                             </li>
                         )}
                         {formType === DOCUMENT_TYPE.LLOYD_GEORGE && (
@@ -89,7 +89,7 @@ const DocumentInputForm = ({
                     </ul>
                 }
             />
-            <div role="region" aria-live="polite">
+            <div aria-live="polite">
                 {documents && documents.length > 0 && (
                     <Table caption="Chosen files" id="selected-documents-table">
                         <Table.Head>

diff --git a/app/src/components/blocks/_arf/documentSearchResults/DocumentSearchResults.tsx b/app/src/components/blocks/_arf/documentSearchResults/DocumentSearchResults.tsx
@@ -1,6 +1,5 @@
 import { Table } from 'nhsuk-react-components';
 import { SearchResult } from '../../../../types/generic/searchResult';
-import { useState } from 'react';
 import { getFormattedDatetime } from '../../../../helpers/utils/formatDatetime';
 
 type Props = {
@@ -12,42 +11,39 @@ const DocumentSearchResults = (props: Props) => {
         new Date(a.created) < new Date(b.created) ? 1 : -1;
 
     const orderedResults = props.searchResults.sort(sortMethod);
-    const [searchResults, ,] = useState(orderedResults);
     const tableCaption = <h2 style={{ fontSize: 32 }}>List of documents available</h2>;
     return (
-        <>
-            <Table id="available-files-table-title" caption={tableCaption}>
-                <Table.Head>
-                    <Table.Row>
-                        <Table.Cell className={'table-column-header'}>Filename</Table.Cell>
-                        <Table.Cell className={'table-column-header'}>Uploaded At</Table.Cell>
-                    </Table.Row>
-                </Table.Head>
-                <Table.Body>
-                    {searchResults.map((result, index) => (
-                        <Table.Row
-                            className={'available-files-row'}
-                            id={'available-files-row-' + index}
-                            key={`document-${index}`}
-                            data-testid="search-result"
+        <Table id="available-files-table-title" caption={tableCaption}>
+            <Table.Head>
+                <Table.Row>
+                    <Table.Cell className={'table-column-header'}>Filename</Table.Cell>
+                    <Table.Cell className={'table-column-header'}>Uploaded At</Table.Cell>
+                </Table.Row>
+            </Table.Head>
+            <Table.Body>
+                {orderedResults.map((result, index) => (
+                    <Table.Row
+                        className={'available-files-row'}
+                        id={'available-files-row-' + index}
+                        key={`document-${result.fileName}`}
+                        data-testid="search-result"
+                    >
+                        <Table.Cell
+                            id={'available-files-row-' + index + '-filename'}
+                            data-testid="filename"
+                        >
+                            {result.fileName}
+                        </Table.Cell>
+                        <Table.Cell
+                            id={'available-files-row-' + index + '-created-date'}
+                            data-testid="created"
                         >
-                            <Table.Cell
-                                id={'available-files-row-' + index + '-filename'}
-                                data-testid="filename"
-                            >
-                                {result.fileName}
-                            </Table.Cell>
-                            <Table.Cell
-                                id={'available-files-row-' + index + '-created-date'}
-                                data-testid="created"
-                            >
-                                {getFormattedDatetime(new Date(result.created))}
-                            </Table.Cell>
-                        </Table.Row>
-                    ))}
-                </Table.Body>
-            </Table>
-        </>
+                            {getFormattedDatetime(new Date(result.created))}
+                        </Table.Cell>
+                    </Table.Row>
+                ))}
+            </Table.Body>
+        </Table>
     );
 };
 

diff --git a/...components/blocks/_arf/documentSearchResultsOptions/DocumentSearchResultsOptions.test.tsx b/...components/blocks/_arf/documentSearchResultsOptions/DocumentSearchResultsOptions.test.tsx
@@ -186,7 +186,6 @@ const renderDocumentSearchResultsOptions = (downloadState: SUBMISSION_STATE) =>
             nhsNumber={patient.nhsNumber}
             downloadState={downloadState}
             updateDownloadState={updateDownloadState}
-            numberOfFiles={7}
             setIsDeletingDocuments={mockSetIsDeletingDocuments}
         />,
     );

diff --git a/app/src/components/blocks/deletionConfirmationStage/DeletionConfirmationStage.tsx b/app/src/components/blocks/deletionConfirmationStage/DeletionConfirmationStage.tsx
@@ -19,7 +19,7 @@ export type Props = {
 function DeletionConfirmationStage({ numberOfFiles, setStage, setDownloadStage }: Props) {
     const navigate = useNavigate();
     const patientDetails = usePatient();
-    const nhsNumber: string = patientDetails?.nhsNumber || '';
+    const nhsNumber: string = patientDetails?.nhsNumber ?? '';
     const formattedNhsNumber = formatNhsNumber(nhsNumber);
     const role = useRole();
     const handleClick = () => {

diff --git a/app/src/components/blocks/lloydGeorgeFileInputStage/LloydGeorgeFileInputStage.tsx b/app/src/components/blocks/lloydGeorgeFileInputStage/LloydGeorgeFileInputStage.tsx
@@ -27,7 +27,7 @@ export type Props = {
 
 function LloydGeorgeFileInputStage({ documents, setDocuments, setStage }: Props) {
     const patientDetails = usePatient();
-    const nhsNumber: string = patientDetails?.nhsNumber || '';
+    const nhsNumber: string = patientDetails?.nhsNumber ?? '';
     const formattedNhsNumber = formatNhsNumber(nhsNumber);
     const dob: string = patientDetails?.birthDate
         ? getFormattedDate(new Date(patientDetails.birthDate))
@@ -142,6 +142,7 @@ function LloydGeorgeFileInputStage({ documents, setDocuments, setStage }: Props)
                 <Fieldset>
                     <div
                         role="button"
+                        tabIndex={0}
                         data-testid="dropzone"
                         onDragOver={(e) => {
                             e.preventDefault();

diff --git a/app/src/components/blocks/lloydGeorgeRecordStage/LloydGeorgeRecordStage.tsx b/app/src/components/blocks/lloydGeorgeRecordStage/LloydGeorgeRecordStage.tsx
@@ -60,7 +60,7 @@ function LloydGeorgeRecordStage({
         required: true,
     });
 
-    const nhsNumber: string = patientDetails?.nhsNumber || '';
+    const nhsNumber: string = patientDetails?.nhsNumber ?? '';
     const formattedNhsNumber = formatNhsNumber(nhsNumber);
 
     const role = useRole();

diff --git a/app/src/components/generic/reducedPatientInfo/ReducedPatientInfo.tsx b/app/src/components/generic/reducedPatientInfo/ReducedPatientInfo.tsx
@@ -8,7 +8,7 @@ interface Props {
 
 const ReducedPatientInfo = ({ className }: Props) => {
     const patientDetails = usePatient();
-    const nhsNumber: string = patientDetails?.nhsNumber || '';
+    const nhsNumber: string = patientDetails?.nhsNumber ?? '';
     const formattedNhsNumber = formatNhsNumber(nhsNumber);
 
     return (

diff --git a/app/src/pages/documentSearchResultsPage/DocumentSearchResultsPage.tsx b/app/src/pages/documentSearchResultsPage/DocumentSearchResultsPage.tsx
@@ -22,7 +22,7 @@ import { errorToParams } from '../../helpers/utils/errorToParams';
 function DocumentSearchResultsPage() {
     const patientDetails = usePatient();
 
-    const nhsNumber: string = patientDetails?.nhsNumber || '';
+    const nhsNumber: string = patientDetails?.nhsNumber ?? '';
     const [searchResults, setSearchResults] = useState<Array<SearchResult>>([]);
     const [submissionState, setSubmissionState] = useState(SUBMISSION_STATE.INITIAL);
     const [downloadState, setDownloadState] = useState(SUBMISSION_STATE.INITIAL);
@@ -98,7 +98,6 @@ function DocumentSearchResultsPage() {
                                 nhsNumber={nhsNumber}
                                 downloadState={downloadState}
                                 updateDownloadState={handleUpdateDownloadState}
-                                numberOfFiles={searchResults.length}
                                 setIsDeletingDocuments={setIsDeletingDocuments}
                             />
                         </>

diff --git a/app/src/pages/lloydGeorgeRecordPage/LloydGeorgeRecordPage.tsx b/app/src/pages/lloydGeorgeRecordPage/LloydGeorgeRecordPage.tsx
@@ -54,7 +54,7 @@ function LloydGeorgeRecordPage() {
         };
 
         const onPageLoad = async () => {
-            const nhsNumber: string = patientDetails?.nhsNumber || '';
+            const nhsNumber: string = patientDetails?.nhsNumber ?? '';
             try {
                 const { number_of_files, total_file_size_in_byte, last_updated, presign_url } =
                     await getLloydGeorgeRecord({

diff --git a/app/src/pages/lloydGeorgeUploadPage/LloydGeorgeUploadPage.tsx b/app/src/pages/lloydGeorgeUploadPage/LloydGeorgeUploadPage.tsx
@@ -4,15 +4,13 @@ import { UploadDocument } from '../../types/pages/UploadDocumentsPage/types';
 import LloydGeorgeFileInputStage from '../../components/blocks/lloydGeorgeFileInputStage/LloydGeorgeFileInputStage';
 import LloydGeorgeUploadComplete from '../../components/blocks/lloydGeorgeUploadComplete/LloydGeorgeUploadComplete';
 
-type Props = {};
-
 export enum LG_UPLOAD_STAGE {
     SELECT = 0,
     UPLOAD = 1,
     COMPLETE = 2,
 }
 
-function LloydGeorgeUploadPage({}: Props) {
+function LloydGeorgeUploadPage() {
     const [stage, setStage] = useState<LG_UPLOAD_STAGE>(LG_UPLOAD_STAGE.SELECT);
     const [documents, setDocuments] = useState<Array<UploadDocument>>([]);
 

diff --git a/app/src/providers/patientProvider/PatientProvider.test.tsx b/app/src/providers/patientProvider/PatientProvider.test.tsx
@@ -35,7 +35,7 @@ const TestComponent = (props: TestProps) => {
 
     return (
         <>
-            <p>NHS Number: {patientDetails?.nhsNumber || 'Null'}</p>
+            <p>NHS Number: {patientDetails?.nhsNumber ?? 'Null'}</p>
             <p>Family Name: {patientDetails?.familyName || 'Null'}</p>
             <button onClick={() => setPatientDetails(props.patientDetails)}>
                 Update NHS Number