Skip to content

Reappropriated the delete infrastructure to implement a close review button. #2694

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

Merged
mkimberlin merged 2 commits into from
Oct 31, 2024
Merged

Reappropriated the delete infrastructure to implement a close review button. #2694

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d674489
Reappropriated the delete infrastructure to implement a close review …
ocielliottc Oct 31, 2024
325c552
Merge branch 'develop' into bugfix-2693/close-review-period
mkimberlin Oct 31, 2024
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
58 changes: 29 additions & 29 deletions web-ui/src/components/reviews/TeamReviews.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { useLocation, Link } from 'react-router-dom';
import {
AddCircle,
Archive,
Delete,
Search,
Unarchive
} from '@mui/icons-material';
Expand Down Expand Up @@ -50,7 +49,6 @@ import {
updateReviewPeriod
} from '../../api/reviewperiods.js';
import {
DELETE_REVIEW_PERIOD,
UPDATE_REVIEW_PERIOD,
UPDATE_REVIEW_PERIODS,
UPDATE_TOAST
Expand All @@ -61,7 +59,7 @@ import {
selectCurrentMembers,
selectCurrentUser,
selectCurrentUserSubordinates,
selectHasDeleteReviewPeriodPermission,
selectHasCloseReviewPeriodPermission,
selectHasLaunchReviewPeriodPermission,
selectHasUpdateReviewPeriodPermission,
selectReviewPeriod,
Expand Down Expand Up @@ -136,7 +134,7 @@ const TeamReviews = ({ onBack, periodId }) => {
const [confirmApproveAllOpen, setConfirmApproveAllOpen] = useState(false);
const [confirmationDialogOpen, setConfirmationDialogOpen] = useState(false);
const [confirmationText, setConfirmationText] = useState('');
const [confirmDeleteOpen, setConfirmDeleteOpen] = useState(false);
const [confirmCloseOpen, setConfirmCloseOpen] = useState(false);
const [memberSelectorOpen, setMemberSelectorOpen] = useState(false);
const [nameQuery, setNameQuery] = useState('');
const [query, setQuery] = useState({});
Expand All @@ -148,7 +146,7 @@ const TeamReviews = ({ onBack, periodId }) => {
const [showAll, setShowAll] = useState(false);
const [hasShowAll, setHasShowAll] = useState(false);
const [teamMembers, setTeamMembers] = useState([]);
const [toDelete, setToDelete] = useState(null);
const [toClose, setToClose] = useState(null);
const [unapproved, setUnapproved] = useState([]);
const [validationMessage, setValidationMessage] = useState(null);
const [confirmRevieweesWithNoSupervisorOpen, setConfirmRevieweesWithNoSupervisorOpen] = useState(false);
Expand Down Expand Up @@ -348,31 +346,29 @@ const TeamReviews = ({ onBack, periodId }) => {
}
}, [csrf, dispatch]);

const confirmDelete = useCallback(() => {
setToDelete(period.id);
setConfirmDeleteOpen(true);
}, [period, setToDelete, setConfirmDeleteOpen]);
const confirmClose = useCallback(() => {
setToClose(period.id);
setConfirmCloseOpen(true);
}, [period, setToClose, setConfirmCloseOpen]);

const handleConfirmDeleteClose = useCallback(() => {
setToDelete(null);
setConfirmDeleteOpen(false);
}, [setToDelete, setConfirmDeleteOpen]);
const handleConfirmCloseClose = useCallback(() => {
setToClose(null);
setConfirmCloseOpen(false);
}, [setToClose, setConfirmCloseOpen]);

const handleConfirmApproveAllClose = useCallback(() => {
setConfirmApproveAllOpen(false);
}, [setToDelete, setConfirmApproveAllOpen]);
}, [setConfirmApproveAllOpen]);

const deleteReviewPeriod = useCallback(async () => {
const closeReviewPeriod = useCallback(async () => {
if (!csrf) return;

await removeReviewPeriod(toDelete, csrf);
dispatch({
type: DELETE_REVIEW_PERIOD,
payload: toDelete
});
handleConfirmDeleteClose();
if (period.reviewStatus === ReviewStatus.OPEN) {
updateReviewPeriodStatus(ReviewStatus.CLOSED);
}
handleConfirmCloseClose();
onBack();
}, [csrf, dispatch, toDelete, handleConfirmDeleteClose]);
}, [csrf, dispatch, toClose, handleConfirmCloseClose]);

const getReviewers = useCallback(
reviewee => {
Expand Down Expand Up @@ -829,14 +825,18 @@ const TeamReviews = ({ onBack, periodId }) => {
}
};

const approvalButton = () => {
const modifierButton = () => {
switch (period.reviewStatus) {
case ReviewStatus.PLANNING:
return <Button onClick={requestApproval}>Request Approval</Button>;
case ReviewStatus.AWAITING_APPROVAL:
return selectHasLaunchReviewPeriodPermission(state) ? (
<Button onClick={requestApproval}>Launch Review</Button>
) : null;
case ReviewStatus.OPEN:
return selectHasCloseReviewPeriodPermission(state) ? (
<Button onClick={confirmClose}>Close Review</Button>
) : null;
default:
return null;
}
Expand Down Expand Up @@ -971,7 +971,7 @@ const TeamReviews = ({ onBack, periodId }) => {
disabled={!canUpdate}
/>
</div>
{approvalButton()}
{modifierButton()}
</div>
)}
{validationMessage && (
Expand Down Expand Up @@ -1093,11 +1093,11 @@ const TeamReviews = ({ onBack, periodId }) => {
}}
/>
<ConfirmationDialog
open={confirmDeleteOpen}
onYes={deleteReviewPeriod}
question={`Are you sure you want to delete the review period ${selectReviewPeriod(state, toDelete)?.name}?`}
setOpen={setConfirmDeleteOpen}
title="Delete this review period?"
open={confirmCloseOpen}
onYes={closeReviewPeriod}
question={`Are you sure you want to close the review period ${selectReviewPeriod(state, toClose)?.name}?`}
setOpen={setConfirmCloseOpen}
title="Close this review period?"
/>
<ConfirmationDialog
open={confirmApproveAllOpen}
Expand Down
Loading