fix sonar errors

Author: adamwhitingnhs

app/src/components/blocks/_admin/reviewsPage/ReviewsPage.test.tsx

@@ -204,14 +204,20 @@ describe('ReviewsPage', () => {
             });
         });
 
-        it('displays loading spinner while fetching initial data', () => {
+        it('displays loading spinner while fetching initial data', async () => {
             mockGetReviews.mockImplementation(
                 () => new Promise((resolve) => setTimeout(() => resolve(mockReviewsResponse), 100)),
             );
 
             renderComponent();
 
-            expect(screen.getByText('Loading...')).toBeInTheDocument();
+            await waitFor(() => {
+                expect(screen.getByText("Review reason")).toBeInTheDocument();
+            });
+
+            await waitFor(() => {
+                expect(screen.getByText('Loading...')).toBeInTheDocument();
+            });
         });
     });
 

app/src/components/blocks/_admin/reviewsPage/ReviewsPage.tsx

@@ -1,5 +1,5 @@
 import { Button, ErrorMessage, Table, TextInput } from 'nhsuk-react-components';
-import { JSX, useEffect, useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { Link } from 'react-router';
 import useBaseAPIUrl from '../../../../helpers/hooks/useBaseAPIUrl';
 import useTitle from '../../../../helpers/hooks/useTitle';
@@ -16,7 +16,7 @@ import { Pagination } from '../../../generic/paginationV2/Pagination';
 import SpinnerButton from '../../../generic/spinnerButton/SpinnerButton';
 import SpinnerV2 from '../../../generic/spinnerV2/SpinnerV2';
 
-export const ReviewsPage = (): JSX.Element => {
+export const ReviewsPage = (): React.JSX.Element => {
     useTitle({ pageTitle: 'Admin - Reviews' });
     const baseUrl = useBaseAPIUrl();
     const inputRef = useRef<HTMLInputElement | null>(null);
@@ -59,7 +59,7 @@ export const ReviewsPage = (): JSX.Element => {
                     return newTokens;
                 });
             }
-        } catch (error) {
+        } catch {
             setFailedLoading(true);
             setCurrentPage(1);
             setPageTokens(['']);
@@ -174,44 +174,11 @@ export const ReviewsPage = (): JSX.Element => {
                         </Table.Row>
                     </Table.Head>
                     <Table.Body>
-                        {failedLoading ? (
-                            <Table.Row>
-                                <Table.Cell colSpan={6}>
-                                    <ErrorMessage>Failed to load reviews</ErrorMessage>
-                                </Table.Cell>
-                            </Table.Row>
-                        ) : null}
-                        {reviews.length > 0 && (!isLoading || failedLoading) ? (
-                            reviews.map(
-                                (review): JSX.Element => (
-                                    <Table.Row key={review.id}>
-                                        <Table.Cell>{review.nhsNumber}</Table.Cell>
-                                        <Table.Cell>{review.recordType}</Table.Cell>
-                                        <Table.Cell>{review.uploader}</Table.Cell>
-                                        <Table.Cell>{review.dateUploaded}</Table.Cell>
-                                        <Table.Cell>{review.reviewReason}</Table.Cell>
-                                        <Table.Cell className="nowrap">
-                                            <Link
-                                                to={review.id}
-                                                data-testid={`view-record-link-${review.id}`}
-                                            >
-                                                View
-                                            </Link>
-                                        </Table.Cell>
-                                    </Table.Row>
-                                ),
-                            )
-                        ) : failedLoading ? null : (
-                            <Table.Row>
-                                <Table.Cell colSpan={6}>
-                                    {isLoading ? (
-                                        <SpinnerV2 status="Loading..." />
-                                    ) : (
-                                        <>No documents to review</>
-                                    )}
-                                </Table.Cell>
-                            </Table.Row>
-                        )}
+                        <TableRows 
+                            reviews={reviews} 
+                            isLoading={isLoading} 
+                            failedLoading={failedLoading} 
+                        />
                     </Table.Body>
                 </Table>
                 <Pagination>
@@ -255,3 +222,68 @@ export const ReviewsPage = (): JSX.Element => {
         </>
     );
 };
+
+type TableRowsProps = {
+    reviews: ReviewListItem[];
+    isLoading: boolean;
+    failedLoading: boolean;
+};
+const TableRows = ({ 
+    reviews, 
+    isLoading, 
+    failedLoading 
+}: TableRowsProps): React.JSX.Element => {
+    if (isLoading) {
+        return (
+            <Table.Row>
+                <Table.Cell colSpan={6}>
+                    <SpinnerV2 status="Loading..." />
+                </Table.Cell>
+            </Table.Row>
+        );
+    }
+
+    if(reviews.length > 0) {
+        return (
+            <>
+                {reviews.map(
+                    (review) => (
+                        <Table.Row key={review.id}>
+                            <Table.Cell>{review.nhsNumber}</Table.Cell>
+                            <Table.Cell>{review.recordType}</Table.Cell>
+                            <Table.Cell>{review.uploader}</Table.Cell>
+                            <Table.Cell>{review.dateUploaded}</Table.Cell>
+                            <Table.Cell>{review.reviewReason}</Table.Cell>
+                            <Table.Cell className="nowrap">
+                                <Link
+                                    to={review.id}
+                                    data-testid={`view-record-link-${review.id}`}
+                                >
+                                    View
+                                </Link>
+                            </Table.Cell>
+                        </Table.Row>
+                    )
+                )}
+            </>
+        );
+    }
+
+    if (failedLoading) {
+        return (
+            <Table.Row>
+                <Table.Cell colSpan={6}>
+                    <ErrorMessage>Failed to load reviews</ErrorMessage>
+                </Table.Cell>
+            </Table.Row>
+        );
+    }
+
+    return (
+        <Table.Row>
+            <Table.Cell colSpan={6}>
+                No documents to review
+            </Table.Cell>
+        </Table.Row>
+    );
+};

app/src/helpers/requests/getReviews.ts

@@ -15,7 +15,7 @@ const getReviews = async (
     const params = new URLSearchParams({
         limit: limit.toString(),
         startKey: nextPageStartKey,
-        nhsNumber: nhsNumber?.replace(/\s/g, ''), // replace whitespace
+        nhsNumber: nhsNumber?.replaceAll(/\s/g, ''), // replace whitespace
     });
 
     if (isLocal) {