#1329 removed lead/manager fields on create and changed cr dropdown

Author: walker-sean

src/frontend/src/components/ChangeRequestDropdown.tsx

@@ -49,6 +49,10 @@ const ChangeRequestDropdown = ({ control, name, errors, changeHeight = 1 }: Chan
     value: cr.crId
   }));
 
+  const renderValues = new Map<number, string>();
+
+  changeRequests.forEach((cr) => renderValues.set(cr.crId, `${cr.crId} - ${wbsPipe(cr.wbsNum)}`));
+
   return (
     <Box>
       <FormControl fullWidth>
@@ -60,7 +64,7 @@ const ChangeRequestDropdown = ({ control, name, errors, changeHeight = 1 }: Chan
             <Select
               id="cr-autocomplete"
               displayEmpty
-              renderValue={(value) => value}
+              renderValue={(value) => renderValues.get(value)}
               value={value}
               onChange={(event: SelectChangeEvent<number>) => onChange(event.target.value)}
               size={'small'}

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

@@ -23,6 +23,7 @@ interface Props {
   usersForProjectManager: User[];
   control: Control<WorkPackageFormViewPayload>;
   errors: Partial<FieldErrorsImpl<WorkPackageFormViewPayload>>;
+  createForm?: boolean;
 }
 
 const WorkPackageFormDetails: React.FC<Props> = ({
@@ -33,7 +34,8 @@ const WorkPackageFormDetails: React.FC<Props> = ({
   usersForProjectLead,
   usersForProjectManager,
   control,
-  errors
+  errors,
+  createForm
 }) => {
   const userToOption = (user?: User): { label: string; id: string } => {
     if (!user) return { label: '', id: '' };
@@ -121,30 +123,34 @@ const WorkPackageFormDetails: React.FC<Props> = ({
             />
           </FormControl>
         </Grid>
-        <Grid item xs={12} md={5}>
-          <FormLabel> Project Lead</FormLabel>
-          <NERAutocomplete
-            sx={{ width: '100%' }}
-            id="project-lead-autocomplete"
-            onChange={(_event, value) => setLead(value?.id)}
-            options={usersForProjectLead.map(userToOption)}
-            size="small"
-            placeholder="Select a Project Lead"
-            value={userToOption(usersForProjectLead.find((user) => user.userId.toString() === lead))}
-          />
-        </Grid>
-        <Grid item xs={12} md={5}>
-          <FormLabel>Project Manager</FormLabel>
-          <NERAutocomplete
-            sx={{ width: '100%' }}
-            id="project-manager-autocomplete"
-            onChange={(_event, value) => setManager(value?.id)}
-            options={usersForProjectManager.map(userToOption)}
-            size="small"
-            placeholder="Select a Project Manager"
-            value={userToOption(usersForProjectManager.find((user) => user.userId.toString() === manager))}
-          />
-        </Grid>
+        {!createForm && (
+          <>
+            <Grid item xs={12} md={5}>
+              <FormLabel> Project Lead</FormLabel>
+              <NERAutocomplete
+                sx={{ width: '100%' }}
+                id="project-lead-autocomplete"
+                onChange={(_event, value) => setLead(value?.id)}
+                options={usersForProjectLead.map(userToOption)}
+                size="small"
+                placeholder="Select a Project Lead"
+                value={userToOption(usersForProjectLead.find((user) => user.userId.toString() === lead))}
+              />
+            </Grid>
+            <Grid item xs={12} md={5}>
+              <FormLabel>Project Manager</FormLabel>
+              <NERAutocomplete
+                sx={{ width: '100%' }}
+                id="project-manager-autocomplete"
+                onChange={(_event, value) => setManager(value?.id)}
+                options={usersForProjectManager.map(userToOption)}
+                size="small"
+                placeholder="Select a Project Manager"
+                value={userToOption(usersForProjectManager.find((user) => user.userId.toString() === manager))}
+              />
+            </Grid>
+          </>
+        )}
       </Grid>
     </Box>
   );

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

@@ -201,6 +201,7 @@ const WorkPackageFormView: React.FC<WorkPackageFormViewProps> = ({
           manager={managerId}
           setLead={setLeadId}
           setManager={setManagerId}
+          createForm={createForm}
         />
         <Box my={2}>
           <Typography variant="h5">Blocked By</Typography>