Fix display issue with TitledBox in Project Form

Fixes hackforla#1646
lcchrty · Jun 4, 2024 · fea7039 · fea7039
1 parent e67c2cd
commit fea7039
Showing 1 changed file with 94 additions and 62 deletions.
diff --git a/client/src/components/ProjectForm.js b/client/src/components/ProjectForm.js
@@ -231,70 +231,102 @@ export default function ProjectForm({
         <TitledBox
           title={editMode ? 'Editing Project' : 'Project Information'}
           badge={isEdit ? editIcon() : addIcon()}
-        />
-      ) : (
-        <TitledBox title={'Project Information'} />
-      )}
-      <form
-        id="project-form"
-        onSubmit={handleSubmit((data) => {
-          isEdit ? submitEditProject(data) : submitNewProject(data);
-        })}
-      >
-        {arr.map((input) => (
-          <ValidatedTextField
-            key={input.name}
-            register={register}
-            isEdit={isEdit}
-            editMode={editMode}
-            locationType={locationType}
-            locationRadios={locationRadios}
-            errors={errors}
-            input={input}
-          />
-        ))}
-        <ChangesModal
-          open={isModalOpen}
-          onClose={handleClose}
-          destination={'/projects'}
-          aria-labelledby="modal-modal-title"
-          aria-describedby="modal-modal-description"
-          handleClose={handleClose}
-        />
-      </form>
-      {auth.user.accessLevel === 'admin' ? (
-        <Box>
-          <Grid container justifyContent="space-evenly" sx={{ my: 3 }}>
-            <Grid item xs="auto">
-              <StyledButton
-                type="submit"
-                form="project-form"
-                variant={
-                  !isEdit ? 'secondary' : !editMode ? 'contained' : 'secondary'
-                }
-                cursor="pointer"
-                disabled={isEdit ? !editMode : false}
-              >
-                Save
-              </StyledButton>
-            </Grid>
-            <Grid item xs="auto">
-              <StyledButton
-                variant="contained"
-                cursor="pointer"
-                onClick={
-                  !editMode || Object.keys(dirtyFields).length === 0
-                    ? checkFields
-                    : handleOpen
-                }
-              >
-                Close
-              </StyledButton>
+        >
+          {' '}
+          <form
+            id="project-form"
+            onSubmit={handleSubmit((data) => {
+              isEdit ? submitEditProject(data) : submitNewProject(data);
+            })}
+          >
+            {arr.map((input) => (
+              <ValidatedTextField
+                key={input.name}
+                register={register}
+                isEdit={isEdit}
+                editMode={editMode}
+                locationType={locationType}
+                locationRadios={locationRadios}
+                errors={errors}
+                input={input}
+              />
+            ))}
+            <ChangesModal
+              open={isModalOpen}
+              onClose={handleClose}
+              destination={'/projects'}
+              aria-labelledby="modal-modal-title"
+              aria-describedby="modal-modal-description"
+              handleClose={handleClose}
+            />
+          </form>
+          <Box>
+            <Grid container justifyContent="space-evenly" sx={{ my: 3 }}>
+              <Grid item xs="auto">
+                <StyledButton
+                  type="submit"
+                  form="project-form"
+                  variant={
+                    !isEdit
+                      ? 'secondary'
+                      : !editMode
+                      ? 'contained'
+                      : 'secondary'
+                  }
+                  cursor="pointer"
+                  disabled={isEdit && !isLoading ? !editMode : false}
+                >
+                  Save
+                </StyledButton>
+              </Grid>
+              <Grid item xs="auto">
+                <StyledButton
+                  variant="contained"
+                  cursor="pointer"
+                  onClick={
+                    !editMode || Object.keys(dirtyFields).length === 0
+                      ? checkFields
+                      : handleOpen
+                  }
+                >
+                  Close
+                </StyledButton>
+              </Grid>
             </Grid>
-          </Grid>
-        </Box>
+          </Box>
+        </TitledBox>
       ) : (
-        ''
+        <TitledBox title={'Project Information'}>
+          {' '}
+          <form
+            id="project-form"
+            onSubmit={handleSubmit((data) => {
+              isEdit ? submitEditProject(data) : submitNewProject(data);
+            })}
+          >
+            {arr.map((input) => (
+              <ValidatedTextField
+                key={input.name}
+                register={register}
+                isEdit={isEdit}
+                editMode={editMode}
+                locationType={locationType}
+                locationRadios={locationRadios}
+                errors={errors}
+                input={input}
+              />
+            ))}
+            <ChangesModal
+              open={isModalOpen}
+              onClose={handleClose}
+              destination={'/projects'}
+              aria-labelledby="modal-modal-title"
+              aria-describedby="modal-modal-description"
+              handleClose={handleClose}
+            />
+          </form>
+          {''}
+        </TitledBox>
       )}
     </Box>
   ) : (