1
0
mirror of https://github.com/Unleash/unleash.git synced 2025-02-04 00:18:01 +01:00

refactor: change create token form

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

View File

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