Skip to content

My Requests: Make Selection Mode always on #1255

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

Open
mal-tee wants to merge 1 commit into
base: master
Choose a base branch
from
Open

My Requests: Make Selection Mode always on #1255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions cypress/e2e/components/proceedings.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
};
Expand Down Expand Up @@ -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();
};
Expand Down
222 changes: 101 additions & 121 deletions src/Components/RequestList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ export const RequestList = (props: RequestListProps) => {
]);

const [selectedRequestIds, setSelectedRequestIds] = useState<string[]>([]);
const [selectionMode, setSelectionMode] = useState(false);

const sortedRequestIdsOldToNew = useMemo(
() =>
Expand Down Expand Up @@ -96,7 +95,6 @@ export const RequestList = (props: RequestListProps) => {
for (const reference of selectedRequestIds) removeProceeding(reference);

setSelectedRequestIds([]);
setSelectionMode(false);
}, [selectedRequestIds, removeProceeding]);

const changeSelectedStatus = useCallback(
Expand Down Expand Up @@ -131,136 +129,118 @@ export const RequestList = (props: RequestListProps) => {
) : (
<>
<div className="proceedings-toolbar">
<button
<a
id="new-request"
className="button button-secondary button-small"
onClick={() => setSelectionMode(!selectionMode)}>
{selectionMode ? <Text id="cancel" /> : <Text id="selection-mode" />}
</button>
href={`${window.BASE_URL}generator`}>
{t('new-request', 'generator')}
</a>

{!selectionMode && (
<a
id="new-request"
className="button button-secondary button-small"
href={`${window.BASE_URL}generator`}>
{t('new-request', 'generator')}
</a>
)}
<>
{props.importEmailsButton}
<button
id="clear-button"
className="button button-error button-small"
onClick={() =>
window.confirm(t('modal-clear-requests', 'privacy-controls')) && clearProceedings()
}>
<Text id="delete-all-btn" />
</button>
</>

{!selectionMode && (
<>
{props.importEmailsButton}
<div className="dropdown-container" style="float:right;">
<button className="icon-ellipsis button button-small button-secondary" />
<div className="dropdown" style="right: 0; max-width: 400px; width: 90vw;">
<button
id="clear-button"
className="button button-error button-small"
onClick={() =>
window.confirm(t('modal-clear-requests', 'privacy-controls')) &&
clearProceedings()
}>
<Text id="delete-all-btn" />
id="toggle-all-button"
className="button button-secondary"
style="margin-right: 10px;"
onClick={() => {
setSelectedRequestIds(
selectedRequestIds.length === sortedRequestIdsOldToNew.length
? []
: sortedRequestIdsOldToNew
);
}}
title={t('more-options', 'my-requests')}>
<Text
id={`${
selectedRequestIds.length === sortedRequestIdsOldToNew.length ? 'de' : ''
}select-all`}
/>
</button>
</>
)}

{selectionMode && (
<div className="dropdown-container" style="float:right;">
<button className="icon-ellipsis button button-small button-secondary" />
<div className="dropdown" style="right: 0; max-width: 400px; width: 90vw;">
<button
id="toggle-all-button"
className="button button-secondary"
style="margin-right: 10px;"
onClick={() => {
setSelectionMode(true);
setSelectedRequestIds(
selectedRequestIds.length === sortedRequestIdsOldToNew.length
? []
: sortedRequestIdsOldToNew
);
}}
title={t('more-options', 'my-requests')}>
<Text
id={`${
selectedRequestIds.length === sortedRequestIdsOldToNew.length
? 'de'
: ''
}select-all`}
/>
</button>
{selectedRequestIds.length > 0 && (
<>
<a
id="download-button"
className="button button-secondary"
href={URL.createObjectURL(buildCsv())}
download={csv_download_filename}
style="margin-right: 10px;">
<Text id="export-btn" />
</a>
<a
id="export-ics-button"
className="button button-secondary"
href={URL.createObjectURL(buildIcs())}
download={ics_download_filename}
style="margin-right: 10px;">
<Text id="export-ics" />
</a>
<button
id="delete-selected-proceedings-button"
className="button button-secondary"
style="margin-right: 10px;"
onClick={() =>
confirm(t('delete-selected-proceedings-confirm', 'my-requests')) &&
deleteSelected()
}>
<Text id="delete-selected-proceedings" />
</button>
<button
id="mark-selected-as-done-button"
className="button button-secondary"
style="margin-right: 10px;"
onClick={() => changeSelectedStatus('done')}>
<Text id="mark-selected-as-done" />
</button>
<button
id="mark-selected-as-abandoned-button"
className="button button-secondary"
style="margin-right: 10px;"
onClick={() => changeSelectedStatus('abandoned')}>
<Text id="mark-selected-as-abandoned" />
</button>
<button
id="reactivate-selected-button"
className="button button-secondary"
style="margin-right: 10px;"
onClick={() => changeSelectedStatus('reactivate')}>
<Text id="reactivate-selected" />
</button>
</>
)}
</div>
{selectedRequestIds.length > 0 && (
<>
<a
id="download-button"
className="button button-secondary"
href={URL.createObjectURL(buildCsv())}
download={csv_download_filename}
style="margin-right: 10px;">
<Text id="export-btn" />
</a>
<a
id="export-ics-button"
className="button button-secondary"
href={URL.createObjectURL(buildIcs())}
download={ics_download_filename}
style="margin-right: 10px;">
<Text id="export-ics" />
</a>
<button
id="delete-selected-proceedings-button"
className="button button-secondary"
style="margin-right: 10px;"
onClick={() =>
confirm(t('delete-selected-proceedings-confirm', 'my-requests')) &&
deleteSelected()
}>
<Text id="delete-selected-proceedings" />
</button>
<button
id="mark-selected-as-done-button"
className="button button-secondary"
style="margin-right: 10px;"
onClick={() => changeSelectedStatus('done')}>
<Text id="mark-selected-as-done" />
</button>
<button
id="mark-selected-as-abandoned-button"
className="button button-secondary"
style="margin-right: 10px;"
onClick={() => changeSelectedStatus('abandoned')}>
<Text id="mark-selected-as-abandoned" />
</button>
<button
id="reactivate-selected-button"
className="button button-secondary"
style="margin-right: 10px;"
onClick={() => changeSelectedStatus('reactivate')}>
<Text id="reactivate-selected" />
</button>
</>
)}
</div>
)}
</div>
</div>
<ul className="proceeding-rows">
{(props.sortOrder === 'old-to-new' ? sortedRequestIdsOldToNew : sortedRequestIdsNewToOld).map(
(id) => (
<li className="proceeding-row-list-item">
{selectionMode && (
<input
className="form-element"
type="checkbox"
aria-labelledby={`proceeding-row-heading-${proceedings[id].reference}`}
checked={selectedRequestIds.includes(proceedings[id].reference)}
data-reference={proceedings[id].reference}
onChange={(e) =>
setSelectedRequestIds((prev) =>
e.currentTarget.checked
? [...prev, e.currentTarget.dataset.reference!]
: prev.filter((i) => i !== e.currentTarget.dataset.reference!)
)
}
/>
)}
<input
className="form-element"
type="checkbox"
aria-labelledby={`proceeding-row-heading-${proceedings[id].reference}`}
checked={selectedRequestIds.includes(proceedings[id].reference)}
data-reference={proceedings[id].reference}
onChange={(e) =>
setSelectedRequestIds((prev) =>
e.currentTarget.checked
? [...prev, e.currentTarget.dataset.reference!]
: prev.filter((i) => i !== e.currentTarget.dataset.reference!)
)
}
/>
<ProceedingRow
proceeding={proceedings[id]}
getBlobFromStorage={props.getBlobFromStorage}
Expand Down