Merge remote-tracking branch 'origin/main' into PRMP-1058

# Conflicts:
#	.github/workflows/base-lambdas-reusable-deploy-all.yml
#	lambdas/handlers/report_orchestration_handler.py

Author: PedroSoaresNHS

.github/workflows/base-lambdas-reusable-deploy-all.yml

@@ -837,4 +837,18 @@ jobs:
       lambda_aws_name: SesFeedbackMonitor
       lambda_layer_names: "core_lambda_layer,reports_lambda_layer"
     secrets:
-      AWS_ASSUME_ROLE: ${{ secrets.AWS_ASSUME_ROLE }}
+      AWS_ASSUME_ROLE: ${{ secrets.AWS_ASSUME_ROLE }}
+
+  deploy_concurrency_controller_lambda:
+    name: Deploy Concurrency Controller Lambda
+    uses: ./.github/workflows/base-lambdas-reusable-deploy.yml
+    with:
+      environment: ${{ inputs.environment }}
+      python_version: ${{ inputs.python_version }}
+      build_branch: ${{ inputs.build_branch }}
+      sandbox: ${{ inputs.sandbox }}
+      lambda_handler_name: concurrency_controller_handler
+      lambda_aws_name: ConcurrencyController
+      lambda_layer_names: "core_lambda_layer"
+    secrets:
+      AWS_ASSUME_ROLE: ${{ secrets.AWS_ASSUME_ROLE }}

Makefile

@@ -81,9 +81,16 @@ clean-test:
 	find . -name '.cache' -exec rm -fr {} +
 
 format:
+ifeq ($(CONTAINER), true)
+	./.venv/bin/python3 -m isort --profile black lambdas/
+	./.venv/bin/python3 -m black lambdas/
+	./.venv/bin/ruff check lambdas/ --fix
+else
 	./lambdas/venv/bin/python3 -m isort --profile black lambdas/
 	./lambdas/venv/bin/python3 -m black lambdas/
 	./lambdas/venv/bin/ruff check lambdas/ --fix
+endif
+
 
 sort-requirements:
 	sort -o $(TEST_REQUIREMENTS) $(TEST_REQUIREMENTS)

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

@@ -33,7 +33,7 @@ describe('GP Workflow: Download Lloyd George summary report', () => {
 
                     cy.wait('@downloadReportFinished', { timeout: 20000 });
 
-                    cy.url().should('contain', Cypress.config('baseUrl') + `${routes.createReportComplete}?reportType=0`);
+                    cy.url().should('contain', Cypress.config('baseUrl') + `${routes.createReportComplete}?reportType=PATIENT`);
                 },
             );
         });

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

@@ -33,7 +33,7 @@ describe('GP Workflow: Download Lloyd George summary report', () => {
 
                 cy.url().should(
                     'contain',
-                    Cypress.config('baseUrl') + `${routes.createReportComplete}?reportType=0`,
+                    Cypress.config('baseUrl') + `${routes.createReportComplete}?reportType=PATIENT`,
                 );
 
                 cy.getByTestId('logout-btn').click();

app/cypress/support/e2e.ts

@@ -122,7 +122,7 @@ Cypress.Commands.add('navigateToDownloadReportPage', () => {
     cy.getByTestId('download-report-btn').should('exist');
     cy.getByTestId('download-report-btn').click();
 
-    cy.url().should('contain', baseUrl + `${routes.createReport}?reportType=0`);
+    cy.url().should('contain', baseUrl + `${routes.createReport}?reportType=PATIENT`);
 });
 
 declare global {

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

@@ -732,4 +732,18 @@ describe('ReviewsPage', () => {
             });
         });
     });
+
+    describe('Report Download Link', () => {
+        it('renders download report link with correct href', async () => {
+            renderComponent();
+
+            await waitFor(() => {
+                expect(screen.getByText('900 000 0001')).toBeInTheDocument();
+            });
+
+            const downloadLink = screen.getByText('Download a report on this data');
+            expect(downloadLink).toBeInTheDocument();
+            expect(downloadLink).toHaveAttribute('href', '/create-report?reportType=REVIEW');
+        });
+    });
 });

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

@@ -19,6 +19,7 @@ import BackButton from '../../../generic/backButton/BackButton';
 import { Pagination } from '../../../generic/paginationV2/Pagination';
 import SpinnerButton from '../../../generic/spinnerButton/SpinnerButton';
 import SpinnerV2 from '../../../generic/spinnerV2/SpinnerV2';
