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 12 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
@@ -1,5 +1,6 @@
import { useNavigate } from 'react-router-dom';
import ProjectForm from '../ProjectForm/ProjectForm';
import { NewProjectForm } from './NewProjectForm';
import useProjectForm, {
DEFAULT_PROJECT_STICKINESS,
} from '../hooks/useProjectForm';
Expand All @@ -14,6 +15,7 @@ import { formatUnknownError } from 'utils/formatUnknownError';
import { GO_BACK } from 'constants/navigate';
import { usePlausibleTracker } from 'hooks/usePlausibleTracker';
import { Button, styled } from '@mui/material';
import { useUiFlag } from 'hooks/useUiFlag';

const CREATE_PROJECT_BTN = 'CREATE_PROJECT_BTN';

Expand Down Expand Up @@ -45,6 +47,8 @@ const CreateProject = () => {
errors,
} = useProjectForm();

const useNewProjectForm = useUiFlag('newCreateProjectUI');

const { createProject, loading } = useProjectApi();

const handleSubmit = async (e: Event) => {
Expand Down Expand Up @@ -89,6 +93,44 @@ const CreateProject = () => {
navigate(GO_BACK);
};

if (useNewProjectForm) {
return (
<FormTemplate
disablePadding
loading={loading}
description='Projects allows you to group feature toggles together in the management UI.'
documentationLink='https://docs.getunleash.io/reference/projects'
documentationLinkLabel='Projects documentation'
formatApiCode={formatApiCode}
>
<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>
);
}

return (
<FormTemplate
loading={loading}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,195 @@
import { v4 as uuidv4 } from 'uuid';
import {
Button,
MenuItem,
Select,
TextField,
Typography,
styled,
} from '@mui/material';

const StyledContainer = styled('form')(({ theme }) => ({
background: theme.palette.background.default,

'> * + *': {
borderBlockStart: `1px solid ${theme.palette.divider}`,
},

'> *': {
padding: theme.spacing(7),
},
}));

const TopGrid = styled('div')(({ theme }) => ({
display: 'grid',
gridTemplateAreas:
'"icon header template" "icon project-name project-name" "icon description description"',
gridTemplateColumns: 'minmax(auto, 50px) 1fr auto',
gap: theme.spacing(2),

'> span.icon': {
border: `1px solid ${theme.palette.primary.main}`,
width: `100%`,
aspectRatio: '1',
borderRadius: theme.shape.borderRadius,
},

'> h2': {
gridArea: 'header',
},

'> span.input': {
gridArea: 'template',
},

'.project-name': {
gridArea: 'project-name',
margin: 0,
},

'.project-name *': {
fontSize: theme.typography.h1.fontSize,
},

'.description': {
gridArea: 'description',
margin: 0,
},

'.description *': {
fontSize: theme.typography.h2.fontSize,
},
}));

const OptionButtons = styled('div')(({ theme }) => ({
display: 'flex',
gap: theme.spacing(2),
}));

const StyledInput = styled(TextField)(({ theme }) => ({
width: '100%',
marginBottom: theme.spacing(2),
paddingRight: theme.spacing(1),

fieldset: { border: 'none' },
}));

const FormActions = styled('div')(({ theme }) => ({
display: 'flex',
gap: theme.spacing(5),
justifyContent: 'flex-end',
}));

const CREATE_PROJECT_BTN = 'CREATE_PROJECT_BTN';

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 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);
const maybeProjectId = input
? `${encodeURIComponent(input.trim())}-${uuidv4().slice(-12)}`
: '';
setProjectId(maybeProjectId);
};

return (
<StyledContainer
onSubmit={(submitEvent) => {
handleSubmit(submitEvent);
}}
>
<TopGrid>
<span className='icon'>icon</span>
<Typography variant='h2'>New project</Typography>
<Select
className='input'
id='template-selector'
value={'none'}
label='Project creation template'
name='Project creation template'
>
<MenuItem value={'none'}>No template</MenuItem>
</Select>
<StyledInput
className='project-name'
label='Project name'
value={projectName}
onChange={handleProjectNameUpdate}
error={Boolean(errors.name)}
errorText={errors.name}
onFocus={() => {
delete errors.name;
}}
data-testid={PROJECT_NAME_INPUT}
required
autoFocus
InputProps={{
classes: {
input: 'project-name-input',
},
}}
/>
<StyledInput
className='description'
label='Description (optional)'
multiline
maxRows={20}
value={projectDesc}
onChange={(e) => setProjectDesc(e.target.value)}
data-testid={PROJECT_DESCRIPTION_INPUT}
/>
</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>{children}</FormActions>
</StyledContainer>
);
};
Loading