refactor: use form's centralized error management
This commit is contained in:
@@ -19,7 +19,6 @@ 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';
|
||||
@@ -66,6 +65,7 @@ export default function CreateRole() {
|
||||
useAdminCreateRole();
|
||||
const { data: permissionCatalogData, isLoading: isPermissionCatalogLoading } =
|
||||
usePermissionCatalog();
|
||||
const [permissionError, setPermissionError] = React.useState(null);
|
||||
|
||||
const defaultValues = React.useMemo(
|
||||
() => ({
|
||||
@@ -81,8 +81,9 @@ export default function CreateRole() {
|
||||
[permissionCatalogData],
|
||||
);
|
||||
|
||||
const handleRoleCreation = async (roleData, e, setError) => {
|
||||
const handleRoleCreation = async (roleData) => {
|
||||
try {
|
||||
setPermissionError(null);
|
||||
const permissions = getPermissions(roleData.computedPermissions);
|
||||
|
||||
await createRole({
|
||||
@@ -100,40 +101,13 @@ export default function CreateRole() {
|
||||
|
||||
navigate(URLS.ROLES);
|
||||
} catch (error) {
|
||||
const errors = error?.response?.data?.errors;
|
||||
|
||||
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,
|
||||
});
|
||||
setPermissionError(permissionError);
|
||||
}
|
||||
|
||||
const generalError = getGeneralErrorMessage({
|
||||
error,
|
||||
fallbackMessage: formatMessage('createRole.generalError'),
|
||||
});
|
||||
|
||||
if (generalError) {
|
||||
setError('root.general', {
|
||||
type: 'requestError',
|
||||
message: generalError,
|
||||
});
|
||||
}
|
||||
const errors = error?.response?.data?.errors;
|
||||
throw errors || error;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -178,18 +152,18 @@ export default function CreateRole() {
|
||||
|
||||
<PermissionCatalogField name="computedPermissions" />
|
||||
|
||||
{errors?.root?.permissions && (
|
||||
{permissionError && (
|
||||
<Alert severity="error" data-test="create-role-error-alert">
|
||||
<AlertTitle>
|
||||
{formatMessage('createRole.permissionsError')}
|
||||
</AlertTitle>
|
||||
<pre>
|
||||
<code>{errors?.root?.permissions?.message}</code>
|
||||
<code>{permissionError}</code>
|
||||
</pre>
|
||||
</Alert>
|
||||
)}
|
||||
|
||||
{errors?.root?.general && (
|
||||
{errors?.root?.general && !permissionError && (
|
||||
<Alert severity="error" data-test="create-role-error-alert">
|
||||
{errors?.root?.general?.message}
|
||||
</Alert>
|
||||
|
||||
Reference in New Issue
Block a user