test: use updated selector for create admin button in installation form

packages/e2e-tests/fixtures/admin-setup-page.js

@@ -1,4 +1,4 @@
-import { BasePage } from "./base-page";
+import { BasePage } from './base-page';
 const { faker } = require('@faker-js/faker');
 const { expect } = require('@playwright/test');
 
@@ -14,8 +14,10 @@ export class AdminSetupPage extends BasePage {
     this.fullNameTextField = this.page.getByTestId('fullName-text-field');
     this.emailTextField = this.page.getByTestId('email-text-field');
     this.passwordTextField = this.page.getByTestId('password-text-field');
-    this.repeatPasswordTextField = this.page.getByTestId('repeat-password-text-field');
+    this.repeatPasswordTextField = this.page.getByTestId(
-    this.createAdminButton = this.page.getByTestId('signUp-button');
+      'repeat-password-text-field'
+    );
+    this.createAdminButton = this.page.getByTestId('installation-button');
     this.invalidFields = this.page.locator('p.Mui-error');
     this.successAlert = this.page.getByTestId('success-alert');
   }
@@ -59,7 +61,10 @@ export class AdminSetupPage extends BasePage {
   }
 
   async expectSuccessMessageToContainLoginLink() {
-    await expect(await this.successAlert.locator('a')).toHaveAttribute('href', '/login');
+    await expect(await this.successAlert.locator('a')).toHaveAttribute(
+      'href',
+      '/login'
+    );
   }
 
   generateUser() {
@@ -69,7 +74,7 @@ export class AdminSetupPage extends BasePage {
       fullName: faker.person.fullName(),
       email: faker.internet.email(),
       password: faker.internet.password(),
-      wronglyRepeatedPassword: faker.internet.password()
+      wronglyRepeatedPassword: faker.internet.password(),
     };
   }
-};
+}

packages/e2e-tests/fixtures/admin/delete-role-modal.js

