mirror of
https://github.com/grafana/grafana.git
synced 2026-09-05 04:40:13 -05:00
Grafana-UI: Update React Hook Form to v7 (#33328)
* Update hook form * Update Form component * Update ChangePassword.tsx * Update custom types * Update SaveDashboardForm * Update form story * Update FieldArray.story.tsx * Bump hook form version * Update typescript to v4.2.4 * Update ForgottenPassword.tsx * Update LoginForm.tsx * Update SignupPage.tsx * Update VerifyEmail.tsx * Update AdminEditOrgPage.tsx * Update UserCreatePage.tsx * Update BasicSettings.tsx * Update NotificationChannelForm.tsx * Update NotificationChannelOptions.tsx * Update NotificationSettings.tsx * Update OptionElement.tsx * Update AlertRuleForm.tsx * Update AlertTypeStep.tsx * Update AnnotationsField.tsx * Update ConditionField.tsx * Update ConditionsStep.tsx * Update GroupAndNamespaceFields.tsx * Update LabelsField.tsx * Update QueryStep.tsx * Update RowOptionsForm.tsx * Update SaveDashboardAsForm.tsx * Update NewDashboardsFolder.tsx * Update ImportDashboardForm.tsx * Update DashboardImportPage.tsx * Update NewOrgPage.tsx * Update OrgProfile.tsx * Update UserInviteForm.tsx * Update PlaylistForm.tsx * Update ChangePasswordForm.tsx * Update UserProfileEditForm.tsx * Update TeamSettings.tsx * Update SignupInvited.tsx * Expose setValue from the Form * Update typescript to v4.2.4 * Remove ref from field props * Fix tests * Revert TS update * Use exact version * Update latest batch of changes * Reduce the number of strict TS errors * Fix defaults * more type error fixes * Update CreateTeam * fix folder picker in rule form * fixes for hook form 7 * Update docs Co-authored-by: Domas <domasx2@gmail.com>
This commit is contained in:
@@ -33,14 +33,13 @@ export const ChangePasswordForm: FC<Props> = ({ user, onChangePassword, isSaving
|
||||
return (
|
||||
<>
|
||||
<Field label="Old password" invalid={!!errors.oldPassword} error={errors?.oldPassword?.message}>
|
||||
<Input type="password" name="oldPassword" ref={register({ required: 'Old password is required' })} />
|
||||
<Input type="password" {...register('oldPassword', { required: 'Old password is required' })} />
|
||||
</Field>
|
||||
|
||||
<Field label="New password" invalid={!!errors.newPassword} error={errors?.newPassword?.message}>
|
||||
<Input
|
||||
type="password"
|
||||
name="newPassword"
|
||||
ref={register({
|
||||
{...register('newPassword', {
|
||||
required: 'New password is required',
|
||||
validate: {
|
||||
confirm: (v) => v === getValues().confirmNew || 'Passwords must match',
|
||||
@@ -53,8 +52,7 @@ export const ChangePasswordForm: FC<Props> = ({ user, onChangePassword, isSaving
|
||||
<Field label="Confirm password" invalid={!!errors.confirmNew} error={errors?.confirmNew?.message}>
|
||||
<Input
|
||||
type="password"
|
||||
name="confirmNew"
|
||||
ref={register({
|
||||
{...register('confirmNew', {
|
||||
required: 'New password confirmation is required',
|
||||
validate: (v) => v === getValues().newPassword || 'Passwords must match',
|
||||
})}
|
||||
|
||||
@@ -24,8 +24,7 @@ export const UserProfileEditForm: FC<Props> = ({ user, isSavingUser, updateProfi
|
||||
<FieldSet label="Edit profile">
|
||||
<Field label="Name" invalid={!!errors.name} error="Name is required" disabled={disableLoginForm}>
|
||||
<Input
|
||||
name="name"
|
||||
ref={register({ required: true })}
|
||||
{...register('name', { required: true })}
|
||||
placeholder="Name"
|
||||
defaultValue={user.name}
|
||||
suffix={<InputSuffix />}
|
||||
@@ -33,21 +32,14 @@ export const UserProfileEditForm: FC<Props> = ({ user, isSavingUser, updateProfi
|
||||
</Field>
|
||||
<Field label="Email" invalid={!!errors.email} error="Email is required" disabled={disableLoginForm}>
|
||||
<Input
|
||||
name="email"
|
||||
ref={register({ required: true })}
|
||||
{...register('email', { required: true })}
|
||||
placeholder="Email"
|
||||
defaultValue={user.email}
|
||||
suffix={<InputSuffix />}
|
||||
/>
|
||||
</Field>
|
||||
<Field label="Username" disabled={disableLoginForm}>
|
||||
<Input
|
||||
name="login"
|
||||
ref={register}
|
||||
defaultValue={user.login}
|
||||
placeholder="Username"
|
||||
suffix={<InputSuffix />}
|
||||
/>
|
||||
<Input {...register('login')} defaultValue={user.login} placeholder="Username" suffix={<InputSuffix />} />
|
||||
</Field>
|
||||
<div className="gf-form-button-row">
|
||||
<Button variant="primary" disabled={isSavingUser}>
|
||||
|
||||
Reference in New Issue
Block a user