diff --git a/src/components/pages/production/recording/RecordingTable.tsx b/src/components/pages/production/recording/RecordingTable.tsx index a461e2d8..36a4e69a 100644 --- a/src/components/pages/production/recording/RecordingTable.tsx +++ b/src/components/pages/production/recording/RecordingTable.tsx @@ -33,6 +33,7 @@ import Badge from '@/components/Badge'; import StatusBadge from '@/components/helper/StatusBadge'; import CheckboxInput from '@/components/input/CheckboxInput'; import { useUiStore } from '@/stores/ui/ui.store'; +import { Color } from '@/types/theme'; // ===== STATUS BADGE UTILITIES ===== const statusTextMap: Record = { @@ -48,10 +49,7 @@ const getStatusText = (status: string): string => { return statusTextMap[status] || status; }; -const statusBadgeColorMap: Record< - string, - 'success' | 'error' | 'neutral' | 'info' | 'warning' -> = { +const statusBadgeColorMap: Record = { APPROVED: 'success', Disetujui: 'success', approved: 'success', @@ -70,9 +68,7 @@ const statusBadgeColorMap: Record< diperbarui: 'warning', }; -const getStatusBadgeColor = ( - status: string -): 'success' | 'error' | 'neutral' | 'info' | 'warning' => { +const getStatusBadgeColor = (status: string): Color => { return statusBadgeColorMap[status] || 'neutral'; }; diff --git a/src/components/pages/purchase/PurchaseTable.tsx b/src/components/pages/purchase/PurchaseTable.tsx index 6773ba99..d0c72dac 100644 --- a/src/components/pages/purchase/PurchaseTable.tsx +++ b/src/components/pages/purchase/PurchaseTable.tsx @@ -25,6 +25,7 @@ import { useTableFilter } from '@/services/hooks/useTableFilter'; import { ROWS_OPTIONS } from '@/config/constant'; import { Purchase } from '@/types/api/purchase/purchase'; import { PurchaseApi } from '@/services/api/purchase'; +import { Color } from '@/types/theme'; // ===== STATUS BADGE UTILITIES ===== const statusTextMap: Record = { @@ -40,10 +41,7 @@ const getStatusText = (status: string): string => { return statusTextMap[status] || status; }; -const statusBadgeColorMap: Record< - string, - 'success' | 'error' | 'neutral' | 'info' | 'warning' | 'primary' -> = { +const statusBadgeColorMap: Record = { APPROVED: 'success', Disetujui: 'success', approved: 'success', @@ -62,9 +60,7 @@ const statusBadgeColorMap: Record< diperbarui: 'warning', }; -const getStatusBadgeColor = ( - status: string -): 'success' | 'error' | 'neutral' | 'info' | 'warning' | 'primary' => { +const getStatusBadgeColor = (status: string): Color => { return statusBadgeColorMap[status] || 'neutral'; }; @@ -204,13 +200,7 @@ const PurchaseTable = () => { const status = approval.action; - let statusColor: - | 'warning' - | 'success' - | 'neutral' - | 'error' - | 'info' - | 'primary' = 'neutral'; + let statusColor: Color = 'neutral'; if (status === 'REJECTED') { statusColor = getStatusBadgeColor(status);