#1329 - fix bugs

Author: RChandler234

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

@@ -71,8 +71,8 @@ export default class WorkPackagesController {
         blockedBy,
         expectedActivities,
         deliverables,
-        projectLead,
-        projectManager
+        projectLeadId,
+        projectManagerId
       } = req.body;
 
       let { stage } = req.body;
@@ -93,8 +93,8 @@ export default class WorkPackagesController {
         blockedBy,
         expectedActivities,
         deliverables,
-        projectLead,
-        projectManager
+        projectLeadId,
+        projectManagerId
       );
       return res.status(200).json({ message: 'Work package updated successfully' });
     } catch (error: unknown) {

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

@@ -42,8 +42,8 @@ workPackagesRouter.post(
   body('deliverables').isArray(),
   body('deliverables.*.id').isInt({ min: -1 }).not().isString(),
   nonEmptyString(body('deliverables.*.detail')),
-  intMinZero(body('projectLead').optional()),
-  intMinZero(body('projectManager').optional()),
+  intMinZero(body('projectLeadId').optional()),
+  intMinZero(body('projectManagerId').optional()),
   validateInputs,
   WorkPackagesController.editWorkPackage
 );

src/frontend/src/pages/WorkPackageForm/EditWorkPackageForm.tsx

@@ -2,6 +2,7 @@ import { WbsNumber } from 'shared';
 import WorkPackageForm from './WorkPackageForm';
 import { useEditWorkPackage } from '../../hooks/work-packages.hooks';
 import { useHistory } from 'react-router-dom';
+import LoadingIndicator from '../../components/LoadingIndicator';
 
 interface EditWorkPackageFormProps {
   wbsNum: WbsNumber;
@@ -11,7 +12,9 @@ interface EditWorkPackageFormProps {
 const EditWorkPackageForm: React.FC<EditWorkPackageFormProps> = ({ wbsNum, setPageMode }) => {
   const history = useHistory();
 
-  const { mutateAsync } = useEditWorkPackage(wbsNum);
+  const { mutateAsync, isLoading } = useEditWorkPackage(wbsNum);
+
+  if (isLoading) return <LoadingIndicator />;
 
   return (
     <WorkPackageForm

src/frontend/src/pages/WorkPackageForm/WorkPackageForm.tsx

@@ -44,7 +44,7 @@ const WorkPackageForm: React.FC<WorkPackageFormProps> = ({ wbsNum, mutateAsync,
         ...workPackage!,
         workPackageId: workPackage!.id,
         crId: workPackage!.changes[0].changeRequestId.toString(),
-        stage: workPackage!.stage,
+        stage: workPackage!.stage ?? 'NONE',
         blockedBy: workPackage!.blockedBy.map(wbsPipe),
         expectedActivities: bulletsToObject(workPackage!.expectedActivities),
         deliverables: bulletsToObject(workPackage!.deliverables)

src/frontend/src/pages/WorkPackageForm/WorkPackageFormView.tsx

@@ -54,7 +54,7 @@ export interface WorkPackageFormViewPayload {
   startDate: Date;
   duration: number;
   crId: string;
-  stage: string | undefined;
+  stage: string;
   blockedBy: string[];
   expectedActivities: {
     bulletId: number;
@@ -94,7 +94,7 @@ const WorkPackageFormView: React.FC<WorkPackageFormViewProps> = ({
       blockedBy: defaultValues?.blockedBy ?? [],
       expectedActivities: defaultValues?.expectedActivities ?? [],
       deliverables: defaultValues?.deliverables ?? [],
-      stage: defaultValues?.stage
+      stage: defaultValues?.stage ?? 'NONE'
     }
   });
 
@@ -136,8 +136,8 @@ const WorkPackageFormView: React.FC<WorkPackageFormViewProps> = ({
         startDate: transformDate(startDate),
         duration,
         blockedBy: blockedByWbsNums,
-        expectedActivities,
-        deliverables,
+        expectedActivities: createForm ? expectedActivities.map((activity) => activity.detail) : expectedActivities,
+        deliverables: createForm ? deliverables.map((deliverable) => deliverable.detail) : deliverables,
         stage
       };
       await mutateAsync(payload);