Merge branch 'development' of gitlab.com:mbugroup/lti-web-client into dev/restu

src/components/pages/report/finance/tab/DebtSupplierTab.tsx

@@ -13,7 +13,6 @@ import Table from '@/components/Table';
 import { isResponseSuccess } from '@/lib/api-helper';
 import { formatCurrency, formatDate, formatNumber } from '@/lib/helper';
 import { SupplierApi } from '@/services/api/master-data';
-import { FinanceApi } from '@/services/api/report/finance-report';
 import { DebtRow, DebtSupplier } from '@/types/api/report/debt-supplier';
 import { generateDebtSupplierExcel } from '@/components/pages/report/finance/export/DebtSupplierExportXLSX';
 import { generateDebtSupplierPDF } from '@/components/pages/report/finance/export/DebtSupllierExportPDF';
@@ -23,6 +22,7 @@ import { useCallback, useMemo, useState } from 'react';
 import toast from 'react-hot-toast';
 import useSWR from 'swr';
 import Pagination from '@/components/Pagination';
+import { DebtSupplierApi } from '@/services/api/report/debt-supplier';
 
 const DebtSupplierTab = () => {
   // ===== STATE MANAGEMENT =====
@@ -41,7 +41,7 @@ const DebtSupplierTab = () => {
   const [filterSupplier, setFilterSupplier] = useState<OptionType[]>([]);
   const [filterStartDate, setFilterStartDate] = useState('');
   const [filterEndDate, setFilterEndDate] = useState('');
-  const [filterDataType, setFilterDataType] = useState<OptionType>();
+  const [filterDateType, setFilterDateType] = useState<OptionType>();
   const [filterErrors, setFilterErrors] = useState<Record<string, string>>({});
 
   const filterModal = useModal();
@@ -96,7 +96,7 @@ const DebtSupplierTab = () => {
               filterSupplier.length > 0
                 ? filterSupplier.map((v) => String(v.value)).join(',')
                 : undefined,
-            filter_by: filterDataType?.value || 'received_date',
+            filter_by: filterDateType?.value,
             start_date: filterStartDate || undefined,
             end_date: filterEndDate || undefined,
             page: currentPage,
@@ -107,7 +107,7 @@ const DebtSupplierTab = () => {
         }
       : null,
     ([, params]) =>
-      FinanceApi.getDebtSupplierReport(
+      DebtSupplierApi.getDebtSupplierReport(
         params.supplier_ids,
         params.filter_by?.toString(),
         params.start_date,
@@ -116,9 +116,6 @@ const DebtSupplierTab = () => {
         params.limit
       )
   );
-  // const { data: debtSupplier, isLoading } = useSWR(FinanceApi.basePath, () =>
-  //   FinanceApi.getDebtSupplierReport()
-  // );
 
   const data: DebtSupplier[] = useMemo(
     () =>
@@ -141,15 +138,15 @@ const DebtSupplierTab = () => {
         filterSupplier.length > 0
           ? filterSupplier.map((v) => String(v.value)).join(',')
           : undefined,
-      filter_by: 'received_date' as const,
+      filter_by: filterDateType?.value?.toString(),
       start_date: filterStartDate || undefined,
       end_date: filterEndDate || undefined,
-      date_type: filterDataType ? filterDataType.value : undefined,
+      date_type: filterDateType ? filterDateType.value : undefined,
       limit: 100,
       page: 1,
     };
 
-    const response = await FinanceApi.getDebtSupplierReport(
+    const response = await DebtSupplierApi.getDebtSupplierReport(
       params.supplier_ids,
       params.filter_by,
       params.start_date,
@@ -602,11 +599,12 @@ const DebtSupplierTab = () => {
                 label='Filter Berdasarkan'
                 placeholder='Pilih Filter Berdasarkan'
                 options={dataTypeOptions}
-                value={filterDataType}
+                value={filterDateType}
                 onChange={(val) => {
-                  setFilterDataType(val ? (val as OptionType) : undefined);
+                  setFilterDateType(val ? (val as OptionType) : undefined);
                 }}
                 className={{ wrapper: 'w-full' }}
+                isClearable
               />
             </div>
           </div>