From 45a960bce3f55108e95d2662e76db46808e131c6 Mon Sep 17 00:00:00 2001
From: karimaldeen <mhmadkarimaldeen@gmail.com>
Date: Tue, 8 Oct 2024 09:19:37 +0300
Subject: [PATCH] fix

---
 src/Components/CustomFields/MathComponent.tsx |  2 +-
 src/Components/LatextInput/LaTeXInputMemo.tsx | 45 ++++++++++++++++---
 .../LatextInput/areFieldPropsEqual.ts         |  5 +--
 src/Pages/Admin/question/AddPage.tsx          |  4 ++
 src/Pages/Admin/question/EditPage.tsx         |  3 +-
 src/Pages/Admin/question/Model/ModelForm.tsx  |  2 +-
 src/Pages/Admin/question/Page.tsx             |  1 -
 src/Pages/Admin/question/formUtil.ts          |  7 +++
 src/Pages/Home/Dummy.tsx                      |  3 +-
 src/Styles/components/LaTeXInput.scss         |  1 +
 src/translate/ar.json                         |  3 +-
 src/types/Item.ts                             |  1 +
 12 files changed, 59 insertions(+), 18 deletions(-)

diff --git a/src/Components/CustomFields/MathComponent.tsx b/src/Components/CustomFields/MathComponent.tsx
index 9b54891..b3688ba 100644
--- a/src/Components/CustomFields/MathComponent.tsx
+++ b/src/Components/CustomFields/MathComponent.tsx
@@ -9,7 +9,7 @@ const LatexPreview = ({ latex }: { latex: string }) => {
     // const sanitizedLatex = latex.replace(/\\_/g, '_');
     
   return (
-    <div>
+    <div >
 
 
         <BlockMath>
diff --git a/src/Components/LatextInput/LaTeXInputMemo.tsx b/src/Components/LatextInput/LaTeXInputMemo.tsx
index 45b873d..2a4592c 100644
--- a/src/Components/LatextInput/LaTeXInputMemo.tsx
+++ b/src/Components/LatextInput/LaTeXInputMemo.tsx
@@ -17,12 +17,13 @@ const EditLazyModal = React.lazy(() => import("./EditLaTexModal"));
 const LaTeXInputMemo: React.FC<any> =  React.memo(({ field ,form, label, ...props }) => {
   const { name  ,value} = field;
   
-  const { setFieldValue ,touched ,errors } = form;
+  const { setFieldValue ,touched ,errors ,getFieldProps,values} = form;
 
   const { ShowLatexOption, Success } = useObjectToEdit();
   const [showPreview, setShowPreview] = useState(false);      
   const Preview = parseTextAndLatex(value ?? "");
 
+
   const onPreviewChange: CheckboxProps['onChange'] = (e) => {
     setShowPreview(e.target.checked);
   };
@@ -68,6 +69,31 @@ const LaTeXInputMemo: React.FC<any> =  React.memo(({ field ,form, label, ...prop
   
   const isError = !!touched?.[name] && !!errors?.[name];
   const errorMessage = isError ? errors?.[name] as string ?? "" : "" ;
+
+  
+
+  console.log(values);
+  
+  let metaName = name.substring(0, name.lastIndexOf('.'));
+  if (metaName.includes('.')) {  metaName += ".meta";} else {metaName += "meta"}
+  console.log(metaName);
+  const meta = getFieldProps(metaName).value ; 
+  console.log(meta);
+  const direction = meta?.direction === "ltr" ? "ltr" : "rtl" 
+    
+  const [Dir, setDir] = useState<"ltr" | "rtl">(direction)
+  
+  const handleChangeDirection = ()=>{
+    if(Dir === "ltr"){
+      setDir("rtl")
+      setFieldValue(metaName,{...(meta ?? {}), direction:"rtl"})
+    }else{
+      setDir("ltr")
+      setFieldValue(metaName,{...(meta ?? {}), direction:"ltr"})
+
+    }
+  }
+
   return (
     <div className='LaTeXInput'>
       <label htmlFor={name} className="text">
@@ -84,17 +110,24 @@ const LaTeXInputMemo: React.FC<any> =  React.memo(({ field ,form, label, ...prop
           onChange={handleChangeInput}
           value={curCentValue}
           onBlur={onBlur}
+          dir={Dir}
           {...props}
         />
-        
+                    <div className='LaTeXInputOptions'>
+                    <Checkbox onChange={handleChangeDirection} checked={direction === "ltr"} >{t("header.change_direction")}</Checkbox>
+          
+    
         {ShowLatexOption && (
-          <div className='LaTeXInputOptions'>
-            <Checkbox onChange={onPreviewChange}>{t("header.show_preview")}</Checkbox>
+          <>
+                      <Checkbox onChange={onPreviewChange}>{t("header.show_preview")}</Checkbox>
             <button type='button' className='addMML' onClick={showModal}> 
               <FaPlus/> {t("MML")} 
             </button>
-          </div>
-        )}
+
+          </>
+          )}
+        
+        </div>
         
         {showPreview && (
           <div className='showPreviewInput'>
diff --git a/src/Components/LatextInput/areFieldPropsEqual.ts b/src/Components/LatextInput/areFieldPropsEqual.ts
index 2675e74..369cc2f 100644
--- a/src/Components/LatextInput/areFieldPropsEqual.ts
+++ b/src/Components/LatextInput/areFieldPropsEqual.ts
@@ -15,9 +15,6 @@ export const areFieldPropsEqual = (
   const nextValue = nextProps.field.value;
 
   return (
-    prevValue === nextValue 
-    &&
-    prevError === nextError &&
-    prevTouched === nextTouched
+   false
   );
 };
diff --git a/src/Pages/Admin/question/AddPage.tsx b/src/Pages/Admin/question/AddPage.tsx
index 8aaacb0..442478c 100644
--- a/src/Pages/Admin/question/AddPage.tsx
+++ b/src/Pages/Admin/question/AddPage.tsx
@@ -32,6 +32,8 @@ const AddPage: React.FC = () => {
         lessons_ids: [lesson_id],
         canAnswersBeShuffled,
         hint: DataToSend?.hint,
+        meta : DataToSend?.meta 
+
       };
 
       mutateAsync(newBseQuestion).then((data: any) => {
@@ -56,6 +58,8 @@ const AddPage: React.FC = () => {
             tags,
             lessons_ids: [lesson_id],
             answers,
+            meta : item?.meta 
+
           });
         });
         console.log(newBseQuestionId, "newBseQuestionId");
diff --git a/src/Pages/Admin/question/EditPage.tsx b/src/Pages/Admin/question/EditPage.tsx
index 57e5cb6..7f0653d 100644
--- a/src/Pages/Admin/question/EditPage.tsx
+++ b/src/Pages/Admin/question/EditPage.tsx
@@ -15,8 +15,6 @@ import { useObjectToEdit } from "../../../zustand/ObjectToEditState";
 import { removeStringKeys } from "../../../utils/removeStringKeys";
 import SpinContainer from "../../../Components/Layout/SpinContainer";
 import { Question } from "../../../types/Item";
-import { toast } from "react-toastify";
-import { deletePathSegments } from "../../../utils/deletePathSegments";
 import BaseFormContainer from "./Model/EditForm/BaseFormContainer";
 import FormContainer from "./Model/EditForm/FormContainer";
 import { handleValidateBaseQuestion, handleValidateSingleQuestion } from "./Model/ValidationFn";
@@ -61,6 +59,7 @@ const EditPage: React.FC = () => {
         id: DataToSend?.id,
         content: DataToSend?.content,
         content_image: DataToSend?.content_image ?? "",
+        meta : DataToSend?.meta 
       };
       if (
         typeof UpdateBseQuestion?.content_image === "string" &&
diff --git a/src/Pages/Admin/question/Model/ModelForm.tsx b/src/Pages/Admin/question/Model/ModelForm.tsx
index b559ee4..43b8d41 100644
--- a/src/Pages/Admin/question/Model/ModelForm.tsx
+++ b/src/Pages/Admin/question/Model/ModelForm.tsx
@@ -36,7 +36,7 @@ const Form = () => {
 
 
   ////////////// hooks
-
+  
 
   useKeyCombination(
     { ctrlKey: true, shiftKey: true, code: CombinationKeyEnum.CHOICE },
diff --git a/src/Pages/Admin/question/Page.tsx b/src/Pages/Admin/question/Page.tsx
index 1ba651b..18bfb61 100644
--- a/src/Pages/Admin/question/Page.tsx
+++ b/src/Pages/Admin/question/Page.tsx
@@ -59,7 +59,6 @@ const TableHeader = () => {
       setObjectToEdit(null)
     }
 }, [])
-  console.log(objectToEdit);
   
   return (
     <div className="TableWithHeader">
diff --git a/src/Pages/Admin/question/formUtil.ts b/src/Pages/Admin/question/formUtil.ts
index de56145..deda1e1 100644
--- a/src/Pages/Admin/question/formUtil.ts
+++ b/src/Pages/Admin/question/formUtil.ts
@@ -5,8 +5,10 @@ export const getInitialValues = (objectToEdit: Question): any => {
   const tags = objectToEdit?.tags?.map((item: any, index: number) => {
     return { ...item };
   });
+
   
   return {
+
     id: objectToEdit?.id ?? null,
     content: objectToEdit?.content ?? "",
     content_image: objectToEdit?.content_image ?? "",
@@ -17,6 +19,7 @@ export const getInitialValues = (objectToEdit: Question): any => {
     parent_id: objectToEdit?.parent_id ?? "",
     answers: objectToEdit?.answers ?? null,
     tags: tags ?? [],
+    meta : objectToEdit?.meta ?? { direction : "rtl" }
   };
 };
 
@@ -83,6 +86,8 @@ export const getInitialValuesBase = (objectToEdit: Question): any => {
       hint: objectToEdit?.hint ?? "",
       isBase: 0,
       tags,
+      meta : objectToEdit?.meta ?? { direction : "rtl" }
+
     };
   });
 
@@ -98,6 +103,8 @@ export const getInitialValuesBase = (objectToEdit: Question): any => {
     canAnswersBeShuffled: objectToEdit?.canAnswersBeShuffled ? 1 : 0,
     hint: objectToEdit?.hint ?? null,
     Questions: questions,
+    meta : objectToEdit?.meta ?? { direction : "rtl" }
+
   };
 };
 
diff --git a/src/Pages/Home/Dummy.tsx b/src/Pages/Home/Dummy.tsx
index 5223d19..6be2ce2 100644
--- a/src/Pages/Home/Dummy.tsx
+++ b/src/Pages/Home/Dummy.tsx
@@ -3,8 +3,7 @@ const Dummy = () => {
   
   return (
     <div className="DummyHomePage">
-     <div>asd</div>
-     <div> asd </div>
+     <div>mohammed karim -_- </div>
     </div>
   );
 };
diff --git a/src/Styles/components/LaTeXInput.scss b/src/Styles/components/LaTeXInput.scss
index 6bea0f8..756b895 100644
--- a/src/Styles/components/LaTeXInput.scss
+++ b/src/Styles/components/LaTeXInput.scss
@@ -73,6 +73,7 @@
 .LaTeXInputOptions{
     display: flex;
     padding: 10px;
+    
 }
 .text{
   margin-bottom: 7px !important;
diff --git a/src/translate/ar.json b/src/translate/ar.json
index bfba32f..9927883 100644
--- a/src/translate/ar.json
+++ b/src/translate/ar.json
@@ -153,7 +153,8 @@
     "add_MML":"إضافة MML",
     "show_preview":"عرض المعاينة",
     "show_MMl":" MML عرض",
-    "financial_collection":"التحصيلات"
+    "financial_collection":"التحصيلات",
+    "change_direction":"تغيير الاتجاه"
   },
   "columns": {
     "id": "الرقم التعريفي",
diff --git a/src/types/Item.ts b/src/types/Item.ts
index e26e5d2..3c58ee3 100644
--- a/src/types/Item.ts
+++ b/src/types/Item.ts
@@ -317,6 +317,7 @@ export interface Question {
   hint?: string;
   tags: tags[]; 
   lessons:any
+  meta?:{}
 }
 
 export type report = {