1
0
mirror of https://github.com/Unleash/unleash.git synced 2024-12-28 00:06:53 +01:00

Merge pull request #607 from Unleash/refactor/create-token

refactor: change create token form
This commit is contained in:
Youssef Khedher 2022-01-19 19:55:42 +01:00 committed by GitHub
commit cacf13c297
2 changed files with 18 additions and 16 deletions

View File

@ -5,10 +5,7 @@ import useEnvironments from '../../../../hooks/api/getters/useEnvironments/useEn
import useProjects from '../../../../hooks/api/getters/useProjects/useProjects';
import GeneralSelect from '../../../common/GeneralSelect/GeneralSelect';
import Input from '../../../common/Input/Input';
import PermissionButton from '../../../common/PermissionButton/PermissionButton';
import { ADMIN } from '../../../providers/AccessProvider/permissions';
import { useStyles } from './ApiTokenForm.styles';
interface IApiTokenFormProps {
username: string;
type: string;
@ -21,10 +18,11 @@ interface IApiTokenFormProps {
handleSubmit: (e: any) => void;
handleCancel: () => void;
errors: { [key: string]: string };
submitButtonText: string;
mode: string;
clearErrors: () => void;
}
const ApiTokenForm = ({
const ApiTokenForm: React.FC<IApiTokenFormProps> = ({
children,
username,
type,
project,
@ -37,8 +35,8 @@ const ApiTokenForm = ({
handleCancel,
errors,
clearErrors,
submitButtonText,
}: IApiTokenFormProps) => {
mode,
}) => {
const TYPE_ADMIN = 'ADMIN';
const styles = useStyles();
const { environments } = useEnvironments();
@ -127,13 +125,7 @@ const ApiTokenForm = ({
<Button onClick={handleCancel} className={styles.cancelButton}>
Cancel
</Button>
<PermissionButton
onClick={handleSubmit}
permission={ADMIN}
type="submit"
>
{submitButtonText} token
</PermissionButton>
{children}
</div>
</form>
);

View File

@ -5,6 +5,8 @@ import useApiTokenForm from '../hooks/useApiTokenForm';
import useUiConfig from '../../../../hooks/api/getters/useUiConfig/useUiConfig';
import useToast from '../../../../hooks/useToast';
import useApiTokensApi from '../../../../hooks/api/actions/useApiTokensApi/useApiTokensApi';
import PermissionButton from '../../../common/PermissionButton/PermissionButton';
import { ADMIN } from '../../../providers/AccessProvider/permissions';
const CreateApiToken = () => {
/* @ts-ignore */
@ -80,9 +82,17 @@ const CreateApiToken = () => {
errors={errors}
handleSubmit={handleSubmit}
handleCancel={handleCancel}
submitButtonText="Create"
mode="Create"
clearErrors={clearErrors}
/>
>
<PermissionButton
onClick={handleSubmit}
permission={ADMIN}
type="submit"
>
Create token
</PermissionButton>
</ApiTokenForm>
</FormTemplate>
);
};