Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: enable project creation through new form #6961

Merged
merged 20 commits into from
Apr 30, 2024
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just shove in all the props that we send to the existing form for now, so that we have all the stuff we need.

Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,30 @@ const CreateProject = () => {
documentationLinkLabel='Projects documentation'
formatApiCode={formatApiCode}
>
<NewProjectForm />
<NewProjectForm
errors={errors}
handleSubmit={handleSubmit}
projectId={projectId}
setProjectId={setProjectId}
projectName={projectName}
projectStickiness={projectStickiness}
projectMode={projectMode}
setProjectMode={setProjectMode}
setProjectStickiness={setProjectStickiness}
setProjectName={setProjectName}
projectDesc={projectDesc}
setProjectDesc={setProjectDesc}
mode='Create'
clearErrors={clearErrors}
validateProjectId={validateProjectId}
>
<StyledButton onClick={handleCancel}>Cancel</StyledButton>
<CreateButton
name='project'
permission={CREATE_PROJECT}
data-testid={CREATE_PROJECT_BTN}
/>
</NewProjectForm>
</FormTemplate>
);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
import {
Button,
MenuItem,
Select,
TextField,
Typography,
styled,
} from '@mui/material';
import { GO_BACK } from 'constants/navigate';
import { CreateButton } from 'component/common/CreateButton/CreateButton';
import { CREATE_PROJECT } from 'component/providers/AccessProvider/permissions';
import { useNavigate } from 'react-router-dom';
import { Button, Typography, styled } from '@mui/material';
import { v4 as uuidv4 } from 'uuid';
import Input from 'component/common/Input/Input';

const StyledForm = styled('form')(({ theme }) => ({
background: theme.palette.background.default,
Expand All @@ -26,8 +17,8 @@ const StyledFormSection = styled('div')(({ theme }) => ({
const TopGrid = styled(StyledFormSection)(({ theme }) => ({
display: 'grid',
gridTemplateAreas:
'"icon header template" "icon project-name project-name" "icon description description"',
gridTemplateColumns: 'minmax(auto, 50px) 1fr auto',
'"icon header" "icon project-name" "icon project-description"',
gridTemplateColumns: 'minmax(auto, 50px) 1fr',
gap: theme.spacing(2),
}));

Expand All @@ -42,23 +33,24 @@ const StyledHeader = styled(Typography)(({ theme }) => ({
gridArea: 'header',
}));

const StyledTemplateSelector = styled(Select)(({ theme }) => ({
gridArea: 'template',
const ProjectNameContainer = styled('div')(({ theme }) => ({
gridArea: 'project-name',
}));

const ProjectDescriptionContainer = styled('div')(({ theme }) => ({
gridArea: 'project-description',
}));

const StyledInput = styled(TextField)(({ theme }) => ({
const StyledInput = styled(Input)(({ theme }) => ({
width: '100%',
margin: 0,
fieldset: { border: 'none' },
}));

const StyledProjectName = styled(StyledInput)(({ theme }) => ({
gridArea: 'project-name',
'*': { fontSize: theme.typography.h1.fontSize },
}));

const StyledProjectDescription = styled(StyledInput)(({ theme }) => ({
gridArea: 'description',
'*': { fontSize: theme.typography.h2.fontSize },
}));

Expand All @@ -73,49 +65,105 @@ const FormActions = styled(StyledFormSection)(({ theme }) => ({
justifyContent: 'flex-end',
}));

const CREATE_PROJECT_BTN = 'CREATE_PROJECT_BTN';

export const NewProjectForm = () => {
const navigate = useNavigate();
type FormProps = {
projectId: string;
projectName: string;
projectDesc: string;
projectStickiness?: string;
featureLimit?: string;
featureCount?: number;
projectMode?: string;
setProjectStickiness?: React.Dispatch<React.SetStateAction<string>>;
setProjectId: React.Dispatch<React.SetStateAction<string>>;
setProjectName: React.Dispatch<React.SetStateAction<string>>;
setProjectDesc: React.Dispatch<React.SetStateAction<string>>;
setFeatureLimit?: React.Dispatch<React.SetStateAction<string>>;
setProjectMode?: React.Dispatch<React.SetStateAction<ProjectMode>>;
handleSubmit: (e: any) => void;
errors: { [key: string]: string };
mode: 'Create' | 'Edit';
clearErrors: () => void;
validateProjectId: () => void;
};

Comment on lines +69 to +88
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are all the props from the old form. I've put them here as a template. We'll use the ones we need and remove the ones we don't as we go.

const handleCancel = () => {
navigate(GO_BACK);
const PROJECT_NAME_INPUT = 'PROJECT_NAME_INPUT';
const PROJECT_DESCRIPTION_INPUT = 'PROJECT_DESCRIPTION_INPUT';

export const NewProjectForm: React.FC<FormProps> = ({
children,
handleSubmit,
projectName,
projectDesc,
projectStickiness,
featureLimit,
featureCount,
projectMode,
setProjectMode,
setProjectId,
setProjectName,
setProjectDesc,
setProjectStickiness,
setFeatureLimit,
errors,
mode,
clearErrors,
}) => {
const handleProjectNameUpdate = (
e: React.ChangeEvent<HTMLInputElement>,
) => {
const input = e.target.value;
setProjectName(input);

// todo: handle this in a real manner. This is a hack for now.
const maybeProjectId = input
? `${encodeURIComponent(input.trim())}-${uuidv4().slice(-12)}`
: '';
setProjectId(maybeProjectId);
};

return (
<StyledForm>
<StyledForm
onSubmit={(submitEvent) => {
handleSubmit(submitEvent);
}}
>
<TopGrid>
<StyledIcon>icon</StyledIcon>
<StyledHeader variant='h2'>New project</StyledHeader>
<StyledTemplateSelector
id='template-selector'
value={'none'}
label='Project creation template'
name='Project creation template'
>
<MenuItem value={'none'}>No template</MenuItem>
</StyledTemplateSelector>
<StyledProjectName label='Project name' required />
<StyledProjectDescription
label='Description (optional)'
multiline
/>
<ProjectNameContainer>
<StyledProjectName
label='Project name'
required
value={projectName}
onChange={handleProjectNameUpdate}
error={Boolean(errors.name)}
errorText={errors.name}
onFocus={() => {
delete errors.name;
}}
data-testid={PROJECT_NAME_INPUT}
autoFocus
/>
</ProjectNameContainer>
<ProjectDescriptionContainer>
<StyledProjectDescription
className='description'
label='Description (optional)'
multiline
maxRows={20}
value={projectDesc}
onChange={(e) => setProjectDesc(e.target.value)}
data-testid={PROJECT_DESCRIPTION_INPUT}
/>
</ProjectDescriptionContainer>
</TopGrid>
<OptionButtons>
<Button variant='outlined'>4 selected</Button>
<Button variant='outlined'>clientId</Button>
<Button variant='outlined'>Open</Button>
<Button variant='outlined'>1 environment configured</Button>
</OptionButtons>
<FormActions>
<Button onClick={handleCancel}>Cancel</Button>

<CreateButton
name='project'
permission={CREATE_PROJECT}
data-testid={CREATE_PROJECT_BTN}
/>
</FormActions>
<FormActions>{children}</FormActions>
</StyledForm>
);
};
Loading