From a95df3debb12c344c7db4f4870d88917ad110290 Mon Sep 17 00:00:00 2001
From: Majd_dk <Majd007n82@gmail.com>
Date: Sun, 28 Sep 2025 11:32:31 +0300
Subject: [PATCH] change some keys

---
 src/Pages/Admin/QuestionBank/Model/FilterForm.tsx | 14 +++++++-------
 src/Pages/Admin/QuestionBank/Table.tsx            |  2 +-
 src/Pages/Admin/question/Model/Malty/Form.tsx     |  6 ++++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/Pages/Admin/QuestionBank/Model/FilterForm.tsx b/src/Pages/Admin/QuestionBank/Model/FilterForm.tsx
index a7d4060..48fe6c6 100644
--- a/src/Pages/Admin/QuestionBank/Model/FilterForm.tsx
+++ b/src/Pages/Admin/QuestionBank/Model/FilterForm.tsx
@@ -29,7 +29,7 @@ const FilterForm = () => {
 
   const grade_id = formik.values.grade_id?.id
   const subject_id = formik.values?.subject_id?.id
-  const unit_id = formik.values?.unit_id?.id
+  const unitId = formik.values?.unitId?.id
   const lessonsIds = formik.values?.lessonsIds?.map((lesson:any) => lesson.id)
 
   const { data: Grade, isLoading: isLoadingGrade } = useGetAllGrade({
@@ -54,7 +54,7 @@ const FilterForm = () => {
   const canChangeSubjectPage = !!Subject?.links?.next;
   const SubjectPage = Subject?.meta?.current_page;
 
-  /// unit_id
+  /// unitId
   const { data: Unit, isLoading: isLoadingUnit } = useGetAllUnit({
     name: UnitName,
     page: UnitCurrentPage,
@@ -75,11 +75,11 @@ const FilterForm = () => {
     name: LessonName,
     page: LessonCurrentPage,
     grade_id,
-    unit_id
+    unitId
 
   },
   {
-    enabled: !!grade_id || !!unit_id
+    enabled: !!grade_id || !!unitId
   }
 );
   const LessonOption = Lesson?.data ?? [];
@@ -93,7 +93,7 @@ const FilterForm = () => {
     lessonsIds,
     grade_id,
     subject_id,
-    unit_id
+    unitId
   });
 
   const TagOption = Tag?.data ?? [];
@@ -132,7 +132,7 @@ const FilterForm = () => {
       dependensValue:subject_id,
       props:  {
         searchBy: "UnitName",
-        name: "unit_id",
+        name: "unitId",
         label: "unit",
         type: "Search",
         option: UnitOption,
@@ -146,7 +146,7 @@ const FilterForm = () => {
 const colLeft :any=[
 
     {
-      dependensValue: unit_id,
+      dependensValue: unitId,
       props:  {
         searchBy: "LessonName",
         name: "lessonsIds",
diff --git a/src/Pages/Admin/QuestionBank/Table.tsx b/src/Pages/Admin/QuestionBank/Table.tsx
index 67db14f..0740adb 100644
--- a/src/Pages/Admin/QuestionBank/Table.tsx
+++ b/src/Pages/Admin/QuestionBank/Table.tsx
@@ -20,7 +20,7 @@ const App: React.FC = () => {
     tagsIds: ConvertArrayToArrayOfIds(filterState?.tagsIds),
     grade_id: filterState?.grade_id?.id,
     subject_id: filterState?.subject_id?.id,
-    unit_id: filterState?.unit_id?.id,
+    unitId: filterState?.unitId?.id,
     lessonsIds: ConvertArrayToArrayOfIds(filterState?.lessonsIds),
     content: Filter?.content,
     hasAnswer: Filter?.hasAnswer,
diff --git a/src/Pages/Admin/question/Model/Malty/Form.tsx b/src/Pages/Admin/question/Model/Malty/Form.tsx
index 5f5a0c6..bafcb46 100644
--- a/src/Pages/Admin/question/Model/Malty/Form.tsx
+++ b/src/Pages/Admin/question/Model/Malty/Form.tsx
@@ -11,11 +11,12 @@ import { toast } from "react-toastify";
 import MainInputs from "./components/MainInputs";
 import Questions from "./components/Questions";
 import useUnsavedChangesWarning from "../../../../../Hooks/useUnsavedChangesWarning";
+import { uid } from "../../../../../utils/reOrder";
 
 const Form = () => {
   const formik = useFormikContext<any>();
   const { setSuccess, Success, ShowHint } = useObjectToEdit();
-
+  
   const handleAddChoice = (
     parent_index: number,
     fromKeyCombination: boolean = false,
@@ -46,9 +47,10 @@ const Form = () => {
         image: "",
         parent: "",
         isBase: 0,
+        id:uid(),
         // max_mark: 1,
         // min_mark_to_pass: 1,
-        answers: [{ answer: null, answer_image: null, isCorrect: 0 }],
+        answers: [{id:uid(),  answer: null, answer_image: null, isCorrect: 0 ,content_image:null}],
         tags: [],
       },
     ]);