merge-conflicts

Author: RChandler234

src/backend/src/prisma/seed.ts

@@ -467,7 +467,14 @@ const performSeed: () => Promise<void> = async () => {
         explain: 'need this to initialize work packages'
       }
     ],
-    []
+    [
+      {
+        budgetImpact: 0,
+        description: 'Initializing seed data',
+        timelineImpact: 0,
+        scopeImpact: 'no scope impact'
+      }
+    ]
   );
 
   const changeRequestWP1Id = changeRequestWP1.crId;
@@ -500,7 +507,14 @@ const performSeed: () => Promise<void> = async () => {
         explain: 'need this to initialize work packages'
       }
     ],
-    []
+    [
+      {
+        budgetImpact: 0,
+        description: 'Initializing seed data',
+        timelineImpact: 0,
+        scopeImpact: 'no scope impact'
+      }
+    ]
   );
 
   const changeRequestWP5Id = changeRequestWP5.crId;

src/frontend/src/components/ChangeRequestDropdown.tsx

@@ -34,10 +34,9 @@ interface ChangeRequestDropdownProps {
   control: Control<any, any>;
   name: string;
   errors: FieldErrors<ChangeRequest>;
-  changeHeight?: number;
 }
 
-const ChangeRequestDropdown = ({ control, name, errors, changeHeight = 1 }: ChangeRequestDropdownProps) => {
+const ChangeRequestDropdown = ({ control, name, errors }: ChangeRequestDropdownProps) => {
   const user = useCurrentUser();
   const { isLoading, data: changeRequests } = useAllChangeRequests();
   if (isLoading || !changeRequests) return <LoadingIndicator />;
@@ -69,7 +68,7 @@ const ChangeRequestDropdown = ({ control, name, errors, changeHeight = 1 }: Chan
               onChange={(event: SelectChangeEvent<number>) => onChange(event.target.value)}
               size={'small'}
               placeholder={'Change Request Id'}
-              sx={{ textAlign: 'left', height: changeHeight }}
+              sx={{ height: 56, width: '100%', textAlign: 'left' }}
               error={!!errors.crId}
               MenuProps={{
                 anchorOrigin: {

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

@@ -38,17 +38,18 @@ const WorkPackageForm: React.FC<WorkPackageFormProps> = ({ wbsNum, mutateAsync,
       wp.wbsNum.workPackageNumber === wbsNum.workPackageNumber
   );
 
-  const defaultValues: WorkPackageFormViewPayload | undefined = createForm
-    ? undefined
-    : {
-        ...workPackage!,
-        workPackageId: workPackage!.id,
-        crId: workPackage!.changes[0].changeRequestId.toString(),
-        stage: workPackage!.stage ?? 'NONE',
-        blockedBy: workPackage!.blockedBy.map(wbsPipe),
-        expectedActivities: bulletsToObject(workPackage!.expectedActivities),
-        deliverables: bulletsToObject(workPackage!.deliverables)
-      };
+  const defaultValues: WorkPackageFormViewPayload | undefined =
+    !createForm && workPackage
+      ? {
+          ...workPackage,
+          workPackageId: workPackage.id,
+          crId: workPackage!.changes[0].changeRequestId.toString(),
+          stage: workPackage!.stage ?? 'NONE',
+          blockedBy: workPackage!.blockedBy.map(wbsPipe),
+          expectedActivities: bulletsToObject(workPackage!.expectedActivities),
+          deliverables: bulletsToObject(workPackage!.deliverables)
+        }
+      : undefined;
 
   const blockedByToAutocompleteOption = (workPackage: WorkPackage) => {
     return { id: wbsPipe(workPackage.wbsNum), label: `${wbsPipe(workPackage.wbsNum)} - ${workPackage.name}` };

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

@@ -84,7 +84,7 @@ const WorkPackageFormDetails: React.FC<Props> = ({
           </FormControl>
         </Grid>
         <Grid item xs={12} md={3}>
-          <ChangeRequestDropdown control={control} name="crId" errors={errors} changeHeight={56} />
+          <ChangeRequestDropdown control={control} name="crId" errors={errors} />
         </Grid>
         <Grid item xs={12} md={3}>
           <StageSelect />