Skip to content

[PRMP-860] Refactor upload components to link doc types #959

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

Draft
adamwhitingnhs wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

[PRMP-860] Refactor upload components to link doc types #959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ec5923
[PRMP-861] Upload documents for review
adamwhitingnhs Dec 9, 2025
32a68f0
[PRMP-860] Refactor upload components to link doc types
adamwhitingnhs Dec 18, 2025
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
215 changes: 109 additions & 106 deletions ...e/1-ndr-smoke-tests/gp_user_workflows/upload_lloyd_george_is_bsol_gp_admin_workflow.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ const workspace = Cypress.env('WORKSPACE');
const baseUrl = Cypress.config('baseUrl');

const uploadedFilePathNames = [
'cypress/fixtures/lg-files/zenia_lees/1of3_Lloyd_George_Record_[Zenia Ellisa LEES]_[9730153930]_[20-03-1929].pdf',
'cypress/fixtures/lg-files/zenia_lees/2of3_Lloyd_George_Record_[Zenia Ellisa LEES]_[9730153930]_[20-03-1929].pdf',
'cypress/fixtures/lg-files/zenia_lees/3of3_Lloyd_George_Record_[Zenia Ellisa LEES]_[9730153930]_[20-03-1929].pdf',
'cypress/fixtures/lg-files/zenia_lees/1of3_Lloyd_George_Record_[Zenia Ellisa LEES]_[9730153930]_[20-03-1929].pdf',
'cypress/fixtures/lg-files/zenia_lees/2of3_Lloyd_George_Record_[Zenia Ellisa LEES]_[9730153930]_[20-03-1929].pdf',
'cypress/fixtures/lg-files/zenia_lees/3of3_Lloyd_George_Record_[Zenia Ellisa LEES]_[9730153930]_[20-03-1929].pdf',
];
const uploadedFileNames = [
'1of3_Lloyd_George_Record_[Zenia Ellisa LEES]_[9730153930]_[20-03-1929].pdf',
'2of3_Lloyd_George_Record_[Zenia Ellisa LEES]_[9730153930]_[20-03-1929].pdf',
'3of3_Lloyd_George_Record_[Zenia Ellisa LEES]_[9730153930]_[20-03-1929].pdf',
'1of3_Lloyd_George_Record_[Zenia Ellisa LEES]_[9730153930]_[20-03-1929].pdf',
'2of3_Lloyd_George_Record_[Zenia Ellisa LEES]_[9730153930]_[20-03-1929].pdf',
'3of3_Lloyd_George_Record_[Zenia Ellisa LEES]_[9730153930]_[20-03-1929].pdf',
];

const bucketName = `${workspace}-lloyd-george-store`;
Expand All @@ -28,108 +28,111 @@ const confirmationUrl = '/patient/document-upload/confirmation';
const activePatient = pdsPatients.activeNoUpload;

