[ksc-release-4.1] chore: validate email when editing basic informatio…

…n (#5576) Signed-off-by: donniean <[email protected]> Co-authored-by: donniean <[email protected]>
kubesphere · Dec 6, 2024 · ffbad8b · ffbad8b
1 parent 1254513
commit ffbad8b
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 9 deletions.
diff --git a/locales/en/l10n-logIn.js b/locales/en/l10n-logIn.js
@@ -5,7 +5,8 @@
 
 module.exports = {
   // Log in page
-  INPUT_USERNAME_OR_EMAIL_TIP: 'Please enter your username or email.',
+  INPUT_USERNAME_OR_EMAIL_TIP: 'Please enter your username or email',
+  INPUT_EMAIL_TIP: 'Please enter your email',
   LOG_IN: 'Log In',
   LOG_IN_WITH_TITLE: 'Log in with {title}',
   LOG_OUT: 'Log Out',

diff --git a/locales/es/l10n-logIn.js b/locales/es/l10n-logIn.js
@@ -6,6 +6,7 @@
 module.exports = {
   // Log in page
   INPUT_USERNAME_OR_EMAIL_TIP: 'Please input username or email',
+  INPUT_EMAIL_TIP: 'Please enter your email',
   LOG_IN: 'Log In',
   LOG_IN_WITH_TITLE: 'Log in with {title}',
   LOG_OUT: 'Log Out',

diff --git a/locales/tc/l10n-logIn.js b/locales/tc/l10n-logIn.js
@@ -6,6 +6,7 @@
 module.exports = {
   // Log in page
   INPUT_USERNAME_OR_EMAIL_TIP: '請輸入用戶名或信箱',
+  INPUT_EMAIL_TIP: '請輸入信箱',
   LOG_IN: 'Log In',
   LOG_IN_WITH_TITLE: '通過 {title} 登入',
   LOG_OUT: 'Log Out',

diff --git a/locales/zh/l10n-logIn.js b/locales/zh/l10n-logIn.js
@@ -5,7 +5,8 @@
 
 module.exports = {
   // Log in page
-  INPUT_USERNAME_OR_EMAIL_TIP: '请输入用户名或邮箱。',
+  INPUT_USERNAME_OR_EMAIL_TIP: '请输入用户名或邮箱',
+  INPUT_EMAIL_TIP: '请输入邮箱',
   LOG_IN: '登录',
   LOG_IN_WITH_TITLE: '通过 {title} 登录',
   LOG_OUT: '登出',

diff --git a/packages/console/src/pages/access/containers/Accounts/components/UserCreateModal/index.tsx b/packages/console/src/pages/access/containers/Accounts/components/UserCreateModal/index.tsx
@@ -43,7 +43,7 @@ export default function UserCreateModal({ visible, onSuccess, onCancel }: UserCr
     },
     'spec.email': {
       rules: [
-        { required: true, message: t('INPUT_USERNAME_OR_EMAIL_TIP') },
+        { required: true, message: t('INPUT_EMAIL_TIP') },
         { type: 'email', message: t('INVALID_EMAIL') },
         { validator: validator.emailValidator },
       ],

diff --git a/packages/console/src/pages/access/containers/Accounts/components/UserEditModal/index.tsx b/packages/console/src/pages/access/containers/Accounts/components/UserEditModal/index.tsx
@@ -35,10 +35,8 @@ export default function UserEditModal({
     },
     'spec.email': {
       rules: [
-        {
-          required: true,
-          message: t('INPUT_USERNAME_OR_EMAIL_TIP'),
-        },
+        { required: true, message: t('INPUT_EMAIL_TIP') },
+        { type: 'email', message: t('INVALID_EMAIL') },
       ],
     },
     'spec.password': {

diff --git a/packages/core/src/components/Layouts/Header/UserSetting/BasicInfo/index.tsx b/packages/core/src/components/Layouts/Header/UserSetting/BasicInfo/index.tsx
@@ -55,9 +55,17 @@ const BasicInfo = ({ visible, formData, form }: BasicInfoProps) => {
         key={formData?.metadata?.name}
       >
         <FormItem label={t('USERNAME')} name={['metadata', 'name']}>
-          <Input placeholder="[email protected]" disabled />
+          <Input disabled />
         </FormItem>
-        <FormItem label={t('EMAIL')} name={['spec', 'email']} help={t('USER_SETTING_EMAIL_DESC')}>
+        <FormItem
+          label={t('EMAIL')}
+          name={['spec', 'email']}
+          help={t('USER_SETTING_EMAIL_DESC')}
+          rules={[
+            { required: true, message: t('INPUT_EMAIL_TIP') },
+            { type: 'email', message: t('INVALID_EMAIL') },
+          ]}
+        >
           <Input placeholder="[email protected]" />
         </FormItem>
         {globals.config.supportLangs && (