fix(ui): do not allow submission of invalid form inputs (#1799)

This commit is contained in:
TheCatLady
2021-06-17 00:59:20 -04:00
committed by GitHub
parent 42e45f38e5
commit 910d00c195
3 changed files with 13 additions and 5 deletions

View File

@@ -178,7 +178,14 @@ const SettingsMain: React.FC = () => {
} }
}} }}
> >
{({ errors, touched, isSubmitting, values, setFieldValue }) => { {({
errors,
touched,
isSubmitting,
isValid,
values,
setFieldValue,
}) => {
return ( return (
<Form className="section"> <Form className="section">
{userHasPermission(Permission.ADMIN) && ( {userHasPermission(Permission.ADMIN) && (
@@ -397,7 +404,7 @@ const SettingsMain: React.FC = () => {
<Button <Button
buttonType="primary" buttonType="primary"
type="submit" type="submit"
disabled={isSubmitting} disabled={isSubmitting || !isValid}
> >
{isSubmitting {isSubmitting
? intl.formatMessage(globalMessages.saving) ? intl.formatMessage(globalMessages.saving)

View File

@@ -342,6 +342,7 @@ const SettingsPlex: React.FC<SettingsPlexProps> = ({ onComplete }) => {
handleSubmit, handleSubmit,
setFieldValue, setFieldValue,
isSubmitting, isSubmitting,
isValid,
}) => { }) => {
return ( return (
<form className="section" onSubmit={handleSubmit}> <form className="section" onSubmit={handleSubmit}>
@@ -517,7 +518,7 @@ const SettingsPlex: React.FC<SettingsPlexProps> = ({ onComplete }) => {
<Button <Button
buttonType="primary" buttonType="primary"
type="submit" type="submit"
disabled={isSubmitting} disabled={isSubmitting || !isValid}
> >
{isSubmitting {isSubmitting
? intl.formatMessage(globalMessages.saving) ? intl.formatMessage(globalMessages.saving)

View File

@@ -143,7 +143,7 @@ const UserPasswordChange: React.FC = () => {
} }
}} }}
> >
{({ errors, touched, isSubmitting }) => { {({ errors, touched, isSubmitting, isValid }) => {
return ( return (
<Form className="section"> <Form className="section">
{!data.hasPassword && ( {!data.hasPassword && (
@@ -221,7 +221,7 @@ const UserPasswordChange: React.FC = () => {
<Button <Button
buttonType="primary" buttonType="primary"
type="submit" type="submit"
disabled={isSubmitting} disabled={isSubmitting || !isValid}
> >
{isSubmitting {isSubmitting
? intl.formatMessage(globalMessages.saving) ? intl.formatMessage(globalMessages.saving)