describe('GP Workflow: Upload Lloyd George record', () => {
context('Upload a Lloyd George document', () => {
beforeEach(() => {
//delete any records present for the active patient
cy.deleteItemsBySecondaryKeyFromDynamoDb(
referenceTableName,
'NhsNumberIndex',
'NhsNumber',
activePatient.toString(),
);
cy.deleteItemsBySecondaryKeyFromDynamoDb(
stitchTableName,
'NhsNumberIndex',
'NhsNumber',
activePatient.toString()
);
uploadedFileNames.forEach((file) => {
cy.deleteFileFromS3(bucketName, file);
});
});

afterEach(() => {
//clean up any records present for the active patient
cy.deleteItemsBySecondaryKeyFromDynamoDb(
referenceTableName,
'NhsNumberIndex',
'NhsNumber',
activePatient.toString(),
);
cy.deleteItemsBySecondaryKeyFromDynamoDb(
stitchTableName,
'NhsNumberIndex',
'NhsNumber',
activePatient.toString()
);
uploadedFileNames.forEach((file) => {
cy.deleteFileFromS3(bucketName, file);
});
});

it(
'[Smoke] GP ADMIN can upload multiple files and then view a Lloyd George record for an active patient with no record',
{ tags: 'smoke', defaultCommandTimeout: 20000 },
() => {
cy.smokeLogin(Roles.SMOKE_GP_ADMIN);

cy.navigateToPatientSearchPage();

cy.get('#nhs-number-input').should('exist');
cy.get('#nhs-number-input').click();
cy.get('#nhs-number-input').type(activePatient);
cy.getByTestId('search-submit-btn').should('exist');
cy.getByTestId('search-submit-btn').click();

cy.url({ timeout: 15000 }).should('contain', patientVerifyUrl);

cy.get('#verify-submit').should('exist');
cy.get('#verify-submit').click();

cy.url().should('contain', lloydGeorgeRecordUrl);
cy.getByTestId('no-records-title').should(
'include.text',
'This patient does not have a Lloyd George record',
);
cy.getByTestId('upload-patient-record-button').should('exist');
cy.getByTestId('upload-patient-record-button').click();
uploadedFilePathNames.forEach((file) => {
cy.getByTestId('button-input').selectFile(file, { force: true });
var index = uploadedFilePathNames.indexOf(file);
cy.get('#selected-documents-table').should('contain', uploadedFileNames[index]);
context('Upload a Lloyd George document', () => {
beforeEach(() => {
//delete any records present for the active patient
cy.deleteItemsBySecondaryKeyFromDynamoDb(
referenceTableName,
'NhsNumberIndex',
'NhsNumber',
activePatient.toString(),
);
cy.deleteItemsBySecondaryKeyFromDynamoDb(
stitchTableName,
'NhsNumberIndex',
'NhsNumber',
activePatient.toString(),
);
uploadedFileNames.forEach((file) => {
cy.deleteFileFromS3(bucketName, file);
});
});
cy.get('#continue-button').click();

cy.url().should('contain', selectOrderUrl);
cy.get('#selected-documents-table').should('exist');
uploadedFileNames.forEach((name) => {
cy.get('#selected-documents-table').should('contain', name);
afterEach(() => {
//clean up any records present for the active patient
cy.deleteItemsBySecondaryKeyFromDynamoDb(
referenceTableName,
'NhsNumberIndex',
'NhsNumber',
activePatient.toString(),
);
cy.deleteItemsBySecondaryKeyFromDynamoDb(
stitchTableName,
'NhsNumberIndex',
'NhsNumber',
activePatient.toString(),
);
uploadedFileNames.forEach((file) => {
cy.deleteFileFromS3(bucketName, file);
});
});
cy.getByTestId('form-submit-button').click();

cy.url().should('contain', confirmationUrl);
uploadedFileNames.forEach((name) => {
cy.get('#selected-documents-table').should('contain', name);
});
cy.getByTestId('confirm-button').click();

cy.getByTestId('upload-complete-page', { timeout: 25000 }).should('exist');
cy.getByTestId('upload-complete-page')
.should('include.text', 'You have successfully uploaded a digital Lloyd George record for');

cy.getByTestId('upload-complete-card').should('be.visible');

cy.getByTestId('home-btn').eq(1).click();

cy.navigateToPatientSearchPage();

cy.get('#nhs-number-input').type(activePatient);
cy.get('#search-submit').click();
cy.wait(5000)

cy.get('.patient-results-form').submit();

cy.get("#pdf-viewer", {timeout: 20000}).should('exist');
});
});
it(
'[Smoke] GP ADMIN can upload multiple files and then view a Lloyd George record for an active patient with no record',
{ tags: 'smoke', defaultCommandTimeout: 20000 },
() => {
cy.smokeLogin(Roles.SMOKE_GP_ADMIN);

cy.navigateToPatientSearchPage();

cy.get('#nhs-number-input').should('exist');
cy.get('#nhs-number-input').click();
cy.get('#nhs-number-input').type(activePatient);
cy.getByTestId('search-submit-btn').should('exist');
cy.getByTestId('search-submit-btn').click();

cy.url({ timeout: 15000 }).should('contain', patientVerifyUrl);

cy.get('#verify-submit').should('exist');
cy.get('#verify-submit').click();

cy.url().should('contain', lloydGeorgeRecordUrl);
cy.getByTestId('no-records-title').should(
'include.text',
'This patient does not have a Lloyd George record',
);
cy.getByTestId('upload-patient-record-button').should('exist');
cy.getByTestId('upload-patient-record-button').click();
uploadedFilePathNames.forEach((file) => {
cy.getByTestId('button-input').selectFile(file, { force: true });
var index = uploadedFilePathNames.indexOf(file);
cy.get('#selected-documents-table').should('contain', uploadedFileNames[index]);
});
cy.get('#continue-button').click();

cy.url().should('contain', selectOrderUrl);
cy.get('#selected-documents-table').should('exist');
uploadedFileNames.forEach((name) => {
cy.get('#selected-documents-table').should('contain', name);
});
cy.getByTestId('form-submit-button').click();

cy.url().should('contain', confirmationUrl);
uploadedFileNames.forEach((name) => {
cy.get('#selected-documents-table').should('contain', name);
});
cy.getByTestId('confirm-button').click();

cy.getByTestId('upload-complete-page', { timeout: 25000 }).should('exist');
cy.getByTestId('upload-complete-page').should(
'include.text',
'You have successfully uploaded a digital Lloyd George record for',
);

cy.getByTestId('upload-complete-card').should('be.visible');

cy.getByTestId('home-btn').eq(1).click();

cy.navigateToPatientSearchPage();

cy.get('#nhs-number-input').type(activePatient);
cy.get('#search-submit').click();
cy.wait(5000);

cy.get('.patient-results-form').submit();

cy.get('#pdf-viewer', { timeout: 20000 }).should('exist');
},
);
});
});
8 changes: 4 additions & 4 deletions app/cypress/support/patients.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
export const pdsPatients = {
activeUpload: 9730153817,
activeNoUpload: 9730153930,
activeUpload: 9730153817,
activeNoUpload: 9730153930,
};
export const stubPatients = {
activeUpload: 9730153817,
activeNoUpload: 9000000068,
activeUpload: 9730153817,
activeNoUpload: 9000000068,
};
11 changes: 10 additions & 1 deletion ...c/components/blocks/_documentUpload/documentSelectOrderStage/DocumentSelectOrderStage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,10 @@ const DocumentSelectOrderStage = ({

if (docToRemove.position) {
updatedDocList = updatedDocList.map((doc) => {
if (doc.docType !== docToRemove.docType) {
return doc;
}

if (doc.position && +doc.position > +docToRemove.position!) {
doc.position = +doc.position - 1;
}
Expand All @@ -185,7 +189,12 @@ const DocumentSelectOrderStage = ({
position: fieldValues[documentPositionKey(doc.id)]!,
}));

setDocuments(updatedDocuments);
setDocuments((previousState) => {
return previousState.map((doc) => {
const updatedDoc = updatedDocuments.find((d) => d.id === doc.id);
return updatedDoc ? updatedDoc : doc;
});
});
};

const submitDocuments = (): void => {
Expand Down
10 changes: 10 additions & 0 deletions app/src/components/blocks/_documentUpload/documentSelectStage/DocumentSelectStage.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.document-select-stage {
.action-buttons {
display: flex;
align-items: center;

.continue-button {
margin-bottom: 0;
}
}
}
Loading
Loading