diff --git a/src/components/account_view/AccountViewCom.jsx b/src/components/account_view/AccountViewCom.jsx index 80aeb1c..3a935f2 100644 --- a/src/components/account_view/AccountViewCom.jsx +++ b/src/components/account_view/AccountViewCom.jsx @@ -1,80 +1,79 @@ -import {useEffect} from 'react' -import { useQuery, useQueryClient } from '@tanstack/react-query' +import { useEffect } from "react"; +import { useQuery, useQueryClient } from "@tanstack/react-query"; -import {useLocation, useNavigate} from 'react-router-dom' +import { useLocation, useNavigate } from "react-router-dom"; -import BreadcrumbCom from '../breadcrumb/BreadcrumbCom' -import RouteLinks from '../../RouteLinks' -import { getAccountView } from '../../services/siteServices' -import queryKeys from '../../services/queryKeys' +import BreadcrumbCom from "../breadcrumb/BreadcrumbCom"; +import RouteLinks from "../../RouteLinks"; +import { getAccountView } from "../../services/siteServices"; +import queryKeys from "../../services/queryKeys"; import CustomerAccountView from "./CustomerAccountView"; import AccountProfileView from "./AccountProfileView"; import CustomerSubscriptionsView from "./CustomerSubscriptionsView"; import CustomerPaymentsView from "./CustomerPaymentsView"; export default function AccountViewCom() { + const queryClient = useQueryClient(); - const queryClient = useQueryClient() + const { state } = useLocation(); + const navigate = useNavigate(); - const {state} = useLocation() - const navigate = useNavigate() + useEffect(() => { + if (!state?.memberUID) { + navigate(RouteLinks.homePage, { replace: true }); + } + }, [navigate, state?.memberUID]); - useEffect(()=>{ - if(!state?.memberUID){ - navigate(RouteLinks.homePage, {replace: true}) - } - },[navigate, state?.memberUID]) + const { data, isFetching, isError, error } = useQuery({ + queryKey: queryKeys.account_view, + queryFn: () => { + // const filterData = filter?.type ? {[filter?.type]: filter.id} : {} + const reqData = { + member_uid: state?.memberUID, + // page, + // ...filterData + }; + return getAccountView(reqData); + }, + staleTime: 0, //0 mins + }); + const accountsViewData = data?.data; // ACCOUNT VIEW DATA + const account_info = accountsViewData?.account; + const account_profile = accountsViewData?.account_profile; + const subscriptions = accountsViewData?.subscriptions; + const payments = accountsViewData?.payments; - const {data, isFetching, isError, error} = useQuery({ - queryKey: queryKeys.account_view, - queryFn: () => { - // const filterData = filter?.type ? {[filter?.type]: filter.id} : {} - const reqData = { - member_uid: state?.memberUID - // page, - // ...filterData - } - return getAccountView(reqData) - }, - staleTime: 0 //0 mins - }) - const accountsViewData = data?.data // ACCOUNT VIEW DATA - const account_info = accountsViewData?.account - const account_profile = accountsViewData?.account_profile - const subscriptions = accountsViewData?.subscriptions - const payments = accountsViewData?.payments - // console.log('DATA', payments, subscriptions) + useEffect(() => { + queryClient.refetchQueries({ + queryKey: [...queryKeys.account_view], + // type: 'active', + // exact: true, + }); + }, [queryClient, state?.memberUID]); - useEffect(()=>{ - queryClient.refetchQueries({ - queryKey: [...queryKeys.account_view], - // type: 'active', - // exact: true, - }) - },[queryClient, state?.memberUID]) + return ( +
Loading...
- > - : isError ? -{error.message}
- : - <> -Loading...
+ > + ) : isError ? ( +{error.message}
+ ) : ( + <> +