Skip to content

[PRMP-1309] LG review reorder/add if both files have the same name it isn't clear which one is being previewed #1017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamwhitingnhs merged 5 commits into from
Feb 2, 2026
Merged

[PRMP-1309] LG review reorder/add if both files have the same name it isn't clear which one is being previewed #1017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a05b671
[PRMP-1309] Updated selected file handling in ReviewDetailsAssessment…
lillie-dae Jan 23, 2026
ba43583
removed italics
lillie-dae Jan 26, 2026
cb350b6
fix issue with selecting review files
lillie-dae Jan 30, 2026
9b8540a
improve test coverage
lillie-dae Feb 2, 2026
b479ee6
Merge branch 'main' into PRMP-1309
adamwhitingnhs Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
269 changes: 255 additions & 14 deletions ...mponents/blocks/_admin/reviewDetailsAssessmentStage/ReviewDetailsAssessmentStage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,219 @@ describe('ReviewDetailsAssessmentPage', () => {
expect(mockGetReviewById).toHaveBeenCalled();
});
});

it('displays selected new file when viewing', async () => {
const user = userEvent.setup();
const reviewData = createMockReviewData();
const mockGetReviewById = vi.spyOn(getReviewsModule, 'getReviewById');
mockGetReviewById.mockResolvedValue(reviewData as any);

render(
<ReviewDetailsAssessmentStage
reviewData={reviewData}
setReviewData={mockSetReviewData}
uploadDocuments={createMockUploadDocuments()}
downloadStage={DOWNLOAD_STAGE.SUCCEEDED}
setDownloadStage={mockSetDownloadStage}
hasExistingRecordInStorage={true}
/>,
);

const viewButtons = screen.getAllByRole('button', { name: /View/i });
await act(async () => {
await user.click(viewButtons[1]);
});

await waitFor(() => {
expect(
screen.getByText((content, element) => {
return (
element?.tagName.toLowerCase() === 'strong' &&
content.includes('You are currently viewing:') &&
content.includes('new-file-1.pdf')
);
}),
).toBeInTheDocument();
});
});

it('displays selected existing file when viewing', async () => {
const user = userEvent.setup();
const reviewData = createMockReviewData();

render(
<ReviewDetailsAssessmentStage
reviewData={reviewData}
setReviewData={mockSetReviewData}
uploadDocuments={createMockUploadDocuments()}
downloadStage={DOWNLOAD_STAGE.SUCCEEDED}
setDownloadStage={mockSetDownloadStage}
hasExistingRecordInStorage={true}
/>,
);

const existingFileViewButton = screen.getByTestId('existing-record-table');
const viewButton = existingFileViewButton.querySelector('button');

await act(async () => {
await user.click(viewButton!);
});

await waitFor(() => {
expect(
screen.getByText((content, element) => {
return (
element?.tagName.toLowerCase() === 'strong' &&
content.includes('You are currently viewing:') &&
content.includes('existing-file-1.pdf')
);
}),
).toBeInTheDocument();
});
});

it('displays "(new files)" label when multiple documents have same filename', async () => {
const user = userEvent.setup();
const reviewData = createMockReviewData();
const mockGetReviewById = vi.spyOn(getReviewsModule, 'getReviewById');
mockGetReviewById.mockResolvedValue(reviewData as any);

// Create upload documents with duplicate filenames
const uploadDocsWithDuplicates: ReviewUploadDocument[] = [
{
id: 'new-1',
file: new File(['test content 1'], 'duplicate.pdf', {
type: 'application/pdf',
}),
type: UploadDocumentType.REVIEW,
state: DOCUMENT_UPLOAD_STATE.SELECTED,
docType: '16521000000101' as DOCUMENT_TYPE,
attempts: 0,
},
{
id: 'new-2',
file: new File(['test content 2'], 'duplicate.pdf', {
type: 'application/pdf',
}),
type: UploadDocumentType.REVIEW,
state: DOCUMENT_UPLOAD_STATE.SELECTED,
docType: '16521000000101' as DOCUMENT_TYPE,
attempts: 0,
},
];

reviewData.files = [
{
fileName: 'duplicate.pdf',
uploadDate: '2024-01-15T10:00:00Z',
presignedUrl: 'https://test-url-1.com',
},
];

render(
<ReviewDetailsAssessmentStage
reviewData={reviewData}
setReviewData={mockSetReviewData}
uploadDocuments={uploadDocsWithDuplicates}
downloadStage={DOWNLOAD_STAGE.SUCCEEDED}
setDownloadStage={mockSetDownloadStage}
hasExistingRecordInStorage={true}
/>,
);

const viewButtons = screen.getAllByRole('button', { name: /View duplicate.pdf/i });
await act(async () => {
await user.click(viewButtons[0]); // Click first duplicate
});

await waitFor(() => {
expect(screen.getByText(/\(new files\)/)).toBeInTheDocument();
expect(
screen.getByText((content, element) => {
return (
element?.tagName.toLowerCase() === 'strong' &&
content.includes('You are currently viewing') &&
content.includes('duplicate.pdf')
);
}),
).toBeInTheDocument();
});
});

