From 458319b49f49e4622388d9fe9f0610b3c79886f2 Mon Sep 17 00:00:00 2001
From: karimaldeen <mhmadkarimaldeen@gmail.com>
Date: Mon, 16 Sep 2024 12:14:19 +0300
Subject: [PATCH] fix page

---
 src/Pages/Admin/Grade/useTableColumns.tsx         | 8 ++++++--
 src/Pages/Admin/QuestionBank/useTableColumns.tsx  | 4 ++++
 src/Pages/Admin/Unit/useTableColumns.tsx          | 4 ++++
 src/Pages/Admin/lesson/useTableColumns.tsx        | 4 ++++
 src/Pages/Admin/subject/Table/useTableColumns.tsx | 4 +++-
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/Pages/Admin/Grade/useTableColumns.tsx b/src/Pages/Admin/Grade/useTableColumns.tsx
index 43f29f3..437b3c8 100644
--- a/src/Pages/Admin/Grade/useTableColumns.tsx
+++ b/src/Pages/Admin/Grade/useTableColumns.tsx
@@ -15,16 +15,20 @@ import {
 import ActionButtons from "../../../Components/Table/ActionButtons";
 import ColumnsImage from "../../../Components/Columns/ColumnsImage";
 import { Grade } from "../../../types/Grade";
-import { CiImageOff } from "react-icons/ci";
-import { isValidImage } from "../../../utils/isValidImage";
+import { useFilterState } from "../../../Components/Utils/Filter/FilterState";
+import { useFilterStateState } from "../../../zustand/Filter";
 
 export const useColumns = () => {
   const { handel_open_model } = useModalHandler();
 
   const { setObjectToEdit } = useObjectToEdit((state) => state);
   const navigate = useNavigate();
+  const { setFilter } = useFilterStateState();
+
+
 
   const handelShow = (record: Grade) => {
+    setFilter({})
     navigate(`${record?.id}`);
   };
 
diff --git a/src/Pages/Admin/QuestionBank/useTableColumns.tsx b/src/Pages/Admin/QuestionBank/useTableColumns.tsx
index def1863..0438bd6 100644
--- a/src/Pages/Admin/QuestionBank/useTableColumns.tsx
+++ b/src/Pages/Admin/QuestionBank/useTableColumns.tsx
@@ -11,11 +11,13 @@ import {
   canEditQuestion,
 } from "../../../utils/hasAbilityFn";
 import ActionButtons from "../../../Components/Table/ActionButtons";
+import { useFilterStateState } from "../../../zustand/Filter";
 
 export const useColumns = () => {
   const { setObjectToEdit } = useObjectToEdit((state) => state);
   const navigate = useNavigate();
   const { setIsOpen } = useModalState((state) => state);
+  const { setFilter } = useFilterStateState();
 
   const handelDelete = (data: any) => {
     setObjectToEdit(data);
@@ -28,6 +30,8 @@ export const useColumns = () => {
       const unit = lesson?.unit;
       const subject = unit?.subject;
       const grade = subject?.grade;
+
+      setFilter({})
     navigate(`/${ABILITIES_ENUM?.GRADE}/${grade?.id}/${ABILITIES_ENUM?.SUBJECT}/${subject?.id}/${ABILITIES_ENUM?.UNIT}/${unit?.id}/${ABILITIES_ENUM?.LESSON}/${lesson?.id}/${ABILITIES_ENUM?.QUESTION}/${record?.id}`);
   };
   const [t] = useTranslation();
diff --git a/src/Pages/Admin/Unit/useTableColumns.tsx b/src/Pages/Admin/Unit/useTableColumns.tsx
index 968b848..fff47fd 100644
--- a/src/Pages/Admin/Unit/useTableColumns.tsx
+++ b/src/Pages/Admin/Unit/useTableColumns.tsx
@@ -19,14 +19,18 @@ import ActionButtons from "../../../Components/Table/ActionButtons";
 import { Unit } from "../../../types/Unit";
 import { ConvertEnumToTranslate } from "../../../utils/ConvertEnumToTranslate";
 import { DragHandleUnit } from "./DrapableTable";
+import { useFilterState } from "../../../Components/Utils/Filter/FilterState";
+import { useFilterStateState } from "../../../zustand/Filter";
 
 export const useColumns = () => {
   const { handel_open_model } = useModalHandler();
+  const { setFilter } = useFilterStateState();
 
   const { setObjectToEdit } = useObjectToEdit((state) => state);
   const navigate = useNavigate();
 
   const handelShow = (record: Unit) => {
+    setFilter({})
     navigate(`${ABILITIES_ENUM?.UNIT}/${record?.id}`);
   };
 
diff --git a/src/Pages/Admin/lesson/useTableColumns.tsx b/src/Pages/Admin/lesson/useTableColumns.tsx
index e9d86f4..a44817d 100644
--- a/src/Pages/Admin/lesson/useTableColumns.tsx
+++ b/src/Pages/Admin/lesson/useTableColumns.tsx
@@ -15,14 +15,18 @@ import {
 } from "../../../utils/hasAbilityFn";
 import ActionButtons from "../../../Components/Table/ActionButtons";
 import { DragHandleLesson } from "./DrapableTable";
+import { useFilterState } from "../../../Components/Utils/Filter/FilterState";
+import { useFilterStateState } from "../../../zustand/Filter";
 
 export const useColumns = () => {
   const { handel_open_model } = useModalHandler();
 
   const { setObjectToEdit } = useObjectToEdit((state) => state);
   const navigate = useNavigate();
+  const { setFilter } = useFilterStateState();
 
   const handelShow = (record: any) => {
+    setFilter({})
     navigate(`${ABILITIES_ENUM.LESSON}/${record?.id}`);
   };
 
diff --git a/src/Pages/Admin/subject/Table/useTableColumns.tsx b/src/Pages/Admin/subject/Table/useTableColumns.tsx
index 2f3315b..b73808a 100644
--- a/src/Pages/Admin/subject/Table/useTableColumns.tsx
+++ b/src/Pages/Admin/subject/Table/useTableColumns.tsx
@@ -14,12 +14,13 @@ import {
 } from "../../../../utils/hasAbilityFn";
 import { ABILITIES_ENUM } from "../../../../enums/abilities";
 import { Subject } from "../../../../types/Subject";
-import { CiImageOff } from "react-icons/ci";
+import { useFilterStateState } from "../../../../zustand/Filter";
 
 export const useColumns = () => {
   const navigate = useNavigate();
   const { setObjectToEdit } = useObjectToEdit((state) => state);
   const { setIsOpen } = useModalState((state) => state);
+  const { setFilter } = useFilterStateState();
 
   const handelDelete = (record: Subject) => {
     setObjectToEdit(record);
@@ -31,6 +32,7 @@ export const useColumns = () => {
   };
 
   const handelShow = (record: Subject) => {
+    setFilter({})
     navigate(`${ABILITIES_ENUM?.SUBJECT}/${record?.id}`);
   };