diff --git a/cypress/e2e/components/proceedings.spec.js b/cypress/e2e/components/proceedings.spec.js index 533a09d8f..151cae1cd 100644 --- a/cypress/e2e/components/proceedings.spec.js +++ b/cypress/e2e/components/proceedings.spec.js @@ -92,7 +92,6 @@ describe('Proceedings page', () => { assertAllProceedingsExist(); const selectProceedings = () => { - cy.contains('Select').click(); cy.get('.proceeding-row-list-item input[type="checkbox"][data-reference="2022-KKD2YF1"]').check(); cy.get('.proceeding-row-list-item input[type="checkbox"][data-reference="2025-P1TJ3BC"]').check(); }; @@ -155,7 +154,6 @@ describe('Proceedings page', () => { ); const selectProceedings = () => { - cy.contains('Select').click(); cy.get('.proceeding-row-list-item input[type="checkbox"][data-reference="2022-KKD2YF1"]').check(); cy.get('.proceeding-row-list-item input[type="checkbox"][data-reference="2025-1INGZ5L6"]').check(); }; diff --git a/src/Components/RequestList.tsx b/src/Components/RequestList.tsx index 4df6bfc68..dc3e61bef 100644 --- a/src/Components/RequestList.tsx +++ b/src/Components/RequestList.tsx @@ -40,7 +40,6 @@ export const RequestList = (props: RequestListProps) => { ]); const [selectedRequestIds, setSelectedRequestIds] = useState([]); - const [selectionMode, setSelectionMode] = useState(false); const sortedRequestIdsOldToNew = useMemo( () => @@ -96,7 +95,6 @@ export const RequestList = (props: RequestListProps) => { for (const reference of selectedRequestIds) removeProceeding(reference); setSelectedRequestIds([]); - setSelectionMode(false); }, [selectedRequestIds, removeProceeding]); const changeSelectedStatus = useCallback( @@ -131,136 +129,118 @@ export const RequestList = (props: RequestListProps) => { ) : ( <>
- + href={`${window.BASE_URL}generator`}> + {t('new-request', 'generator')} + - {!selectionMode && ( - - {t('new-request', 'generator')} - - )} + <> + {props.importEmailsButton} + + - {!selectionMode && ( - <> - {props.importEmailsButton} +
+ - - )} - - {selectionMode && ( -
- - {selectedRequestIds.length > 0 && ( - <> - - - - - - - - - - - - )} -
+ {selectedRequestIds.length > 0 && ( + <> + + + + + + + + + + + + )}
- )} +