From 1eccab74346ea1ac5ac5760256b689e7f18f1db0 Mon Sep 17 00:00:00 2001 From: Moaz Dawalibi Date: Thu, 12 Sep 2024 11:57:50 +0300 Subject: [PATCH] fixes --- src/Components/Utils/Filter/useFilter.tsx | 7 +++++-- src/Layout/Dashboard/FilterLayout.tsx | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Components/Utils/Filter/useFilter.tsx b/src/Components/Utils/Filter/useFilter.tsx index 9a8244f..3893042 100644 --- a/src/Components/Utils/Filter/useFilter.tsx +++ b/src/Components/Utils/Filter/useFilter.tsx @@ -8,7 +8,6 @@ import { useFilterState } from "./FilterState"; import { ModalEnum } from "../../../enums/Model"; import { QueryStatusEnum } from "../../../enums/QueryStatus"; import { useObjectToEdit } from "../../../zustand/ObjectToEditState"; -import FormikForm from "../../../Layout/Dashboard/FormikForm"; import SpinContainer from "../../Layout/SpinContainer"; type OmitFormikProps = "children" | "initialValues" | "onSubmit"; @@ -37,7 +36,8 @@ const useFilter = () => { const [t] = useTranslation(); const [formValues, setFormValues] = useState({}); const { setObjectToEdit } = useObjectToEdit(); - + console.log(formValues); + // Define the type for the callback type SubmitCallback = () => void; @@ -75,7 +75,10 @@ const useFilter = () => { }: FormikFormProps) => { const handleSubmit = (values: any) => { setFilterState(values); + console.log(formValues,"prev"); + setFormValues(values); + console.log(formValues,"next"); if (onSubmit) { onSubmit(values); } diff --git a/src/Layout/Dashboard/FilterLayout.tsx b/src/Layout/Dashboard/FilterLayout.tsx index d3b1106..fc7c8a2 100644 --- a/src/Layout/Dashboard/FilterLayout.tsx +++ b/src/Layout/Dashboard/FilterLayout.tsx @@ -6,7 +6,6 @@ import { translateOptions } from "../../utils/translatedOptions"; import { search_array } from "../../Routes"; import PaginationColumn from "../../Components/Filter/PaginationColumn"; import OrderBySelect from "../../Components/Filter/OrderBySelect"; -import LayoutFilterModal from "./LayoutFilterModal"; import { BiFilterAlt } from "react-icons/bi"; import { MdKeyboardArrowDown } from "react-icons/md"; import SearchField from "../../Components/DataTable/SearchField";