From 293f2c9d849daf4bb32f9e463cc5c8d7f0abd9a2 Mon Sep 17 00:00:00 2001
From: karimaldeen <mhmadkarimaldeen@gmail.com>
Date: Thu, 12 Sep 2024 17:12:15 +0300
Subject: [PATCH] fix column

---
 .../utils/ValidationField.scss                |  6 ++--
 src/Layout/Dashboard/Table/DataTable.tsx      |  3 ++
 src/Layout/Dashboard/usePagination.ts         |  2 ++
 src/Pages/Admin/lesson/useTableColumns.tsx    |  3 +-
 src/Pages/Admin/question/AddPage.tsx          | 19 ++++--------
 src/Pages/Admin/question/EditPage.tsx         | 30 +++++++++++--------
 src/Pages/Home/Dummy.tsx                      |  4 +--
 src/utils/deletePathSegments copy.ts          | 15 ++++++++++
 8 files changed, 50 insertions(+), 32 deletions(-)
 create mode 100644 src/utils/deletePathSegments copy.ts

diff --git a/src/Components/ValidationField/utils/ValidationField.scss b/src/Components/ValidationField/utils/ValidationField.scss
index 364f4a0..3f797be 100644
--- a/src/Components/ValidationField/utils/ValidationField.scss
+++ b/src/Components/ValidationField/utils/ValidationField.scss
@@ -28,7 +28,7 @@
 
 .ant-btn-default {
   padding: 7px 11px;
-  height: var(--fieldHeight);
+  min-height: var(--fieldHeight);
   display: flex;
   justify-content: center;
   align-items: center;
@@ -45,12 +45,12 @@
 
 /// input hight
 .ant-form-item-control-input-content {
-  height: var(--fieldHeight);
+  min-height: var(--fieldHeight);
 }
 
 //// date picker
 .ant-picker-large {
-  height: var(--fieldHeight);
+  min-height: var(--fieldHeight);
 }
 
 /// text area
diff --git a/src/Layout/Dashboard/Table/DataTable.tsx b/src/Layout/Dashboard/Table/DataTable.tsx
index 108bd05..a5569c4 100644
--- a/src/Layout/Dashboard/Table/DataTable.tsx
+++ b/src/Layout/Dashboard/Table/DataTable.tsx
@@ -56,7 +56,10 @@ const DataTable: React.FC<DataTableProps> = ({
         nextIcon: <>{t("practical.next")}</>,
         prevIcon: <> {t("practical.prev")} </>,
         className: "pagination_antd",
+        showSizeChanger:false
+        
       }}
+      
       {...props}
     />
   );
diff --git a/src/Layout/Dashboard/usePagination.ts b/src/Layout/Dashboard/usePagination.ts
index a833ff3..44375a1 100644
--- a/src/Layout/Dashboard/usePagination.ts
+++ b/src/Layout/Dashboard/usePagination.ts
@@ -14,6 +14,7 @@ const usePagination = (data: Data) => {
     current: data?.meta?.current_page || 1,
     pageSize: data?.meta?.per_page || 2,
     total: data?.meta?.total || 0,
+    
   });
 
   useEffect(() => {
@@ -21,6 +22,7 @@ const usePagination = (data: Data) => {
       current: data?.meta?.current_page || 1,
       pageSize: data?.meta?.per_page || 2,
       total: data?.meta?.total || 0,
+      
     });
   }, [data]);
 
