misc changes

Author: chpy04

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

@@ -223,7 +223,6 @@ export default class PartReviewService {
   }
 
   static async uploadFile(file: Express.Multer.File) {
-    console.log('Service Function file', file);
     const data = await uploadFile(file);
 
     if (!data?.id) {

src/backend/tests/unit/part-review.test.ts

@@ -1004,7 +1004,7 @@ describe('part review tests', () => {
 
       const part = await createTestPart(superman, 'door', '1', 1, project.projectId);
 
-      const testPart = await PartReviewService.getPart(organization, project1?.wbsElement as WbsNumber, '1');
+      const testPart = await PartReviewService.getPart(organization, batman, project1?.wbsElement as WbsNumber, '1');
 
       expect(testPart.userCreated.userId).toEqual(part.userCreatedId);
       expect(testPart.commonName).toBe(part.commonName);
@@ -1027,7 +1027,7 @@ describe('part review tests', () => {
       });
       const wbsNum = project1?.wbsElement as WbsNumber;
 
-      await expect(PartReviewService.getPart(organization, wbsNum, '1')).rejects.toThrow(
+      await expect(PartReviewService.getPart(organization, batman, wbsNum, '1')).rejects.toThrow(
         new NotFoundException('Part', `projectId: ${project.projectId} and index number: 1`)
       );
     });

src/frontend/src/pages/PartPage/PartPage.tsx

@@ -211,12 +211,7 @@ const PartPage: React.FC = () => {
         { name: 'Files', route: `${routes.PROJECTS}/${wbsNum}/parts-review` }
       ]}
       headerRight={
-        <PartActionsMenu
-          part={partWithAllReviews}
-          submissionIndex={subIndex}
-          reviewIndex={reviewIndex}
-          wbsNum={validateWBS(wbsNum)}
-        />
+        <PartActionsMenu part={part} submissionIndex={subIndex} reviewIndex={reviewIndex} wbsNum={validateWBS(wbsNum)} />
       }
     >
       <Breadcrumbs sx={{ mb: 2 }}></Breadcrumbs>

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

@@ -119,10 +119,6 @@ const PartActionsMenu: React.FC<PartActionsMenuProps> = ({
       : null;
 
   const handleReopen = async () => {
-    if (!latestReview) {
-      toast.error('No review found.');
-      return;
-    }
     try {
       await editPart({
         reviewStatus: Review_Status.IN_PROGRESS,

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

@@ -2,28 +2,35 @@ import { Typography } from '@mui/material';
 import { Box, Stack } from '@mui/system';
 import { PartSubmission, PartReview } from 'shared';
 import DownloadButton from '../../../components/DownloadButton';
+import LoadingIndicator from '../../../components/LoadingIndicator';
 
 interface PartSubmissionProps {
   submission: PartSubmission;
 }
 
 const PartSubmissionDetails = ({ submission }: PartSubmissionProps) => {
-  const reviewNotes = (reviews: PartReview[]): string => {
+  const reviewNotes = (reviews: PartReview[]) => {
     if (reviews.length === 0) {
-      return 'No Reviews Yet.';
+      return <Typography variant="body1">No Reviews Yet.</Typography>;
     }
     if (reviews.filter((review) => review.notes).length === 0) {
-      return 'There are no notes.';
+      return <Typography variant="body1">There are no notes.</Typography>;
     }
     return (
-      '\n' +
-      reviews
-        .filter((review) => review.notes)
-        .map((review) => '- ' + review.notes)
-        .join('\n')
+      <Box>
+        {reviews
+          .filter((review) => review.notes)
+          .map((review) => (
+            <Typography key={review.partReviewId} variant="body1">
+              - {review.notes}
+            </Typography>
+          ))}
+      </Box>
     );
   };
 
+  if (!submission) return <LoadingIndicator />;
+
   return (
     <Stack spacing={2} alignItems="left" width="100%">
       <Typography variant="h4" mb={1}>
@@ -58,7 +65,9 @@ const PartSubmissionDetails = ({ submission }: PartSubmissionProps) => {
       </Typography>
 
       <Typography variant="body1">
-        <b>Reviewer Notes: </b>
+        <b>
+          Reviewer Notes: <br />
+        </b>
         {reviewNotes(submission.reviews)}
       </Typography>
     </Stack>

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

@@ -145,9 +145,9 @@ const PDFViewer: React.FC<FileDisplayProps> = ({ submission, review, hasNext, ne
     data: pdf,
     isLoading: pdfLoading,
     isError: pdfIsError
-  } = useDownloadFile(review?.completedAt ? review.fileIds[fileIdx] : submission.fileIds[fileIdx]);
+  } = useDownloadFile(review?.completedAt ? review.fileIds[fileIdx] : submission?.fileIds[fileIdx]);
 
-  if (!mistakes || isLoadingCommonMistake) return <LoadingIndicator />;
+  if (!mistakes || isLoadingCommonMistake || !submission) return <LoadingIndicator />;
   if (isErrorCommonMistakes) return <ErrorPage error={errorCommonMistakes} />;
 
   //only enter review mode if this user is the creator of the non-complete review
@@ -314,6 +314,7 @@ const PDFViewer: React.FC<FileDisplayProps> = ({ submission, review, hasNext, ne
               sx={{ display: 'flex', height: '50%', transform: 'translateY(50%)' }}
               onClick={() => {
                 resetPos();
+                setFileIdx(0);
                 prev();
               }}
             >
@@ -329,6 +330,7 @@ const PDFViewer: React.FC<FileDisplayProps> = ({ submission, review, hasNext, ne
               sx={{ display: 'flex', height: '50%', transform: 'translateY(50%)' }}
               onClick={() => {
                 resetPos();
+                setFileIdx(0);
                 next();
               }}
             >

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/PartReview/PartReviewComponents/PartFormModels/ReviewFormModal.tsx

@@ -234,7 +234,7 @@ const ReviewFormModal = ({ open, handleClose, defaultValues, onSubmit, partsInPr
               name="status"
               control={control}
               render={({ field: { onChange, value } }) => {
-                const statusOptions = Object.values(Review_Status);
+                const statusOptions = [Review_Status.APPROVED, Review_Status.REVIEWED];
 
                 return (
                   <Autocomplete
@@ -267,6 +267,9 @@ const ReviewFormModal = ({ open, handleClose, defaultValues, onSubmit, partsInPr
           </FormControl>
         </Grid>
       </Grid>
+      <Typography variant="body2" sx={{ mb: -2 }}>
+        To create a review with markups on a submission, visit the part's page
+      </Typography>
     </NERFormModal>
   );
 };

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/PartReview/PartReviewComponents/PartPreviewCard.tsx

@@ -40,7 +40,7 @@ export function PartPreviewCard({ partPreview, projectName, redirectUrl }: PartP
           {previewImageId && previewUrl ? (
             <Box
               sx={{
-                height: 200,
+                height: '15vw',
                 border: '0.5px solid rgb(193, 193, 193)',
                 bgcolor: grey[600],
                 overflow: 'hidden'