lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: getErrorMsg() to pure functions

Browse source
This commit is contained in:
Sérgio Salgado 2021-04-20 22:07:57 +01:00 • committed by Josh Harvey
parent 26a051ff07
commit 86a245f6ba
4 changed files with 64 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

22
new-lamassu-admin/src/pages/Authentication/LoginState.js
View file

@ -34,19 +34,19 @@ const initialValues = {
rememberMe: false
}
const LoginState = ({ state, dispatch }) => {
const classes = useStyles()
const [login, { error: mutationError }] = useMutation(LOGIN)
const getErrorMsg = (formikErrors, formikTouched) => {
const getErrorMsg = (formikErrors, formikTouched, mutationError) => {
if (!formikErrors || !formikTouched) return null
if (mutationError) return 'Invalid login/password combination'
if (formikErrors.client && formikTouched.client) return formikErrors.client
if (formikErrors.password && formikTouched.password)
return formikErrors.password
return null
}
}
const LoginState = ({ state, dispatch }) => {
const classes = useStyles()
const [login, { error: mutationError }] = useMutation(LOGIN)
const submitLogin = async (username, password, rememberMe) => {
const { data: loginResponse } = await login({
@ -88,7 +88,7 @@ const LoginState = ({ state, dispatch }) => {
fullWidth
autoFocus
className={classes.input}
error={getErrorMsg(errors, touched)}
error={getErrorMsg(errors, touched, mutationError)}
/>
<Field
name="password"
@ -96,7 +96,7 @@ const LoginState = ({ state, dispatch }) => {
component={SecretInput}
label="Password"
fullWidth
error={getErrorMsg(errors, touched)}
error={getErrorMsg(errors, touched, mutationError)}
/>
<div className={classes.rememberMeWrapper}>
<Field
@ -107,9 +107,9 @@ const LoginState = ({ state, dispatch }) => {
<Label3>Keep me logged in</Label3>
</div>
<div className={classes.footer}>
{getErrorMsg(errors, touched) && (
{getErrorMsg(errors, touched, mutationError) && (
<P className={classes.errorMessage}>
{getErrorMsg(errors, touched)}
{getErrorMsg(errors, touched, mutationError)}
</P>
)}
<Button

39
new-lamassu-admin/src/pages/Authentication/Register.js
View file

@ -72,6 +72,21 @@ const reducer = (state, action) => {
return { ...state, ...payload, result: type }
}
const getErrorMsg = (
formikErrors,
formikTouched,
queryError,
mutationError
) => {
if (!formikErrors || !formikTouched) return null
if (queryError || mutationError) return 'Internal server error'
if (formikErrors.password && formikTouched.password)
return formikErrors.password
if (formikErrors.confirmPassword && formikTouched.confirmPassword)
return formikErrors.confirmPassword
return null
}
const Register = () => {
const classes = useStyles()
const history = useHistory()
@ -107,16 +122,6 @@ const Register = () => {
}
})
const getErrorMsg = (formikErrors, formikTouched) => {
if (!formikErrors || !formikTouched) return null
if (queryError || mutationError) return 'Internal server error'
if (formikErrors.password && formikTouched.password)
return formikErrors.password
if (formikErrors.confirmPassword && formikTouched.confirmPassword)
return formikErrors.confirmPassword
return null
}
return (
<Grid
container
@ -166,9 +171,19 @@ const Register = () => {
fullWidth
/>
<div className={classes.footer}>
{getErrorMsg(errors, touched) && (
{getErrorMsg(
errors,
touched,
queryError,
mutationError
) && (
<P className={classes.errorMessage}>
{getErrorMsg(errors, touched)}
{getErrorMsg(
errors,
touched,
queryError,
mutationError
)}
</P>
)}
<Button

24
new-lamassu-admin/src/pages/Authentication/ResetPassword.js
View file

@ -49,6 +49,16 @@ const initialValues = {
confirmPassword: ''
}
const getErrorMsg = (formikErrors, formikTouched, mutationError) => {
if (!formikErrors || !formikTouched) return null
if (mutationError) return 'Internal server error'
if (formikErrors.password && formikTouched.password)
return formikErrors.password
if (formikErrors.confirmPassword && formikTouched.confirmPassword)
return formikErrors.confirmPassword
return null
}
const ResetPassword = () => {
const classes = useStyles()
const history = useHistory()
@ -81,16 +91,6 @@ const ResetPassword = () => {
}
})
const getErrorMsg = (formikErrors, formikTouched) => {
if (!formikErrors || !formikTouched) return null
if (error) return 'Internal server error'
if (formikErrors.password && formikTouched.password)
return formikErrors.password
if (formikErrors.confirmPassword && formikTouched.confirmPassword)
return formikErrors.confirmPassword
return null
}
return (
<Grid
container
@ -139,9 +139,9 @@ const ResetPassword = () => {
fullWidth
/>
<div className={classes.footer}>
{getErrorMsg(errors, touched) && (
{getErrorMsg(errors, touched, error) && (
<P className={classes.errorMessage}>
{getErrorMsg(errors, touched)}
{getErrorMsg(errors, touched, error)}
</P>
)}
<Button

22
new-lamassu-admin/src/pages/UserManagement/modals/CreateUserModal.js
View file

@ -50,6 +50,14 @@ const radioOptions = [
}
]
const getErrorMsg = (formikErrors, formikTouched, mutationError) => {
if (!formikErrors || !formikTouched) return null
if (mutationError) return 'Internal server error'
if (formikErrors.username && formikTouched.username)
return formikErrors.username
return null
}
const CreateUserModal = ({ state, dispatch }) => {
const classes = useStyles()
@ -74,14 +82,6 @@ const CreateUserModal = ({ state, dispatch }) => {
[classes.error]: formikErrors.role && formikTouched.role
})
const getErrorMsg = (formikErrors, formikTouched) => {
if (!formikErrors || !formikTouched) return null
if (error) return 'Internal server error'
if (formikErrors.username && formikTouched.username)
return formikErrors.username
return null
}
return (
<>
{state.showCreateUserModal && !createUserURL && (
@ -125,8 +125,10 @@ const CreateUserModal = ({ state, dispatch }) => {
options={radioOptions}
/>
<div className={classes.footer}>
{getErrorMsg(errors, touched) && (
<ErrorMessage>{getErrorMsg(errors, touched)}</ErrorMessage>
{getErrorMsg(errors, touched, error) && (
<ErrorMessage>
{getErrorMsg(errors, touched, error)}
</ErrorMessage>
)}
<Button
type="submit"