#1195 Cleaned up default values

Author: jackturner106

src/frontend/src/components/ReactHookEditableList.tsx

@@ -1,36 +1,46 @@
 import { Grid, Button, IconButton, TextField } from '@mui/material';
 import DeleteIcon from '@mui/icons-material/Delete';
 import { FieldArrayWithId, UseFieldArrayRemove, UseFormRegister, UseFieldArrayAppend } from 'react-hook-form';
+import { Box } from '@mui/system';
 
 interface ReactHookEditableListProps {
   name: string;
   ls: FieldArrayWithId[];
   register: UseFormRegister<any>;
   append: UseFieldArrayAppend<any, any>;
   remove: UseFieldArrayRemove;
+  addMessage: string;
 }
 
-const ReactHookEditableList: React.FC<ReactHookEditableListProps> = ({ name, ls, register, append, remove }) => {
+const ReactHookEditableList: React.FC<ReactHookEditableListProps> = ({
+  name,
+  ls,
+  register,
+  append,
+  remove,
+  addMessage = '+ ADD NEW BULLET'
+}) => {
   return (
     <>
+      <Button
+        variant="contained"
+        color="primary"
+        onClick={() => append({ bulletId: -1, detail: '' })}
+        sx={{ my: 2, width: 'max-content' }}
+      >
+        {addMessage}
+      </Button>
       {ls.map((_element, i) => {
         return (
-          <Grid item sx={{ display: 'flex', alignItems: 'center' }}>
-            <TextField required autoComplete="off" sx={{ width: 9 / 10 }} {...register(`${name}.${i}.detail`)} />
+          //<Grid item sx={{ display: 'grid', alignItems: 'center' }}>
+          <Box sx={{ width: 10 / 10 }}>
+            <TextField required autoComplete="off" sx={{ width: 2 / 10 }} {...register(`${name}.${i}.detail`)} />
             <IconButton type="button" onClick={() => remove(i)} sx={{ mx: 1, my: 0 }}>
               <DeleteIcon />
             </IconButton>
-          </Grid>
+          </Box>
         );
       })}
-      <Button
-        variant="contained"
-        color="success"
-        onClick={() => append({ bulletId: -1, detail: '' })}
-        sx={{ my: 2, width: 'max-content' }}
-      >
-        + Add New Bullet
-      </Button>
     </>
   );
 };

src/frontend/src/pages/ProjectDetailPage/ProjectEdit/ProjectEditContainer.tsx

@@ -214,7 +214,14 @@ const ProjectEditContainer: React.FC<ProjectEditContainerProps> = ({ project, ex
           <LinksEditView watch={watch} ls={links} register={register} append={appendLink} remove={removeLink} />
         </PageBlock>
         <PageBlock title="Goals">
-          <ReactHookEditableList name="goals" register={register} ls={goals} append={appendGoal} remove={removeGoal} />
+          <ReactHookEditableList
+            name="goals"
+            register={register}
+            ls={goals}
+            append={appendGoal}
+            remove={removeGoal}
+            addMessage="Add Goal"
+          />
         </PageBlock>
         <PageBlock title="Features">
           <ReactHookEditableList
@@ -223,6 +230,7 @@ const ProjectEditContainer: React.FC<ProjectEditContainerProps> = ({ project, ex
             ls={features}
             append={appendFeature}
             remove={removeFeature}
+            addMessage="Add Feature"
           />
         </PageBlock>
         <PageBlock title="Other Constraints">
@@ -232,22 +240,18 @@ const ProjectEditContainer: React.FC<ProjectEditContainerProps> = ({ project, ex
             ls={constraints}
             append={appendConstraint}
             remove={removeConstraint}
+            addMessage="Add Constraint"
           />
         </PageBlock>
         <PageBlock title="Rules">
-          {rules.map((_rule, i) => {
-            return (
-              <Grid item sx={{ display: 'flex', alignItems: 'center' }}>
-                <TextField required autoComplete="off" {...register(`rules.${i}.rule`)} sx={{ width: 5 / 10 }} />
-                <IconButton type="button" onClick={() => removeRule(i)} sx={{ mx: 1, my: 0 }}>
-                  <DeleteIcon />
-                </IconButton>
-              </Grid>
-            );
-          })}
-          <Button variant="contained" color="success" onClick={() => appendRule({ rule: '' })} sx={{ mt: 2 }}>
-            + ADD NEW RULE
-          </Button>
+          <ReactHookEditableList
+            name="rules"
+            register={register}
+            ls={rules}
+            append={appendRule}
+            remove={removeRule}
+            addMessage="Add Rule"
+          />
         </PageBlock>
         <Box textAlign="right" sx={{ my: 2 }}>
           <NERFailButton variant="contained" onClick={exitEditMode} sx={{ mx: 1 }}>

src/frontend/src/pages/WorkPackageDetailPage/ActivateWorkPackageModalContainer/ActivateWorkPackageModal.tsx

@@ -47,8 +47,6 @@ const schema = yup.object().shape({
   confirmDetails: yup.boolean().required()
 });
 
-//startDate: new Date().toLocaleDateString(),
-
 const ActivateWorkPackageModal: React.FC<ActivateWorkPackageModalProps> = ({
   allUsers,
   wbsNum,
@@ -62,19 +60,16 @@ const ActivateWorkPackageModal: React.FC<ActivateWorkPackageModalProps> = ({
     const daysUntilNextMonday = (7 - today + 1) % 7;
     startDate.setDate(startDate.getDate() + daysUntilNextMonday);
   }
-  const { reset, handleSubmit, control } = useForm<FormInput>({
-    resolver: yupResolver(schema),
-    defaultValues: {
-      confirmDetails: false,
-      startDate
-    }
-  });
 
   const defaultValues: FormInput = {
-    startDate: new Date(),
+    startDate: startDate,
     confirmDetails: false
   };
 
+  const { reset, handleSubmit, control } = useForm<FormInput>({
+    resolver: yupResolver(schema)
+  });
+
   const [projectLeadId, setProjectLeadId] = useState<string>();
   const [projectManagerId, setProjectManagerId] = useState<string>();
   const toast = useToast();
@@ -149,7 +144,7 @@ const ActivateWorkPackageModal: React.FC<ActivateWorkPackageModalProps> = ({
                         inputFormat="yyyy-MM-dd"
                         onChange={(date) => onChange(date ?? new Date())}
                         className={'padding: 10'}
-                        value={value}
+                        value={startDate}
                         shouldDisableDate={disableStartDate}
                         renderInput={(params) => <TextField autoComplete="off" {...params} />}
                       />