Skip to content

Commit 103f63f

Browse files
authored
Merge pull request #1202 from RedisInsight/fe/feature/RI-3477_email_validation_username
#RI-3577 - Change validation for Admin Username in RE Cluster
2 parents 1e6a0b9 + fe9ab00 commit 103f63f

File tree

1 file changed

+1
-40
lines changed

1 file changed

+1
-40
lines changed

redisinsight/ui/src/pages/home/components/ClusterConnection/ClusterConnectionForm/ClusterConnectionForm.tsx

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@ import {
2121

2222
import {
2323
MAX_PORT_NUMBER,
24-
validateEmail,
2524
validateField,
2625
validatePortNumber,
2726
} from 'uiSrc/utils/validations'
2827
import { APPLICATION_NAME } from 'uiSrc/constants'
29-
import { ErrorTextValidation, handlePasteHostName } from 'uiSrc/utils'
28+
import { handlePasteHostName } from 'uiSrc/utils'
3029
import validationErrors from 'uiSrc/constants/validationErrors'
3130
import { ICredentialsRedisCluster } from 'uiSrc/slices/interfaces'
3231

@@ -65,8 +64,6 @@ const fieldDisplayNames: Values = {
6564
password: 'Admin Password',
6665
}
6766

68-
const initErrorEmail = `Username/email ${ErrorTextValidation.FormatIncorrect}`
69-
7067
const Message = () => (
7168
<EuiText color="subdued" size="s" className={styles.message} data-testid="summary">
7269
Your Redis Enterprise databases can be automatically added. Enter the
@@ -105,7 +102,6 @@ const ClusterConnectionForm = (props: Props) => {
105102
const [errors, setErrors] = useState<FormikErrors<Values>>(
106103
host || port || username || password ? {} : fieldDisplayNames
107104
)
108-
const [errorEmail, setErrorEmail] = useState<string>('')
109105

110106
const [initialValues, setInitialValues] = useState({
111107
host,
@@ -132,24 +128,6 @@ const ClusterConnectionForm = (props: Props) => {
132128
!value && Object.assign(errs, { [key]: fieldDisplayNames[key] })
133129
)
134130

135-
if (
136-
values.username
137-
&& formik.touched.username
138-
&& !validateEmail(values.username)
139-
) {
140-
setErrorEmail(initErrorEmail)
141-
Object.assign(errs, { username: initErrorEmail })
142-
}
143-
144-
if (
145-
values.username
146-
&& formik.touched.username
147-
&& validateEmail(values.username)
148-
) {
149-
setErrorEmail('')
150-
delete errs.username
151-
}
152-
153131
setErrors(errs)
154132
return errs
155133
}
@@ -173,16 +151,6 @@ const ClusterConnectionForm = (props: Props) => {
173151
}
174152
}
175153

176-
const onBlurUsername = (username: string) => {
177-
formik.setFieldTouched('username')
178-
if (username && !validateEmail(username)) {
179-
setErrorEmail(initErrorEmail)
180-
setErrors(Object.assign(errors, { username: initErrorEmail }))
181-
} else {
182-
setErrorEmail('')
183-
}
184-
}
185-
186154
const AppendHostName = () => (
187155
<EuiToolTip
188156
title={(
@@ -342,23 +310,16 @@ const ClusterConnectionForm = (props: Props) => {
342310
<EuiFlexItem className={flexItemClassName}>
343311
<EuiFormRow
344312
label="Admin Username*"
345-
error={errorEmail}
346-
isInvalid={!!errorEmail}
347313
>
348314
<EuiFieldText
349315
name="username"
350316
id="username"
351317
data-testid="username"
352318
fullWidth
353319
maxLength={200}
354-
isInvalid={!!errorEmail}
355320
placeholder="Enter Admin Username"
356321
value={formik.values.username}
357322
onChange={formik.handleChange}
358-
onBlur={(e: React.FocusEvent<HTMLInputElement>) => {
359-
onBlurUsername(e.target.value)
360-
formik.handleBlur(e)
361-
}}
362323
/>
363324
</EuiFormRow>
364325
</EuiFlexItem>

0 commit comments

Comments
 (0)