Fix profile inputs disabled for teacher

codiumkg · May 24, 2024 · ed8577c · ed8577c
1 parent 21d1a1d
commit ed8577c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/components/shared/CustomInput/CustomInput.tsx b/src/components/shared/CustomInput/CustomInput.tsx
@@ -15,6 +15,7 @@ interface Props extends InputHTMLAttributes<HTMLInputElement> {
   label?: string;
   errorMessage?: string;
   isViewOnly?: boolean;
+  ignoreRole?: boolean;
   onChangeCallback?: (value: string) => void;
 }
 
@@ -28,6 +29,7 @@ const CustomInput: FC<Props> = forwardRef<HTMLInputElement, Props>(
       errorMessage,
       onChange,
       isViewOnly = false,
+      ignoreRole = false,
     },
     ref?
   ) {
@@ -44,7 +46,7 @@ const CustomInput: FC<Props> = forwardRef<HTMLInputElement, Props>(
         type={type}
         isInvalid={!!errorMessage}
         errorMessage={errorMessage}
-        isDisabled={isViewOnly || isTeacher}
+        isDisabled={isViewOnly || (!ignoreRole && isTeacher)}
       />
     );
   }

diff --git a/src/pages/my-groups/StudentProgressModal.tsx b/src/pages/my-groups/StudentProgressModal.tsx
@@ -111,7 +111,7 @@ export default function StudentProgressModal({
               </div>
             </ModalBody>
             <ModalFooter>
-              <Button onPress={onClose} color="secondary">
+              <Button onPress={onClose} color="secondary" size="sm">
                 Закрыть
               </Button>
             </ModalFooter>

diff --git a/src/pages/profile/Profile.tsx b/src/pages/profile/Profile.tsx
@@ -67,6 +67,7 @@ export default function ProfilePage() {
                 currentPassword: e.target.value,
               })
             }
+            ignoreRole
           />
 
           <CustomInput
@@ -80,6 +81,7 @@ export default function ProfilePage() {
                 newPassword: e.target.value,
               })
             }
+            ignoreRole
           />
 
           <div>