MERMS/MermsFirstOffice
1
0
Fork 0
Code Issues Pull Requests 1 Releases Activity

fixed country endpoint data table #22

Merged
ameye merged 1 commits from country-endpoint-fix into master 2025-10-06 19:25:23 +00:00
Conversation 0 Commits 1 Files Changed 1
+66 -154
1 changed files with 66 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/country/CountrySettings.jsx
+17 -105
View File
@@ -3,36 +3,13 @@ import { useQuery } from '@tanstack/react-query'
import queryKeys from '../../services/queryKeys' import queryKeys from '../../services/queryKeys'
import BreadcrumbCom from "../breadcrumb/BreadcrumbCom"; import BreadcrumbCom from "../breadcrumb/BreadcrumbCom";
import { getCountry } from "../../services/siteServices"; import { getCountry } from "../../services/siteServices";
import TablePaginatedWrapper from "../tableWrapper/TablePaginatedWrapper"; import TableWrapper from "../tableWrapper/TableWrapper";
export default function CountrySettings(){ export default function CountrySettings(){
const [page, setPage] = useState(1)
const [filter, setFilter] = useState({type: '', id: ''})
const [willFilter, setWillFilter] = useState(false)
const handleFilter = ({target:{name, value}}) => {
setFilter(prev => ({...prev, [name]:value}))
}
const handleFilterByParams = () => {
if(filter.type && !filter.id){
return
}else if(!filter.type){
setPage(1)
setWillFilter(prev => !prev)
setFilter({type: '', id: ''})
}else{
setPage(1)
setWillFilter(prev => !prev)
}
}
const {data, isFetching, isError, error} = useQuery({ const {data, isFetching, isError, error} = useQuery({
// queryKey: [...queryKeys.country_list, page, willFilter],
queryKey: queryKeys.country_list, queryKey: queryKeys.country_list,
queryFn: () => { queryFn: () => {
// const filterData = filter?.type ? {[filter?.type]: filter.id} : {}
const reqData = { const reqData = {
// page, // page,
// ...filterData // ...filterData
@@ -41,9 +18,8 @@ export default function CountrySettings(){
}, },
staleTime: 0 //0 mins staleTime: 0 //0 mins
}) })
const countryData = data?.data?.templates // PRODUCTS TEMPLATE LIST const countryData = data?.data?.country_data // COUNTRY LIST
const pagination = data?.data?.pagination
console.log('DATA', data?.data)
return ( return (
<div className='w-full flex flex-col gap-8'> <div className='w-full flex flex-col gap-8'>
@@ -52,75 +28,12 @@ export default function CountrySettings(){
<div className='box bg-white dark:bg-black-box text-black-body dark:text-white-body'> <div className='box bg-white dark:bg-black-box text-black-body dark:text-white-body'>
<> <>
{/* <table className="py-2 w-full text-sm"> {isFetching ?
<thead className="py-2 text-sm text-slate-500 text-left"> <p className='text-slate-800'>Loading...</p>
<tr> : isError ?
<th scope="col" className="px-2 py-2"> <p className='text-red-500'>{error.message}</p>
Code :
</th> <TableWrapper data={countryData} itemsPerPage={20}>
<th scope="col" className="px-8">
Country
</th>
<th scope="col" className="px-2 text-right">
Status
</th>
<th scope="col" className="px-2 text-right">
Signup
</th>
</tr>
</thead>
<tbody>
<tr className="py-2 border-t border-dashed border-slate-300">
<td className="px-2 py-2">
<div className='w-full min-w-48 flex items-center gap-2 whitespace-nowrap'>
<div className="text-left">
<div className="text-base font-semibold">US</div>
</div>
</div>
</td>
<td className="px-8">
<div className="text-left">
<div className="text-base font-semibold">United States</div>
</div>
</td>
<td className="px-8">
<div className="text-left">
<div className="text-base font-semibold">[chkbox]</div>
</div>
</td>
<td className="px-8">
<div className="text-left">
<div className="text-base font-semibold">[chkbox]</div>
</div>
</td>
</tr>
<tr className="py-2 border-t border-dashed border-slate-300">
<td className="px-2 py-2">
<div className='w-full min-w-48 flex items-center gap-2 whitespace-nowrap'>
<div className="text-left">
<div className="text-base font-semibold">NG</div>
</div>
</div>
</td>
<td className="px-8">
<div className="text-left">
<div className="text-base font-semibold">Nigeria</div>
</div>
</td>
<td className="px-8">
<div className="text-left">
<div className="text-base font-semibold">[chkbox]</div>
</div>
</td>
<td className="px-8">
<div className="text-left">
<div className="text-base font-semibold">[chkbox]</div>
</div>
</td>
</tr>
</tbody>
</table> */}
<TablePaginatedWrapper data={countryData} isFetching={isFetching} setPage={setPage} itemsPerPage={pagination?.limit} pagination={pagination}>
{({ data }) => ( {({ data }) => (
<> <>
<table className="py-2 w-full text-sm"> <table className="py-2 w-full text-sm">
@@ -144,25 +57,23 @@ export default function CountrySettings(){
{(data && data.length > 0) ? data?.map((item, index) => ( {(data && data.length > 0) ? data?.map((item, index) => (
<tr key={index} className="py-2 border-t border-dashed border-slate-300"> <tr key={index} className="py-2 border-t border-dashed border-slate-300">
<td className="px-2 py-2"> <td className="px-2 py-2">
<div className='w-full min-w-48 flex items-center gap-2 whitespace-nowrap'>
<div className="text-left"> <div className="text-left">
<div className="text-base font-semibold">US</div> <div className="text-base font-semibold">{item?.code}</div>
</div>
</div> </div>
</td> </td>
<td className="px-8"> <td className="px-8">
<div className="text-left"> <div className="text-left">
<div className="text-base font-semibold">United States</div> <div className="text-base font-semibold">{item?.description}</div>
</div> </div>
</td> </td>
<td className="px-8"> <td className="px-8">
<div className="text-left"> <div className="text-right">
<div className="text-base font-semibold">[chkbox]</div> <div className="text-base font-semibold">{item?.status}</div>
</div> </div>
</td> </td>
<td className="px-8"> <td className="px-8">
<div className="text-left"> <div className="text-right">
<div className="text-base font-semibold">[chkbox]</div> <div className="text-base font-semibold">{item?.signup}</div>
</div> </div>
</td> </td>
</tr> </tr>
@@ -180,7 +91,8 @@ export default function CountrySettings(){
</table> </table>
</> </>
)} )}
</TablePaginatedWrapper> </TableWrapper>
}
</> </>
</div> </div>