it('displays "(existing files)" label when multiple existing documents have same filename', async () => {
const user = userEvent.setup();
const reviewData = createMockReviewData();

// Create upload documents with duplicate existing filenames
const uploadDocsWithDuplicates: ReviewUploadDocument[] = [
{
id: 'existing-1',
file: new File(['existing content 1'], 'existing-dup.pdf', {
type: 'application/pdf',
}),
type: UploadDocumentType.EXISTING,
state: DOCUMENT_UPLOAD_STATE.SELECTED,
docType: '16521000000101' as DOCUMENT_TYPE,
attempts: 0,
},
{
id: 'existing-2',
file: new File(['existing content 2'], 'existing-dup.pdf', {
type: 'application/pdf',
}),
type: UploadDocumentType.EXISTING,
state: DOCUMENT_UPLOAD_STATE.SELECTED,
docType: '16521000000101' as DOCUMENT_TYPE,
attempts: 0,
},
];

reviewData.existingFiles = [
{
fileName: 'existing-dup.pdf',
created: '2023-12-01T10:00:00Z',
virusScannerResult: 'Clean',
id: 'existing-1',
fileSize: 1024,
version: '1',
documentSnomedCodeType: '16521000000101' as DOCUMENT_TYPE,
contentType: 'application/pdf',
url: 'https://existing-url-1.com',
blob: undefined,
},
];

render(
<ReviewDetailsAssessmentStage
reviewData={reviewData}
setReviewData={mockSetReviewData}
uploadDocuments={uploadDocsWithDuplicates}
downloadStage={DOWNLOAD_STAGE.SUCCEEDED}
setDownloadStage={mockSetDownloadStage}
hasExistingRecordInStorage={true}
/>,
);

const existingFileViewButton = screen.getByTestId('existing-record-table');
const viewButton = existingFileViewButton.querySelector('button');

await act(async () => {
await user.click(viewButton!);
});

await waitFor(() => {
expect(screen.getByText(/\(existing files\)/)).toBeInTheDocument();
expect(
screen.getByText((content, element) => {
return (
element?.tagName.toLowerCase() === 'strong' &&
content.includes('You are currently viewing') &&
content.includes('existing-dup.pdf')
);
}),
).toBeInTheDocument();
});
});
});

