[PRMP-1373] Fix reviews routing

app/cypress/e2e/1-ndr-smoke-tests/gp_user_workflows/review_reassign_happy_workflow.cy.js

@@ -57,7 +57,7 @@ describe('GP Workflow: Review and Reassign', () => {
                 cy.contains('This document has been matched to the correct patient').should(
                     'be.visible',
                 );
-                cy.url().should('contain', '/admin/reviews/:reviewId/complete/patient-matched');
+                cy.url().should('contain', '/reviews/:reviewId/complete/patient-matched');
 
                 // assert the review is no longer in our review queue
                 cy.getByTestId('review-another-btn').should('exist').click();

app/src/components/blocks/_documentManagement/documentSelectStage/DocumentSelectStage.test.tsx

@@ -682,7 +682,7 @@ describe('DocumentSelectStage', () => {
         });
 
         it('navigates to removeAllFilesLinkOverride when Remove all files is clicked in review mode', async () => {
-            const mockRemoveAllLink = '/admin/reviews/test-123/remove-all';
+            const mockRemoveAllLink = '/reviews/test-123/remove-all';
 
             renderApp(history, {
                 isReview: true,

app/src/components/blocks/_admin/reviewDetailsAddMoreChoiceStage/ReviewDetailsAddMoreChoiceStage.test.tsx → app/src/components/blocks/_reviews/reviewDetailsAddMoreChoiceStage/ReviewDetailsAddMoreChoiceStage.test.tsx

@@ -242,7 +242,7 @@ describe('ReviewDetailsAddMoreChoiceStage', () => {
 
             await waitFor(() => {
                 expect(mockNavigate).toHaveBeenCalledWith(
-                    `/admin/reviews/${mockReviewId}/upload-additional-files`,
+                    `/reviews/${mockReviewId}/upload-additional-files`,
                     undefined,
                 );
             });
@@ -266,7 +266,7 @@ describe('ReviewDetailsAddMoreChoiceStage', () => {
 
             await waitFor(() => {
                 expect(mockNavigate).toHaveBeenCalledWith(
-                    `/admin/reviews/${mockReviewId}/upload-file-order`,
+                    `/reviews/${mockReviewId}/upload-file-order`,
                     undefined,
                 );
             });
@@ -290,7 +290,7 @@ describe('ReviewDetailsAddMoreChoiceStage', () => {
 
             await waitFor(() => {
                 expect(mockNavigate).toHaveBeenCalledWith(
-                    `/admin/reviews/${mockReviewId}/upload`,
+                    `/reviews/${mockReviewId}/upload`,
                     undefined,
                 );
             });
@@ -314,7 +314,7 @@ describe('ReviewDetailsAddMoreChoiceStage', () => {
 
             await waitFor(() => {
                 expect(mockNavigate).toHaveBeenCalledWith(
-                    `/admin/reviews/${mockReviewId}/upload`,
+                    `/reviews/${mockReviewId}/upload`,
                     undefined,
                 );
             });

app/src/components/blocks/_admin/reviewDetailsAddMoreChoiceStage/ReviewDetailsAddMoreChoiceStage.tsx → app/src/components/blocks/_reviews/reviewDetailsAddMoreChoiceStage/ReviewDetailsAddMoreChoiceStage.tsx

@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { Button, Fieldset, HintText, Radios } from 'nhsuk-react-components';
 import { useNavigate, useParams } from 'react-router-dom';
-import { navigateUrlParam, routeChildren } from '../../../../types/generic/routes';
+import { navigateUrlParam, routeChildren, routes } from '../../../../types/generic/routes';
 import BackButton from '../../../generic/backButton/BackButton';
 import { ReviewDetails } from '../../../../types/generic/reviews';
 import { getConfigForDocType } from '../../../../helpers/utils/documentType';
@@ -21,7 +21,7 @@ const ReviewDetailsAddMoreChoiceStage: React.FC<ReviewDetailsAddMoreChoicePagePr
     const { reviewId } = useParams<{ reviewId: string }>();
 
     if (!reviewData) {
-        navigate(routeChildren.ADMIN_REVIEW);
+        navigate(routes.REVIEWS);
         return <></>;
     }
 
@@ -34,16 +34,12 @@ const ReviewDetailsAddMoreChoiceStage: React.FC<ReviewDetailsAddMoreChoicePagePr
         }
 
         if (addMoreChoice === 'yes') {
-            navigateUrlParam(
-                routeChildren.ADMIN_REVIEW_UPLOAD_ADDITIONAL_FILES,
-                { reviewId },
-                navigate,
-            );
+            navigateUrlParam(routeChildren.REVIEW_UPLOAD_ADDITIONAL_FILES, { reviewId }, navigate);
         } else {
             navigateUrlParam(
                 reviewData.files!.length > 1
-                    ? routeChildren.ADMIN_REVIEW_UPLOAD_FILE_ORDER
-                    : routeChildren.ADMIN_REVIEW_UPLOAD,
+                    ? routeChildren.REVIEW_UPLOAD_FILE_ORDER
+                    : routeChildren.REVIEW_UPLOAD,
                 { reviewId },
                 navigate,
             );

app/src/components/blocks/_admin/reviewDetailsAssessmentStage/ReviewDetailsAssessmentStage.test.tsx → app/src/components/blocks/_reviews/reviewDetailsAssessmentStage/ReviewDetailsAssessmentStage.test.tsx

@@ -756,7 +756,7 @@ describe('ReviewDetailsAssessmentStage', () => {
             await user.click(continueButton);
 
             expect(mockedUseNavigate).toHaveBeenCalledWith(
-                '/admin/reviews/test-review-id.v1/add-more-choice',
+                '/reviews/test-review-id.v1/add-more-choice',
                 undefined,
             );
         });
@@ -784,7 +784,7 @@ describe('ReviewDetailsAssessmentStage', () => {
             await user.click(continueButton);
 
             expect(mockedUseNavigate).toHaveBeenCalledWith(
-                '/admin/reviews/test-review-id.v1/no-files-choice',
+                '/reviews/test-review-id.v1/no-files-choice',
                 undefined,
             );
         });
@@ -810,7 +810,7 @@ describe('ReviewDetailsAssessmentStage', () => {
             await user.click(continueButton);
 
             expect(mockedUseNavigate).toHaveBeenCalledWith(
-                '/admin/reviews/test-review-id.v1/no-files-choice',
+                '/reviews/test-review-id.v1/no-files-choice',
                 undefined,
             );
         });
@@ -987,7 +987,7 @@ describe('ReviewDetailsAssessmentStage', () => {
 
             await waitFor(() => {
                 expect(mockedUseNavigate).toHaveBeenCalledWith(
-                    '/admin/reviews/test-review-id.v1/upload',
+                    '/reviews/test-review-id.v1/upload',
                     undefined,
                 );
             });
@@ -1052,7 +1052,7 @@ describe('ReviewDetailsAssessmentStage', () => {
 
             await waitFor(() => {
                 expect(mockedUseNavigate).toHaveBeenCalledWith(
-                    '/admin/reviews/test-review-id.v1/upload-file-order',
+                    '/reviews/test-review-id.v1/upload-file-order',
                     undefined,
                 );
             });
@@ -1095,7 +1095,7 @@ describe('ReviewDetailsAssessmentStage', () => {
             await vi.advanceTimersByTimeAsync(0);
 
             expect(mockedUseNavigate).toHaveBeenCalledWith(
-                '/admin/reviews/test-review-id.v1/add-more-choice',
+                '/reviews/test-review-id.v1/add-more-choice',
                 { replace: true },
             );
 

app/src/components/blocks/_admin/reviewDetailsAssessmentStage/ReviewDetailsAssessmentStage.tsx → app/src/components/blocks/_reviews/reviewDetailsAssessmentStage/ReviewDetailsAssessmentStage.tsx

@@ -1,5 +1,5 @@
 import { Button, ErrorSummary, Fieldset, Radios, Table } from 'nhsuk-react-components';
-import { Dispatch, JSX, useRef, useState } from 'react';
+import { Dispatch, JSX, useEffect, useRef, useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import useTitle from '../../../../helpers/hooks/useTitle';
 import { getConfigForDocType } from '../../../../helpers/utils/documentType';
@@ -65,13 +65,23 @@ const ReviewDetailsAssessmentStage = ({
 
     const baseUrl = useBaseAPIUrl();
     const baseHeaders = useBaseAPIHeaders();
+    const skipRef = useRef(false);
+
+    useEffect(() => {
+        if (skipRef.current) {
+            navigateUrlParam(
+                routeChildren.REVIEW_ADD_MORE_CHOICE,
+                { reviewId: reviewId! },
+                navigate,
+                {
+                    replace: true,
+                },
+            );
+        }
+    }, [skipRef.current]);
 
     if (!hasExistingRecordInStorage && reviewId !== undefined) {
-        setTimeout(() => {
-            navigateUrlParam(routeChildren.ADMIN_REVIEW_ADD_MORE_CHOICE, { reviewId }, navigate, {
-                replace: true,
-            });
-        }, 0);
+        skipRef.current = true;
         return <></>;
     }
 
@@ -109,7 +119,7 @@ const ReviewDetailsAssessmentStage = ({
             return;
         }
 
-        const [id, version] = reviewId.split('.');
+        const [id, version] = reviewId.split('_');
 
         let refreshedReview: GetDocumentReviewDto;
         try {
@@ -171,30 +181,30 @@ const ReviewDetailsAssessmentStage = ({
         switch (fileAction) {
             case 'add-all':
                 if (reviewConfig.canBeUpdated === true && reviewConfig.canBeDiscarded === false) {
-                    navigateUrl = routeChildren.ADMIN_REVIEW_UPLOAD;
+                    navigateUrl = routeChildren.REVIEW_UPLOAD;
                     break;
                 }
-                navigateUrl = routeChildren.ADMIN_REVIEW_ADD_MORE_CHOICE;
+                navigateUrl = routeChildren.REVIEW_ADD_MORE_CHOICE;
                 break;
             case 'choose-files':
-                navigateUrl = routeChildren.ADMIN_REVIEW_CHOOSE_WHICH_FILES;
+                navigateUrl = routeChildren.REVIEW_CHOOSE_WHICH_FILES;
                 break;
             case 'duplicate':
-                navigateUrl = routeChildren.ADMIN_REVIEW_NO_FILES_CHOICE;
+                navigateUrl = routeChildren.REVIEW_NO_FILES_CHOICE;
                 break;
             case 'accept':
                 if (uploadDocuments.length === 1) {
                     navigateUrl =
                         reviewConfig.multifileReview === true
-                            ? routeChildren.ADMIN_REVIEW_ADD_MORE_CHOICE
-                            : routeChildren.ADMIN_REVIEW_UPLOAD;
+                            ? routeChildren.REVIEW_ADD_MORE_CHOICE
+                            : routeChildren.REVIEW_UPLOAD;
                     break;
                 }
 
-                navigateUrl = routeChildren.ADMIN_REVIEW_UPLOAD_FILE_ORDER;
+                navigateUrl = routeChildren.REVIEW_UPLOAD_FILE_ORDER;
                 break;
             case 'reject':
-                navigateUrl = routeChildren.ADMIN_REVIEW_NO_FILES_CHOICE;
+                navigateUrl = routeChildren.REVIEW_NO_FILES_CHOICE;
                 break;
 
             default:

app/src/components/blocks/_admin/reviewDetailsCompleteStage/ReviewDetailsCompleteStage.test.tsx → app/src/components/blocks/_reviews/reviewDetailsCompleteStage/ReviewDetailsCompleteStage.test.tsx

@@ -4,8 +4,8 @@ import userEvent from '@testing-library/user-event';
 import { beforeEach, describe, expect, it, vi, Mock } from 'vitest';
 import ReviewDetailsCompleteStage from './ReviewDetailsCompleteStage';
 import { runAxeTest } from '../../../../helpers/test/axeTestHelper';
-import { CompleteState } from '../../../../pages/adminRoutesPage/AdminRoutesPage';
-import { routeChildren, routes } from '../../../../types/generic/routes';
+import { CompleteState } from '../../../../pages/ReviewsPage/ReviewsPage';
+import { routes } from '../../../../types/generic/routes';
 import { buildPatientDetails } from '../../../../helpers/test/testBuilders';
 import { DOCUMENT_TYPE } from '../../../../helpers/utils/documentType';
 import {
@@ -599,7 +599,7 @@ describe('ReviewDetailsCompletePage', () => {
             const button = screen.getByRole('button', { name: 'Go to documents to review' });
             await user.click(button);
 
-            expect(mockNavigate).toHaveBeenCalledWith(routeChildren.ADMIN_REVIEW, {
+            expect(mockNavigate).toHaveBeenCalledWith(routes.REVIEWS, {
                 replace: true,
             });
         });
@@ -620,7 +620,7 @@ describe('ReviewDetailsCompletePage', () => {
 
             expect(mockSetPatientDetails).toHaveBeenCalledBefore(mockNavigate as Mock);
             expect(mockSetPatientDetails).toHaveBeenCalledWith(null);
-            expect(mockNavigate).toHaveBeenCalledWith(routeChildren.ADMIN_REVIEW, {
+            expect(mockNavigate).toHaveBeenCalledWith(routes.REVIEWS, {
                 replace: true,
             });
         });

app/src/components/blocks/_admin/reviewDetailsCompleteStage/ReviewDetailsCompleteStage.tsx → app/src/components/blocks/_reviews/reviewDetailsCompleteStage/ReviewDetailsCompleteStage.tsx

@@ -1,8 +1,8 @@
 import { Button } from 'nhsuk-react-components';
 import { useNavigate } from 'react-router-dom';
 import useTitle from '../../../../helpers/hooks/useTitle';
-import { routeChildren, routes } from '../../../../types/generic/routes';
-import { CompleteState } from '../../../../pages/adminRoutesPage/AdminRoutesPage';
+import { routes } from '../../../../types/generic/routes';
+import { CompleteState } from '../../../../pages/ReviewsPage/ReviewsPage';
 import { JSX, useEffect, useRef, useState } from 'react';
 import { formatNhsNumber } from '../../../../helpers/utils/formatNhsNumber';
 import { getFormattedDateFromString } from '../../../../helpers/utils/formatDate';
@@ -104,7 +104,7 @@ const ReviewDetailsCompleteStage = ({
 
     const OnComplete = (): void => {
         setPatientDetails(null);
-        navigate(routeChildren.ADMIN_REVIEW, { replace: true });
+        navigate(routes.REVIEWS, { replace: true });
     };
 
     const getDefaultPrmEmailSupportMessage = (): JSX.Element => {

app/src/components/blocks/_admin/reviewDetailsDocumentRemoveAllStage/ReviewDetailsDocumentRemoveAllStage.tsx → app/src/components/blocks/_reviews/reviewDetailsDocumentRemoveAllStage/ReviewDetailsDocumentRemoveAllStage.tsx

@@ -32,7 +32,7 @@ const ReviewDetailsDocumentRemoveAllStage = ({
         setDocuments(documents.filter((doc) => doc.type === UploadDocumentType.REVIEW));
 
         navigateUrlParam(
-            routeChildren.ADMIN_REVIEW_UPLOAD_ADDITIONAL_FILES,
+            routeChildren.REVIEW_UPLOAD_ADDITIONAL_FILES,
             { reviewId: reviewId || '' },
             navigate,
         );

app/src/components/blocks/_admin/reviewDetailsDocumentSelectOrderStage/ReviewDetailsDocumentSelectOrderStage.tsx → app/src/components/blocks/_reviews/reviewDetailsDocumentSelectOrderStage/ReviewDetailsDocumentSelectOrderStage.tsx

@@ -44,7 +44,7 @@ const ReviewDetailsDocumentSelectOrderStage = ({
         );
         setDocuments(updatedDocs);
         navigate(
-            routeChildren.ADMIN_REVIEW_UPLOAD.replaceAll(
+            routeChildren.REVIEW_UPLOAD.replaceAll(
                 ':reviewId',
                 reviewData ? `${reviewData.id}.${reviewData.version}` : '',
             ),

app/src/components/blocks/_admin/reviewDetailsDocumentSelectStage/ReviewDetailsDocumentSelectStage.test.tsx → app/src/components/blocks/_reviews/reviewDetailsDocumentSelectStage/ReviewDetailsDocumentSelectStage.test.tsx

@@ -225,7 +225,7 @@ describe('ReviewDetailsDocumentSelectStage', () => {
 
             await waitFor(() => {
                 expect(mockNavigate).toHaveBeenCalledWith(
-                    routeChildren.ADMIN_REVIEW_UPLOAD_FILE_ORDER.replaceAll(
+                    routeChildren.REVIEW_UPLOAD_FILE_ORDER.replaceAll(
                         ':reviewId',
                         'test-review-id.1',
                     ),
@@ -317,7 +317,7 @@ describe('ReviewDetailsDocumentSelectStage', () => {
 
                 await waitFor(() => {
                     expect(mockNavigate).toHaveBeenCalledWith(
-                        routeChildren.ADMIN_REVIEW_FILE_ERRORS.replaceAll(
+                        routeChildren.REVIEW_FILE_ERRORS.replaceAll(
                             ':reviewId',
                             'test-review-id.1',
                         ),
@@ -354,10 +354,7 @@ describe('ReviewDetailsDocumentSelectStage', () => {
 
             await waitFor(() => {
                 expect(mockNavigate).toHaveBeenCalledWith(
-                    routeChildren.ADMIN_REVIEW_FILE_ERRORS.replaceAll(
-                        ':reviewId',
-                        'test-review-id.1',
-                    ),
+                    routeChildren.REVIEW_FILE_ERRORS.replaceAll(':reviewId', 'test-review-id.1'),
                 );
             });
         });

app/src/components/blocks/_admin/reviewDetailsDocumentSelectStage/ReviewDetailsDocumentSelectStage.tsx → app/src/components/blocks/_reviews/reviewDetailsDocumentSelectStage/ReviewDetailsDocumentSelectStage.tsx

@@ -49,7 +49,7 @@ const ReviewDetailsDocumentSelectStage = ({
 
     const onSuccess = (): void => {
         navigate(
-            routeChildren.ADMIN_REVIEW_UPLOAD_FILE_ORDER.replaceAll(
+            routeChildren.REVIEW_UPLOAD_FILE_ORDER.replaceAll(
                 ':reviewId',
                 `${reviewData?.id}.${reviewData?.version}`,
             ),
@@ -58,7 +58,7 @@ const ReviewDetailsDocumentSelectStage = ({
 
     const onError = (): void => {
         navigate(
-            routeChildren.ADMIN_REVIEW_FILE_ERRORS.replaceAll(
+            routeChildren.REVIEW_FILE_ERRORS.replaceAll(
                 ':reviewId',
                 `${reviewData?.id}.${reviewData?.version}`,
             ),
@@ -80,7 +80,7 @@ const ReviewDetailsDocumentSelectStage = ({
             backLinkOverride={(): void => {
                 navigate(-1);
             }}
-            removeAllFilesLinkOverride={routeChildren.ADMIN_REVIEW_REMOVE_ALL.replaceAll(
+            removeAllFilesLinkOverride={routeChildren.REVIEW_REMOVE_ALL.replaceAll(
                 ':reviewId',
                 `${reviewData?.id}.${reviewData?.version}`,
             )}