submission changes status, button fix, history approve added

Author: chpy04

src/backend/src/services/part-review.services.ts

@@ -534,6 +534,11 @@ export default class PartReviewService {
       ...getPartSubmissionQueryArgs(organizationId)
     });
 
+    await prisma.part.update({
+      where: { partId },
+      data: { status: Review_Status.READY_FOR_REVIEW }
+    });
+
     if (!part.previewImageId && fileIds.length > 0) {
       await prisma.part.update({
         where: {

src/frontend/src/pages/PartPage/PartPageComponents/PartActionsMenu.tsx

@@ -121,7 +121,7 @@ const PartActionsMenu: React.FC<PartActionsMenuProps> = ({
   const handleReopen = async () => {
     try {
       await editPart({
-        reviewStatus: Review_Status.IN_PROGRESS,
+        reviewStatus: part.status,
         wbsNum: wbsPipe(wbsNum),
         tagIds: part.tags.map((tag) => tag.partTagId),
         assigneeIds: part.assignees.map((assignee) => assignee.userId),

src/frontend/src/pages/PartPage/PartPageComponents/PdfDisplay.tsx

@@ -288,6 +288,7 @@ const PDFViewer: React.FC<FileDisplayProps> = ({ submission, review, hasNext, ne
     setIsDragging(false);
     setPosition({ x: 0, y: 0 });
     setScale(1);
+    setLoadSuccess(false);
   };
 
   return (

src/frontend/src/pages/PartPage/PartPageComponents/ReviewPage.tsx

@@ -103,6 +103,7 @@ const ReviewSidebar: React.FC<ReviewSidebarProps> = ({ submission, review }) =>
         <Button
           onClick={onFormSubmit(Review_Status.IN_PROGRESS)}
           sx={{
+            minWidth: '5rem',
             variant: 'contained',
             textTransform: 'none',
             fontSize: 16,
@@ -118,10 +119,13 @@ const ReviewSidebar: React.FC<ReviewSidebarProps> = ({ submission, review }) =>
         >
           SAVE AS DRAFT
         </Button>
-        <NERSuccessButton onClick={onFormSubmit(Review_Status.REVIEWED)}>Request Changes</NERSuccessButton>
+        <NERSuccessButton onClick={onFormSubmit(Review_Status.REVIEWED)} sx={{ minWidth: '5rem' }}>
+          Request Changes
+        </NERSuccessButton>
         <Button
           onClick={onFormSubmit(Review_Status.APPROVED)}
           sx={{
+            minWidth: '5rem',
             variant: 'contained',
             textTransform: 'none',
             fontSize: 16,

src/frontend/src/utils/part.utils.ts

@@ -67,56 +67,54 @@ export const getReviewRequestHistory = (reviewRequests: PartReviewRequest[]): Hi
   return historyEntries.sort((a, b) => a[0].getTime() - b[0].getTime());
 };
 
-export const getReviewHistory = (submissions: PartSubmission[]): HistoryEntry[] => {
+export const getReviewHistory = (submissions: PartSubmission[], approved: boolean): HistoryEntry[] => {
   if (submissions.length === 0) return [];
   const historyEntries: HistoryEntry[] = [];
 
-  submissions.forEach((sub) => {
-    // Each reviewer gets a separate "began reviewing" and "reviewed"
-    const reviewsForReviewer = new Map<User, PartReview[]>();
-    sub.reviews.forEach((review) => {
-      const reviewer = review.userCreated;
-      if (!reviewsForReviewer.has(reviewer)) {
-        reviewsForReviewer.set(reviewer, []);
-      }
-      reviewsForReviewer.get(reviewer)!.push(review);
-    });
-
-    reviewsForReviewer.forEach((reviews, reviewer) => {
-      processReviewerHistory(reviews, reviewer, sub.name, historyEntries);
+  submissions.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime());
+
+  // if part is approved, the last review must have approved it, so change that one to say reviewed
+  submissions.forEach((sub, subIdx) => {
+    sub.reviews.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime());
+    sub.reviews.forEach((review, reviewIdx) => {
+      processReviewerHistory(
+        review,
+        review.userCreated,
+        sub.name,
+        historyEntries,
+        approved && subIdx === submissions.length - 1 && reviewIdx === sub.reviews.length - 1
+      );
     });
   });
   return historyEntries;
 };
 
 // Processes an individual reviewer's history in a submission
 export const processReviewerHistory = (
-  reviews: PartReview[],
+  review: PartReview,
   reviewer: User,
   subName: string,
-  historyEntries: HistoryEntry[]
+  historyEntries: HistoryEntry[],
+  approved: boolean
 ) => {
   const reviewerName = `${reviewer.firstName} ${reviewer.lastName}`;
-  reviews.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime());
-  if (reviews.length === 0) return;
-
-  const [firstReview] = reviews;
-  historyEntries.push([new Date(firstReview.createdAt), `${reviewerName} began reviewing ${subName}`]);
-
-  reviews.forEach((review) => {
-    if (review.completedAt) {
-      const message = `${reviewerName} reviewed ${subName} (in ${subName} Review)`;
-      historyEntries.push([new Date(review.completedAt), message]);
-    }
-  });
+  if (review.createdAt.getDate !== review.completedAt?.getDate) {
+    historyEntries.push([new Date(review.createdAt), `${reviewerName} began reviewing ${subName}`]);
+  }
+  if (review.completedAt) {
+    const message = approved
+      ? `${reviewerName} approved ${subName}`
+      : `${reviewerName} reviewed ${subName} (in ${subName} Review)`;
+    historyEntries.push([new Date(review.completedAt), message]);
+  }
 };
 
 export const completePartHistory = (part: Part): string[] => {
   const history = [
     ...getPartCreationHistory(part.createdAt, part.commonName),
     ...getSubmissionHistory(part.submissions, part.commonName),
     ...getReviewRequestHistory(part.reviewRequests),
-    ...getReviewHistory(part.submissions)
+    ...getReviewHistory(part.submissions, part.status === Review_Status.APPROVED)
   ];
   const result: string[] = [];
   history