describe('Radio button selection', () => {
Expand Down Expand Up @@ -832,17 +1045,32 @@ describe('ReviewDetailsAssessmentPage', () => {
describe('Navigation with accept action and multifileReview', () => {
it('navigates to UPLOAD when accept is selected with single file', async () => {
const user = userEvent.setup();
const singleFileReviewData = createMockReviewData(false, true, false, '24511000000107' as DOCUMENT_TYPE);
singleFileReviewData.files = [{ fileName: 'single-file.pdf', uploadDate: '2024-01-15T09:00:00Z', presignedUrl: 'http://example.com' }];

const singleUploadDoc = [{
id: 'new-1',
file: new File(['test content'], 'single-file.pdf', { type: 'application/pdf' }),
type: UploadDocumentType.REVIEW,
state: DOCUMENT_UPLOAD_STATE.SELECTED,
docType: '24511000000107' as DOCUMENT_TYPE,
attempts: 0,
}];
const singleFileReviewData = createMockReviewData(
false,
true,
false,
'24511000000107' as DOCUMENT_TYPE,
);
singleFileReviewData.files = [
{
fileName: 'single-file.pdf',
uploadDate: '2024-01-15T09:00:00Z',
presignedUrl: 'http://example.com',
},
];

const singleUploadDoc = [
{
id: 'new-1',
file: new File(['test content'], 'single-file.pdf', {
type: 'application/pdf',
}),
type: UploadDocumentType.REVIEW,
state: DOCUMENT_UPLOAD_STATE.SELECTED,
docType: '24511000000107' as DOCUMENT_TYPE,
attempts: 0,
},
];

render(
<ReviewDetailsAssessmentStage
Expand Down Expand Up @@ -871,10 +1099,23 @@ describe('ReviewDetailsAssessmentPage', () => {

it('navigates to UPLOAD_FILE_ORDER when accept is selected with multiple files', async () => {
const user = userEvent.setup();
const multipleFileReviewData = createMockReviewData(false, true, false, '24511000000107' as DOCUMENT_TYPE);
const multipleFileReviewData = createMockReviewData(
false,
true,
false,
'24511000000107' as DOCUMENT_TYPE,
);
multipleFileReviewData.files = [
{ fileName: 'file-1.pdf', uploadDate: '2024-01-15T09:00:00Z', presignedUrl: 'http://example.com/1' },
{ fileName: 'file-2.pdf', uploadDate: '2024-01-16T09:00:00Z', presignedUrl: 'http://example.com/2' },
{
fileName: 'file-1.pdf',
uploadDate: '2024-01-15T09:00:00Z',
presignedUrl: 'http://example.com/1',
},
{
fileName: 'file-2.pdf',
uploadDate: '2024-01-16T09:00:00Z',
presignedUrl: 'http://example.com/2',
},
];

const multiUploadDocs: ReviewUploadDocument[] = [
Expand Down
28 changes: 21 additions & 7 deletions ...rc/components/blocks/_admin/reviewDetailsAssessmentStage/ReviewDetailsAssessmentStage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ export type ReviewDetailsAssessmentStageProps = {
hasExistingRecordInStorage: boolean;
};

export type SelectedFile = { fileName: string; reviewType: UploadDocumentType };

const ReviewDetailsAssessmentStage = ({
reviewData,
setReviewData,
Expand All @@ -52,7 +54,7 @@ const ReviewDetailsAssessmentStage = ({
const { reviewId } = useParams<{ reviewId: string }>();
const navigate = useNavigate();

const [selectedFile, setSelectedFile] = useState<string | null>(null);
const [selectedFile, setSelectedFile] = useState<SelectedFile | null>(null);
const [fileAction, setFileAction] = useState<FileAction>('');
const [showError, setShowError] = useState(false);
const errorSummaryRef = useRef<HTMLDivElement>(null);
Expand All @@ -70,15 +72,15 @@ const ReviewDetailsAssessmentStage = ({
return;
}
getPdfObjectUrl(file.url || '', (): void => {}, setDownloadStage);
setSelectedFile(filename);
setSelectedFile({ fileName: filename, reviewType: UploadDocumentType.EXISTING });
return;
}

const existing = uploadDocuments.find((doc) => doc.type === UploadDocumentType.EXISTING);
if (!existing) {
return;
}
setSelectedFile(filename);
setSelectedFile({ fileName: filename, reviewType: UploadDocumentType.EXISTING });
};

const handleNewFileView = async (file: ReviewsListFiles): Promise<void> => {
Expand All @@ -88,7 +90,7 @@ const ReviewDetailsAssessmentStage = ({
}

if (isLocal) {
setSelectedFile(file.fileName);
setSelectedFile({ fileName: file.fileName, reviewType: UploadDocumentType.REVIEW });
getPdfObjectUrl(file.presignedUrl, (): void => {}, setDownloadStage);
return;
}
Expand Down Expand Up @@ -129,7 +131,7 @@ const ReviewDetailsAssessmentStage = ({
setReviewData(reviewData);
}

setSelectedFile(file.fileName);
setSelectedFile({ fileName: file.fileName, reviewType: UploadDocumentType.REVIEW });
}
setDownloadStage(DOWNLOAD_STAGE.SUCCEEDED);
};
Expand Down Expand Up @@ -411,14 +413,26 @@ const ReviewDetailsAssessmentStage = ({
{selectedFile && (
<section className="file-viewer mb-4">
<p>
<strong>You are currently viewing: {selectedFile}</strong>
<strong>
Comment thread
adamwhitingnhs marked this conversation as resolved.
You are currently viewing
{uploadDocuments.filter((f) => f.file.name === selectedFile.fileName)
.length >= 2 &&
Comment thread
steph-torres-nhs marked this conversation as resolved.
(selectedFile.reviewType === UploadDocumentType.EXISTING
? ' (existing files)'
: ' (new files)')}
{': '}
{selectedFile.fileName}
</strong>
</p>
{downloadStage === DOWNLOAD_STAGE.PENDING ? (
<Spinner status="Preparing file for viewing..." />
) : (
<DocumentUploadLloydGeorgePreview
documents={uploadDocuments.filter(
(f) => f.file.name === selectedFile && f.file.name.endsWith('.pdf'),
(f) =>
f.type === selectedFile.reviewType &&
f.file.name === selectedFile.fileName &&
f.file.name.endsWith('.pdf'),
)}
setMergedPdfBlob={(): void => {}}
stitchedBlobLoaded={(): void => {}}
Expand Down
Loading
Loading