input id changed, novalidate form removed, btn disabled added

ita-social-projects · Oct 10, 2024 · ca33389 · ca33389
1 parent 5442ee6
commit ca33389
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/FrontEnd/src/components/MiniComponents/AdminSubmitButton.jsx b/FrontEnd/src/components/MiniComponents/AdminSubmitButton.jsx
@@ -1,11 +1,12 @@
 import classes from './AdminSubmitButton.module.css';
 
-const AdminSubmitButton = () => {
+const AdminSubmitButton = ({ disabled }) => {
     return (
         <div className={classes['admin-submit__container']}>
             <button
                 className={classes['admin-submit__button']}
                 type="submit"
+                disabled={disabled}
             >
                 Зберегти зміни
             </button>

diff --git a/FrontEnd/src/pages/AdminPage/AdminProfile/AdminInfo.jsx b/FrontEnd/src/pages/AdminPage/AdminProfile/AdminInfo.jsx
@@ -12,7 +12,7 @@ const AdminInfo = ({ user, mutate }) => {
         handleSubmit,
         setValue,
         getValues,
-        formState: { errors },
+        formState: { errors, isDirty },
     } = useForm({
         defaultValues: {
         'name': user.name,
@@ -129,7 +129,7 @@ const AdminInfo = ({ user, mutate }) => {
               {errors.surname && errors.surname.message}
             </div>
           </div>
-          <AdminSubmitButton />
+          <AdminSubmitButton disabled={!isDirty}/>
         </div>
     </form>
     </div>

diff --git a/FrontEnd/src/pages/AdminPage/AdminProfile/ChangeAdminPassword.jsx b/FrontEnd/src/pages/AdminPage/AdminProfile/ChangeAdminPassword.jsx
@@ -17,7 +17,7 @@ export default function ChangeAdminPassword(props) {
     getValues,
     watch,
     reset,
-    formState: { errors },
+    formState: { errors, isDirty },
   } = useForm({
     mode: 'all',
     defaultValues: {
@@ -55,14 +55,13 @@ export default function ChangeAdminPassword(props) {
   return (
     <div className={classes['form__container']}>
       {props.user ? (
-        <form id="ChangePassword" onSubmit={handleSubmit(handleFormSubmit)} noValidate >
+        <form id="ChangeAdminPassword" onSubmit={handleSubmit(handleFormSubmit)} >
             <PasswordField
-              inputId="currentPassword"
+              inputId="currentAdminPassword"
               name="currentPassword"
               label="Поточний пароль"
               register={register}
               error={errors}
-              showError={false}
               watch={watch}
               checkValid={false}
               checkMatch={{
@@ -71,12 +70,11 @@ export default function ChangeAdminPassword(props) {
               }}
             />
             <PasswordField
-              inputId="newPassword"
+              inputId="newAdminPassword"
               name="newPassword"
               label="Новий пароль"
               error={errors}
               register={register}
-              showError={true}
               watch={watch}
               checkValid={true}
               checkMatch={{
@@ -85,7 +83,7 @@ export default function ChangeAdminPassword(props) {
               }}
             />
             <PasswordField
-              inputId="reNewPassword"
+              inputId="reNewAdminPassword"
               name="reNewPassword"
               label="Повторіть новий пароль"
               error={errors}
@@ -97,7 +95,7 @@ export default function ChangeAdminPassword(props) {
                 checkWith: 'newPassword',
               }}
             />
-          <AdminSubmitButton />
+          <AdminSubmitButton disabled={!isDirty}/>
         </form>
       ) : (
         <Loader />