From a2461703ba314dc49aad91f6a5b88d852cf20af9 Mon Sep 17 00:00:00 2001 From: KarimAldeen Date: Tue, 26 Mar 2024 11:24:35 +0300 Subject: [PATCH] Done --- src/Pages/Categories/Page.tsx | 11 +++++--- src/Pages/Categories/View/EditPage.tsx | 36 +++++++++++++------------- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/src/Pages/Categories/Page.tsx b/src/Pages/Categories/Page.tsx index f0d6c61..a6cc0c8 100644 --- a/src/Pages/Categories/Page.tsx +++ b/src/Pages/Categories/Page.tsx @@ -14,16 +14,19 @@ import { usePageState } from '../../lib/state mangment/LayoutPagestate' function Page() { const column =useTableColumns() - const {data ,status } = useGetCategories() + const {data ,isRefetching ,status } = useGetCategories() const navigate = useNavigate() const totalRows = data?.meta?.total; const { setObjectToEdit, objectToEdit } = usePageState() + console.log(objectToEdit,"objectToEdit"); useEffect(() => { - if(objectToEdit && objectToEdit.length > 0) - setObjectToEdit([]) + console.log(objectToEdit,"objectToEdit"); + if(objectToEdit) + setObjectToEdit(null) - }, [setObjectToEdit,objectToEdit ]) + + }, [setObjectToEdit,objectToEdit ,data,isRefetching]) return ( // Pass Status to Layout diff --git a/src/Pages/Categories/View/EditPage.tsx b/src/Pages/Categories/View/EditPage.tsx index 91ff570..b29da05 100644 --- a/src/Pages/Categories/View/EditPage.tsx +++ b/src/Pages/Categories/View/EditPage.tsx @@ -354,14 +354,14 @@ const EditPage = () => { else { const EditAttributeValue = dataToSend - const IMage = - (typeof EditAttributeValue?.image === 'string') ? - { - copied_image: EditAttributeValue?.image - } : - { - image: EditAttributeValue?.image - }; + // const IMage = + // (typeof EditAttributeValue?.image === 'string') ? + // { + // copied_image: EditAttributeValue?.image + // } : + // { + // image: EditAttributeValue?.image + // }; const NewEditAttributeValue = { value: { @@ -369,7 +369,7 @@ const EditPage = () => { ar: EditAttributeValue?.value_ar, de: EditAttributeValue?.value_de }, - ...IMage, + image:EditAttributeValue?.image, attribute_id: EditAttribute?.id, } if (EditAttribute.type === "color") { @@ -420,21 +420,21 @@ const EditPage = () => { AddAttribute?.AttributeValue?.slice(1)?.map((dataToSend: any, index: number) => { const AddAttributeValue = dataToSend - const IMage = - (typeof AddAttributeValue?.image === 'string') ? - { - copied_image: AddAttributeValue?.image - } : - { - image: AddAttributeValue?.image - }; + // const IMage = + // (typeof AddAttributeValue?.image === 'string') ? + // { + // copied_image: AddAttributeValue?.image + // } : + // { + // image: AddAttributeValue?.image + // }; const NewAddAttributeValue = { value: { en: AddAttributeValue?.value_en, ar: AddAttributeValue?.value_ar ?? AddAttributeValue?.value_en, de: AddAttributeValue?.value_de ?? AddAttributeValue?.value_en }, - ...IMage, + image:AddAttributeValue?.image, attribute_id: AttributeId, } mutateAttributeValue(NewAddAttributeValue)