all react-client using the new ValidatedTextInput

jhipster · Sep 11, 2022 · 7cf1c74 · 7cf1c74
1 parent a0b5c1d
commit 7cf1c74
Show file tree

Hide file tree

Showing 6 changed files with 145 additions and 107 deletions.
diff --git a/...t/src/main/webapp/app/modules/account/password-reset/finish/password-reset-finish.tsx.ejs b/...t/src/main/webapp/app/modules/account/password-reset/finish/password-reset-finish.tsx.ejs
@@ -70,7 +70,7 @@ export const PasswordResetFinishPage = () => {
           touchedFields={ touchedFields }
           errors={ errors }
           setValue={ setValue }
-          name="newPassword"
+          nameIdCy="newPassword"
           validate={{
             required: translate('global.messages.validate.newpassword.required') ,
             minLength: { value: 4, message: translate('global.messages.validate.newpassword.minlength') },
@@ -87,7 +87,7 @@ export const PasswordResetFinishPage = () => {
           touchedFields={ touchedFields }
           errors={ errors }
           setValue={ setValue }
-          name="confirmPassword"
+          nameIdCy="confirmPassword"
           validate={{
             required: translate('global.messages.validate.confirmpassword.required'),
             minLength: { value: 4, message: translate('global.messages.validate.confirmpassword.minlength') },

diff --git a/...react/src/main/webapp/app/modules/account/password-reset/init/password-reset-init.tsx.ejs b/...react/src/main/webapp/app/modules/account/password-reset/init/password-reset-init.tsx.ejs
@@ -71,7 +71,7 @@ export const PasswordResetInit = () => {
               touchedFields={ touchedFields }
               errors={ errors }
               setValue={ setValue }
-              name="email"
+              nameIdCy="email"
               validate={ {
                 required: translate('global.messages.validate.email.required'),
                 minLength: { value: 5, message: translate('global.messages.validate.email.minlength') },

diff --git a/...tors/client/templates/react/src/main/webapp/app/modules/account/password/password.tsx.ejs b/...tors/client/templates/react/src/main/webapp/app/modules/account/password/password.tsx.ejs
@@ -80,7 +80,7 @@ export const PasswordPage = () => {
               touchedFields={ touchedFields }
               errors={ errors }
               setValue={ setValue }
-              name="currentPassword"
+              nameIdCy="currentPassword"
               validate={{ required: translate('global.messages.validate.newpassword.required') }}
               labelPlaceholderKey="global.form.currentpassword.label"
               inputPlaceholderKey="global.form.currentpassword.placeholder"
@@ -91,7 +91,7 @@ export const PasswordPage = () => {
               touchedFields={ touchedFields }
               errors={ errors }
               setValue={ setValue }
-              name="newPassword"
+              nameIdCy="newPassword"
               validate={{
                 required: translate('global.messages.validate.newpassword.required'),
                 minLength: { value: 4, message: translate('global.messages.validate.newpassword.minlength') },
@@ -108,7 +108,7 @@ export const PasswordPage = () => {
               touchedFields={ touchedFields }
               errors={ errors }
               setValue={ setValue }
-              name="confirmPassword"
+              nameIdCy="confirmPassword"
               validate={{
                 required: translate('global.messages.validate.confirmpassword.required'),
                 minLength: { value: 4, message: translate('global.messages.validate.confirmpassword.minlength') },

diff --git a/...tors/client/templates/react/src/main/webapp/app/modules/account/register/register.tsx.ejs b/...tors/client/templates/react/src/main/webapp/app/modules/account/register/register.tsx.ejs
@@ -82,7 +82,7 @@ export const RegisterPage = () => {
               touchedFields={ touchedFields }
               errors={ errors }
               setValue={ setValue }
-              name="username"
+              nameIdCy="username"
               validate={{
                 required: translate('register.messages.validate.login.required'),
                 pattern: {
@@ -100,7 +100,7 @@ export const RegisterPage = () => {
               touchedFields={ touchedFields }
               errors={ errors }
               setValue={ setValue }
-              name="email"
+              nameIdCy="email"
               type="email"
               validate={{
                 required: translate('global.messages.validate.email.required'),
@@ -116,7 +116,7 @@ export const RegisterPage = () => {
               touchedFields={ touchedFields }
               errors={ errors }
               setValue={ setValue }
-              name="firstPassword"
+              nameIdCy="firstPassword"
               type="password"
               validate={{
                 required: translate('global.messages.validate.newpassword.required'),
@@ -133,7 +133,7 @@ export const RegisterPage = () => {
               touchedFields={ touchedFields }
               errors={ errors }
               setValue={ setValue }
-              name="secondPassword"
+              nameIdCy="secondPassword"
               type="password"
               validate={{
                 required: translate('global.messages.validate.confirmpassword.required'),

diff --git a/...tors/client/templates/react/src/main/webapp/app/modules/account/settings/settings.tsx.ejs b/...tors/client/templates/react/src/main/webapp/app/modules/account/settings/settings.tsx.ejs
@@ -27,7 +27,7 @@ import { locales, languages } from 'app/config/translation';
 import { useAppDispatch, useAppSelector } from 'app/config/store';
 import { getSession } from 'app/shared/reducers/authentication';
 import { saveAccountSettings, reset } from './settings.reducer';
-import { useForm } from 'react-hook-form';
+import { DefaultValues, FieldValues, useForm } from 'react-hook-form';
 
 export const SettingsPage = () => {
   const dispatch = useAppDispatch();
@@ -38,7 +38,16 @@ export const SettingsPage = () => {
     handleSubmit,
     setValue,
     formState: { errors, touchedFields },
-  } = useForm();
+  } = useForm({
+      defaultValues: {
+        firstName: account?.firstName,
+        lastName: account?.lastName,
+        email: account?.email,
+<%_ if (enableTranslation) { _%>
+        langKey: account?.langKey,
+<%_ } _%>
+      } as DefaultValues<FieldValues>
+  });
 
   useEffect(() => {
     dispatch(getSession());
@@ -76,13 +85,13 @@ export const SettingsPage = () => {
             </Translate>
           </h2>
           {/* eslint-disable-next-line @typescript-eslint/no-misused-promises */}
-          <Form id="settings-form" onSubmit={handleSubmit(handleValidSubmit)} defaultValues={account}>
+          <Form id="settings-form" onSubmit={handleSubmit(handleValidSubmit)}>
             <ValidatedTextInput
               register={ register }
               touchedFields={ touchedFields }
               errors={ errors }
               setValue={ setValue }
-              name="firstName"
+              nameIdCy="firstName"
               validate={{
                 required: translate('settings.messages.validate.firstname.required'),
                 minLength: { value: 1, message: translate('settings.messages.validate.firstname.minlength') },
@@ -96,7 +105,7 @@ export const SettingsPage = () => {
               touchedFields={ touchedFields }
               errors={ errors }
               setValue={ setValue }
-              name="lastName"
+              nameIdCy="lastName"
               validate={{
                 required: translate('settings.messages.validate.lastname.required'),
                 minLength: { value: 1, message: translate('settings.messages.validate.lastname.minlength') },
@@ -110,7 +119,7 @@ export const SettingsPage = () => {
               touchedFields={ touchedFields }
               errors={ errors }
               setValue={ setValue }
-              name="email"
+              nameIdCy="email"
               type="email"
               validate={{
                 required: translate('global.messages.validate.email.required'),