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

src/components/pages/closing/ClosingOverheadTable.tsx

@@ -5,21 +5,27 @@ import { cn, formatCurrency, formatDate, formatNumber } from '@/lib/helper';
 import { ClosingApi } from '@/services/api/closing';
 import { Overhead, OverheadTotal } from '@/types/api/closing';
 import { ColumnDef } from '@tanstack/react-table';
+import { useSearchParams } from 'next/navigation';
 import { useMemo } from 'react';
 import useSWR from 'swr';
 
 interface ClosingOverheadTableProps {
-  type?: 'detail';
   projectFlockId: number;
 }
 
 const ClosingOverheadTable = ({
-  type,
   projectFlockId,
 }: ClosingOverheadTableProps) => {
+  const searchParams = useSearchParams();
+  const kandangId = searchParams.get('kandangId');
+
   const { data: overhead, isLoading: isLoadingOverhead } = useSWR(
-    `${ClosingApi.basePath}/${projectFlockId}/overhead`,
+    `${ClosingApi.basePath}/${projectFlockId}${kandangId ? `/${kandangId}` : ''}/overhead`,
-    () => ClosingApi.getOverhead(projectFlockId),
+    () =>
+      ClosingApi.getOverhead(
+        projectFlockId,
+        kandangId ? Number(kandangId) : undefined
+      ),
     {
       keepPreviousData: true,
     }
@@ -148,6 +154,7 @@ const ClosingOverheadTable = ({
               'whitespace-nowrap'
             ),
           }}
+          isLoading={isLoadingOverhead}
           renderFooter={
             isResponseSuccess(overhead)
               ? overhead.data?.overheads.length > 0

src/services/api/closing.ts

@@ -131,10 +131,11 @@ export class ClosingApiService extends BaseApiService<Closing, null, null> {
   }
 
   async getOverhead(
-    id: number
+    id: number,
+    kandangId?: number
   ): Promise<BaseApiResponse<ClosingOverhead> | undefined> {
     try {
-      const path = `${this.basePath}/${id}/overhead`;
+      const path = `${this.basePath}/${id}${kandangId ? `/${kandangId}` : ''}/overhead`;
       return await httpClient<BaseApiResponse<ClosingOverhead>>(path, {
         method: 'GET',
       });