From d9cd95fe1528e500f03094e587a2d14a521b9727 Mon Sep 17 00:00:00 2001 From: Wikzyy Date: Tue, 15 Apr 2025 23:00:41 +0700 Subject: [PATCH 1/8] fix menus content on dialog manage position --- .../user/manage-position/hooks/ManagePositionContext.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/settings/user/manage-position/hooks/ManagePositionContext.tsx b/src/pages/settings/user/manage-position/hooks/ManagePositionContext.tsx index 2bc9d80..66f5b3e 100644 --- a/src/pages/settings/user/manage-position/hooks/ManagePositionContext.tsx +++ b/src/pages/settings/user/manage-position/hooks/ManagePositionContext.tsx @@ -159,7 +159,7 @@ const ManagePositionContextProvider = ({ children }: { children: React.ReactNode with_deleted: false, order_field: 'order_number', order_direction: 'ASC', - filter: JSON.stringify({}) + // filter: JSON.stringify({}) }; const response = await GetData(`${API_URL}/menus/list`, params); if (response?.status) { From f424f463b8ced4a7544347b354ff9da2ac3c01a2 Mon Sep 17 00:00:00 2001 From: bagusajisaputroo Date: Tue, 15 Apr 2025 23:18:29 +0700 Subject: [PATCH 2/8] search with handleDebounce --- .../transfertype/blocks/ListToolBar.tsx | 17 +++++++-- .../hooks/ManageTransferTypeContext.tsx | 36 ++++++++++++++++--- 2 files changed, 45 insertions(+), 8 deletions(-) diff --git a/src/pages/transfer/transfertype/blocks/ListToolBar.tsx b/src/pages/transfer/transfertype/blocks/ListToolBar.tsx index 7325816..7d9e413 100644 --- a/src/pages/transfer/transfertype/blocks/ListToolBar.tsx +++ b/src/pages/transfer/transfertype/blocks/ListToolBar.tsx @@ -1,10 +1,21 @@ import { DefaultTooltip, KeenIcon, useDataGrid } from '@/components'; import { useManageTransferTypeContext } from '../hooks/useManageTransferTypeContext'; import { Button } from '@/components/ui/button'; +import { useEffect, useState } from 'react'; const ListToolbar = () => { const { table, reload } = useDataGrid(); const { handleAddDialog, handleEditDialog } = useManageTransferTypeContext(); + + const [searchValue, setSearchValue] = useState((table.getColumn('name')?.getFilterValue() as string) ?? ''); + + useEffect(() => { + const timer = setTimeout(() => { + table.getColumn('name')?.setFilterValue(searchValue); + }, 200); + + return () => clearTimeout(timer); + }, [searchValue, table]); return (
@@ -16,8 +27,8 @@ const ListToolbar = () => { table.getColumn('name')?.setFilterValue(event.target.value)} + value={searchValue} + onChange={(event) => setSearchValue(event.target.value)} />
@@ -41,4 +52,4 @@ const ListToolbar = () => { ); }; -export default ListToolbar; +export default ListToolbar; \ No newline at end of file diff --git a/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx b/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx index 7e886a3..dfdd72d 100644 --- a/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx +++ b/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx @@ -6,6 +6,22 @@ import { ColumnDef } from '@tanstack/react-table'; import { createContext, useCallback, useEffect, useMemo, useState } from 'react'; import ListToolbar from '../blocks/ListToolBar'; +function useDebounce(value: T, delay: number): T { + const [debouncedValue, setDebouncedValue] = useState(value); + + useEffect(() => { + const timer = setTimeout(() => { + setDebouncedValue(value); + }, delay); + + return () => { + clearTimeout(timer); + }; + }, [value, delay]); + + return debouncedValue; +} + interface AccountProps { id: string; name: string; @@ -33,6 +49,8 @@ interface ContextProps { selectedTransferType: string | null; transferType: string | null; accounts: AccountProps[]; + searchTerm: string; + setSearchTerm: (term: string) => void; } const initialProps: ContextProps = { @@ -44,7 +62,9 @@ const initialProps: ContextProps = { handleDeleteDialog: () => {}, selectedTransferType: null, accounts: [], - transferType: null + transferType: null, + searchTerm: '', + setSearchTerm: () => {} }; const ManageTransferTypeContext = createContext(initialProps); @@ -59,6 +79,9 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React const { GetData } = useCallApi(); const [selectedTransferType, setSelectedTransferType] = useState(null); const [transferType, setTransferType] = useState(null); + const [searchTerm, setSearchTerm] = useState(''); + + const debouncedSearchTerm = useDebounce(searchTerm, 200); const handleEditDialog = useCallback((show: boolean, selected_transfertype: string | null) => { setSelectedTransferType(show ? selected_transfertype : null); @@ -231,7 +254,9 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React const orderDirection = sorting.length > 0 ? (sorting[0].desc ? 'DESC' : 'ASC') : 'DESC'; - filter = filter.length == 0 ? {} : { any: filter[0].value?.toLowerCase() }; + const searchFilter = debouncedSearchTerm ? { any: debouncedSearchTerm.toLowerCase() } : {}; + + filter = filter.length == 0 ? searchFilter : { any: filter[0].value?.toLowerCase() }; const response = await GetData(`${API_URL}/transactiontype/list`, { limit: limit, @@ -241,7 +266,6 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React order_direction: orderDirection, filter: JSON.stringify(filter) }); - // console.log(response?.data.list); return { data: response?.data.list, totalCount: response?.data.total_count }; }; @@ -257,7 +281,9 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React handleDeleteDialog, selectedTransferType, accounts, - transferType + transferType, + searchTerm, + setSearchTerm }} > @@ -283,4 +309,4 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React }; export { ManageTransferTypeContext, ManageTransferTypeContextProvider }; -export type { TransferType }; +export type { TransferType }; \ No newline at end of file From c11662e12710e5b6e96f1e0e697f853196bb1da1 Mon Sep 17 00:00:00 2001 From: Narul Hidayah Date: Wed, 16 Apr 2025 01:44:42 +0700 Subject: [PATCH 3/8] fixing kyc delete member, transaction topup request, disbursement saldo --- .../kyc-delete-member/blocks/DetailDialog.tsx | 13 ++- .../hooks/ManageKycDeletionContext.tsx | 6 +- .../TransactionDisbursement.tsx | 105 ++++++++++++++++++ .../blocks/DetailDialog.tsx | 105 ++++++++++++++++++ .../disbursement-saldo/blocks/ListToolbar.tsx | 61 ++++++++++ .../hooks/TransactionDisbursementContext.tsx | 81 ++++++++++++++ .../disbursement-saldo/hooks/index.tsx | 2 + .../useTransactionDisbursementContext.tsx | 12 ++ .../transaction/topup/TransactionTopup.tsx | 95 ++++++++++++++++ .../transaction/topup/blocks/DetailDialog.tsx | 105 ++++++++++++++++++ .../transaction/topup/blocks/ListToolbar.tsx | 61 ++++++++++ .../topup/hooks/TransactionTopupContext.tsx | 81 ++++++++++++++ src/pages/transaction/topup/hooks/index.tsx | 2 + .../hooks/useTransactionTopupContext.tsx | 12 ++ src/routing/AppRoutingSetup.tsx | 4 + 15 files changed, 739 insertions(+), 6 deletions(-) create mode 100644 src/pages/transaction/disbursement-saldo/TransactionDisbursement.tsx create mode 100644 src/pages/transaction/disbursement-saldo/blocks/DetailDialog.tsx create mode 100644 src/pages/transaction/disbursement-saldo/blocks/ListToolbar.tsx create mode 100644 src/pages/transaction/disbursement-saldo/hooks/TransactionDisbursementContext.tsx create mode 100644 src/pages/transaction/disbursement-saldo/hooks/index.tsx create mode 100644 src/pages/transaction/disbursement-saldo/hooks/useTransactionDisbursementContext.tsx create mode 100644 src/pages/transaction/topup/TransactionTopup.tsx create mode 100644 src/pages/transaction/topup/blocks/DetailDialog.tsx create mode 100644 src/pages/transaction/topup/blocks/ListToolbar.tsx create mode 100644 src/pages/transaction/topup/hooks/TransactionTopupContext.tsx create mode 100644 src/pages/transaction/topup/hooks/index.tsx create mode 100644 src/pages/transaction/topup/hooks/useTransactionTopupContext.tsx diff --git a/src/pages/members/kyc-delete-member/blocks/DetailDialog.tsx b/src/pages/members/kyc-delete-member/blocks/DetailDialog.tsx index 016674c..8b1ca90 100644 --- a/src/pages/members/kyc-delete-member/blocks/DetailDialog.tsx +++ b/src/pages/members/kyc-delete-member/blocks/DetailDialog.tsx @@ -9,11 +9,12 @@ import { Input } from '@/components/ui/input'; import { Button } from '@/components/ui/button'; import { useManageKycDeletionContext } from '../hooks'; import { apiConfig } from '@/config/api.config'; -import axios from 'axios'; +import { useDataGrid } from '@/components'; const API_URL = apiConfig.service_customer; const DetailDialog = () => { const { showDetailDialog, setShowDetailDialog, detailKyc, handleApproveReject } = useManageKycDeletionContext(); + const { reload } = useDataGrid(); return ( @@ -38,8 +39,14 @@ const DetailDialog = () => {
- - + +
) : (
)} diff --git a/src/pages/members/kyc-delete-member/hooks/ManageKycDeletionContext.tsx b/src/pages/members/kyc-delete-member/hooks/ManageKycDeletionContext.tsx index c0742fd..48e4608 100644 --- a/src/pages/members/kyc-delete-member/hooks/ManageKycDeletionContext.tsx +++ b/src/pages/members/kyc-delete-member/hooks/ManageKycDeletionContext.tsx @@ -37,7 +37,7 @@ interface ContextProps { selectedIdCustomer: string | null; detailKyc: any | null; setDetailKyc: React.Dispatch>; - handleApproveReject: (customerDeletionId: string, status_approve: string) => {}; + handleApproveReject: (customerDeletionId: string, status_approve: string) => Promise; } const initialProps: ContextProps = { @@ -50,7 +50,7 @@ const initialProps: ContextProps = { setShowDetailDialog: () => { }, detailKyc: async () => {}, setDetailKyc: () => { }, - handleApproveReject: () => ({customerDeletionId: '0', status_approve: 'Y'}), + handleApproveReject: async () => ({customerDeletionId: '0', status_approve: 'Y'}), }; const ManageKycDeletionContext = createContext(initialProps); @@ -271,7 +271,6 @@ const ManageKycDeletionContextProvider = ({ children }: { children: React.ReactN }} > - {children} + ); diff --git a/src/pages/transaction/disbursement-saldo/TransactionDisbursement.tsx b/src/pages/transaction/disbursement-saldo/TransactionDisbursement.tsx new file mode 100644 index 0000000..4086d51 --- /dev/null +++ b/src/pages/transaction/disbursement-saldo/TransactionDisbursement.tsx @@ -0,0 +1,105 @@ +import { Container, DataGridInner } from '@/components'; +import { TransactionDisbursementProvider } from './hooks/TransactionDisbursementContext'; +import { Breadcrumbs, Link } from '@mui/material'; +import { Helmet } from 'react-helmet'; +import { Input } from '@/components/ui/input'; +import { Button } from '@/components/ui/button'; +import { useState } from 'react'; +import { useCallApi } from '@/hooks'; +import { apiConfig } from '@/config/api.config'; +import { toast } from 'sonner'; + +const TransactionDisbursement = () => { + const [form, setForm] = useState({ + customerId: '', + amount: '', + pin: '' + }); + const { GetData, PostData } = useCallApi(); + const API_URL = apiConfig.transaction; + + const handleSubmit = async (e: any) => { + e.preventDefault(); + console.log('Submitted Data:', form); + try { + // let requestTopup = await PostData(`${API_URL}/transaction/request-topup`, { + // amount: form.topupAmount, + // pin: form.pin + // }) + // console.log(requestTopup) + // if (requestTopup?.status == true) { + // toast.success('Success Request Topup') + // } else { + // toast.warning(`${requestTopup?.message}`) + // } + toast.warning('Failed') + } catch (error) { + toast.warning('Failed') + } + // TODO: Kirim ke backend atau proses lainnya + }; + + return ( + <> + + TPAY | Transaction Disbursement Saldo + + + +

MANAGE TRANSACTION DISBURSEMENT SALDO

+ + + Dashboard + + + Transaction + + + Disbursement Saldo + + + +
+
+ {/* form */} +
+
+ + setForm({ ...form, customerId: e.target.value })} + /> +
+
+ + setForm({ ...form, amount: e.target.value })} + /> +
+
+ + setForm({ ...form, pin: e.target.value })} + /> +
+
+ +
+
+
+
+ + + + + ); +}; + +export default TransactionDisbursement; diff --git a/src/pages/transaction/disbursement-saldo/blocks/DetailDialog.tsx b/src/pages/transaction/disbursement-saldo/blocks/DetailDialog.tsx new file mode 100644 index 0000000..8b1ca90 --- /dev/null +++ b/src/pages/transaction/disbursement-saldo/blocks/DetailDialog.tsx @@ -0,0 +1,105 @@ +import { + Dialog, + DialogBody, + DialogContent, + DialogHeader, + DialogTitle +} from '@/components/ui/dialog'; +import { Input } from '@/components/ui/input'; +import { Button } from '@/components/ui/button'; +import { useManageKycDeletionContext } from '../hooks'; +import { apiConfig } from '@/config/api.config'; +import { useDataGrid } from '@/components'; + +const API_URL = apiConfig.service_customer; +const DetailDialog = () => { + const { showDetailDialog, setShowDetailDialog, detailKyc, handleApproveReject } = useManageKycDeletionContext(); + const { reload } = useDataGrid(); + + return ( + + + + Customer Deletion Details + + + {/* Tab Content */} + {detailKyc && detailKyc != null ? ( +
+ {generateInput(detailKyc, null, 'Group', 'group_name', 'text', false, true)} + {generateInput(detailKyc, null, 'Username', 'username', 'text', false, true)} + {generateInput(detailKyc, null, 'Full Name', 'fullname', 'text', false, true)} + {generateInput(detailKyc, null, 'Gender', 'customers_gender', 'text', false, true)} + {generateInput(detailKyc, null, 'Date of Birth', 'birthdate', 'date', false, true)} + {generateInput(detailKyc, null, 'Mother Name', 'registered_mother_fullname', 'text', false, true)} + {generateInput(detailKyc, null, 'MSISDN', 'registered_msisdn', 'text', false, true)} + {generateInput(detailKyc, null, 'Reason Deletion', 'reason_deletion', 'text', false, true)} + {generateInput(detailKyc, null, 'Reason Note', 'reason_note', 'text', false, true)} + {generateInput(detailKyc, null, 'Status Approval', 'status_approve', 'text', false, true)} + +
+ + + +
+
+ ) : (
)} + + + + ); +}; + +export default DetailDialog; + +function generateInput(formData: any, handleChange: any, label: string, name: string, type: string, required: boolean, disabled: boolean) { + function generateDate(isoString: string) { + return isoString.slice(0, 10); // "2000-01-18" + } + + type Code = 'W' | 'Y' | 'N' | 'T' | 'P' | 'D' | 'L'; + interface Reason { + label: string; + } + + const statusMap: Record = { + W: { label: 'Waiting Approval' }, + Y: { label: 'Approve' }, + N: { label: 'Reject' }, + T: { label: 'Tidak lagi menggunakan layanan' }, + P: { label: 'Privasi dan keamanan' }, + D: { label: 'Akun ganda' }, + L: { label: 'Lainnya' } + }; + if (name == 'reason_deletion' || name == 'status_approve') { + const status = formData[name] as Code + const fixStatus = statusMap[status] ?? { label: formData[name] } + formData[name] = fixStatus.label + } + return ( + <> +
+
+ + +
+
+ + ) +} \ No newline at end of file diff --git a/src/pages/transaction/disbursement-saldo/blocks/ListToolbar.tsx b/src/pages/transaction/disbursement-saldo/blocks/ListToolbar.tsx new file mode 100644 index 0000000..013a15c --- /dev/null +++ b/src/pages/transaction/disbursement-saldo/blocks/ListToolbar.tsx @@ -0,0 +1,61 @@ +import { DefaultTooltip, KeenIcon, useDataGrid } from '@/components'; +import { Button } from '@/components/ui/button'; +import { useCallback, useState, useEffect } from 'react'; +import { toast } from 'sonner'; + +const ListToolbar = () => { + const { table, reload } = useDataGrid(); + + // Set the initial state for trxDate + const [trxDate, settrxDate] = useState({ from: '', to: '' }); + + // Function to format date to YYYY-MM-DD + const formatDate = (date: Date): string => { + return date.toISOString().split('T')[0]; + }; + + // useEffect to set the default date values + useEffect(() => { + const today = new Date(); + const nextWeek = new Date(today); + nextWeek.setDate(today.getDate() + 7); + + settrxDate({ + from: formatDate(today), // Set 'from' to today + to: formatDate(nextWeek), // Set 'to' to 7 days later + }); + }, []); + + const handleFilterData = useCallback(() => { + try { + table.getColumn('transaction_date')?.setFilterValue(trxDate); + } catch (error) { + toast.error('Error applying filter'); + console.error('Error applying filter:', error); + } + }, [trxDate, table]); + + useEffect(() => { + if (trxDate.from && trxDate.to) { + handleFilterData(); + } + }, [trxDate]); + + return ( +
+
+
+
+ + + +
+
+
+
+ ); +}; + +export default ListToolbar; diff --git a/src/pages/transaction/disbursement-saldo/hooks/TransactionDisbursementContext.tsx b/src/pages/transaction/disbursement-saldo/hooks/TransactionDisbursementContext.tsx new file mode 100644 index 0000000..a3366be --- /dev/null +++ b/src/pages/transaction/disbursement-saldo/hooks/TransactionDisbursementContext.tsx @@ -0,0 +1,81 @@ +import { DataGridColumnHeader, DataGridProvider, KeenIcon } from '@/components'; +import { Toaster } from '@/components/ui/sonner'; +import { toast } from 'sonner'; +import { apiConfig } from '@/config/api.config'; +import { ColumnDef } from '@tanstack/react-table'; +import { createContext, useCallback, useMemo, useState } from 'react'; +import ListToolbar from '../blocks/ListToolbar'; +import { useCallApi } from '@/hooks'; +import moment from 'moment'; +import DetailDialog from '../blocks/DetailDialog'; + +interface TransactionDisbursementProps { + id: string; + customers_id: string; + group_id: string; + username: string; + fullname: string; + email: string; + status: string; + created_at: Date; +} + +interface ContextProps { + +} + +const initialProps: ContextProps = { + +}; + +const TransactionDisbursementContext = createContext(initialProps); +const API_URL = apiConfig.service_customer; + +type StatusCode = 'W' | 'Y' | 'N' | 'T'; + +interface StatusInfo { + label: string; + bg: string; + text: string; +} + +const statusMap: Record = { + W: { label: 'Waiting Approval', bg: 'bg-yellow-100', text: 'text-yellow-600' }, + T: { label: 'No Need', bg: 'bg-blue-100', text: 'text-blue-600' }, + N: { label: 'Reject', bg: 'bg-red-100', text: 'text-red-600' }, + Y: { label: 'Approve', bg: 'bg-green-100', text: 'text-green-600' }, +}; + +export const renderStatusBadge = (statusRaw: string | null | undefined) => { + const status = statusRaw as StatusCode; + const { label, bg, text } = statusMap[status] ?? { + label: 'Unknown', + bg: 'bg-gray-100', + text: 'text-gray-600', + }; + + return ( + + {label} + + ); +}; + +// const { reload } = useDataGrid(); + +const TransactionDisbursementProvider = ({ children }: { children: React.ReactNode }) => { + + return ( + + +
+ {children} +
+ + ); +}; + +export { TransactionDisbursementProvider, TransactionDisbursementContext }; +export type { TransactionDisbursementProps }; diff --git a/src/pages/transaction/disbursement-saldo/hooks/index.tsx b/src/pages/transaction/disbursement-saldo/hooks/index.tsx new file mode 100644 index 0000000..2def845 --- /dev/null +++ b/src/pages/transaction/disbursement-saldo/hooks/index.tsx @@ -0,0 +1,2 @@ +export * from './TransactionDisbursementContext'; +export * from './useTransactionTopupContext'; diff --git a/src/pages/transaction/disbursement-saldo/hooks/useTransactionDisbursementContext.tsx b/src/pages/transaction/disbursement-saldo/hooks/useTransactionDisbursementContext.tsx new file mode 100644 index 0000000..5137bc2 --- /dev/null +++ b/src/pages/transaction/disbursement-saldo/hooks/useTransactionDisbursementContext.tsx @@ -0,0 +1,12 @@ +import { useContext } from 'react'; +import { TransactionDisbursementContext } from './TransactionDisbursementContext'; + +const useTransactionDisbursementContext = () => { + const context = useContext(TransactionDisbursementContext); + + if (!context) throw new Error('useTransactionDisbursementContext must be used within AuthProvider'); + + return context; +}; + +export { useTransactionDisbursementContext }; diff --git a/src/pages/transaction/topup/TransactionTopup.tsx b/src/pages/transaction/topup/TransactionTopup.tsx new file mode 100644 index 0000000..d6e343c --- /dev/null +++ b/src/pages/transaction/topup/TransactionTopup.tsx @@ -0,0 +1,95 @@ +import { Container, DataGridInner } from '@/components'; +import { TransactionTopupProvider } from './hooks/TransactionTopupContext'; +import { Breadcrumbs, Link } from '@mui/material'; +import { Helmet } from 'react-helmet'; +import { Input } from '@/components/ui/input'; +import { Button } from '@/components/ui/button'; +import { useState } from 'react'; +import { useCallApi } from '@/hooks'; +import { apiConfig } from '@/config/api.config'; +import { toast } from 'sonner'; + +const TransactionTopup = () => { + const [form, setForm] = useState({ + topupAmount: '', + pin: '' + }); + const { GetData, PostData } = useCallApi(); + const API_URL = apiConfig.transaction; + + const handleSubmit = async (e: any) => { + e.preventDefault(); + console.log('Submitted Data:', form); + try { + let requestTopup = await PostData(`${API_URL}/transaction/request-topup`, { + amount: form.topupAmount, + pin: form.pin + }) + console.log(requestTopup) + if (requestTopup?.status == true) { + toast.success('Success Request Topup') + } else { + toast.warning(`${requestTopup?.message}`) + } + } catch (error) { + toast.warning('Failed') + } + // TODO: Kirim ke backend atau proses lainnya + }; + + return ( + <> + + TPAY | Transaction Topup Request + + + +

MANAGE TRANSACTION TOPUP REQUEST

+ + + Dashboard + + + Transaction + + + Topup + + + +
+
+ {/* form */} +
+
+ + setForm({ ...form, topupAmount: e.target.value })} + /> +
+
+ + setForm({ ...form, pin: e.target.value })} + /> +
+
+ +
+
+
+
+ + + + + ); +}; + +export default TransactionTopup; diff --git a/src/pages/transaction/topup/blocks/DetailDialog.tsx b/src/pages/transaction/topup/blocks/DetailDialog.tsx new file mode 100644 index 0000000..8b1ca90 --- /dev/null +++ b/src/pages/transaction/topup/blocks/DetailDialog.tsx @@ -0,0 +1,105 @@ +import { + Dialog, + DialogBody, + DialogContent, + DialogHeader, + DialogTitle +} from '@/components/ui/dialog'; +import { Input } from '@/components/ui/input'; +import { Button } from '@/components/ui/button'; +import { useManageKycDeletionContext } from '../hooks'; +import { apiConfig } from '@/config/api.config'; +import { useDataGrid } from '@/components'; + +const API_URL = apiConfig.service_customer; +const DetailDialog = () => { + const { showDetailDialog, setShowDetailDialog, detailKyc, handleApproveReject } = useManageKycDeletionContext(); + const { reload } = useDataGrid(); + + return ( + + + + Customer Deletion Details + + + {/* Tab Content */} + {detailKyc && detailKyc != null ? ( +
+ {generateInput(detailKyc, null, 'Group', 'group_name', 'text', false, true)} + {generateInput(detailKyc, null, 'Username', 'username', 'text', false, true)} + {generateInput(detailKyc, null, 'Full Name', 'fullname', 'text', false, true)} + {generateInput(detailKyc, null, 'Gender', 'customers_gender', 'text', false, true)} + {generateInput(detailKyc, null, 'Date of Birth', 'birthdate', 'date', false, true)} + {generateInput(detailKyc, null, 'Mother Name', 'registered_mother_fullname', 'text', false, true)} + {generateInput(detailKyc, null, 'MSISDN', 'registered_msisdn', 'text', false, true)} + {generateInput(detailKyc, null, 'Reason Deletion', 'reason_deletion', 'text', false, true)} + {generateInput(detailKyc, null, 'Reason Note', 'reason_note', 'text', false, true)} + {generateInput(detailKyc, null, 'Status Approval', 'status_approve', 'text', false, true)} + +
+ + + +
+
+ ) : (
)} + + + + ); +}; + +export default DetailDialog; + +function generateInput(formData: any, handleChange: any, label: string, name: string, type: string, required: boolean, disabled: boolean) { + function generateDate(isoString: string) { + return isoString.slice(0, 10); // "2000-01-18" + } + + type Code = 'W' | 'Y' | 'N' | 'T' | 'P' | 'D' | 'L'; + interface Reason { + label: string; + } + + const statusMap: Record = { + W: { label: 'Waiting Approval' }, + Y: { label: 'Approve' }, + N: { label: 'Reject' }, + T: { label: 'Tidak lagi menggunakan layanan' }, + P: { label: 'Privasi dan keamanan' }, + D: { label: 'Akun ganda' }, + L: { label: 'Lainnya' } + }; + if (name == 'reason_deletion' || name == 'status_approve') { + const status = formData[name] as Code + const fixStatus = statusMap[status] ?? { label: formData[name] } + formData[name] = fixStatus.label + } + return ( + <> +
+
+ + +
+
+ + ) +} \ No newline at end of file diff --git a/src/pages/transaction/topup/blocks/ListToolbar.tsx b/src/pages/transaction/topup/blocks/ListToolbar.tsx new file mode 100644 index 0000000..013a15c --- /dev/null +++ b/src/pages/transaction/topup/blocks/ListToolbar.tsx @@ -0,0 +1,61 @@ +import { DefaultTooltip, KeenIcon, useDataGrid } from '@/components'; +import { Button } from '@/components/ui/button'; +import { useCallback, useState, useEffect } from 'react'; +import { toast } from 'sonner'; + +const ListToolbar = () => { + const { table, reload } = useDataGrid(); + + // Set the initial state for trxDate + const [trxDate, settrxDate] = useState({ from: '', to: '' }); + + // Function to format date to YYYY-MM-DD + const formatDate = (date: Date): string => { + return date.toISOString().split('T')[0]; + }; + + // useEffect to set the default date values + useEffect(() => { + const today = new Date(); + const nextWeek = new Date(today); + nextWeek.setDate(today.getDate() + 7); + + settrxDate({ + from: formatDate(today), // Set 'from' to today + to: formatDate(nextWeek), // Set 'to' to 7 days later + }); + }, []); + + const handleFilterData = useCallback(() => { + try { + table.getColumn('transaction_date')?.setFilterValue(trxDate); + } catch (error) { + toast.error('Error applying filter'); + console.error('Error applying filter:', error); + } + }, [trxDate, table]); + + useEffect(() => { + if (trxDate.from && trxDate.to) { + handleFilterData(); + } + }, [trxDate]); + + return ( +
+
+
+
+ + + +
+
+
+
+ ); +}; + +export default ListToolbar; diff --git a/src/pages/transaction/topup/hooks/TransactionTopupContext.tsx b/src/pages/transaction/topup/hooks/TransactionTopupContext.tsx new file mode 100644 index 0000000..ffe6337 --- /dev/null +++ b/src/pages/transaction/topup/hooks/TransactionTopupContext.tsx @@ -0,0 +1,81 @@ +import { DataGridColumnHeader, DataGridProvider, KeenIcon } from '@/components'; +import { Toaster } from '@/components/ui/sonner'; +import { toast } from 'sonner'; +import { apiConfig } from '@/config/api.config'; +import { ColumnDef } from '@tanstack/react-table'; +import { createContext, useCallback, useMemo, useState } from 'react'; +import ListToolbar from '../blocks/ListToolbar'; +import { useCallApi } from '@/hooks'; +import moment from 'moment'; +import DetailDialog from '../blocks/DetailDialog'; + +interface TransactionTopupProps { + id: string; + customers_id: string; + group_id: string; + username: string; + fullname: string; + email: string; + status: string; + created_at: Date; +} + +interface ContextProps { + +} + +const initialProps: ContextProps = { + +}; + +const TransactionTopupContext = createContext(initialProps); +const API_URL = apiConfig.service_customer; + +type StatusCode = 'W' | 'Y' | 'N' | 'T'; + +interface StatusInfo { + label: string; + bg: string; + text: string; +} + +const statusMap: Record = { + W: { label: 'Waiting Approval', bg: 'bg-yellow-100', text: 'text-yellow-600' }, + T: { label: 'No Need', bg: 'bg-blue-100', text: 'text-blue-600' }, + N: { label: 'Reject', bg: 'bg-red-100', text: 'text-red-600' }, + Y: { label: 'Approve', bg: 'bg-green-100', text: 'text-green-600' }, +}; + +export const renderStatusBadge = (statusRaw: string | null | undefined) => { + const status = statusRaw as StatusCode; + const { label, bg, text } = statusMap[status] ?? { + label: 'Unknown', + bg: 'bg-gray-100', + text: 'text-gray-600', + }; + + return ( + + {label} + + ); +}; + +// const { reload } = useDataGrid(); + +const TransactionTopupProvider = ({ children }: { children: React.ReactNode }) => { + + return ( + + +
+ {children} +
+ + ); +}; + +export { TransactionTopupProvider, TransactionTopupContext }; +export type { TransactionTopupProps }; diff --git a/src/pages/transaction/topup/hooks/index.tsx b/src/pages/transaction/topup/hooks/index.tsx new file mode 100644 index 0000000..2b919d5 --- /dev/null +++ b/src/pages/transaction/topup/hooks/index.tsx @@ -0,0 +1,2 @@ +export * from './TransactionTopupContext'; +export * from './useTransactionTopupContext'; diff --git a/src/pages/transaction/topup/hooks/useTransactionTopupContext.tsx b/src/pages/transaction/topup/hooks/useTransactionTopupContext.tsx new file mode 100644 index 0000000..cd253c2 --- /dev/null +++ b/src/pages/transaction/topup/hooks/useTransactionTopupContext.tsx @@ -0,0 +1,12 @@ +import { useContext } from 'react'; +import { TransactionTopupContext } from './TransactionTopupContext'; + +const useTransactionTopupContext = () => { + const context = useContext(TransactionTopupContext); + + if (!context) throw new Error('useTransactionTopupContext must be used within AuthProvider'); + + return context; +}; + +export { useTransactionTopupContext }; diff --git a/src/routing/AppRoutingSetup.tsx b/src/routing/AppRoutingSetup.tsx index 865effb..786cd1e 100644 --- a/src/routing/AppRoutingSetup.tsx +++ b/src/routing/AppRoutingSetup.tsx @@ -10,6 +10,8 @@ import DashboardHomePage from '@/pages/dashboards/home/DashboardHomePage'; import ManageUserPage from '@/pages/settings/user/manage-user/ManageUserPage'; import Transaction from '@/pages/transaction/history-transaction/Transaction'; import ApprovalTransaction from '@/pages/transaction/approval-transaction/ApprovalTransaction'; +import TransactionTopup from '@/pages/transaction/topup/TransactionTopup'; +import TransactionDisbursement from '@/pages/transaction/disbursement-saldo/TransactionDisbursement'; import LogActivityPage from '@/pages/settings/user/log-activity/LogActivityPage'; import ManagePositionPage from '@/pages/settings/user/manage-position/ManagePositionPage'; import ManageAccount from '@/pages/account/manage-account/ManageAccount'; @@ -96,6 +98,8 @@ const AppRoutingSetup = (): ReactElement => { } /> } /> + } /> + } /> } /> } /> } /> From d422c05894c77ae2a757926bda2ad8e3f25c8acd Mon Sep 17 00:00:00 2001 From: Narul Hidayah Date: Wed, 16 Apr 2025 01:50:45 +0700 Subject: [PATCH 4/8] fixing --- .../kyc-delete-member/ManageKycDeletion.tsx | 2 +- .../blocks/DetailDialog.tsx | 105 ------------------ .../hooks/TransactionDisbursementContext.tsx | 1 - .../disbursement-saldo/hooks/index.tsx | 2 +- .../transaction/topup/blocks/DetailDialog.tsx | 105 ------------------ .../topup/hooks/TransactionTopupContext.tsx | 1 - 6 files changed, 2 insertions(+), 214 deletions(-) delete mode 100644 src/pages/transaction/disbursement-saldo/blocks/DetailDialog.tsx delete mode 100644 src/pages/transaction/topup/blocks/DetailDialog.tsx diff --git a/src/pages/members/kyc-delete-member/ManageKycDeletion.tsx b/src/pages/members/kyc-delete-member/ManageKycDeletion.tsx index 0d5962e..8a175b7 100644 --- a/src/pages/members/kyc-delete-member/ManageKycDeletion.tsx +++ b/src/pages/members/kyc-delete-member/ManageKycDeletion.tsx @@ -1,5 +1,5 @@ import { Container, DataGridInner } from '@/components'; -import { ManageKycDeletionContextProvider } from './hooks/ManageKycDeletionContext'; +import { ManageKycDeletionContextProvider } from './hooks'; import { Breadcrumbs, Link } from '@mui/material'; import { Helmet } from 'react-helmet'; diff --git a/src/pages/transaction/disbursement-saldo/blocks/DetailDialog.tsx b/src/pages/transaction/disbursement-saldo/blocks/DetailDialog.tsx deleted file mode 100644 index 8b1ca90..0000000 --- a/src/pages/transaction/disbursement-saldo/blocks/DetailDialog.tsx +++ /dev/null @@ -1,105 +0,0 @@ -import { - Dialog, - DialogBody, - DialogContent, - DialogHeader, - DialogTitle -} from '@/components/ui/dialog'; -import { Input } from '@/components/ui/input'; -import { Button } from '@/components/ui/button'; -import { useManageKycDeletionContext } from '../hooks'; -import { apiConfig } from '@/config/api.config'; -import { useDataGrid } from '@/components'; - -const API_URL = apiConfig.service_customer; -const DetailDialog = () => { - const { showDetailDialog, setShowDetailDialog, detailKyc, handleApproveReject } = useManageKycDeletionContext(); - const { reload } = useDataGrid(); - - return ( - - - - Customer Deletion Details - - - {/* Tab Content */} - {detailKyc && detailKyc != null ? ( -
- {generateInput(detailKyc, null, 'Group', 'group_name', 'text', false, true)} - {generateInput(detailKyc, null, 'Username', 'username', 'text', false, true)} - {generateInput(detailKyc, null, 'Full Name', 'fullname', 'text', false, true)} - {generateInput(detailKyc, null, 'Gender', 'customers_gender', 'text', false, true)} - {generateInput(detailKyc, null, 'Date of Birth', 'birthdate', 'date', false, true)} - {generateInput(detailKyc, null, 'Mother Name', 'registered_mother_fullname', 'text', false, true)} - {generateInput(detailKyc, null, 'MSISDN', 'registered_msisdn', 'text', false, true)} - {generateInput(detailKyc, null, 'Reason Deletion', 'reason_deletion', 'text', false, true)} - {generateInput(detailKyc, null, 'Reason Note', 'reason_note', 'text', false, true)} - {generateInput(detailKyc, null, 'Status Approval', 'status_approve', 'text', false, true)} - -
- - - -
-
- ) : (
)} - - - - ); -}; - -export default DetailDialog; - -function generateInput(formData: any, handleChange: any, label: string, name: string, type: string, required: boolean, disabled: boolean) { - function generateDate(isoString: string) { - return isoString.slice(0, 10); // "2000-01-18" - } - - type Code = 'W' | 'Y' | 'N' | 'T' | 'P' | 'D' | 'L'; - interface Reason { - label: string; - } - - const statusMap: Record = { - W: { label: 'Waiting Approval' }, - Y: { label: 'Approve' }, - N: { label: 'Reject' }, - T: { label: 'Tidak lagi menggunakan layanan' }, - P: { label: 'Privasi dan keamanan' }, - D: { label: 'Akun ganda' }, - L: { label: 'Lainnya' } - }; - if (name == 'reason_deletion' || name == 'status_approve') { - const status = formData[name] as Code - const fixStatus = statusMap[status] ?? { label: formData[name] } - formData[name] = fixStatus.label - } - return ( - <> -
-
- - -
-
- - ) -} \ No newline at end of file diff --git a/src/pages/transaction/disbursement-saldo/hooks/TransactionDisbursementContext.tsx b/src/pages/transaction/disbursement-saldo/hooks/TransactionDisbursementContext.tsx index a3366be..7fc3604 100644 --- a/src/pages/transaction/disbursement-saldo/hooks/TransactionDisbursementContext.tsx +++ b/src/pages/transaction/disbursement-saldo/hooks/TransactionDisbursementContext.tsx @@ -7,7 +7,6 @@ import { createContext, useCallback, useMemo, useState } from 'react'; import ListToolbar from '../blocks/ListToolbar'; import { useCallApi } from '@/hooks'; import moment from 'moment'; -import DetailDialog from '../blocks/DetailDialog'; interface TransactionDisbursementProps { id: string; diff --git a/src/pages/transaction/disbursement-saldo/hooks/index.tsx b/src/pages/transaction/disbursement-saldo/hooks/index.tsx index 2def845..b3acae0 100644 --- a/src/pages/transaction/disbursement-saldo/hooks/index.tsx +++ b/src/pages/transaction/disbursement-saldo/hooks/index.tsx @@ -1,2 +1,2 @@ export * from './TransactionDisbursementContext'; -export * from './useTransactionTopupContext'; +export * from './useTransactionDisbursementContext'; diff --git a/src/pages/transaction/topup/blocks/DetailDialog.tsx b/src/pages/transaction/topup/blocks/DetailDialog.tsx deleted file mode 100644 index 8b1ca90..0000000 --- a/src/pages/transaction/topup/blocks/DetailDialog.tsx +++ /dev/null @@ -1,105 +0,0 @@ -import { - Dialog, - DialogBody, - DialogContent, - DialogHeader, - DialogTitle -} from '@/components/ui/dialog'; -import { Input } from '@/components/ui/input'; -import { Button } from '@/components/ui/button'; -import { useManageKycDeletionContext } from '../hooks'; -import { apiConfig } from '@/config/api.config'; -import { useDataGrid } from '@/components'; - -const API_URL = apiConfig.service_customer; -const DetailDialog = () => { - const { showDetailDialog, setShowDetailDialog, detailKyc, handleApproveReject } = useManageKycDeletionContext(); - const { reload } = useDataGrid(); - - return ( - - - - Customer Deletion Details - - - {/* Tab Content */} - {detailKyc && detailKyc != null ? ( -
- {generateInput(detailKyc, null, 'Group', 'group_name', 'text', false, true)} - {generateInput(detailKyc, null, 'Username', 'username', 'text', false, true)} - {generateInput(detailKyc, null, 'Full Name', 'fullname', 'text', false, true)} - {generateInput(detailKyc, null, 'Gender', 'customers_gender', 'text', false, true)} - {generateInput(detailKyc, null, 'Date of Birth', 'birthdate', 'date', false, true)} - {generateInput(detailKyc, null, 'Mother Name', 'registered_mother_fullname', 'text', false, true)} - {generateInput(detailKyc, null, 'MSISDN', 'registered_msisdn', 'text', false, true)} - {generateInput(detailKyc, null, 'Reason Deletion', 'reason_deletion', 'text', false, true)} - {generateInput(detailKyc, null, 'Reason Note', 'reason_note', 'text', false, true)} - {generateInput(detailKyc, null, 'Status Approval', 'status_approve', 'text', false, true)} - -
- - - -
-
- ) : (
)} - - - - ); -}; - -export default DetailDialog; - -function generateInput(formData: any, handleChange: any, label: string, name: string, type: string, required: boolean, disabled: boolean) { - function generateDate(isoString: string) { - return isoString.slice(0, 10); // "2000-01-18" - } - - type Code = 'W' | 'Y' | 'N' | 'T' | 'P' | 'D' | 'L'; - interface Reason { - label: string; - } - - const statusMap: Record = { - W: { label: 'Waiting Approval' }, - Y: { label: 'Approve' }, - N: { label: 'Reject' }, - T: { label: 'Tidak lagi menggunakan layanan' }, - P: { label: 'Privasi dan keamanan' }, - D: { label: 'Akun ganda' }, - L: { label: 'Lainnya' } - }; - if (name == 'reason_deletion' || name == 'status_approve') { - const status = formData[name] as Code - const fixStatus = statusMap[status] ?? { label: formData[name] } - formData[name] = fixStatus.label - } - return ( - <> -
-
- - -
-
- - ) -} \ No newline at end of file diff --git a/src/pages/transaction/topup/hooks/TransactionTopupContext.tsx b/src/pages/transaction/topup/hooks/TransactionTopupContext.tsx index ffe6337..14cccdb 100644 --- a/src/pages/transaction/topup/hooks/TransactionTopupContext.tsx +++ b/src/pages/transaction/topup/hooks/TransactionTopupContext.tsx @@ -7,7 +7,6 @@ import { createContext, useCallback, useMemo, useState } from 'react'; import ListToolbar from '../blocks/ListToolbar'; import { useCallApi } from '@/hooks'; import moment from 'moment'; -import DetailDialog from '../blocks/DetailDialog'; interface TransactionTopupProps { id: string; From 81c84dc1cda6ace248d5a13d3b99b7d55ae159d6 Mon Sep 17 00:00:00 2001 From: Narul Hidayah Date: Wed, 16 Apr 2025 02:04:12 +0700 Subject: [PATCH 5/8] fixing required --- .../disbursement-saldo/TransactionDisbursement.tsx | 10 +++++++--- src/pages/transaction/topup/TransactionTopup.tsx | 9 +++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/pages/transaction/disbursement-saldo/TransactionDisbursement.tsx b/src/pages/transaction/disbursement-saldo/TransactionDisbursement.tsx index 4086d51..e2f6cba 100644 --- a/src/pages/transaction/disbursement-saldo/TransactionDisbursement.tsx +++ b/src/pages/transaction/disbursement-saldo/TransactionDisbursement.tsx @@ -21,6 +21,10 @@ const TransactionDisbursement = () => { const handleSubmit = async (e: any) => { e.preventDefault(); console.log('Submitted Data:', form); + if (form.amount == '' || form.customerId == '' || form.pin == '') { + toast.warning('Please fill in all required fields.') + return + } try { // let requestTopup = await PostData(`${API_URL}/transaction/request-topup`, { // amount: form.topupAmount, @@ -64,7 +68,7 @@ const TransactionDisbursement = () => { {/* form */}
- + * { />
- + * { />
- + * { const handleSubmit = async (e: any) => { e.preventDefault(); console.log('Submitted Data:', form); + + if (form.pin == '' || form.topupAmount) { + toast.warning('Please fill in all required fields.') + return + } try { let requestTopup = await PostData(`${API_URL}/transaction/request-topup`, { amount: form.topupAmount, @@ -62,7 +67,7 @@ const TransactionTopup = () => { {/* form */}
- + * { />
- + * Date: Wed, 16 Apr 2025 10:04:58 +0700 Subject: [PATCH 6/8] fix customer dropdown on edit manage user --- src/pages/settings/user/manage-user/blocks/EditDialog.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/settings/user/manage-user/blocks/EditDialog.tsx b/src/pages/settings/user/manage-user/blocks/EditDialog.tsx index e2c1248..f8b5ef8 100644 --- a/src/pages/settings/user/manage-user/blocks/EditDialog.tsx +++ b/src/pages/settings/user/manage-user/blocks/EditDialog.tsx @@ -153,7 +153,7 @@ const EditDialog = () => { email: response.data.email, id_role: response.data.idRole, status: response.data.status, - customerid: response.data.customerid?.id || '' + customerid: response.data.customer?.id || '' })); // console.log('Customer ID from API:', response?.data.customerid); } else { From ac5969c3b8d08d696a91ee05ef0c0885d542d6d7 Mon Sep 17 00:00:00 2001 From: Wikzyy Date: Wed, 16 Apr 2025 10:13:24 +0700 Subject: [PATCH 7/8] update variable on columns table manage user - sync with response - fix sorting --- .../settings/user/manage-user/blocks/ListToolBar.tsx | 2 +- .../user/manage-user/hooks/ManageUserContext.tsx | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/settings/user/manage-user/blocks/ListToolBar.tsx b/src/pages/settings/user/manage-user/blocks/ListToolBar.tsx index 2e76deb..998ef61 100644 --- a/src/pages/settings/user/manage-user/blocks/ListToolBar.tsx +++ b/src/pages/settings/user/manage-user/blocks/ListToolBar.tsx @@ -15,7 +15,7 @@ const ListToolBar = () => { table.getColumn('username')?.setFilterValue(event.target.value) diff --git a/src/pages/settings/user/manage-user/hooks/ManageUserContext.tsx b/src/pages/settings/user/manage-user/hooks/ManageUserContext.tsx index 8b33e36..77f68a9 100644 --- a/src/pages/settings/user/manage-user/hooks/ManageUserContext.tsx +++ b/src/pages/settings/user/manage-user/hooks/ManageUserContext.tsx @@ -86,7 +86,7 @@ const ManageUserContextProvider = ({ children }: { children: React.ReactNode }) }, { accessorFn: (row) => row.customer?.username, - id: 'customer', + id: 'Users.customer', header: ({ column }) => , enableSorting: true, enableHiding: false, @@ -98,7 +98,7 @@ const ManageUserContextProvider = ({ children }: { children: React.ReactNode }) accessorFn: (row) => row.email, id: 'email', header: ({ column }) => , - enableSorting: true, + enableSorting: false, enableHiding: false, meta: { headerClassName: 'w-[350px]' @@ -106,9 +106,9 @@ const ManageUserContextProvider = ({ children }: { children: React.ReactNode }) }, { accessorFn: (row) => row.name, - id: 'name', + id: 'Users.name', header: ({ column }) => , - enableSorting: true, + enableSorting: false, enableHiding: false, meta: { headerClassName: 'w-[250px]' @@ -116,7 +116,7 @@ const ManageUserContextProvider = ({ children }: { children: React.ReactNode }) }, { accessorFn: (row) => row.role.name, - id: 'role_name', + id: 'Users.role', header: ({ column }) => , enableSorting: true, enableHiding: false, @@ -239,7 +239,7 @@ const ManageUserContextProvider = ({ children }: { children: React.ReactNode }) pagination={{ size: 10 }} toolbar={} layout={{ card: true }} - sorting={[{ id: 'Users.username', desc: false }]} + sorting={[{ id: 'Users.created_at', desc: false }]} serverSide={true} onFetchData={({ pageIndex, pageSize, sorting, columnFilters }) => doGetListData(pageIndex, pageSize, sorting, columnFilters) From e691041e7c2f86e7678702a2376af3c1b3a0a551 Mon Sep 17 00:00:00 2001 From: Wikzyy Date: Wed, 16 Apr 2025 10:58:11 +0700 Subject: [PATCH 8/8] update responsive search bar on master data --- src/pages/master/aldeias/blocks/ListToolbar.tsx | 2 +- src/pages/master/municipios/blocks/ListToolbar.tsx | 2 +- src/pages/master/postoadms/blocks/ListToolbar.tsx | 2 +- src/pages/master/products/blocks/ListToolbar.tsx | 2 +- src/pages/master/profession/blocks/ListToolbar.tsx | 2 +- src/pages/master/reward/blocks/ListToolbar.tsx | 2 +- src/pages/master/sucos/blocks/ListToolbar.tsx | 2 +- src/pages/master/wallet/blocks/ListToolbar.tsx | 2 +- src/pages/menu/manage-menu/blocks/ListToolbar.tsx | 2 +- src/pages/settings/user/manage-user/blocks/ListToolBar.tsx | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/pages/master/aldeias/blocks/ListToolbar.tsx b/src/pages/master/aldeias/blocks/ListToolbar.tsx index 2454a1c..efbb499 100644 --- a/src/pages/master/aldeias/blocks/ListToolbar.tsx +++ b/src/pages/master/aldeias/blocks/ListToolbar.tsx @@ -11,7 +11,7 @@ const ListToolbar = () => {
-