From 42cc0f2661ef9192e5633fc9b8f66db1325f06dc Mon Sep 17 00:00:00 2001 From: rstubryan Date: Wed, 18 Feb 2026 16:15:27 +0700 Subject: [PATCH] refactor(FE): Refactor component and file names for consistency --- .../pages/closing/ClosingDetail.tsx | 30 ++++++++-------- .../closing/tab/ClosingFinanceTabContent.tsx | 17 --------- .../closing/tab/ClosingSapronakTabContent.tsx | 36 ------------------- .../pages/closing/tab/FinanceClosingTab.tsx | 13 +++++++ ...dTabContent.tsx => OverheadClosingTab.tsx} | 12 +++---- ...ntent.tsx => ProductionDataClosingTab.tsx} | 8 ++--- ....tsx => SapronakCalculationClosingTab.tsx} | 12 +++---- .../pages/closing/tab/SapronakClosingTab.tsx | 32 +++++++++++++++++ ...nanceTable.tsx => FinanceClosingTable.tsx} | 4 +-- ...able.tsx => HppExpeditionClosingTable.tsx} | 8 ++--- ....tsx => IncomingSapronaksSummaryTable.tsx} | 0 ...ksTable.tsx => IncomingSapronaksTable.tsx} | 0 ....tsx => OutgoingSapronaksSummaryTable.tsx} | 0 ...ksTable.tsx => OutgoingSapronaksTable.tsx} | 0 ...headTable.tsx => OverheadClosingTable.tsx} | 8 ++--- ...sReportTable.tsx => SalesClosingTable.tsx} | 6 ++-- ...sx => SapronakCalculationClosingTable.tsx} | 8 ++--- 17 files changed, 94 insertions(+), 100 deletions(-) delete mode 100644 src/components/pages/closing/tab/ClosingFinanceTabContent.tsx delete mode 100644 src/components/pages/closing/tab/ClosingSapronakTabContent.tsx create mode 100644 src/components/pages/closing/tab/FinanceClosingTab.tsx rename src/components/pages/closing/tab/{ClosingOverheadTabContent.tsx => OverheadClosingTab.tsx} (66%) rename src/components/pages/closing/tab/{ClosingProductionDataTabContent.tsx => ProductionDataClosingTab.tsx} (98%) rename src/components/pages/closing/tab/{ClosingSapronakCalculationTabContent.tsx => SapronakCalculationClosingTab.tsx} (56%) create mode 100644 src/components/pages/closing/tab/SapronakClosingTab.tsx rename src/components/pages/closing/table/{ClosingFinanceTable.tsx => FinanceClosingTable.tsx} (99%) rename src/components/pages/closing/table/{HppExpeditionReportTable.tsx => HppExpeditionClosingTable.tsx} (95%) rename src/components/pages/closing/table/{ClosingIncomingSapronaksSummaryTable.tsx => IncomingSapronaksSummaryTable.tsx} (100%) rename src/components/pages/closing/table/{ClosingIncomingSapronaksTable.tsx => IncomingSapronaksTable.tsx} (100%) rename src/components/pages/closing/table/{ClosingOutgoingSapronaksSummaryTable.tsx => OutgoingSapronaksSummaryTable.tsx} (100%) rename src/components/pages/closing/table/{ClosingOutgoingSapronaksTable.tsx => OutgoingSapronaksTable.tsx} (100%) rename src/components/pages/closing/table/{ClosingOverheadTable.tsx => OverheadClosingTable.tsx} (98%) rename src/components/pages/closing/table/{SalesReportTable.tsx => SalesClosingTable.tsx} (98%) rename src/components/pages/closing/table/{ClosingSapronakCalculationTable.tsx => SapronakCalculationClosingTable.tsx} (97%) diff --git a/src/components/pages/closing/ClosingDetail.tsx b/src/components/pages/closing/ClosingDetail.tsx index 305f8316..9100186b 100644 --- a/src/components/pages/closing/ClosingDetail.tsx +++ b/src/components/pages/closing/ClosingDetail.tsx @@ -6,19 +6,19 @@ import { Icon } from '@iconify/react'; import Button from '@/components/Button'; import Tabs from '@/components/Tabs'; import ClosingGeneralInformationTable from '@/components/pages/closing/ClosingGeneralInformationTable'; -import ClosingSapronakTabContent from '@/components/pages/closing/tab/ClosingSapronakTabContent'; -import ClosingProductionDataTabContent from '@/components/pages/closing/tab/ClosingProductionDataTabContent'; +import SapronakClosingTab from '@/components/pages/closing/tab/SapronakClosingTab'; +import ProductionDataClosingTab from '@/components/pages/closing/tab/ProductionDataClosingTab'; import { ClosingGeneralInformation, BaseClosingSales, ClosingHppExpedition, } from '@/types/api/closing'; -import ClosingSapronakCalculationTabContent from '@/components/pages/closing/tab/ClosingSapronakCalculationTabContent'; -import ClosingOverheadTabContent from '@/components/pages/closing/tab/ClosingOverheadTabContent'; -import ClosingFinanceTabContent from '@/components/pages/closing/tab/ClosingFinanceTabContent'; -import SalesReportTable from '@/components/pages/closing/table/SalesReportTable'; -import HppExpeditionReportTable from './table/HppExpeditionReportTable'; +import SapronakCalculationClosingTab from '@/components/pages/closing/tab/SapronakCalculationClosingTab'; +import OverheadClosingTab from '@/components/pages/closing/tab/OverheadClosingTab'; +import FinanceClosingTab from '@/components/pages/closing/tab/FinanceClosingTab'; +import SalesClosingTable from '@/components/pages/closing/table/SalesClosingTable'; +import HppExpeditionClosingTable from './table/HppExpeditionClosingTable'; import ClosingKandangList from '@/components/pages/closing/ClosingKandangList'; import { ProjectFlock } from '@/types/api/production/project-flock'; import { ProjectFlockKandang } from '@/types/api/production/project-flock-kandang'; @@ -46,13 +46,13 @@ const ClosingDetail: React.FC = ({ { id: 'sapronak', label: 'Sapronak', - content: , + content: , }, { id: 'perhitunganSapronak', label: 'Perhitungan Sapronak', content: ( - @@ -61,13 +61,13 @@ const ClosingDetail: React.FC = ({ { id: 'penjualan', label: 'Penjualan', - content: , + content: , }, { id: 'overhead', label: 'Overhead', content: ( - = ({ { id: 'hppEkspedisi', label: 'HPP Ekspedisi', - content: , + content: ( + + ), }, { id: 'dataProduksi', label: 'Data Produksi', - content: , + content: , }, { id: 'keuangan', label: 'Keuangan', - content: , + content: , }, ]; diff --git a/src/components/pages/closing/tab/ClosingFinanceTabContent.tsx b/src/components/pages/closing/tab/ClosingFinanceTabContent.tsx deleted file mode 100644 index 7df96129..00000000 --- a/src/components/pages/closing/tab/ClosingFinanceTabContent.tsx +++ /dev/null @@ -1,17 +0,0 @@ -import ClosingFinanceTable from '@/components/pages/closing/table/ClosingFinanceTable'; - -const ClosingFinanceTabContent = ({ - projectFlockId, -}: { - projectFlockId: number; -}) => { - return ( -
- {projectFlockId && ( - - )} -
- ); -}; - -export default ClosingFinanceTabContent; diff --git a/src/components/pages/closing/tab/ClosingSapronakTabContent.tsx b/src/components/pages/closing/tab/ClosingSapronakTabContent.tsx deleted file mode 100644 index aaaf0d0e..00000000 --- a/src/components/pages/closing/tab/ClosingSapronakTabContent.tsx +++ /dev/null @@ -1,36 +0,0 @@ -'use client'; - -import ClosingIncomingSapronaksTable from '@/components/pages/closing/table/ClosingIncomingSapronaksTable'; -import ClosingOutgoingSapronaksTable from '@/components/pages/closing/table/ClosingOutgoingSapronaksTable'; -import ClosingIncomingSapronaksSummaryTable from '@/components/pages/closing/table/ClosingIncomingSapronaksSummaryTable'; -import ClosingOutgoingSapronaksSummaryTable from '../table/ClosingOutgoingSapronaksSummaryTable'; - -interface ClosingSapronakTableProps { - projectFlockId?: number; -} - -const ClosingSapronakTabContent = ({ - projectFlockId, -}: ClosingSapronakTableProps) => { - return ( -
- {projectFlockId && ( - <> - - - - - - - - - )} -
- ); -}; - -export default ClosingSapronakTabContent; diff --git a/src/components/pages/closing/tab/FinanceClosingTab.tsx b/src/components/pages/closing/tab/FinanceClosingTab.tsx new file mode 100644 index 00000000..53a5068b --- /dev/null +++ b/src/components/pages/closing/tab/FinanceClosingTab.tsx @@ -0,0 +1,13 @@ +import FinanceClosingTable from '@/components/pages/closing/table/FinanceClosingTable'; + +const FinanceClosingTab = ({ projectFlockId }: { projectFlockId: number }) => { + return ( +
+ {projectFlockId && ( + + )} +
+ ); +}; + +export default FinanceClosingTab; diff --git a/src/components/pages/closing/tab/ClosingOverheadTabContent.tsx b/src/components/pages/closing/tab/OverheadClosingTab.tsx similarity index 66% rename from src/components/pages/closing/tab/ClosingOverheadTabContent.tsx rename to src/components/pages/closing/tab/OverheadClosingTab.tsx index 5ac92448..85942a62 100644 --- a/src/components/pages/closing/tab/ClosingOverheadTabContent.tsx +++ b/src/components/pages/closing/tab/OverheadClosingTab.tsx @@ -1,22 +1,22 @@ -import ClosingOverheadTable from '@/components/pages/closing/table/ClosingOverheadTable'; +import OverheadClosingTable from '@/components/pages/closing/table/OverheadClosingTable'; import { ClosingGeneralInformation } from '@/types/api/closing'; import { ProjectFlockKandang } from '@/types/api/production/project-flock-kandang'; -interface ClosingOverheadTabContentProps { +interface OverheadClosingTabProps { projectFlockId: number; generalInformation?: ClosingGeneralInformation; kandangData?: ProjectFlockKandang; } -const ClosingOverheadTabContent = ({ +const OverheadClosingTab = ({ projectFlockId, generalInformation, kandangData, -}: ClosingOverheadTabContentProps) => { +}: OverheadClosingTabProps) => { return (
{projectFlockId && ( - { +}: ProductionDataClosingTabProps) => { const searchParams = useSearchParams(); const kandangId = searchParams.get('kandangId'); @@ -305,4 +305,4 @@ const ClosingProductionDataTabContent = ({ ); }; -export default ClosingProductionDataTabContent; +export default ProductionDataClosingTab; diff --git a/src/components/pages/closing/tab/ClosingSapronakCalculationTabContent.tsx b/src/components/pages/closing/tab/SapronakCalculationClosingTab.tsx similarity index 56% rename from src/components/pages/closing/tab/ClosingSapronakCalculationTabContent.tsx rename to src/components/pages/closing/tab/SapronakCalculationClosingTab.tsx index 7517018b..77a74d71 100644 --- a/src/components/pages/closing/tab/ClosingSapronakCalculationTabContent.tsx +++ b/src/components/pages/closing/tab/SapronakCalculationClosingTab.tsx @@ -1,22 +1,22 @@ 'use client'; -import ClosingSapronakCalculationTable from '@/components/pages/closing/table/ClosingSapronakCalculationTable'; +import SapronakCalculationClosingTable from '@/components/pages/closing/table/SapronakCalculationClosingTable'; import { ClosingGeneralInformation } from '@/types/api/closing'; -interface ClosingSapronakCalculationTabContentProps { +interface SapronakCalculationClosingTabProps { projectFlockId?: number; closingGeneralInformation?: ClosingGeneralInformation; } -const ClosingSapronakCalculationTabContent = ({ +const SapronakCalculationClosingTab = ({ projectFlockId, closingGeneralInformation, -}: ClosingSapronakCalculationTabContentProps) => { +}: SapronakCalculationClosingTabProps) => { return (
{projectFlockId && ( <> - @@ -26,4 +26,4 @@ const ClosingSapronakCalculationTabContent = ({ ); }; -export default ClosingSapronakCalculationTabContent; +export default SapronakCalculationClosingTab; diff --git a/src/components/pages/closing/tab/SapronakClosingTab.tsx b/src/components/pages/closing/tab/SapronakClosingTab.tsx new file mode 100644 index 00000000..8f931671 --- /dev/null +++ b/src/components/pages/closing/tab/SapronakClosingTab.tsx @@ -0,0 +1,32 @@ +'use client'; + +import IncomingSapronaksTable from '@/components/pages/closing/table/IncomingSapronaksTable'; +import OutgoingSapronaksTable from '@/components/pages/closing/table/OutgoingSapronaksTable'; +import IncomingSapronaksSummaryTable from '@/components/pages/closing/table/IncomingSapronaksSummaryTable'; +import ClosingOutgoingSapronaksSummaryTable from '../table/OutgoingSapronaksSummaryTable'; + +interface SapronakClosingTabProps { + projectFlockId?: number; +} + +const SapronakClosingTab = ({ projectFlockId }: SapronakClosingTabProps) => { + return ( +
+ {projectFlockId && ( + <> + + + + + + + + + )} +
+ ); +}; + +export default SapronakClosingTab; diff --git a/src/components/pages/closing/table/ClosingFinanceTable.tsx b/src/components/pages/closing/table/FinanceClosingTable.tsx similarity index 99% rename from src/components/pages/closing/table/ClosingFinanceTable.tsx rename to src/components/pages/closing/table/FinanceClosingTable.tsx index 6225f5e7..8dce38de 100644 --- a/src/components/pages/closing/table/ClosingFinanceTable.tsx +++ b/src/components/pages/closing/table/FinanceClosingTable.tsx @@ -8,7 +8,7 @@ import { useSearchParams } from 'next/navigation'; import { useMemo } from 'react'; import useSWR from 'swr'; -const ClosingFinanceTable = ({ +const FinanceClosingTable = ({ projectFlockId, }: { projectFlockId: number; @@ -396,4 +396,4 @@ const ClosingFinanceTable = ({ ); }; -export default ClosingFinanceTable; +export default FinanceClosingTable; diff --git a/src/components/pages/closing/table/HppExpeditionReportTable.tsx b/src/components/pages/closing/table/HppExpeditionClosingTable.tsx similarity index 95% rename from src/components/pages/closing/table/HppExpeditionReportTable.tsx rename to src/components/pages/closing/table/HppExpeditionClosingTable.tsx index da89d963..2229180e 100644 --- a/src/components/pages/closing/table/HppExpeditionReportTable.tsx +++ b/src/components/pages/closing/table/HppExpeditionClosingTable.tsx @@ -7,14 +7,14 @@ import Card from '@/components/Card'; import { formatCurrency } from '@/lib/helper'; import { BaseHppExpedition, BaseExpeditionCost } from '@/types/api/closing'; -interface HppExpeditionReportTableProps { +interface HppExpeditionClosingTableProps { type?: 'detail'; initialValues?: BaseHppExpedition; } -const HppExpeditionReportTable = ({ +const HppExpeditionClosingTable = ({ initialValues, -}: HppExpeditionReportTableProps) => { +}: HppExpeditionClosingTableProps) => { const costOfRevenueExpeditionData: BaseExpeditionCost[] = useMemo(() => { return initialValues?.expedition_costs || []; }, [initialValues]); @@ -106,4 +106,4 @@ const HppExpeditionReportTable = ({ ); }; -export default HppExpeditionReportTable; +export default HppExpeditionClosingTable; diff --git a/src/components/pages/closing/table/ClosingIncomingSapronaksSummaryTable.tsx b/src/components/pages/closing/table/IncomingSapronaksSummaryTable.tsx similarity index 100% rename from src/components/pages/closing/table/ClosingIncomingSapronaksSummaryTable.tsx rename to src/components/pages/closing/table/IncomingSapronaksSummaryTable.tsx diff --git a/src/components/pages/closing/table/ClosingIncomingSapronaksTable.tsx b/src/components/pages/closing/table/IncomingSapronaksTable.tsx similarity index 100% rename from src/components/pages/closing/table/ClosingIncomingSapronaksTable.tsx rename to src/components/pages/closing/table/IncomingSapronaksTable.tsx diff --git a/src/components/pages/closing/table/ClosingOutgoingSapronaksSummaryTable.tsx b/src/components/pages/closing/table/OutgoingSapronaksSummaryTable.tsx similarity index 100% rename from src/components/pages/closing/table/ClosingOutgoingSapronaksSummaryTable.tsx rename to src/components/pages/closing/table/OutgoingSapronaksSummaryTable.tsx diff --git a/src/components/pages/closing/table/ClosingOutgoingSapronaksTable.tsx b/src/components/pages/closing/table/OutgoingSapronaksTable.tsx similarity index 100% rename from src/components/pages/closing/table/ClosingOutgoingSapronaksTable.tsx rename to src/components/pages/closing/table/OutgoingSapronaksTable.tsx diff --git a/src/components/pages/closing/table/ClosingOverheadTable.tsx b/src/components/pages/closing/table/OverheadClosingTable.tsx similarity index 98% rename from src/components/pages/closing/table/ClosingOverheadTable.tsx rename to src/components/pages/closing/table/OverheadClosingTable.tsx index a7a170eb..f082697a 100644 --- a/src/components/pages/closing/table/ClosingOverheadTable.tsx +++ b/src/components/pages/closing/table/OverheadClosingTable.tsx @@ -15,17 +15,17 @@ import { useSearchParams } from 'next/navigation'; import { useMemo } from 'react'; import useSWR from 'swr'; -interface ClosingOverheadTableProps { +interface OverheadClosingTableProps { projectFlockId: number; generalInformation?: ClosingGeneralInformation; kandangData?: ProjectFlockKandang; } -const ClosingOverheadTable = ({ +const OverheadClosingTable = ({ projectFlockId, generalInformation, kandangData, -}: ClosingOverheadTableProps) => { +}: OverheadClosingTableProps) => { const searchParams = useSearchParams(); const kandangId = searchParams.get('kandangId'); @@ -302,4 +302,4 @@ const ClosingOverheadTable = ({ ); }; -export default ClosingOverheadTable; +export default OverheadClosingTable; diff --git a/src/components/pages/closing/table/SalesReportTable.tsx b/src/components/pages/closing/table/SalesClosingTable.tsx similarity index 98% rename from src/components/pages/closing/table/SalesReportTable.tsx rename to src/components/pages/closing/table/SalesClosingTable.tsx index 0632676b..b30cfb4a 100644 --- a/src/components/pages/closing/table/SalesReportTable.tsx +++ b/src/components/pages/closing/table/SalesClosingTable.tsx @@ -14,12 +14,12 @@ import { Product } from '@/types/api/master-data/product'; import { Customer } from '@/types/api/master-data/customer'; import { Kandang } from '@/types/api/master-data/kandang'; -interface SalesReportTableProps { +interface SalesClosingTableProps { type?: 'detail'; initialValues?: BaseClosingSales; } -const SalesReportTable = ({ initialValues }: SalesReportTableProps) => { +const SalesClosingTable = ({ initialValues }: SalesClosingTableProps) => { const salesData: BaseSales[] = useMemo(() => { return initialValues?.sales || []; }, [initialValues]); @@ -330,4 +330,4 @@ const SalesReportTable = ({ initialValues }: SalesReportTableProps) => { ); }; -export default SalesReportTable; +export default SalesClosingTable; diff --git a/src/components/pages/closing/table/ClosingSapronakCalculationTable.tsx b/src/components/pages/closing/table/SapronakCalculationClosingTable.tsx similarity index 97% rename from src/components/pages/closing/table/ClosingSapronakCalculationTable.tsx rename to src/components/pages/closing/table/SapronakCalculationClosingTable.tsx index 77cef803..ba92c3d0 100644 --- a/src/components/pages/closing/table/ClosingSapronakCalculationTable.tsx +++ b/src/components/pages/closing/table/SapronakCalculationClosingTable.tsx @@ -16,15 +16,15 @@ import { isResponseSuccess } from '@/lib/api-helper'; import { ClosingGeneralInformation } from '@/types/api/closing'; import { useSearchParams } from 'next/navigation'; -interface ClosingSapronakCalculationTableProps { +interface SapronakCalculationClosingTableProps { projectFlockId: number; closingGeneralInformation?: ClosingGeneralInformation; } -const ClosingSapronakCalculationTable = ({ +const SapronakCalculationClosingTable = ({ projectFlockId, closingGeneralInformation, -}: ClosingSapronakCalculationTableProps) => { +}: SapronakCalculationClosingTableProps) => { const searchParams = useSearchParams(); const kandangId = searchParams.get('kandangId'); @@ -265,4 +265,4 @@ const ClosingSapronakCalculationTable = ({ ); }; -export default ClosingSapronakCalculationTable; +export default SapronakCalculationClosingTable;