diff --git a/src/component/home/Products.jsx b/src/component/home/Products.jsx index f3877a1..53266e3 100644 --- a/src/component/home/Products.jsx +++ b/src/component/home/Products.jsx @@ -13,7 +13,7 @@ export default function Products() { uid: localStorage.getItem('uid') // USER UID } const {data, isFetching, isError, error} = useQuery({ - queryKey: queryKeys.product, + queryKey: queryKeys.products, queryFn: () => productsData(reqData) }) const products = data?.data?.products_data // PRODUCTS DATA diff --git a/src/component/product/ProductFactory.jsx b/src/component/product/ProductFactory.jsx index fbcfe2e..9395842 100644 --- a/src/component/product/ProductFactory.jsx +++ b/src/component/product/ProductFactory.jsx @@ -1,5 +1,4 @@ -import {useEffect} from "react"; -import { useMutation, useQuery } from '@tanstack/react-query' +import { useQuery } from '@tanstack/react-query' import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS"; // import getImage from "../../utils/getImage"; import ProductStart from "./ProductStart"; @@ -8,6 +7,7 @@ import {MyProductData} from "../../services/services"; import ProductActive from "./ProductActive"; import ProductProvision from "./ProductProvision"; import {productConst} from "../../constants/products"; +import queryKeys from "../../services/queryKeys"; export default function ProductFactory(){ const location = useLocation(); @@ -16,30 +16,18 @@ export default function ProductFactory(){ // Split the pathname by '/' and get the last element const productID = pathname.split('/').pop(); - const getProductData = useMutation({ - mutationFn: (reqData) => { - return MyProductData(reqData) - }, - onError: (error) => { - console.log(error) - }, - onSuccess: (res) => { - if(res?.data?.resultCode != '0'){ - throw({message: 'Something went wrong'}) - } - } - }) - - useEffect(()=>{ let reqData = { product_id : productID, token: localStorage.getItem('token'), // USER TOKEN uid: localStorage.getItem('uid') // USER UID } - getProductData.mutate(reqData) - },[]) - - const myproduct_data = getProductData?.data?.data?.myproduct?.myproudct // PRODUCT DETAILS + const {data, isFetching, isError, error} = useQuery({ + queryKey: queryKeys.product_page, + queryFn: () => MyProductData(reqData), + staleTime: 0 + }) + + const myproduct_data = data?.data?.myproduct?.myproudct // PRODUCT DETAILS const product_name = myproduct_data?.product_name; const product_status = myproduct_data?.status; @@ -47,7 +35,7 @@ export default function ProductFactory(){ <>
- {getProductData?.isPending ? + {isFetching ? <>
@@ -55,10 +43,10 @@ export default function ProductFactory(){
- : getProductData?.error ? + : isError ?
-

{getProductData?.error?.message}

+

{error?.message}

: diff --git a/src/component/product/ProductProvision.jsx b/src/component/product/ProductProvision.jsx index 39e6a07..9281819 100644 --- a/src/component/product/ProductProvision.jsx +++ b/src/component/product/ProductProvision.jsx @@ -110,9 +110,9 @@ export default function ProductProvision(props){

Started creating your selection

Card image cap -
+ {/*
-
+
*/}
diff --git a/src/component/product/ProductStart.jsx b/src/component/product/ProductStart.jsx index 2d68e44..e3374fb 100644 --- a/src/component/product/ProductStart.jsx +++ b/src/component/product/ProductStart.jsx @@ -30,6 +30,7 @@ export default function ProductStart(props){ // // exact: true, // }) queryClient.invalidateQueries({ queryKey: [...queryKeys.product_url] }) + queryClient.invalidateQueries({ queryKey: [...queryKeys.product_page] }) } const mutation = useMutation({ diff --git a/src/services/queryKeys.js b/src/services/queryKeys.js index c3d03dc..c10c04b 100644 --- a/src/services/queryKeys.js +++ b/src/services/queryKeys.js @@ -1,12 +1,13 @@ const queryKeys = { user_details: ['user_details'], product_url: ['product_url'], - product: ['product-data'], + products: ['product-data'], + myproduct_provision: ['myproduct_provision'], + product_page: ['product_page'], dashboard: ['dashboard'], topBar: ['top-bar'], recentAction: ['recent-action'], - myproduct_provision: ['myproduct_provision'], calendar_events: ['calendar_events'], contacts: ['contacts'] }