2024-09-04 - bugfix-2579 - add check on null supervisors

Author: Luch76

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

@@ -124,7 +124,6 @@ const TeamReviews = ({ onBack, periodId }) => {
   const [canUpdate, setCanUpdate] = useState(false);
   const [confirmApproveAllOpen, setConfirmApproveAllOpen] = useState(false);
   const [confirmationDialogOpen, setConfirmationDialogOpen] = useState(false);
-  const [confirmRevieweesWithNoSupervisorOpen, setConfirmRevieweesWithNoSupervisorOpen] = useState(false);
   const [confirmationText, setConfirmationText] = useState('');
   const [confirmDeleteOpen, setConfirmDeleteOpen] = useState(false);
   const [memberSelectorOpen, setMemberSelectorOpen] = useState(false);
@@ -140,6 +139,8 @@ const TeamReviews = ({ onBack, periodId }) => {
   const [toDelete, setToDelete] = useState(null);
   const [unapproved, setUnapproved] = useState([]);
   const [validationMessage, setValidationMessage] = useState(null);
+  const [confirmRevieweesWithNoSupervisorOpen, setConfirmRevieweesWithNoSupervisorOpen] = useState(false);
+  const [confirmRevieweesWithNoSupervisorQuestion, setConfirmRevieweesWithNoSupervisorQuestionText] = useState('');
 
   const loadedReviews = useRef(false);
   const loadingReviews = useRef(false);
@@ -662,29 +663,12 @@ const TeamReviews = ({ onBack, periodId }) => {
     console.log("TeamReviews, requestApproval, uniqueNamesWithNoSupervisor", uniqueNamesWithNoSupervisor);
 
     if (uniqueNamesWithNoSupervisor.trim().length > 0) {
-
+      setConfirmRevieweesWithNoSupervisorQuestionText(uniqueNamesWithNoSupervisor);
+      setConfirmRevieweesWithNoSupervisorOpen(true);
+    } else {
+      return requestApprovalPost();
     }
 
-    if (period.reviewStatus === ReviewStatus.PLANNING) {
-      updateReviewPeriodStatus(ReviewStatus.AWAITING_APPROVAL);
-    } else if (period.reviewStatus === ReviewStatus.AWAITING_APPROVAL) {
-      const visibleIds = new Set(visibleTeamMembers().map(m => m.id));
-      const unapproved = assignments.filter(
-        a => !a.approved && visibleIds.has(a.revieweeId)
-      );
-      // logAssignments(unapproved); // for debugging
-      setUnapproved(unapproved);
-      setConfirmationText(
-        unapproved.length === 0
-          ? 'Are you sure you want to launch the review period?'
-          : unapproved.length === 1
-            ? 'There is one visible, unapproved review assignment. ' +
-              'Would you like to approve it and launch this review period?'
-            : `There are ${unapproved.length} visible, unapproved review assignments. ` +
-              'Would you like to approve all of them and launch this review period?'
-      );
-      setConfirmationDialogOpen(true);
-    }
   };
 
   const compareStrings = (s1, s2) => (s1 || '').localeCompare(s2 || '');
@@ -797,6 +781,29 @@ const TeamReviews = ({ onBack, periodId }) => {
     onBack();
   };
 
+  const requestApprovalPost = async () => {
+    if (period.reviewStatus === ReviewStatus.PLANNING) {
+      updateReviewPeriodStatus(ReviewStatus.AWAITING_APPROVAL);
+    } else if (period.reviewStatus === ReviewStatus.AWAITING_APPROVAL) {
+      const visibleIds = new Set(visibleTeamMembers().map(m => m.id));
+      const unapproved = assignments.filter(
+          a => !a.approved && visibleIds.has(a.revieweeId)
+      );
+      // logAssignments(unapproved); // for debugging
+      setUnapproved(unapproved);
+      setConfirmationText(
+          unapproved.length === 0
+              ? 'Are you sure you want to launch the review period?'
+              : unapproved.length === 1
+                  ? 'There is one visible, unapproved review assignment. ' +
+                  'Would you like to approve it and launch this review period?'
+                  : `There are ${unapproved.length} visible, unapproved review assignments. ` +
+                  'Would you like to approve all of them and launch this review period?'
+      );
+      setConfirmationDialogOpen(true);
+    }
+  }
+
   const unapproveAll = () => {
     visibleTeamMembers().map(member => approveMember(member, false));
   };
@@ -1069,7 +1076,7 @@ const TeamReviews = ({ onBack, periodId }) => {
       />
       <ConfirmationDialog
           open={confirmRevieweesWithNoSupervisorOpen}
-          onYes={confirmRevieweesWithNoSupervisorYes}
+          onYes={requestApprovalPost}
           question={confirmRevieweesWithNoSupervisorQuestion}
           setOpen={setConfirmRevieweesWithNoSupervisorOpen}
           title="These reviewees have no supervisor. Continue?"