diff --git a/src/component/reports/PaymentReportTable.jsx b/src/component/reports/PaymentReportTable.jsx index 8ca29ba..aa517fe 100644 --- a/src/component/reports/PaymentReportTable.jsx +++ b/src/component/reports/PaymentReportTable.jsx @@ -16,10 +16,13 @@ export default function PaymentReportTable() { page } return getPaymentReports(reqData) - } + }, + staleTime: 0 }) - console.log('DATA', data?.data) + // console.log('DATA', data?.data) + const paymentReportData = data?.data?.payment || [] + return ( <>
@@ -57,18 +60,21 @@ export default function PaymentReportTable() { - - Sat, 30 Aug 2025 06:18:31 GMT - STATRTER001 - $5.99 - 1 - - - Sat, 30 Aug 2025 06:18:31 GMT - STATRTER001 - $5.99 - 1 - + {paymentReportData.length > 0 ? paymentReportData.map((item, index) => { + return ( + + {item?.added} + {item?.name} + {item?.amount} + {item?.status} + + ) + }) + : + + No data found + + } @@ -80,4 +86,4 @@ export default function PaymentReportTable() {
) -} \ No newline at end of file +} diff --git a/src/component/reports/ProductReportTable.jsx b/src/component/reports/ProductReportTable.jsx index a9a5c98..ca10179 100644 --- a/src/component/reports/ProductReportTable.jsx +++ b/src/component/reports/ProductReportTable.jsx @@ -16,10 +16,12 @@ export default function ProductReportTable() { page } return getProductReports(reqData) - } + }, + staleTime: 0 }) - console.log('DATA', data?.data) + // console.log('DATA', data?.data) + const productReportData = data?.data?.product || [] return ( <> @@ -60,23 +62,22 @@ export default function ProductReportTable() { - - A000002 - Sun, 13 Jul 2025 15:02:57 GMT - Name for - A000001 - 7 - - - - A000002 - Sun, 13 Jul 2025 15:02:57 GMT - Name for - A000001 - 7 - - - + {productReportData.length > 0 ? productReportData.map((item, index) => { + return ( + + {item?.product_id} + {item?.added} + {item?.product_name} + {item?.status} + + ) + }) + : + + No data found + + } - diff --git a/src/component/reports/Reports.jsx b/src/component/reports/Reports.jsx index f7c6448..c553ae3 100644 --- a/src/component/reports/Reports.jsx +++ b/src/component/reports/Reports.jsx @@ -1,4 +1,4 @@ -import React from "react"; +import React, { useState } from "react"; import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS"; import {useQuery} from "@tanstack/react-query"; import queryKeys from "../../services/queryKeys"; @@ -11,6 +11,8 @@ import SystemReportTable from "./SystemReportTable"; export default function Reports() { + const [activeTab, setActiveTab] = useState('payment') + const {data, isFetching, isError, error} = useQuery({ queryKey: queryKeys.topics, queryFn: () => { @@ -49,7 +51,7 @@ export default function Reports() { :
-
+
{/*
*/} {/*
*/} {/*

Tab vertical

*/} @@ -62,7 +64,7 @@ export default function Reports() {
    {sortedReportTopicList && sortedReportTopicList.map((item, index) => { return ( -
  • +
  • setActiveTab(item?.url)}> {item?.name} @@ -72,14 +74,19 @@ export default function Reports() {
{/* */} -
+ {/*
{sortedReportTopicList && sortedReportTopicList.map((item, index) => { return ( -
+
{renderedTable[item?.url]}
) })} +
*/} +
+
+ {renderedTable[activeTab]} +
diff --git a/src/component/reports/SystemReportTable.jsx b/src/component/reports/SystemReportTable.jsx index e9b14c5..ab6ccfe 100644 --- a/src/component/reports/SystemReportTable.jsx +++ b/src/component/reports/SystemReportTable.jsx @@ -17,9 +17,11 @@ export default function SystemReportTable() { } return getSystemReports(reqData) }, + staleTime: 0 }) - console.log('DATA', data?.data) + // console.log('DATA', data?.data) + const systemReportData = data?.data?.system || [] return ( <> @@ -60,18 +62,21 @@ export default function SystemReportTable() { - - Sun, 15 Feb 2026 10:52:01 GMT - Systems Status Checks - processing - Sun, 15 Feb 2026 09:26:02 GMT - - - Sun, 15 Feb 2026 10:52:01 GMT - Systems Status Checks - processing - Sun, 15 Feb 2026 09:26:02 GMT - + {systemReportData.length > 0 ? systemReportData.map((item, index) => { + return ( + + {item?.added} + {item?.action_name} + {item?.status_description} + {item?.updated} + + ) + }) + : + + No data found + + }
diff --git a/src/component/settings/ProfileImage.jsx b/src/component/settings/ProfileImage.jsx index c75e0d3..6d67eb7 100644 --- a/src/component/settings/ProfileImage.jsx +++ b/src/component/settings/ProfileImage.jsx @@ -1,17 +1,21 @@ import React, { memo, useRef, useState } from 'react' -// import { useSelector } from 'react-redux'; +import { useSelector, useDispatch } from 'react-redux'; import getImage from '../../utils/getImage'; import { useMutation, useQueryClient } from '@tanstack/react-query'; import { uploadProfileImg } from '../../services/services'; import queryKeys from '../../services/queryKeys'; +import { updateUserDetails } from '../../store/UserDetails' const ProfileImage = memo(({intialData}) => { + const dispatch = useDispatch() + const queryClient = useQueryClient() const [selectedImg, setSelectedImg] = useState(null) // const {userDetails} = useSelector((state) => state?.userDetails); // CHECKS FOR ACTIVE USER DETAILS + const avtarImage = "avtar/merms-user.png"; // browser profile img @@ -32,17 +36,20 @@ const ProfileImage = memo(({intialData}) => { return uploadProfileImg(fields) }, onSuccess: (res) => { + console.log('res', res) + if(res?.data?.picture){ + dispatch(updateUserDetails({ picture: res?.data?.picture })); + } // if(res.data.resultCode != '0'){ // throw({message: res?.data?.resultDescription ? res?.data?.resultDescription : 'An error occured'}) // } // const account_name = res?.data?.personal_data?.account_name - // dispatch(updateUserDetails({ account_name })); }, onSettled: ()=>{ setTimeout(() => { - queryClient.refetchQueries({ - queryKey: [...queryKeys.profile_data], // type: 'active', // exact: true, - }) + // queryClient.refetchQueries({ + // queryKey: [...queryKeys.profile_data], // type: 'active', // exact: true, + // }) uploadProfileMutation.reset() }, 3000); } @@ -95,7 +102,7 @@ const ProfileImage = memo(({intialData}) => { {selectedImg &&
} diff --git a/src/store/UserDetails.js b/src/store/UserDetails.js index 8cb2677..64e026b 100644 --- a/src/store/UserDetails.js +++ b/src/store/UserDetails.js @@ -9,7 +9,7 @@ export const userSlice = createSlice({ initialState, reducers: { updateUserDetails: (state, action) => { - state.userDetails = { ...action.payload }; + state.userDetails = { ...state.userDetails, ...action.payload }; }, }, });