+import { REPORT_TYPE } from '../../../../types/generic/reports';
 import { AxiosError } from 'axios';
 import { errorToParams } from '../../../../helpers/utils/errorToParams';
 
@@ -292,6 +293,13 @@ export const ReviewsPage = ({ setReviewData }: ReviewsPageProps): React.JSX.Elem
             </p>
 
             <Table.Panel heading="Documents to review" className="reviews-page" allowFullScreen>
+                <div className="nhsuk-u-text-align-right">
+                    <a
+                        href={`${routes.REPORT_DOWNLOAD}?reportType=${REPORT_TYPE.ODS_REVIEW_SUMMARY}`}
+                    >
+                        Download a report on this data
+                    </a>
+                </div>
                 {/* Search box */}
                 <form
                     id="search-form"

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

@@ -146,6 +146,29 @@ describe('DocumentSelectStage', () => {
             const expectedDob = getFormattedDate(new Date(patientDetails.birthDate));
             expect(screen.getByText(expectedDob)).toBeInTheDocument();
         });
+
+        it('should show remove files error message when skip is clicked after selecting a file', async () => {
+            const config = {
+                ...docConfig,
+                stitched: false,
+            };
+            renderApp(history, {
+                showSkipLink: true,
+                documentConfig: config,
+            });
+
+            await userEvent.upload(screen.getByTestId('button-input'), [
+                buildLgFile(1),
+            ]);
+
+            await userEvent.click(await screen.findByTestId('skip-link'));
+
+            await waitFor(() => {
+                expect(screen.getByTestId('error-box')).toHaveTextContent(
+                    'Remove files before you skip to the next step',
+                );
+            });
+        });
     });
 
     describe('Navigation', () => {

app/src/components/blocks/_documentUpload/documentSelectStage/DocumentSelectStage.tsx

@@ -65,6 +65,7 @@ const DocumentSelectStage = ({
     const fileInputAreaRef = useRef<HTMLFieldSetElement>(null);
     const [lastErrorsLength, setLastErrorsLength] = useState(0);
     const [tooManyFilesAdded, setTooManyFilesAdded] = useState<boolean>(false);
+    const [removeFilesToSkip, setRemoveFilesToSkip] = useState<boolean>(false);
     const journey = getJourney();
 
     const navigate = useEnhancedNavigate();
@@ -109,6 +110,7 @@ const DocumentSelectStage = ({
         }
 
         if (!multifile && fileArray.length > 1) {
+            resetErrors();
             setTooManyFilesAdded(true);
             return;
         }
@@ -199,6 +201,10 @@ const DocumentSelectStage = ({
         let updatedDocList: UploadDocument[] = [...documents];
         updatedDocList.splice(index, 1);
 
+        if (updatedDocList.filter((doc) => doc.docType === documentType).length === 0) {
+            setRemoveFilesToSkip(false);
+        }
+
         updateDocuments(updatedDocList);
     };
 
@@ -210,8 +216,6 @@ const DocumentSelectStage = ({
                 position: index + 1,
             }));
 
-        setNoFilesSelected(sortedDocs.length === 0);
-
         setDocuments((previousState) => {
             const docs = previousState.filter((doc) => doc.docType !== documentType);
             return [...docs, ...sortedDocs];
@@ -248,6 +252,8 @@ const DocumentSelectStage = ({
     };
 
     const continueClicked = (): void => {
+        resetErrors();
+        
         if (!validateDocuments()) {
             scrollToRef.current?.scrollIntoView({ behavior: 'smooth' });
             return;
@@ -263,10 +269,19 @@ const DocumentSelectStage = ({
             return;
         }
 
-        skipClicked();
+        skipClicked(false);
     };
 
-    const skipClicked = (): void => {
+    const skipClicked = (checkDocCount: boolean = true): void => {
+        if (checkDocCount && documents.some(doc => doc.docType === documentType)) {
+            resetErrors();
+            setRemoveFilesToSkip(true);
+            setTimeout(() => {
+                scrollToRef.current?.scrollIntoView({ behavior: 'smooth' });
+            }, 0);
+            return;
+        }
+
         if (goToNextDocType) {
             goToNextDocType();
             window.scrollTo(0, 0);
@@ -337,6 +352,11 @@ const DocumentSelectStage = ({
                 linkId: 'upload-files',
                 error: UPLOAD_FILE_ERROR_TYPE.tooManyFiles,
             });
+        } else if (removeFilesToSkip) {
+            errors.push({
+                linkId: 'upload-files',
+                error: UPLOAD_FILE_ERROR_TYPE.removeFilesToSkip,
+            });
         } else {
             errorDocs().forEach((doc) => {
                 errors.push({
@@ -352,6 +372,7 @@ const DocumentSelectStage = ({
     const resetErrors = (): void => {
         setNoFilesSelected(false);
         setTooManyFilesAdded(false);
+        setRemoveFilesToSkip(false);
     };
 
     const backClicked = (): void => {
@@ -371,7 +392,7 @@ const DocumentSelectStage = ({
                 Go back
             </BackLink>
 
-            {(errorDocs().length > 0 || noFilesSelected || tooManyFilesAdded) && (
+            {(errorDocs().length > 0 || noFilesSelected || tooManyFilesAdded || removeFilesToSkip) && (
                 <ErrorBox
                     dataTestId="error-box"
                     errorBoxSummaryId="failed-document-uploads-summary-title"
@@ -541,7 +562,7 @@ const DocumentSelectStage = ({
                     Continue
                 </Button>
                 {showSkiplink && (
-                    <LinkButton data-testid="skip-link" onClick={skipClicked}>
+                    <LinkButton data-testid="skip-link" onClick={() => skipClicked()}>
                         {documentConfig.content.skipDocumentLinkText}
                     </LinkButton>
                 )}

app/src/components/blocks/_downloadReport/downloadReportSelectStage/DownloadReportSelectStage.test.tsx

@@ -12,7 +12,6 @@ import { beforeEach, describe, expect, it, vi, MockedFunction, Mock } from 'vite
 const mockDownloadReport = downloadReport as MockedFunction<typeof downloadReport>;
 const mockUseConfig = vi.fn();
 
-
 const mockedUseNavigate = vi.fn();
 vi.mock('react-router-dom', async () => {
     const actual = await vi.importActual('react-router-dom');
@@ -46,7 +45,7 @@ describe('DownloadReportSelectStage', () => {
             const report = getReportByType(REPORT_TYPE.ODS_PATIENT_SUMMARY);
             render(<DownloadReportSelectStage report={report!} />);
 
-            expect(screen.getByTestId('return-to-home-button')).toBeInTheDocument();
+            expect(screen.getByTestId('go-back-button')).toBeInTheDocument();
             const title = screen.getByTestId('title');
             expect(title).toBeInTheDocument();
             expect(title.innerHTML).toContain(report!.title);
@@ -56,7 +55,7 @@ describe('DownloadReportSelectStage', () => {
                 ).toBeInTheDocument();
             });
             expect(screen.queryByTestId('error-notification-banner')).not.toBeInTheDocument();
-            expect(screen.getByText('Go to home')).toBeInTheDocument();
+            expect(screen.getByText('Go back')).toBeInTheDocument();
         });
 
         it('should render error notification when download fails', async () => {
@@ -107,33 +106,16 @@ describe('DownloadReportSelectStage', () => {
         });
     });
 
-    it('should navigate to home when clicking go to home link', async () => {
+    it('should navigate to back when clicking go back link', async () => {
         const report = getReportByType(REPORT_TYPE.ODS_PATIENT_SUMMARY);
         render(<DownloadReportSelectStage report={report!} />);
-
-        await userEvent.click(screen.getByText('Go to home'));
-        await waitFor(() => {
-            expect(mockedUseNavigate).toHaveBeenCalledWith(routes.HOME);
-        });
-    });
-
-    it ('should navigate to admin hub, upload version 3 enabled', async () => {
-        mockUseConfig.mockReturnValue({
-            featureFlags: { uploadDocumentIteration3Enabled: true },
-        });
-
-        const report = getReportByType(REPORT_TYPE.ODS_PATIENT_SUMMARY);
-        render(<DownloadReportSelectStage report={report!} />);
-
         let backLink: Element;
-        backLink = screen.getByTestId('return-to-home-button');
-
+        backLink = screen.getByTestId('go-back-button');
         expect(backLink).toHaveTextContent('Go back');
 
         await userEvent.click(backLink);
-
         await waitFor(() => {
-            expect(mockedUseNavigate).toHaveBeenCalledWith(routes.ADMIN_ROUTE);
-        })
+            expect(mockedUseNavigate).toHaveBeenCalledWith(-1);
+        });
     });
 });