Merge branch 'develop' into #1293-PeterMoise-Refund-Sources

Author: RChandler234

src/backend/src/controllers/reimbursement-requests.controllers.ts

@@ -182,7 +182,10 @@ export default class ReimbursementRequestsController {
 
       const receipt = await ReimbursementRequestService.uploadReceipt(requestId, file, user);
 
-      res.header('Access-Control-Allow-Origin', 'true');
+      const isProd = process.env.NODE_ENV === 'production';
+      const origin = isProd ? 'https://finishlinebyner.com' : 'http://localhost:3000';
+
+      res.header('Access-Control-Allow-Origin', origin);
       res.status(200).json(receipt);
     } catch (error: unknown) {
       next(error);

src/backend/src/services/tasks.services.ts

@@ -94,7 +94,10 @@ export default class TasksService {
    */
   static async editTask(user: User, taskId: string, title: string, notes: string, priority: Task_Priority, deadline: Date) {
     const hasPermission = await hasPermissionToEditTask(user, taskId);
-    if (!hasPermission) throw new AccessDeniedException();
+    if (!hasPermission)
+      throw new AccessDeniedException(
+        'Only admins, app admins, heads, task creators, project leads, project managers, or project assignees can edit a task'
+      );
 
     const originalTask = await prisma.task.findUnique({ where: { taskId } });
     if (!originalTask) throw new NotFoundException('Task', taskId);
@@ -129,7 +132,7 @@ export default class TasksService {
     const hasPermission = await hasPermissionToEditTask(user, taskId);
     if (!hasPermission)
       throw new AccessDeniedException(
-        'Only admins, app admins, task creators, project leads, project managers, or project assignees can edit a task'
+        'Only admins, app admins, heads, task creators, project leads, project managers, or project assignees can edit a task'
       );
 
     const updatedTask = await prisma.task.update({ where: { taskId }, data: { status }, ...taskQueryArgs });
@@ -158,7 +161,7 @@ export default class TasksService {
     const hasPermission = await hasPermissionToEditTask(user, taskId);
     if (!hasPermission)
       throw new AccessDeniedException(
-        'Only admins, app admins, task creators, project leads, project managers, or project assignees can edit a task'
+        'Only admins, app admins, heads, task creators, project leads, project managers, or project assignees can edit a task'
       );
 
     // this throws if any of the users aren't found

src/backend/src/services/work-packages.services.ts

@@ -154,6 +154,12 @@ export default class WorkPackagesService {
       throw new HttpException(400, 'A Work Package cannot have its own project as a blocker');
     }
 
+    blockedBy.forEach((dep: WbsNumber) => {
+      if (dep.workPackageNumber === 0) {
+        throw new HttpException(400, 'A Project cannot be a Blocker');
+      }
+    });
+
     const wbsElem = await prisma.wBS_Element.findUnique({
       where: {
         wbsNumber: {
@@ -287,6 +293,12 @@ export default class WorkPackagesService {
     // verify user is allowed to edit work packages
     if (isGuest(user.role)) throw new AccessDeniedGuestException('edit work packages');
 
+    blockedBy.forEach((dep: WbsNumber) => {
+      if (dep.workPackageNumber === 0) {
+        throw new HttpException(400, 'A Project cannot be a Blocker');
+      }
+    });
+
     const { userId } = user;
 
     // get the original work package so we can compare things

src/backend/tests/tasks.test.ts

@@ -201,7 +201,7 @@ describe('Tasks', () => {
       // Try updating from IN_PROGRESS to IN_BACKLOG
       await expect(() => TasksService.editTaskStatus(aquaman, taskId, Task_Status.IN_BACKLOG)).rejects.toThrow(
         new AccessDeniedException(
-          'Only admins, app admins, task creators, project leads, project managers, or project assignees can edit a task'
+          'Only admins, app admins, heads, task creators, project leads, project managers, or project assignees can edit a task'
         )
       );
     });
@@ -216,7 +216,7 @@ describe('Tasks', () => {
       // Aquaman is a leader, but did not create this task
       await expect(() => TasksService.editTaskStatus(aquaman, taskId, Task_Status.IN_BACKLOG)).rejects.toThrow(
         new AccessDeniedException(
-          'Only admins, app admins, task creators, project leads, project managers, or project assignees can edit a task'
+          'Only admins, app admins, heads, task creators, project leads, project managers, or project assignees can edit a task'
         )
       );
     });
@@ -288,7 +288,7 @@ describe('Tasks', () => {
         TasksService.editTaskAssignees(aquaman, taskId, [superman.userId, wonderwoman.userId])
       ).rejects.toThrow(
         new AccessDeniedException(
-          'Only admins, app admins, task creators, project leads, project managers, or project assignees can edit a task'
+          'Only admins, app admins, heads, task creators, project leads, project managers, or project assignees can edit a task'
         )
       );
     });
@@ -391,7 +391,11 @@ describe('Tasks', () => {
       vi.spyOn(taskUtils, 'hasPermissionToEditTask').mockResolvedValue(false);
       await expect(() =>
         TasksService.editTask(wonderwoman, taskId, fakeTitle, fakeNotes, fakePriority, fakeDeadline)
-      ).rejects.toThrow(new AccessDeniedException());
+      ).rejects.toThrow(
+        new AccessDeniedException(
+          'Only admins, app admins, heads, task creators, project leads, project managers, or project assignees can edit a task'
+        )
+      );
     });
 
     test('Task not found', async () => {

src/frontend/src/apis/change-requests.api.ts

@@ -141,3 +141,12 @@ export const addProposedSolution = (
     budgetImpact
   });
 };
+
+/**
+ * Request reviewers in change request
+ * @param crId The ID of the associated change request.
+ * @param crReviewData The data to request reviewers
+ */
+export const requestCRReview = (crId: string, crReviewData: { userIds: number[] }) => {
+  return axios.post<{ message: string }>(apiUrls.changeRequestRequestReviewer(crId), crReviewData);
+};

src/frontend/src/components/ActionsMenu.tsx

@@ -2,20 +2,22 @@ import { Box } from '@mui/system';
 import { ReactElement, useState } from 'react';
 import { NERButton } from './NERButton';
 import { ArrowDropDown } from '@mui/icons-material';
-import { ListItemIcon, Menu, MenuItem } from '@mui/material';
+import { Divider, ListItemIcon, Menu, MenuItem } from '@mui/material';
 
 export type ButtonInfo = {
   title: string;
   onClick: () => void;
   disabled?: boolean;
   icon?: ReactElement;
+  dividerTop?: boolean;
 };
 
 interface ActionsMenuProps {
   buttons: ButtonInfo[];
+  title?: string;
 }
 
-const ActionsMenu: React.FC<ActionsMenuProps> = ({ buttons }) => {
+const ActionsMenu: React.FC<ActionsMenuProps> = ({ buttons, title = 'Actions' }) => {
   const [anchorEl, setAnchorEl] = useState<null | HTMLElement>(null);
 
   const handleClick = (event: React.MouseEvent<HTMLElement>) => {
@@ -36,22 +38,25 @@ const ActionsMenu: React.FC<ActionsMenuProps> = ({ buttons }) => {
         id="reimbursement-request-actions-dropdown"
         onClick={handleClick}
       >
-        Actions
+        {title}
       </NERButton>
       <Menu open={dropdownOpen} anchorEl={anchorEl} onClose={handleDropdownClose}>
-        {buttons.map((button, index) => (
-          <MenuItem
-            key={index}
-            onClick={() => {
-              handleDropdownClose();
-              button.onClick();
-            }}
-            disabled={button.disabled}
-          >
-            <ListItemIcon>{button.icon}</ListItemIcon>
-            {button.title}
-          </MenuItem>
-        ))}
+        {buttons.flatMap((button, index) => {
+          return [
+            button.dividerTop && <Divider key={`${index}-divider`} />,
+            <MenuItem
+              key={index}
+              onClick={() => {
+                handleDropdownClose();
+                button.onClick();
+              }}
+              disabled={button.disabled}
+            >
+              <ListItemIcon>{button.icon}</ListItemIcon>
+              {button.title}
+            </MenuItem>
+          ];
+        })}
       </Menu>
     </Box>
   );

src/frontend/src/hooks/change-requests.hooks.ts

@@ -13,7 +13,8 @@ import {
   getSingleChangeRequest,
   reviewChangeRequest,
   addProposedSolution,
-  deleteChangeRequest
+  deleteChangeRequest,
+  requestCRReview
 } from '../apis/change-requests.api';
 
 /**
@@ -153,3 +154,22 @@ export const useCreateProposeSolution = () => {
     }
   );
 };
+
+/**
+ * Custom React hook to request cr reviewers
+ */
+export const useRequestCRReview = (crId: string) => {
+  const queryClient = useQueryClient();
+  return useMutation<{ message: string }, Error, any>(
+    ['change requests', 'review'],
+    async (crReviewPayload: { userIds: number[] }) => {
+      const { data } = await requestCRReview(crId, crReviewPayload);
+      return data;
+    },
+    {
+      onSuccess: () => {
+        queryClient.invalidateQueries(['change requests']);
+      }
+    }
+  );
+};

src/frontend/src/hooks/work-packages.hooks.ts

@@ -37,22 +37,6 @@ export const useSingleWorkPackage = (wbsNum: WbsNumber) => {
   });
 };
 
-/**
- * Custom React Hook to supply multiple work packages
- *
- * @param wbsNums WBS numbers of the requested work packages
- */
-export const useManyWorkPackages = (wbsNums: WbsNumber[]) => {
-  return useQuery<WorkPackage[], Error>(['work packages', wbsNums], async () => {
-    const workPackagePromises = wbsNums.map(async (wbsNum) => {
-      const { data } = await getSingleWorkPackage(wbsNum);
-      return data;
-    });
-    const workPackages = await Promise.all(workPackagePromises);
-    return workPackages;
-  });
-};
-
 /**
  * Custom React Hook to create a new work package.
  *