Skip to content

Commit 6b29964

Browse files
jack-nhsJuttonSsteph-torres-nhs
authored
Prmp 1182 - Remove number of files line from available records page (#485)
* removes number of files and size of files from within record card * adds number of files downloading back * fixes tests * remove unnessecary import * remove unnessecary import * remove unnessecary import * remove unnessecary import --------- Co-authored-by: Jack Sutton <[email protected]> Co-authored-by: steph-torres-nhs <[email protected]>
1 parent 735f574 commit 6b29964

File tree

9 files changed

+6
-74
lines changed

9 files changed

+6
-74
lines changed

app/cypress/e2e/0-ndr-core-tests/gp_user_workflows/download_lloyd_george_workflow.cy.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,6 @@ describe('GP Workflow: View Lloyd George record', () => {
171171
// Assert contents of page when downloading
172172
cy.getByTestId('lloyd-george-download-header').should('exist');
173173
cy.getByTestId('cancel-download-link').should('exist');
174-
cy.getByTestId('download-file-header-' + testFiles.length + '-files').should(
175-
'exist',
176-
);
177174

178175
// Assert contents of page after download
179176
cy.wait('@documentManifestCompleted');
@@ -225,7 +222,6 @@ describe('GP Workflow: View Lloyd George record', () => {
225222
cy.title().should('eq', downloadingPageTitle);
226223
// Assert contents of page when downloading
227224
cy.getByTestId('lloyd-george-download-header').should('exist');
228-
cy.getByTestId('download-file-header-2-files').should('exist');
229225

230226
cy.getByTestId('cancel-download-link').should('exist');
231227

@@ -289,8 +285,6 @@ describe('GP Workflow: View Lloyd George record', () => {
289285
cy.title().should('eq', downloadingPageTitle);
290286
// Assert contents of page when downloading
291287
cy.getByTestId('lloyd-george-download-header').should('exist');
292-
cy.getByTestId('download-file-header-1-files').should('exist');
293-
294288
cy.getByTestId('cancel-download-link').should('exist');
295289

296290
// Assert contents of page after download

app/cypress/e2e/0-ndr-core-tests/gp_user_workflows/view_lloyd_george_is_bsol_workflow.cy.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@ describe('GP Workflow: View Lloyd George record', () => {
9595
assertPatientInfo();
9696
cy.getByTestId('pdf-card')
9797
.should('include.text', 'Lloyd George record')
98-
.should('include.text', 'Last updated: 09 October 2023 at 15:41:38')
99-
.should('include.text', '12 files | File size: 502 KB | File format: PDF');
98+
.should('include.text', 'Last updated: 09 October 2023 at 15:41:38');
10099
cy.getByTestId('pdf-viewer').should('be.visible');
101100

102101
// Act - open full screen view

app/src/components/blocks/_lloydGeorge/lloydGeorgeDownloadStage/LloydGeorgeDownloadStage.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,9 @@ describe('LloydGeorgeDownloadStage', () => {
220220

221221
const renderComponent = (history: MemoryHistory, propsOverride?: Partial<Props>) => {
222222
const props: Omit<Props, 'setStage' | 'setDownloadStage'> = {
223-
numberOfFiles: mockPdf.numberOfFiles,
224223
deleteAfterDownload: false,
225224
...propsOverride,
225+
numberOfFiles: mockPdf.numberOfFiles,
226226
};
227227

228228
return render(

app/src/components/blocks/_lloydGeorge/lloydGeorgeDownloadStage/LloydGeorgeDownloadStage.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,14 @@ function LloydGeorgeDownloadStage({
4141
filename: '',
4242
});
4343
const linkRef = useRef<HTMLAnchorElement | null>(null);
44-
44+
const pageDownloadCountId = 'download-file-header-' + numberOfFiles + '-files';
4545
const mounted = useRef(false);
4646
const navigate = useNavigate();
4747
const { mockLocal } = useConfig();
4848
const patientDetails = usePatient();
4949
const nhsNumber = patientDetails?.nhsNumber ?? '';
5050
const [delayTimer, setDelayTimer] = useState<NodeJS.Timeout>();
5151

52-
const pageDownloadCountId = 'download-file-header-' + numberOfFiles + '-files';
53-
5452
const progressTimer = useMemo(() => {
5553
return new FakeProgress({
5654
timeConstant: timeToComplete,
@@ -145,7 +143,6 @@ function LloydGeorgeDownloadStage({
145143
navigate,
146144
mockLocal,
147145
selectedDocuments,
148-
numberOfFiles,
149146
]);
150147

151148
const pageHeader = 'Downloading documents';

app/src/components/blocks/_lloydGeorge/lloydGeorgeRecordDetails/LloydGeorgeRecordDetails.test.tsx

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { render, screen } from '@testing-library/react';
22
import LgRecordDetails, { Props } from './LloydGeorgeRecordDetails';
33
import { buildLgSearchResult } from '../../../../helpers/test/testBuilders';
4-
import formatFileSize from '../../../../helpers/utils/formatFileSize';
54

65
const mockPdf = buildLgSearchResult();
76

@@ -19,20 +18,13 @@ describe('LloydGeorgeRecordDetails', () => {
1918
renderComponent();
2019

2120
expect(screen.getByText(`Last updated: ${mockPdf.lastUpdated}`)).toBeInTheDocument();
22-
expect(screen.getByText(`${mockPdf.numberOfFiles} files`)).toBeInTheDocument();
23-
expect(
24-
screen.getByText(`File size: ${formatFileSize(mockPdf.totalFileSizeInBytes)}`),
25-
).toBeInTheDocument();
26-
expect(screen.getByText('File format: PDF')).toBeInTheDocument();
2721
});
2822
});
2923
});
3024

3125
const renderComponent = (propsOverride?: Partial<Props>) => {
3226
const props: Props = {
3327
lastUpdated: mockPdf.lastUpdated,
34-
numberOfFiles: mockPdf.numberOfFiles,
35-
totalFileSizeInBytes: mockPdf.totalFileSizeInBytes,
3628
...propsOverride,
3729
};
3830
return render(<LgRecordDetails {...props} />);

app/src/components/blocks/_lloydGeorge/lloydGeorgeRecordDetails/LloydGeorgeRecordDetails.tsx

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,16 @@
11
import React from 'react';
2-
import formatFileSize from '../../../../helpers/utils/formatFileSize';
32

43
export type Props = {
54
lastUpdated: string;
6-
numberOfFiles: number;
7-
totalFileSizeInBytes: number;
85
};
96

10-
function LloydGeorgeRecordDetails({ lastUpdated, numberOfFiles, totalFileSizeInBytes }: Props) {
7+
function LloydGeorgeRecordDetails({ lastUpdated }: Props) {
118
return (
129
<div className="lloydgeorge_record-details">
1310
<div className="lloydgeorge_record-details_details">
1411
<div className="lloydgeorge_record-details_details--last-updated">
1512
Last updated: {lastUpdated}
1613
</div>
17-
<div className="lloydgeorge_record-details_details--num-files">
18-
<span>{numberOfFiles} files</span>
19-
{' | '}
20-
<span>File size: {formatFileSize(totalFileSizeInBytes)}</span>
21-
{' | '}
22-
<span>File format: PDF</span>
23-
{' |'}
24-
</div>
2514
</div>
2615
</div>
2716
);

app/src/components/blocks/_lloydGeorge/lloydGeorgeViewRecordStage/LloydGeorgeViewRecordStage.test.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import useRole from '../../../../helpers/hooks/useRole';
99
import useIsBSOL from '../../../../helpers/hooks/useIsBSOL';
1010
import useConfig from '../../../../helpers/hooks/useConfig';
1111
import { act, render, screen, waitFor } from '@testing-library/react';
12-
import formatFileSize from '../../../../helpers/utils/formatFileSize';
1312
import { DOWNLOAD_STAGE } from '../../../../types/generic/downloadStage';
1413
import { getFormattedDate } from '../../../../helpers/utils/formatDate';
1514
import userEvent from '@testing-library/user-event';
@@ -62,11 +61,6 @@ describe('LloydGeorgeViewRecordStage', () => {
6261
expect(screen.getByText('View in full screen')).toBeInTheDocument();
6362
expect(screen.getByText('Lloyd George record')).toBeInTheDocument();
6463
expect(screen.getByText(`Last updated: ${mockPdf.lastUpdated}`)).toBeInTheDocument();
65-
expect(screen.getByText(`${mockPdf.numberOfFiles} files`)).toBeInTheDocument();
66-
expect(
67-
screen.getByText(`File size: ${formatFileSize(mockPdf.totalFileSizeInBytes)}`),
68-
).toBeInTheDocument();
69-
expect(screen.getByText('File format: PDF')).toBeInTheDocument();
7064

7165
expect(
7266
screen.queryByText('No documents are available for this patient.'),

app/src/components/blocks/_lloydGeorge/lloydGeorgeViewRecordStage/LloydGeorgeViewRecordStage.tsx

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ function LloydGeorgeViewRecordStage({
9797
const recordDetailsProps: RecordDetailsProps = {
9898
downloadStage,
9999
lastUpdated,
100-
numberOfFiles,
101-
totalFileSizeInBytes,
102100
};
103101

104102
const pageHeader = 'Available records';
@@ -258,17 +256,9 @@ function LloydGeorgeViewRecordStage({
258256
);
259257
}
260258

261-
type RecordDetailsProps = Pick<
262-
Props,
263-
'downloadStage' | 'lastUpdated' | 'numberOfFiles' | 'totalFileSizeInBytes'
264-
>;
259+
type RecordDetailsProps = Pick<Props, 'downloadStage' | 'lastUpdated'>;
265260

266-
const RecordDetails = ({
267-
downloadStage,
268-
lastUpdated,
269-
numberOfFiles,
270-
totalFileSizeInBytes,
271-
}: RecordDetailsProps) => {
261+
const RecordDetails = ({ downloadStage, lastUpdated }: RecordDetailsProps) => {
272262
switch (downloadStage) {
273263
case DOWNLOAD_STAGE.INITIAL:
274264
case DOWNLOAD_STAGE.PENDING:
@@ -277,8 +267,6 @@ const RecordDetails = ({
277267
case DOWNLOAD_STAGE.SUCCEEDED: {
278268
const detailsProps = {
279269
lastUpdated,
280-
numberOfFiles,
281-
totalFileSizeInBytes,
282270
};
283271
return <LloydGeorgeRecordDetails {...detailsProps} />;
284272
}

app/src/pages/lloydGeorgeRecordPage/LloydGeorgeRecordPage.test.tsx

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
} from '../../helpers/test/testBuilders';
88
import { getFormattedDate } from '../../helpers/utils/formatDate';
99
import axios from 'axios';
10-
import formatFileSize from '../../helpers/utils/formatFileSize';
1110
import usePatient from '../../helpers/hooks/usePatient';
1211
import useConfig from '../../helpers/hooks/useConfig';
1312
import useRole from '../../helpers/hooks/useRole';
@@ -99,20 +98,6 @@ describe('LloydGeorgeRecordPage', () => {
9998
});
10099
});
101100

102-
it('calls refreshRecord and updates state when successful', async () => {
103-
const lgResult = buildLgSearchResult();
104-
mockAxios.post.mockResolvedValue({ data: { jobStatus: 'Complete' } });
105-
mockAxios.get.mockResolvedValue({ data: lgResult });
106-
107-
renderPage(history);
108-
109-
await waitFor(async () => {
110-
expect(screen.getByText(`${lgResult.numberOfFiles} files`)).toBeInTheDocument();
111-
});
112-
113-
expect(screen.getByText('File format: PDF')).toBeInTheDocument();
114-
});
115-
116101
it('renders initial lg record view with no docs available text if lambda return records status is uploading for more than 3 min', async () => {
117102
const errorResponse = {
118103
response: {
@@ -199,12 +184,6 @@ describe('LloydGeorgeRecordPage', () => {
199184

200185
expect(screen.getByText('Lloyd George record')).toBeInTheDocument();
201186
expect(screen.queryByText('No documents are available')).not.toBeInTheDocument();
202-
203-
expect(screen.getByText(`${lgResult.numberOfFiles} files`)).toBeInTheDocument();
204-
expect(
205-
screen.getByText(`File size: ${formatFileSize(lgResult.totalFileSizeInBytes)}`),
206-
).toBeInTheDocument();
207-
expect(screen.getByText('File format: PDF')).toBeInTheDocument();
208187
});
209188

210189
describe('Accessibility', () => {

0 commit comments

Comments
 (0)