Merge branch 'develop' into bugfix-2672/address-test-warnings

Author: mkimberlin

web-ui/src/pages/FeedbackSubmitPage.jsx

@@ -7,6 +7,7 @@ import { useHistory, useLocation } from 'react-router-dom';
 import {
   selectCsrfToken,
   selectCurrentUser,
+  selectIsSubordinateOfCurrentUser,
   selectProfile
 } from '../context/selectors';
 import { AppContext } from '../context/AppContext';
@@ -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');
@@ -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: {
@@ -170,7 +166,7 @@ const FeedbackSubmitPage = () => {
       );
       setRecipient(recipientProfile);
     }
-  }, [feedbackRequest, selfReviewRequest, state]);
+  }, [currentUserId, feedbackRequest, selfReviewRequest, state]);
 
   return (
     <Root className="feedback-submit-page">

web-ui/src/pages/MeritReportPage.jsx

@@ -19,6 +19,8 @@ import { useQueryParameters } from '../helpers/query-parameters';
 
 import markdown from 'markdown-builder';
 
+const noneAvailable = "None available during the period covered by this review.";
+
 const MeritReportPage = () => {
   const { state, dispatch } = useContext(AppContext);
 
@@ -256,49 +258,58 @@ const MeritReportPage = () => {
     let text = markdown.headers.h1("Current Information");
     text += years.toFixed(1) + " years\n\n";
     text += markdown.headers.h2("Biographical Notes");
-    text += currentInfo.biography + "\n\n";
+    text += (currentInfo.biography ? currentInfo.biography :
+                                     noneAvailable) + "\n\n";
     return text;
   };
 
   const markdownKudos = (data) => {
     const kudosList = data.kudos;
     let text = markdown.headers.h1("Kudos");
-    for (let kudos of kudosList) {
-      const date = dateFromArray(kudos.dateCreated);
-      text += kudos.message + "\n\n";
-      text += "     " +
-              markdown.emphasis.i("Submitted on " + formatDate(date) +
-                                  ", by " + kudos.sender) +
-              "\n\n\n";
+    if (kudosList.length > 0) {
+      for (let kudos of kudosList) {
+        const date = dateFromArray(kudos.dateCreated);
+        text += kudos.message + "\n\n";
+        text += "     " +
+                markdown.emphasis.i("Submitted on " + formatDate(date) +
+                                    ", by " + kudos.sender) +
+                "\n\n\n";
+      }
+    } else {
+      text += noneAvailable + "\n\n";
     }
     return text;
   };
 
   const markdownReviewsImpl = (title, feedbackList, listMembers) => {
     let text = markdown.headers.h1(title);
-    for(let feedback of feedbackList) {
-      const members = getUniqueMembers(feedback.answers);
-      for(let member of Object.keys(members)) {
-        if (listMembers) {
-          text += member + ": ";
-        }
-        text += "Submitted - " + formatDate(members[member]) + "\n\n";
-      }
-      text += "\n";
-
-      const questions = getUniqueQuestions(feedback.answers);
-      for(let question of Object.keys(questions)) {
-        text += markdown.headers.h4(question) + "\n";
-        for(let answer of questions[question]) {
+    if (feedbackList.length > 0) {
+      for(let feedback of feedbackList) {
+        const members = getUniqueMembers(feedback.answers);
+        for(let member of Object.keys(members)) {
           if (listMembers) {
-            text += answer[0] + ": ";
+            text += member + ": ";
           }
-          text += answer[1] + "\n\n";
+          text += "Submitted - " + formatDate(members[member]) + "\n\n";
         }
         text += "\n";
+
+        const questions = getUniqueQuestions(feedback.answers);
+        for(let question of Object.keys(questions)) {
+          text += markdown.headers.h4(question) + "\n";
+          for(let answer of questions[question]) {
+            if (listMembers) {
+              text += answer[0] + ": ";
+            }
+            text += answer[1] + "\n\n";
+          }
+          text += "\n";
+        }
       }
+      text += "\n";
+    } else {
+      text += noneAvailable + "\n\n";
     }
-    text += "\n";
     return text;
   }
 
@@ -347,31 +358,35 @@ const MeritReportPage = () => {
   const markdownFeedback = (data) => {
     let text = markdown.headers.h1("Feedback");
     const feedbackList = data.feedback;
-    for(let feedback of feedbackList) {
-      text += markdown.headers.h2("Template: " + feedback.name);
-      const members = getUniqueMembers(feedback.answers);
-      for(let member of Object.keys(members)) {
-        text += member + ": " + formatDate(members[member]) + "\n\n";
-      }
-      text += "\n";
-
-      const questions = getUniqueQuestions(feedback.answers);
-      for(let question of Object.keys(questions)) {
-        text += markdown.headers.h4(question) + "\n";
-        for(let answer of questions[question]) {
-          text += answer[0] + ": " + answer[1] + "\n\n";
+    if (feedbackList.length > 0) {
+      for(let feedback of feedbackList) {
+        text += markdown.headers.h2("Template: " + feedback.name);
+        const members = getUniqueMembers(feedback.answers);
+        for(let member of Object.keys(members)) {
+          text += member + ": " + formatDate(members[member]) + "\n\n";
         }
         text += "\n";
+
+        const questions = getUniqueQuestions(feedback.answers);
+        for(let question of Object.keys(questions)) {
+          text += markdown.headers.h4(question) + "\n";
+          for(let answer of questions[question]) {
+            text += answer[0] + ": " + answer[1] + "\n\n";
+          }
+          text += "\n";
+        }
       }
+      text += "\n";
+    } else {
+      text += noneAvailable + "\n\n";
     }
-    text += "\n";
     return text;
   };
 
   const markdownTitleHistory = (data) => {
     // Get the position history sorted latest to earliest
     const posHistory = data.positionHistory.sort((a, b) => {
-      for(let i = 0; i < a.length; i++) {
+      for(let i = 0; i < a.date.length; i++) {
         if (a.date[i] != b.date[i]) {
           return b.date[i] - a.date[i];
         }