Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rewrite LoginForm to tsx format and fix the sonar issues #2236

Merged
merged 8 commits into from
Aug 2, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Olenka-Hryk marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useTranslation } from 'react-i18next'
import useInputVisibility from '~/hooks/use-input-visibility'
import { useSelector } from 'react-redux'

Check warning on line 3 in src/containers/guest-home-page/login-form/LoginForm.tsx

View workflow job for this annotation

GitHub Actions / tests

'useSelector' import from 'react-redux' is restricted. Use typed hooks `useAppDispatch` and `useAppSelector` instead

import Box from '@mui/material/Box'
import ButtonBase from '@mui/material/ButtonBase'
Expand All @@ -15,17 +15,40 @@

import { styles } from '~/containers/guest-home-page/login-form/LoginForm.styles'

const LoginForm = ({
interface LoginFormProps {
handleSubmit: (e: React.FormEvent<HTMLFormElement>) => void
handleChange: (
name: string
) => (e: React.ChangeEvent<HTMLInputElement>) => void
handleBlur: (name: string) => (e: React.FocusEvent<HTMLInputElement>) => void
data: {
email: string
password: string
rememberMe: boolean
}
errors: {
email?: string
password?: string
}
}

interface AppState {
appMain: {
authLoading: boolean
}
}

const LoginForm: React.FC<LoginFormProps> = ({
handleSubmit,
handleChange,
handleBlur,
data,
errors
}) => {
const { inputVisibility: passwordVisibility, showInputText: showPassword } =
useInputVisibility(errors.password)
useInputVisibility(errors.password ?? '')

const { authLoading } = useSelector((state) => state.appMain)
const { authLoading } = useSelector((state: AppState) => state.appMain)

const { openModal } = useModalContext()

Expand All @@ -35,26 +58,41 @@
openModal({ component: <ForgotPassword /> })
}

const handleCheckboxChange = (
Olenka-Hryk marked this conversation as resolved.
Show resolved Hide resolved
event: React.SyntheticEvent<Element, Event>,
checked: boolean
) => {
const target = event.target as HTMLInputElement
const changeEvent = {
...event,
target: {
...target,
value: checked.toString()
}
} as React.ChangeEvent<HTMLInputElement>
handleChange(target.name)(changeEvent)
}

return (
<Box component='form' onSubmit={handleSubmit} sx={styles.form}>
<AppTextField
autoFocus
data-testid={'email'}
errorMsg={t(errors.email)}
errorMsg={t(errors.email ?? '')}
fullWidth
label={t('common.labels.email')}
onBlur={handleBlur('email')}
onChange={handleChange('email')}
required
size='large'
size='medium'
sx={{ mb: '5px' }}
type='email'
value={data.email}
/>

<AppTextField
InputProps={passwordVisibility}
errorMsg={t(errors.password)}
errorMsg={t(errors.password ?? '')}
fullWidth
label={t('common.labels.password')}
onBlur={handleBlur('password')}
Expand All @@ -66,10 +104,10 @@

<Box sx={styles.loginOptionsContainer}>
<FormControlLabel
control={<Checkbox />}
control={<Checkbox checked={data.rememberMe} name='rememberMe' />}
label={t('login.rememberMe')}
labelPlacement='end'
onChange={handleChange('rememberMe')}
onChange={handleCheckboxChange}
sx={styles.checkboxLabel}
value={data.rememberMe}
/>
Expand Down
Loading