@@ -9,7 +9,6 @@ export class DeleteRoleModal {
     this.modal = page.getByTestId('delete-role-modal');
     this.cancelButton = this.modal.getByTestId('confirmation-cancel-button');
     this.deleteButton = this.modal.getByTestId('confirmation-confirm-button');
-    this.deleteAlert = this.modal.getByTestId('confirmation-dialog-error-alert');
   }
 
   async close () {

packages/e2e-tests/tests/admin/manage-roles.spec.js

@@ -218,7 +218,12 @@ test.describe('Role management page', () => {
         const row = await adminRolesPage.getRoleRowByName('Delete Role');
         const modal = await adminRolesPage.clickDeleteRole(row);
         await modal.deleteButton.click();
-        await expect(modal.deleteAlert).toHaveCount(1);
+        await adminRolesPage.snackbar.waitFor({
+          state: 'attached',
+        });
+        const snackbar = await adminRolesPage.getSnackbarData('snackbar-delete-role-error');
+        await expect(snackbar.variant).toBe('error');
+        await adminRolesPage.closeSnackbar();
         await modal.close();
       }
     );
@@ -313,6 +318,7 @@ test.describe('Role management page', () => {
       const row = await adminUsersPage.findUserPageWithEmail(
         'user-delete-role-test@automatisch.io'
       );
+      // await test.waitForTimeout(10000);
       const modal = await adminUsersPage.clickDeleteUser(row);
       await modal.deleteButton.click();
       await adminUsersPage.snackbar.waitFor({
@@ -329,7 +335,15 @@ test.describe('Role management page', () => {
       const row = await adminRolesPage.getRoleRowByName('Cannot Delete Role');
       const modal = await adminRolesPage.clickDeleteRole(row);
       await modal.deleteButton.click();
-      await expect(modal.deleteAlert).toHaveCount(1);
+      await adminRolesPage.snackbar.waitFor({
+        state: 'attached',
+      });
+      /*
+        * TODO: await snackbar - make assertions based on product
+        * decisions
+        const snackbar = await adminRolesPage.getSnackbarData();
+        await expect(snackbar.variant).toBe('...');
+        */
       await adminRolesPage.closeSnackbar();
     });
   });

packages/web/src/components/ConfirmationDialog/index.jsx

@@ -6,7 +6,6 @@ import DialogActions from '@mui/material/DialogActions';
 import DialogContent from '@mui/material/DialogContent';
 import DialogContentText from '@mui/material/DialogContentText';
 import DialogTitle from '@mui/material/DialogTitle';
-import Alert from '@mui/material/Alert';
 
 function ConfirmationDialog(props) {
   const {
@@ -17,7 +16,6 @@ function ConfirmationDialog(props) {
     cancelButtonChildren,
     confirmButtonChildren,
     open = true,
-    errorMessage,
   } = props;
   const dataTest = props['data-test'];
   return (
@@ -46,11 +44,6 @@ function ConfirmationDialog(props) {
           </Button>
         )}
       </DialogActions>
-      {errorMessage && (
-        <Alert data-test="confirmation-dialog-error-alert" severity="error">
-          {errorMessage}
-        </Alert>
-      )}
     </Dialog>
   );
 }
@@ -64,7 +57,6 @@ ConfirmationDialog.propTypes = {
   confirmButtonChildren: PropTypes.node.isRequired,
   open: PropTypes.bool,
   'data-test': PropTypes.string,
-  errorMessage: PropTypes.string,
 };
 
 export default ConfirmationDialog;

packages/web/src/components/DeleteRoleButton/index.ee.jsx

@@ -4,7 +4,6 @@ import IconButton from '@mui/material/IconButton';
 import useEnqueueSnackbar from 'hooks/useEnqueueSnackbar';
 import * as React from 'react';
 
-import { getGeneralErrorMessage, getFieldErrorMessage } from 'helpers/errors';
 import Can from 'components/Can';
 import ConfirmationDialog from 'components/ConfirmationDialog';
 import useFormatMessage from 'hooks/useFormatMessage';
@@ -16,21 +15,7 @@ function DeleteRoleButton(props) {
   const formatMessage = useFormatMessage();
   const enqueueSnackbar = useEnqueueSnackbar();
 
-  const {
+  const { mutateAsync: deleteRole } = useAdminDeleteRole(roleId);
-    mutateAsync: deleteRole,
-    error: deleteRoleError,
-    reset: resetDeleteRole,
-  } = useAdminDeleteRole(roleId);
-
-  const roleErrorMessage = getFieldErrorMessage({
-    fieldName: 'role',
-    error: deleteRoleError,
-  });
-
-  const generalErrorMessage = getGeneralErrorMessage({
-    error: deleteRoleError,
-    fallbackMessage: formatMessage('deleteRoleButton.generalError'),
-  });
 
   const handleConfirm = React.useCallback(async () => {
     try {
@@ -43,13 +28,23 @@ function DeleteRoleButton(props) {
           'data-test': 'snackbar-delete-role-success',
         },
       });
-    } catch {}
+    } catch (error) {
-  }, [deleteRole, enqueueSnackbar, formatMessage]);
+      const errors = Object.values(
+        error.response.data.errors || [['Failed while deleting!']],
+      );
 
-  const handleClose = () => {
+      for (const [error] of errors) {
-    setShowConfirmation(false);
+        enqueueSnackbar(error, {
-    resetDeleteRole();
+          variant: 'error',
-  };
+          SnackbarProps: {
+            'data-test': 'snackbar-delete-role-error',
+          },
+        });
+      }
+
+      throw new Error('Failed while deleting!');
+    }
+  }, [deleteRole, enqueueSnackbar, formatMessage]);
 
   return (
     <>
@@ -70,12 +65,11 @@ function DeleteRoleButton(props) {
         open={showConfirmation}
         title={formatMessage('deleteRoleButton.title')}
         description={formatMessage('deleteRoleButton.description')}
-        onClose={handleClose}
+        onClose={() => setShowConfirmation(false)}
         onConfirm={handleConfirm}
         cancelButtonChildren={formatMessage('deleteRoleButton.cancel')}
         confirmButtonChildren={formatMessage('deleteRoleButton.confirm')}
         data-test="delete-role-modal"
-        errorMessage={roleErrorMessage || generalErrorMessage}
       />
     </>
   );

packages/web/src/components/DeleteUserButton/index.ee.jsx

@@ -3,7 +3,6 @@ import DeleteIcon from '@mui/icons-material/Delete';
 import IconButton from '@mui/material/IconButton';
 import { useQueryClient } from '@tanstack/react-query';
 
-import { getGeneralErrorMessage } from 'helpers/errors';
 import useEnqueueSnackbar from 'hooks/useEnqueueSnackbar';
 import * as React from 'react';
 import ConfirmationDialog from 'components/ConfirmationDialog';
@@ -13,21 +12,12 @@ import useAdminUserDelete from 'hooks/useAdminUserDelete';
 function DeleteUserButton(props) {
   const { userId } = props;
   const [showConfirmation, setShowConfirmation] = React.useState(false);
-  const {
+  const { mutateAsync: deleteUser } = useAdminUserDelete(userId);
-    mutateAsync: deleteUser,
-    error: deleteUserError,
-    reset: resetDeleteUser,
-  } = useAdminUserDelete(userId);
 
   const formatMessage = useFormatMessage();
   const enqueueSnackbar = useEnqueueSnackbar();
   const queryClient = useQueryClient();
 
-  const generalErrorMessage = getGeneralErrorMessage({
-    error: deleteUserError,
-    fallbackMessage: formatMessage('deleteUserButton.deleteError'),
-  });
-
   const handleConfirm = React.useCallback(async () => {
     try {
       await deleteUser();
@@ -39,14 +29,16 @@ function DeleteUserButton(props) {
           'data-test': 'snackbar-delete-user-success',
         },
       });
-    } catch {}
+    } catch (error) {
+      enqueueSnackbar(
+        error?.message || formatMessage('deleteUserButton.deleteError'),
+        {
+          variant: 'error',
+        },
+      );
+    }
   }, [deleteUser]);
 
