Always show two tabs when doing using TeamMemberReview and show the self-review regardless of supervisor status of the currrent user.

Author: ocielliottc

web-ui/src/components/reviews/TeamMemberReview.jsx

@@ -97,8 +97,7 @@ const TeamMemberReview = ({
   const csrf = selectCsrfToken(state);
   const currentUser = selectCurrentUser(state);
   const theme = useTheme();
-  const [value, setValue] = useState(0);
-  const [init, setInit] = useState(true);
+  const [value, setValue] = useState(1);
   const [reassignOpen, setReassignOpen] = useState(false);
   const [cancelOpen, setCancelOpen] = useState(false);
 
@@ -211,10 +210,6 @@ const TeamMemberReview = ({
   let selfReviewIcon = <HourglassEmptyIcon />;
   if (selfReview && selfReview.status?.toUpperCase() === 'SUBMITTED') {
     selfReviewIcon = <CheckCircleIcon />;
-  } else if (init) {
-    // If there is no self-review, switch to the next tab.
-    setInit(false);
-    setValue(1);
   }
 
   return (

web-ui/src/components/reviews/TeamReviews.jsx

@@ -735,15 +735,12 @@ const TeamReviews = ({ onBack, periodId }) => {
                       recipientProfile?.supervisorid === currentUser?.id;
       const selfSubmitted = selfReviewRequest?.status == 'submitted';
       if (manages) {
-        let separator = '?';
-        url = "/feedback/submit";
+        url = "/feedback/submit?tabs=true";
         if (request) {
-          url += `${separator}request=${request.id}`;
-          separator = '&';
+          url += `&request=${request.id}`;
         }
         if (selfSubmitted) {
-          url += `${separator}selfrequest=${selfReviewRequest.id}`;
-          separator = '&';
+          url += `&selfrequest=${selfReviewRequest.id}`;
         }
       }
     }

web-ui/src/pages/FeedbackSubmitPage.jsx

@@ -40,6 +40,7 @@ const FeedbackSubmitPage = () => {
   const location = useLocation();
   const history = useHistory();
   const query = queryString.parse(location?.search);
+  const tabs = query.tabs?.toString();
   const requestQuery = query.request?.toString();
   const selfRequestQuery = query.selfrequest?.toString();
   const [showTips, setShowTips] = useState(true);
@@ -123,7 +124,6 @@ const FeedbackSubmitPage = () => {
     ) {
       getFeedbackRequest(selfRequestQuery, csrf).then(request => {
         if (request) {
-          // Permission to view this feedback request will be checked later.
           setSelfReviewRequest(request);
         }
       });
@@ -169,13 +169,6 @@ const FeedbackSubmitPage = () => {
         selfReviewRequest?.recipientId
       );
       setRecipient(recipientProfile);
-
-      if (!isManager(recipientProfile)) {
-        // The current user is not the recipient's manager, we need to clear
-        // out the self review request so that we do not display something that
-        // we shouldn't, on the next page.
-        setSelfReviewRequest(null);
-      }
     }
   }, [feedbackRequest, selfReviewRequest, state]);
 
@@ -185,7 +178,7 @@ const FeedbackSubmitPage = () => {
         <Typography className={classes.announcement} variant="h3">
           This feedback request has been canceled.
         </Typography>
-      ) : requestSubmitted || selfReviewRequest ? (
+      ) : tabs || requestSubmitted || selfReviewRequest ? (
         <TeamMemberReview
           reviews={[feedbackRequest]}
           selfReview={selfReviewRequest}