feat: introduce inline error messages for create user and create role forms

This commit is contained in:
kasia.oczkowska
2024-12-06 11:52:44 +00:00
parent 978ceaadb6
commit 7a8dc68592
6 changed files with 334 additions and 122 deletions

View File

@@ -1,10 +1,14 @@
import LoadingButton from '@mui/lab/LoadingButton';
import Grid from '@mui/material/Grid';
import Stack from '@mui/material/Stack';
import Alert from '@mui/material/Alert';
import AlertTitle from '@mui/material/AlertTitle';
import PermissionCatalogField from 'components/PermissionCatalogField/index.ee';
import useEnqueueSnackbar from 'hooks/useEnqueueSnackbar';
import * as React from 'react';
import { useNavigate } from 'react-router-dom';
import { yupResolver } from '@hookform/resolvers/yup';
import * as yup from 'yup';
import Container from 'components/Container';
import Form from 'components/Form';
@@ -15,10 +19,45 @@ import {
getComputedPermissionsDefaultValues,
getPermissions,
} from 'helpers/computePermissions.ee';
import { getGeneralErrorMessage } from 'helpers/errors';
import useFormatMessage from 'hooks/useFormatMessage';
import useAdminCreateRole from 'hooks/useAdminCreateRole';
import usePermissionCatalog from 'hooks/usePermissionCatalog.ee';
const getValidationSchema = (formatMessage) => {
const getMandatoryFieldMessage = (fieldTranslationId) =>
formatMessage('roleForm.mandatoryInput', {
inputName: formatMessage(fieldTranslationId),
});
return yup.object().shape({
name: yup
.string()
.trim()
.required(getMandatoryFieldMessage('roleForm.name')),
description: yup.string().trim(),
});
};
const getPermissionsErrorMessage = (error) => {
const errors = error?.response?.data?.errors;
if (errors) {
const permissionsErrors = Object.keys(errors)
.filter((key) => key.startsWith('permissions'))
.reduce((obj, key) => {
obj[key] = errors[key];
return obj;
}, {});
if (Object.keys(permissionsErrors).length > 0) {
return JSON.stringify(permissionsErrors, null, 2);
}
}
return null;
};
export default function CreateRole() {
const navigate = useNavigate();
const formatMessage = useFormatMessage();
@@ -41,7 +80,7 @@ export default function CreateRole() {
[permissionCatalogData],
);
const handleRoleCreation = async (roleData) => {
const handleRoleCreation = async (roleData, e, setError) => {
try {
const permissions = getPermissions(roleData.computedPermissions);
@@ -60,14 +99,38 @@ export default function CreateRole() {
navigate(URLS.ROLES);
} catch (error) {
const errors = Object.values(error.response.data.errors);
const errors = error?.response?.data?.errors;
for (const [errorMessage] of errors) {
enqueueSnackbar(errorMessage, {
variant: 'error',
SnackbarProps: {
'data-test': 'snackbar-error',
},
if (errors) {
const fieldNames = ['name', 'description'];
Object.entries(errors).forEach(([fieldName, fieldErrors]) => {
if (fieldNames.includes(fieldName) && Array.isArray(fieldErrors)) {
setError(fieldName, {
type: 'fieldRequestError',
message: fieldErrors.join(', '),
});
}
});
}
const permissionError = getPermissionsErrorMessage(error);
if (permissionError) {
setError('root.permissions', {
type: 'fieldRequestError',
message: permissionError,
});
}
const generalError = getGeneralErrorMessage({
error,
fallbackMessage: formatMessage('createRole.generalError'),
});
if (generalError) {
setError('root.general', {
type: 'requestError',
message: generalError,
});
}
}
@@ -83,37 +146,67 @@ export default function CreateRole() {
</Grid>
<Grid item xs={12} justifyContent="flex-end" sx={{ pt: 5 }}>
<Form onSubmit={handleRoleCreation} defaultValues={defaultValues}>
<Stack direction="column" gap={2}>
<TextField
required={true}
name="name"
label={formatMessage('roleForm.name')}
fullWidth
data-test="name-input"
/>
<Form
onSubmit={handleRoleCreation}
defaultValues={defaultValues}
noValidate
resolver={yupResolver(
getValidationSchema(formatMessage, defaultValues),
)}
automaticValidation={false}
render={({ formState: { errors } }) => (
<Stack direction="column" gap={2}>
<TextField
required={true}
name="name"
label={formatMessage('roleForm.name')}
fullWidth
data-test="name-input"
error={!!errors?.name}
helperText={errors?.name?.message}
/>
<TextField
name="description"
label={formatMessage('roleForm.description')}
fullWidth
data-test="description-input"
/>
<TextField
name="description"
label={formatMessage('roleForm.description')}
fullWidth
data-test="description-input"
error={!!errors?.description}
helperText={errors?.description?.message}
/>
<PermissionCatalogField name="computedPermissions" />
<PermissionCatalogField name="computedPermissions" />
<LoadingButton
type="submit"
variant="contained"
color="primary"
sx={{ boxShadow: 2 }}
loading={isCreateRolePending}
data-test="create-button"
>
{formatMessage('createRole.submit')}
</LoadingButton>
</Stack>
</Form>
{errors?.root?.permissions && (
<Alert severity="error" data-test="create-role-error-alert">
<AlertTitle>
{formatMessage('createRole.permissionsError')}
</AlertTitle>
<pre>
<code>{errors?.root?.permissions?.message}</code>
</pre>
</Alert>
)}
{errors?.root?.general && (
<Alert severity="error" data-test="create-role-error-alert">
{errors?.root?.general?.message}
</Alert>
)}
<LoadingButton
type="submit"
variant="contained"
color="primary"
sx={{ boxShadow: 2 }}
loading={isCreateRolePending}
data-test="create-button"
>
{formatMessage('createRole.submit')}
</LoadingButton>
</Stack>
)}
/>
</Grid>
</Grid>
</Container>