diff --git a/src/Pages/Admin/lesson/useTableColumns.tsx b/src/Pages/Admin/lesson/useTableColumns.tsx
index 1e1605e..e9d86f4 100644
--- a/src/Pages/Admin/lesson/useTableColumns.tsx
+++ b/src/Pages/Admin/lesson/useTableColumns.tsx
@@ -71,8 +71,7 @@ export const useColumns = () => {
       // ),
       title: t("columns.procedure"),
       key: "actions",
-      align: "end",
-      width: "25vw",
+      align: "center",
       render: (_text, record, index) => {
         return (
           <ActionButtons
diff --git a/src/Pages/Admin/question/AddPage.tsx b/src/Pages/Admin/question/AddPage.tsx
index 604c5ba..c632a2e 100644
--- a/src/Pages/Admin/question/AddPage.tsx
+++ b/src/Pages/Admin/question/AddPage.tsx
@@ -22,7 +22,7 @@ import { toast } from "react-toastify";
 const AcceptModal = lazy(() => import("./Model/AcceptModal"));
 
 const AddPage: React.FC = () => {
-  const { mutateAsync } = useAddQuestionAsync();
+  const { mutateAsync,isLoading:LoadingAsync } = useAddQuestionAsync();
   const { mutate, isLoading, isSuccess } = useAddQuestion();
   const { isBseQuestion, setTagsSearch, objectToEdit, setSuccess } =
     useObjectToEdit();
@@ -72,13 +72,6 @@ const AddPage: React.FC = () => {
             const isValidAnswers = answers?.some(
               (answer: any) => answer?.isCorrect === 1,
             );
-
-            if (!isValidAnswers) {
-              toast.error(
-                t("validation.at_least_one_answer_should_be_correct"),
-              );
-              return;
-            }
           }
           mutate({
             ...item,
@@ -134,7 +127,7 @@ const AddPage: React.FC = () => {
   const handleCancel = () => {
     navigate(-1);
   };
-
+  const Loading = LoadingAsync || isLoading
   useEffect(() => {
     console.log("all api success");
     if (isSuccess) {
@@ -156,10 +149,10 @@ const AddPage: React.FC = () => {
 
             <div className="exercise_add_buttons">
               <div onClick={handleCancel}>{t("practical.back")}</div>
-              <button disabled={isLoading} className="relative" type="submit">
+              <button disabled={Loading} className="relative" type="submit">
                 {t("practical.add")}
 
-                {isLoading && (
+                {Loading && (
                   <span className="Spinier_Div">
                     <Spin />
                   </span>
@@ -187,10 +180,10 @@ const AddPage: React.FC = () => {
 
           <div className="exercise_add_buttons">
             <div onClick={handleCancel}>{t("practical.back")}</div>
-            <button disabled={isLoading} className="relative" type="submit">
+            <button disabled={Loading} className="relative" type="submit">
               {t("practical.add")}
 
-              {isLoading && (
+              {Loading && (
                 <span className="Spinier_Div">
                   <Spin />
                 </span>
diff --git a/src/Pages/Admin/question/EditPage.tsx b/src/Pages/Admin/question/EditPage.tsx
index d03abfc..8535c6c 100644
--- a/src/Pages/Admin/question/EditPage.tsx
+++ b/src/Pages/Admin/question/EditPage.tsx
@@ -15,7 +15,7 @@ import {
   useUpdateQuestion,
 } from "../../../api/Question";
 import { useTranslation } from "react-i18next";
-import { useNavigate, useParams } from "react-router-dom";
+import { useLocation, useNavigate, useParams } from "react-router-dom";
 import { ParamsEnum } from "../../../enums/params";
 import { useObjectToEdit } from "../../../zustand/ObjectToEditState";
 import { removeStringKeys } from "../../../utils/removeStringKeys";
@@ -24,6 +24,7 @@ import ModelForm from "./Model/ModelForm";
 import BaseForm from "./Model/Malty/Form";
 import { Question } from "../../../types/Item";
 import { toast } from "react-toastify";
+import { deletePathSegments } from "../../../utils/deletePathSegments";
 
 const EditPage: React.FC = () => {
   const { subject_id, lesson_id, question_id } = useParams<ParamsEnum>();
@@ -32,7 +33,7 @@ const EditPage: React.FC = () => {
 
   const { mutate, isSuccess, isLoading } = useUpdateQuestion();
   const { mutate: DeleteQuestion } = useDeleteQuestion();
-  const { mutate: mutateAdd } = useAddQuestion();
+  const { mutate: mutateAdd , isLoading:LoadingAsync } = useAddQuestion();
 
   const { data, isLoading: dataLoading } = useGetAllQuestion({
     show: question_id,
@@ -178,17 +179,22 @@ const EditPage: React.FC = () => {
     }
   };
 
+  const location = useLocation();
+  
   const navigate = useNavigate();
   const handleCancel = () => {
     navigate(-1);
   };
 
-  // useEffect(() => {
-  //   if (isSuccess) {
-  //     toast.success(t("validation.the_possess_done_successful"));
-  //     navigate(-1);
-  //   }
-  // }, [isSuccess]);
+
+  useEffect(() => {
+    if (isSuccess) {
+      toast.success(t("validation.the_possess_done_successful"));
+      navigate(deletePathSegments(location.pathname, 2));
+    }
+  }, [isSuccess]);
+
+  const Loading = LoadingAsync || isLoading
 
   if (dataLoading || QuestionsDataLoading) {
     return <SpinContainer />;
@@ -212,10 +218,10 @@ const EditPage: React.FC = () => {
             <BaseForm />
             <div className="exercise_add_buttons">
               <div onClick={handleCancel}>{t("practical.back")}</div>
-              <button disabled={isLoading} className="relative" type="submit">
+              <button disabled={Loading} className="relative" type="submit">
                 {t("practical.edit")}
 
-                {isLoading && (
+                {Loading && (
                   <span className="Spinier_Div">
                     <Spin />
                   </span>
@@ -246,10 +252,10 @@ const EditPage: React.FC = () => {
           <ModelForm />
           <div className="exercise_add_buttons">
             <div onClick={handleCancel}>{t("practical.back")}</div>
-            <button disabled={isLoading} className="relative" type="submit">
+            <button disabled={Loading} className="relative" type="submit">
               {t("practical.edit")}
 
-              {isLoading && (
+              {Loading && (
                 <span className="Spinier_Div">
                   <Spin />
                 </span>
diff --git a/src/Pages/Home/Dummy.tsx b/src/Pages/Home/Dummy.tsx
index 25ad488..85181c8 100644
--- a/src/Pages/Home/Dummy.tsx
+++ b/src/Pages/Home/Dummy.tsx
@@ -10,8 +10,8 @@ const Dummy = () => {
   const { FilterButton, FilterBody } = useFilter();
   return (
     <div className="DummyHomePage">
-      <FilterButton />
-      <FilterBody>karim</FilterBody>
+      {/* <FilterButton />
+      <FilterBody>karim</FilterBody> */}
     </div>
   );
 };
diff --git a/src/utils/deletePathSegments copy.ts b/src/utils/deletePathSegments copy.ts
new file mode 100644
index 0000000..8a78c85
--- /dev/null
+++ b/src/utils/deletePathSegments copy.ts	
@@ -0,0 +1,15 @@
+export const deletePathSegments = (path: string, num: number): string => {
+  // Split the path by '/'
+  const segments = path.split("/");
+
+  // Handle cases where the number of segments to delete is greater than available segments
+  if (num >= segments.length - 1) {
+    return "/";
+  }
+
+  // Remove the specified number of segments from the end
+  const newSegments = segments.slice(0, -num);
+
+  // Join the remaining segments back into a path
+  return newSegments.join("/");
+};