From e7d0180865662b2e524fbe29e0b6fd26369af229 Mon Sep 17 00:00:00 2001 From: ardiola Date: Tue, 22 Apr 2025 15:05:59 +0700 Subject: [PATCH] refactor: remove unused ResendTransaction component and update TransactionContext --- .../history-transaction/Transaction.tsx | 2 -- .../blocks/DetailTransaction.tsx | 2 ++ .../blocks/ResendTransaction.tsx | 18 +++++++++++------- .../hooks/TransactionContext.tsx | 9 ++++++++- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/pages/transaction/history-transaction/Transaction.tsx b/src/pages/transaction/history-transaction/Transaction.tsx index ee0aeff..e0bc691 100644 --- a/src/pages/transaction/history-transaction/Transaction.tsx +++ b/src/pages/transaction/history-transaction/Transaction.tsx @@ -2,7 +2,6 @@ import { Container, DataGridInner } from '@/components'; import { TransactionProvider } from './hooks/TransactionContext'; import { Breadcrumbs, Link } from '@mui/material'; import { Helmet } from 'react-helmet'; -import ResendTransaction from './blocks/ResendTransaction'; const Transaction = () => { return ( @@ -29,7 +28,6 @@ const Transaction = () => {
- {/* */} diff --git a/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx b/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx index 46a9acc..72596b7 100644 --- a/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx +++ b/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx @@ -12,11 +12,13 @@ import { DialogHeader, DialogTitle } from '@/components/ui/dialog'; +import { useDataGrid } from '@/components'; const API_URL = apiConfig.transaction; const DetailTransaction = () => { const { GetData } = useCallApi(); + // const { reload } = useDataGrid(); const { showDetailDialog, setShowDetailDialog, diff --git a/src/pages/transaction/history-transaction/blocks/ResendTransaction.tsx b/src/pages/transaction/history-transaction/blocks/ResendTransaction.tsx index 3da5a09..9ec262b 100644 --- a/src/pages/transaction/history-transaction/blocks/ResendTransaction.tsx +++ b/src/pages/transaction/history-transaction/blocks/ResendTransaction.tsx @@ -11,7 +11,6 @@ import { DialogHeader, DialogTitle } from '@/components/ui/dialog'; -import { Button } from '@/components/ui/button'; import { Alert, useDataGrid } from '@/components'; import { doSaveLogActivity } from '@/actions/GlobalActions'; import { toast } from 'sonner'; @@ -27,10 +26,14 @@ interface ResendTransactionProps { const ResendTransaction = ({ isOpen, onClose, selectedTransactionForResend }: ResendTransactionProps) => { - // const { showResendDialog, handleResendDialog, selectedTransactionForResend } = useTransactionContext(); const { GetData, PostData } = useCallApi(); - // const { reload } = useDataGrid(); + const { + showDetailDialog, + setShowDetailDialog, + selectedTransactionId + } = useTransactionContext(); + const { reload } = useDataGrid(); const [transactionDetails, setTransactionDetails] = useState(null); const [alert, setAlert] = useState({ show: false, @@ -159,25 +162,26 @@ const ResendTransaction = ({ isOpen, onClose, selectedTransactionForResend }: Re if (response?.status) { setAlert({ show: false, message: '' }); // handleResendDialog(false, null); + onClose(); + setShowDetailDialog(false); + reload(); toast.success('Success Retry Transaction'); - // reload(); const createActivity = { module: 'History Transaction', - description: `Retry Transaction => ${selectedTransactionForResend}`, + description: `Retry Transaction => ${data.code}`, action: 'U' }; doSaveLogActivity(createActivity); } else { - setAlert({ show: true, message: response?.message }); + setAlert({ show: true, message: response?.message.message }); toast.error('Failed Retry Transaction'); } }, [selectedTransactionForResend, PostData]); if (!isOpen) return null; - return ( diff --git a/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx b/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx index 569e266..725cc9b 100644 --- a/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx +++ b/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx @@ -7,6 +7,7 @@ import { useCallApi } from '@/hooks'; import ListToolbar from '../blocks/ListToolbar'; import { useNavigate } from 'react-router'; import DetailTransaction from '../blocks/DetailTransaction'; +import ResendTransaction from '../blocks/ResendTransaction'; interface TransactionProps { id: number; @@ -320,7 +321,7 @@ const TransactionProvider = ({ children }: { children: React.ReactNode }) => { }} > - + { getTransactionLists(pageIndex, pageSize, sorting, columnFilters) } > + + console.log('Retry Transaction closed')} + selectedTransactionForResend={null} + /> {children}