Skip to content

Adjust redirect logic for feedback requests #2783

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 1 commit into from
Nov 21, 2024
Merged

Adjust redirect logic for feedback requests #2783

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
18 changes: 7 additions & 11 deletions web-ui/src/pages/FeedbackSubmitPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { useHistory, useLocation } from 'react-router-dom';
import {
selectCsrfToken,
selectCurrentUser,
selectIsSubordinateOfCurrentUser,
selectProfile
} from '../context/selectors';
import { AppContext } from '../context/AppContext';
Expand Down Expand Up @@ -52,11 +53,6 @@ const FeedbackSubmitPage = () => {
const [requestCanceled, setRequestCanceled] = useState(false);
const feedbackRequestFetched = useRef(false);

function isManager(revieweeProfile) {
const supervisorId = revieweeProfile?.supervisorid;
return supervisorId === currentUserId;
}

useEffect(() => {
if (!requestQuery && !selfRequestQuery) {
history.push('/checkins');
Expand Down Expand Up @@ -147,12 +143,12 @@ const FeedbackSubmitPage = () => {
feedbackRequest?.recipientId
);

// If this is our review or we are the manager of the reviewer we are
// allowed to view this review.
if (recipientProfile?.id != currentUserId &&
!isManager(recipientProfile)) {
// If we know the current user and it's not the recipient or someone in the person having feedback given's
// management heirarchy, then we should issue an error and send them home...
if (currentUserId && feedbackRequest?.recipientId != currentUserId &&
!selectIsSubordinateOfCurrentUser(feedbackRequest?.requesteeId)) {
// The current user is not the recipients's manager, we need to leave.
history.push('/checkins');
history.push('/');
window.snackDispatch({
type: UPDATE_TOAST,
payload: {
Expand All @@ -170,7 +166,7 @@ const FeedbackSubmitPage = () => {
);
setRecipient(recipientProfile);
}
}, [feedbackRequest, selfReviewRequest, state]);
}, [currentUserId, feedbackRequest, selfReviewRequest, state]);

return (
<Root className="feedback-submit-page">
Expand Down