From b1c5405ff71c38c16b7f782dce0d71c2dceac10c Mon Sep 17 00:00:00 2001
From: karimaldeen <mhmadkarimaldeen@gmail.com>
Date: Sat, 14 Sep 2024 15:17:40 +0300
Subject: [PATCH] fix validation

---
 src/Layout/Dashboard/DeleteModels.tsx      | 2 +-
 src/Pages/Admin/question/AddPage.tsx       | 6 +-----
 src/Pages/Admin/question/EditPage.tsx      | 7 ++-----
 src/Pages/Admin/question/Model/formUtil.ts | 7 -------
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/Layout/Dashboard/DeleteModels.tsx b/src/Layout/Dashboard/DeleteModels.tsx
index dc88705..dd9fed4 100644
--- a/src/Layout/Dashboard/DeleteModels.tsx
+++ b/src/Layout/Dashboard/DeleteModels.tsx
@@ -73,7 +73,7 @@ const DeleteModels: React.FC<ModalFormProps> = ({
     <Modal
       className="ModalForm"
       centered
-      width={"40vw"}
+      width={"500px"}
       footer={null}
       open={isOpen === ModelEnum}
       onCancel={handleCancel}
diff --git a/src/Pages/Admin/question/AddPage.tsx b/src/Pages/Admin/question/AddPage.tsx
index 8e22305..5d35fe7 100644
--- a/src/Pages/Admin/question/AddPage.tsx
+++ b/src/Pages/Admin/question/AddPage.tsx
@@ -112,12 +112,8 @@ const AddPage: React.FC = () => {
 
 
   const handleValidateSingleQuestion = (values:any)=>{
-      const haveAnswers = values?.answers?.length > 0 ; 
-      const haveMoreThanOneAnswer = haveAnswers && values?.answers?.length > 1;      
+      const haveMoreThanOneAnswer =  values?.answers?.length > 1;      
       const haveOneAnswerRight = haveMoreThanOneAnswer && values?.answers?.some((item:any)=> item?.isCorrect === 1 || item.isCorrect === true )
-      if(!haveAnswers){
-          return false ;
-      }
       if(!haveMoreThanOneAnswer){
           toast.error(t("validation.it_should_have_more_than_one_answers")) ;
           return false ;
diff --git a/src/Pages/Admin/question/EditPage.tsx b/src/Pages/Admin/question/EditPage.tsx
index 1de5f7b..c82a6af 100644
--- a/src/Pages/Admin/question/EditPage.tsx
+++ b/src/Pages/Admin/question/EditPage.tsx
@@ -190,12 +190,9 @@ const EditPage: React.FC = () => {
 
 
   const handleValidateSingleQuestion = (values:any)=>{
-    const haveAnswers = values?.answers?.length > 0 ; 
-    const haveMoreThanOneAnswer = haveAnswers && values?.answers?.length > 1;      
+    const haveMoreThanOneAnswer =  values?.answers?.length > 1;      
     const haveOneAnswerRight = haveMoreThanOneAnswer && values?.answers?.some((item:any)=> item?.isCorrect === 1 || item.isCorrect === true )
-    if(!haveAnswers){
-        return false ;
-    }
+
     if(!haveMoreThanOneAnswer){
         toast.error(t("validation.it_should_have_more_than_one_answers")) ;
         return false ;
diff --git a/src/Pages/Admin/question/Model/formUtil.ts b/src/Pages/Admin/question/Model/formUtil.ts
index 5122ad5..bb129dd 100644
--- a/src/Pages/Admin/question/Model/formUtil.ts
+++ b/src/Pages/Admin/question/Model/formUtil.ts
@@ -37,9 +37,6 @@ export const getValidationSchema = () => {
       "At least one answer must be correct",
       (answers: any) => {
         console.log(answers, "answers");
-          if(answers === null){
-            return true
-          }
         return answers?.some(
           (answer: any) =>
             answer?.isCorrect === true || answer?.isCorrect === 1,
@@ -110,10 +107,6 @@ export const getValidationSchemaBase = () => {
             "at-least-one-correct",
             "At least one answer must be correct",
             (answers: any) => {
-
-              if(answers === null){
-                return true
-              }
               
               return answers.some(
                 (answer: any) =>