-  const handleClose = () => {
-    setShowConfirmation(false);
-    resetDeleteUser();
-  };
-
   return (
     <>
       <IconButton
@@ -61,12 +53,11 @@ function DeleteUserButton(props) {
         open={showConfirmation}
         title={formatMessage('deleteUserButton.title')}
         description={formatMessage('deleteUserButton.description')}
-        onClose={handleClose}
+        onClose={() => setShowConfirmation(false)}
         onConfirm={handleConfirm}
         cancelButtonChildren={formatMessage('deleteUserButton.cancel')}
         confirmButtonChildren={formatMessage('deleteUserButton.confirm')}
         data-test="delete-user-modal"
-        errorMessage={generalErrorMessage}
       />
     </>
   );

packages/web/src/components/Form/index.jsx

@@ -46,7 +46,12 @@ function Form(props) {
 
   return (
     <FormProvider {...methods}>
-      <form onSubmit={methods.handleSubmit(onSubmit)} {...formProps}>
+      <form
+        onSubmit={methods.handleSubmit((data, event) =>
+          onSubmit?.(data, event, methods.setError),
+        )}
+        {...formProps}
+      >
         {render ? render(methods) : children}
       </form>
     </FormProvider>

packages/web/src/components/InstallationForm/index.jsx

@@ -2,35 +2,55 @@ import * as React from 'react';
 import { Link as RouterLink } from 'react-router-dom';
 import Paper from '@mui/material/Paper';
 import Typography from '@mui/material/Typography';
-import { Alert } from '@mui/material';
+import Alert from '@mui/material/Alert';
 import LoadingButton from '@mui/lab/LoadingButton';
 import * as yup from 'yup';
 import { yupResolver } from '@hookform/resolvers/yup';
-import { enqueueSnackbar } from 'notistack';
 import { useQueryClient } from '@tanstack/react-query';
 import Link from '@mui/material/Link';
 
+import { getGeneralErrorMessage } from 'helpers/errors';
 import useFormatMessage from 'hooks/useFormatMessage';
 import useInstallation from 'hooks/useInstallation';
 import * as URLS from 'config/urls';
 import Form from 'components/Form';
 import TextField from 'components/TextField';
 
-const validationSchema = yup.object().shape({
+const getValidationSchema = (formatMessage) => {
-  fullName: yup.string().trim().required('installationForm.mandatoryInput'),
+  const getMandatoryInputMessage = (inputNameId) =>
+    formatMessage('installationForm.mandatoryInput', {
+      inputName: formatMessage(inputNameId),
+    });
+
+  return yup.object().shape({
+    fullName: yup
+      .string()
+      .trim()
+      .required(
+        getMandatoryInputMessage('installationForm.fullNameFieldLabel'),
+      ),
     email: yup
       .string()
       .trim()
-    .email('installationForm.validateEmail')
+      .required(getMandatoryInputMessage('installationForm.emailFieldLabel'))
-    .required('installationForm.mandatoryInput'),
+      .email(formatMessage('installationForm.validateEmail')),
-  password: yup.string().required('installationForm.mandatoryInput'),
+    password: yup
+      .string()
+      .required(getMandatoryInputMessage('installationForm.passwordFieldLabel'))
+      .min(6, formatMessage('installationForm.passwordMinLength')),
     confirmPassword: yup
       .string()
-    .required('installationForm.mandatoryInput')
+      .required(
-    .oneOf([yup.ref('password')], 'installationForm.passwordsMustMatch'),
+        getMandatoryInputMessage('installationForm.confirmPasswordFieldLabel'),
+      )
+      .oneOf(
+        [yup.ref('password')],
+        formatMessage('installationForm.passwordsMustMatch'),
+      ),
   });
+};
 
-const initialValues = {
+const defaultValues = {
   fullName: '',
   email: '',
   password: '',
@@ -39,7 +59,7 @@ const initialValues = {
 
 function InstallationForm() {
   const formatMessage = useFormatMessage();
-  const install = useInstallation();
+  const { mutateAsync: install, isSuccess, isPending } = useInstallation();
   const queryClient = useQueryClient();
 
   const handleOnRedirect = () => {
@@ -48,21 +68,38 @@ function InstallationForm() {
     });
   };
 
-  const handleSubmit = async (values) => {
+  const handleSubmit = async ({ fullName, email, password }, e, setError) => {
-    const { fullName, email, password } = values;
     try {
-      await install.mutateAsync({
+      await install({
         fullName,
         email,
         password,
       });
     } catch (error) {
-      enqueueSnackbar(
+      const errors = error?.response?.data?.errors;
-        error?.message || formatMessage('installationForm.error'),
+      if (errors) {
-        {
+        const fieldNames = Object.keys(defaultValues);
-          variant: 'error',
+        Object.entries(errors).forEach(([fieldName, fieldErrors]) => {
-        },
+          if (fieldNames.includes(fieldName) && Array.isArray(fieldErrors)) {
-      );
+            setError(fieldName, {
+              type: 'fieldRequestError',
+              message: fieldErrors.join(', '),
+            });
+          }
+        });
+      }
+
+      const generalError = getGeneralErrorMessage({
+        error,
+        fallbackMessage: formatMessage('installationForm.error'),
+      });
+
+      if (generalError) {
+        setError('root.general', {
+          type: 'requestError',
+          message: generalError,
+        });
+      }
     }
   };
 
@@ -82,11 +119,13 @@ function InstallationForm() {
         {formatMessage('installationForm.title')}
       </Typography>
       <Form
-        defaultValues={initialValues}
+        automaticValidation={false}
+        noValidate
+        defaultValues={defaultValues}
         onSubmit={handleSubmit}
-        resolver={yupResolver(validationSchema)}
+        resolver={yupResolver(getValidationSchema(formatMessage))}
         mode="onChange"
-        render={({ formState: { errors, touchedFields } }) => (
+        render={({ formState: { errors } }) => (
           <>
             <TextField
               label={formatMessage('installationForm.fullNameFieldLabel')}
@@ -95,19 +134,12 @@ function InstallationForm() {
               margin="dense"
               autoComplete="fullName"
               data-test="fullName-text-field"
-              error={touchedFields.fullName && !!errors?.fullName}
+              error={!!errors?.fullName}
-              helperText={
+              helperText={errors?.fullName?.message}
-                touchedFields.fullName && errors?.fullName?.message
-                  ? formatMessage(errors?.fullName?.message, {
-                      inputName: formatMessage(
-                        'installationForm.fullNameFieldLabel',
-                      ),
-                    })
-                  : ''
-              }
               required
-              readOnly={install.isSuccess}
+              readOnly={isSuccess}
             />
+
             <TextField
               label={formatMessage('installationForm.emailFieldLabel')}
               name="email"
@@ -115,19 +147,12 @@ function InstallationForm() {
               margin="dense"
               autoComplete="email"
               data-test="email-text-field"
-              error={touchedFields.email && !!errors?.email}
+              error={!!errors?.email}
-              helperText={
+              helperText={errors?.email?.message}
-                touchedFields.email && errors?.email?.message
-                  ? formatMessage(errors?.email?.message, {
-                      inputName: formatMessage(
-                        'installationForm.emailFieldLabel',
-                      ),
-                    })
-                  : ''
-              }
               required
-              readOnly={install.isSuccess}
+              readOnly={isSuccess}
             />
+
             <TextField
               label={formatMessage('installationForm.passwordFieldLabel')}
               name="password"
@@ -135,19 +160,12 @@ function InstallationForm() {
               margin="dense"
               type="password"
               data-test="password-text-field"
-              error={touchedFields.password && !!errors?.password}
+              error={!!errors?.password}
-              helperText={
+              helperText={errors?.password?.message}
-                touchedFields.password && errors?.password?.message
-                  ? formatMessage(errors?.password?.message, {
-                      inputName: formatMessage(
-                        'installationForm.passwordFieldLabel',
-                      ),
-                    })
-                  : ''
-              }
               required
-              readOnly={install.isSuccess}
+              readOnly={isSuccess}
             />
+
             <TextField
               label={formatMessage(
                 'installationForm.confirmPasswordFieldLabel',
@@ -157,38 +175,24 @@ function InstallationForm() {
               margin="dense"
               type="password"
               data-test="repeat-password-text-field"
-              error={touchedFields.confirmPassword && !!errors?.confirmPassword}
+              error={!!errors?.confirmPassword}
-              helperText={
+              helperText={errors?.confirmPassword?.message}
-                touchedFields.confirmPassword &&
-                errors?.confirmPassword?.message
-                  ? formatMessage(errors?.confirmPassword?.message, {
-                      inputName: formatMessage(
-                        'installationForm.confirmPasswordFieldLabel',
-                      ),
-                    })
-                  : ''
-              }
               required
-              readOnly={install.isSuccess}
+              readOnly={isSuccess}
             />
 
-            <LoadingButton
+            {errors?.root?.general && (
-              type="submit"
+              <Alert data-test="error-alert" severity="error" sx={{ mt: 2 }}>
-              variant="contained"
+                {errors.root.general.message}
-              color="primary"
+              </Alert>
-              sx={{ boxShadow: 2, mt: 3 }}
-              loading={install.isPending}
-              disabled={install.isSuccess}
-              fullWidth
-              data-test="signUp-button"
-            >
-              {formatMessage('installationForm.submit')}
-            </LoadingButton>
-          </>
             )}
-      />
+
-      {install.isSuccess && (
+            {isSuccess && (
-        <Alert data-test="success-alert" severity="success" sx={{ mt: 3 }}>
+              <Alert
+                data-test="success-alert"
+                severity="success"
+                sx={{ mt: 2 }}
+              >
                 {formatMessage('installationForm.success', {
                   link: (str) => (
                     <Link
@@ -203,6 +207,21 @@ function InstallationForm() {
                 })}
               </Alert>
             )}
+            <LoadingButton
+              type="submit"
+              variant="contained"
+              color="primary"
+              sx={{ boxShadow: 2, mt: 2 }}
+              loading={isPending}
+              disabled={isSuccess}
+              fullWidth
+              data-test="installation-button"
+            >
+              {formatMessage('installationForm.submit')}
+            </LoadingButton>
+          </>
+        )}
+      />
     </Paper>
   );
 }

packages/web/src/components/SignUpForm/index.ee.jsx

@@ -3,33 +3,52 @@ import { useNavigate } from 'react-router-dom';
 import Paper from '@mui/material/Paper';
 import Typography from '@mui/material/Typography';
 import LoadingButton from '@mui/lab/LoadingButton';
+import Alert from '@mui/material/Alert';
 import * as yup from 'yup';
 import { yupResolver } from '@hookform/resolvers/yup';
 
+import { getGeneralErrorMessage } from 'helpers/errors';
 import useAuthentication from 'hooks/useAuthentication';
 import * as URLS from 'config/urls';
 import Form from 'components/Form';
 import TextField from 'components/TextField';
 import useFormatMessage from 'hooks/useFormatMessage';
 import useCreateAccessToken from 'hooks/useCreateAccessToken';
-import useEnqueueSnackbar from 'hooks/useEnqueueSnackbar';
 import useRegisterUser from 'hooks/useRegisterUser';
 
-const validationSchema = yup.object().shape({
+const getValidationSchema = (formatMessage) => {
-  fullName: yup.string().trim().required('signupForm.mandatoryInput'),
+  const getMandatoryInputMessage = (inputNameId) =>
+    formatMessage('signupForm.mandatoryInput', {
+      inputName: formatMessage(inputNameId),
+    });
+
+  return yup.object().shape({
+    fullName: yup
+      .string()
+      .trim()
+      .required(getMandatoryInputMessage('signupForm.fullNameFieldLabel')),
     email: yup
       .string()
       .trim()
-    .email('signupForm.validateEmail')
+      .required(getMandatoryInputMessage('signupForm.emailFieldLabel'))
-    .required('signupForm.mandatoryInput'),
+      .email(formatMessage('signupForm.validateEmail')),
-  password: yup.string().required('signupForm.mandatoryInput'),
+    password: yup
+      .string()
+      .required(getMandatoryInputMessage('signupForm.passwordFieldLabel'))
+      .min(6, formatMessage('signupForm.passwordMinLength')),
     confirmPassword: yup
       .string()
-    .required('signupForm.mandatoryInput')
+      .required(
-    .oneOf([yup.ref('password')], 'signupForm.passwordsMustMatch'),
+        getMandatoryInputMessage('signupForm.confirmPasswordFieldLabel'),
+      )
+      .oneOf(
+        [yup.ref('password')],
+        formatMessage('signupForm.passwordsMustMatch'),
+      ),
   });
+};
 
-const initialValues = {
+const defaultValues = {
   fullName: '',
   email: '',
   password: '',
@@ -40,7 +59,6 @@ function SignUpForm() {
   const navigate = useNavigate();
   const authentication = useAuthentication();
   const formatMessage = useFormatMessage();
-  const enqueueSnackbar = useEnqueueSnackbar();
   const { mutateAsync: registerUser, isPending: isRegisterUserPending } =
     useRegisterUser();
   const { mutateAsync: createAccessToken, isPending: loginLoading } =
@@ -52,7 +70,7 @@ function SignUpForm() {
     }
   }, [authentication.isAuthenticated]);
 
-  const handleSubmit = async (values) => {
+  const handleSubmit = async (values, e, setError) => {
     try {
       const { fullName, email, password } = values;
       await registerUser({
@@ -67,25 +85,28 @@ function SignUpForm() {
       const { token } = data;
       authentication.updateToken(token);
     } catch (error) {
-      const errors = error?.response?.data?.errors
+      const errors = error?.response?.data?.errors;
-        ? Object.values(error.response.data.errors)
+      if (errors) {
-        : [];
+        const fieldNames = Object.keys(defaultValues);
-
+        Object.entries(errors).forEach(([fieldName, fieldErrors]) => {
-      if (errors.length) {
+          if (fieldNames.includes(fieldName) && Array.isArray(fieldErrors)) {
-        for (const [error] of errors) {
+            setError(fieldName, {
-          enqueueSnackbar(error, {
+              type: 'fieldRequestError',
-            variant: 'error',
+              message: fieldErrors.join(', '),
-            SnackbarProps: {
-              'data-test': 'snackbar-sign-up-error',
-            },
             });
           }
-      } else {
+        });
-        enqueueSnackbar(error?.message || formatMessage('signupForm.error'), {
+      }
-          variant: 'error',
+
-          SnackbarProps: {
+      const generalError = getGeneralErrorMessage({
-            'data-test': 'snackbar-sign-up-error',
+        error,
-          },
+        fallbackMessage: formatMessage('signupForm.error'),
+      });
+
+      if (generalError) {
+        setError('root.general', {
+          type: 'requestError',
+          message: generalError,
         });
       }
     }
@@ -108,11 +129,13 @@ function SignUpForm() {
       </Typography>
 
       <Form
-        defaultValues={initialValues}
+        automaticValidation={false}
+        noValidate
+        defaultValues={defaultValues}
         onSubmit={handleSubmit}
-        resolver={yupResolver(validationSchema)}
+        resolver={yupResolver(getValidationSchema(formatMessage))}
         mode="onChange"
-        render={({ formState: { errors, touchedFields } }) => (
+        render={({ formState: { errors } }) => (
           <>
             <TextField
               label={formatMessage('signupForm.fullNameFieldLabel')}
@@ -121,14 +144,9 @@ function SignUpForm() {
               margin="dense"
               autoComplete="fullName"
               data-test="fullName-text-field"
-              error={touchedFields.fullName && !!errors?.fullName}
+              error={!!errors?.fullName}
-              helperText={
+              helperText={errors?.fullName?.message}
-                touchedFields.fullName && errors?.fullName?.message
+              required
-                  ? formatMessage(errors?.fullName?.message, {
-                      inputName: formatMessage('signupForm.fullNameFieldLabel'),
-                    })
-                  : ''
-              }
             />
 
             <TextField
@@ -138,14 +156,9 @@ function SignUpForm() {
               margin="dense"
               autoComplete="email"
               data-test="email-text-field"
-              error={touchedFields.email && !!errors?.email}
+              error={!!errors?.email}
-              helperText={
+              helperText={errors?.email?.message}
-                touchedFields.email && errors?.email?.message
+              required
-                  ? formatMessage(errors?.email?.message, {
-                      inputName: formatMessage('signupForm.emailFieldLabel'),
-                    })
-                  : ''
-              }
             />
 
             <TextField
@@ -154,14 +167,9 @@ function SignUpForm() {
               fullWidth
               margin="dense"
               type="password"
-              error={touchedFields.password && !!errors?.password}
+              error={!!errors?.password}
-              helperText={
+              helperText={errors?.password?.message}
-                touchedFields.password && errors?.password?.message
+              required
-                  ? formatMessage(errors?.password?.message, {
-                      inputName: formatMessage('signupForm.passwordFieldLabel'),
-                    })
-                  : ''
-              }
             />
 
             <TextField
@@ -170,19 +178,21 @@ function SignUpForm() {
               fullWidth
               margin="dense"
               type="password"
-              error={touchedFields.confirmPassword && !!errors?.confirmPassword}
+              error={!!errors?.confirmPassword}
-              helperText={
+              helperText={errors?.confirmPassword?.message}
-                touchedFields.confirmPassword &&
+              required
-                errors?.confirmPassword?.message
-                  ? formatMessage(errors?.confirmPassword?.message, {
-                      inputName: formatMessage(
-                        'signupForm.confirmPasswordFieldLabel',
-                      ),
-                    })
-                  : ''
-              }
             />
 
+            {errors?.root?.general && (
+              <Alert
+                data-test="alert-sign-up-error"
+                severity="error"
+                sx={{ mt: 2 }}
+              >
+                {errors.root.general.message}
+              </Alert>
+            )}
+
             <LoadingButton
               type="submit"
               variant="contained"

packages/web/src/helpers/errors.js

@@ -16,14 +16,3 @@ export const getGeneralErrorMessage = ({ error, fallbackMessage }) => {
     return error?.message || fallbackMessage;
   }
 };
-
-export const getFieldErrorMessage = ({ fieldName, error }) => {
-  const errors = error?.response?.data?.errors;
-  const fieldErrors = errors?.[fieldName];
-
-  if (fieldErrors && Array.isArray(fieldErrors)) {
-    return fieldErrors.join(', ');
-  }
-
-  return '';
-};

packages/web/src/locales/en.json

@@ -138,6 +138,7 @@
   "installationForm.submit": "Create admin",
   "installationForm.validateEmail": "Email must be valid.",
   "installationForm.passwordsMustMatch": "Passwords must match.",
+  "installationForm.passwordMinLength": "Password must be at least 6 characters long.",
   "installationForm.mandatoryInput": "{inputName} is required.",
   "installationForm.success": "The admin account has been created, and thus, the installation has been completed. You can now log in <link>here</link>.",
   "installationForm.error": "Something went wrong. Please try again.",
@@ -149,6 +150,7 @@
   "signupForm.submit": "Sign up",
   "signupForm.validateEmail": "Email must be valid.",
   "signupForm.passwordsMustMatch": "Passwords must match.",
+  "signupForm.passwordMinLength": "Password must be at least 6 characters long.",
   "signupForm.mandatoryInput": "{inputName} is required.",
   "signupForm.error": "Something went wrong. Please try again.",
   "loginForm.title": "Login",
@@ -245,7 +247,6 @@
   "deleteRoleButton.cancel": "Cancel",
   "deleteRoleButton.confirm": "Delete",
   "deleteRoleButton.successfullyDeleted": "The role has been deleted.",
-  "deleteRoleButton.generalError": "Failed while deleting!",
   "editRolePage.title": "Edit role",
   "createRolePage.title": "Create role",
   "roleForm.name": "Name",