fixing disable field detail

accuracy

.gitlab-ci.yml

@@ -15,7 +15,7 @@ default:
 # ==========================================================
 .build_template: &build_template
   stage: build
-  image: node:20-alpine
+  image: public.ecr.aws/docker/library/node:20-alpine
   cache:
     key: npm-cache
     paths:
@@ -56,7 +56,7 @@ default:
 .deploy_template: &deploy_template
   stage: deploy
   image:
-    name: amazon/aws-cli:latest
+    name: public.ecr.aws/aws-cli/aws-cli:latest
     entrypoint: ['/bin/sh', '-c']
   script:
     - set -e
@@ -183,3 +183,31 @@ deploy:staging:
   environment:
     name: staging
     url: https://stg-lti-erp.mbugroup.id
+
+# ==========================================================
+# ====== STAGING (Branch production) ======
+# ==========================================================
+build:production:
+  <<: *build_template
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "production"'
+  environment:
+    name: staging
+  variables:
+    NEXT_PUBLIC_LTI_URL: 'https://lti-erp.mbugroup.id'
+    NEXT_PUBLIC_SSO_LOGIN_URL: 'https://auth-erp.mbugroup.id'
+    NEXT_PUBLIC_API_BASE_URL: 'https://api-lti.mbugroup.id/api'
+    NEXT_PUBLIC_CLIENT_ID: 'Lumbung-Telur-Indonesia'
+
+deploy:production:
+  <<: *deploy_template
+  needs: ['build:production']
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "production"'
+  variables:
+    S3_BUCKET: 'production-lti-erp.mbugroup.id'
+    AWS_REGION: 'ap-southeast-3'
+    CLOUDFRONT_DISTRIBUTION_ID: 'E1SSLXKYYITASJ'
+  environment:
+    name: staging
+    url: https://lti-erp.mbugroup.id

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20-alpine
+FROM public.ecr.aws/docker/library/node:20-alpine
 
 RUN apk add --no-cache git bash build-base curl
 

package.json

@@ -8,7 +8,8 @@
     "start": "next start",
     "lint": "eslint",
     "prepare": "husky",
-    "format": "prettier --write ."
+    "format": "prettier --write .",
+    "pre-commit": "npm run format && npm run lint && npx tsc --noEmit && npm run build"
   },
   "dependencies": {
     "@react-pdf/renderer": "^4.3.1",

src/app/closing/detail/page.tsx

@@ -3,11 +3,10 @@
 import { useRouter, useSearchParams } from 'next/navigation';
 import useSWR from 'swr';
 
-import ClosingDetail from '@/components/pages/closing/ClosingDetail';
+import ClosingDetail from '@/components/pages/closing/ClosingDetailTabs';
 
 import { ClosingApi } from '@/services/api/closing';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
-import { FlockApi } from '@/services/api/master-data';
 import { ProjectFlockApi } from '@/services/api/production/project-flock';
 import { ProjectFlockKandangApi } from '@/services/api/production';
 
@@ -34,33 +33,6 @@ const ClosingDetailPage = () => {
     () => ProjectFlockKandangApi.getSingle(Number(kandangId))
   );
 
-  const { data: salesData, isLoading: isLoadingSales } = useSWR(
-    kandangId
-      ? `sales-${closingId}-${kandangId}`
-      : closingId
-        ? `sales-${closingId}`
-        : null,
-    () =>
-      kandangId
-        ? ClosingApi.getPenjualanByKandang(Number(closingId), Number(kandangId))
-        : ClosingApi.getPenjualan(Number(closingId))
-  );
-
-  const { data: hppEkspedisiData, isLoading: isLoadingHppEkspedisi } = useSWR(
-    kandangId
-      ? `hpp-ekspedisi-${closingId}-${kandangId}`
-      : closingId
-        ? `hpp-ekspedisi-${closingId}`
-        : null,
-    () =>
-      kandangId
-        ? ClosingApi.getHppEkspedisiByKandang(
-            Number(closingId),
-            Number(kandangId)
-          )
-        : ClosingApi.getHppEkspedisi(Number(closingId))
-  );
-
   if (!closingId) {
     router.back();
 
@@ -76,12 +48,7 @@ const ClosingDetailPage = () => {
     return;
   }
 
-  const isLoading =
-    isLoadingClosing ||
-    isLoadingSales ||
-    isLoadingHppEkspedisi ||
-    isLoadingProject ||
-    isLoadingKandang;
+  const isLoading = isLoadingClosing || isLoadingProject || isLoadingKandang;
 
   return (
     <div className='w-full p-4 flex flex-row justify-center'>
@@ -91,12 +58,6 @@ const ClosingDetailPage = () => {
         <ClosingDetail
           id={Number(closingId)}
           initialValue={closing.data}
-          salesData={isResponseSuccess(salesData) ? salesData.data : undefined}
-          hppExpeditionData={
-            isResponseSuccess(hppEkspedisiData)
-              ? hppEkspedisiData.data
-              : undefined
-          }
           projectData={
             isResponseSuccess(projectData) ? projectData.data : undefined
           }

src/app/closing/page.tsx

@@ -2,7 +2,7 @@ import ClosingsTable from '@/components/pages/closing/ClosingsTable';
 
 const Closing = () => {
   return (
-    <section className='w-full p-4'>
+    <section className='w-full p-3'>
       <ClosingsTable />
     </section>
   );

src/app/daily-checklist/master-data/kandang/page.tsx

@@ -0,0 +1,11 @@
+import { MasterKandangContent } from '@/figma-make/components/pages/master-data/kandang/MasterKandangContent';
+
+const MasterKandangPage = () => {
+  return (
+    <section className='w-full'>
+      <MasterKandangContent />
+    </section>
+  );
+};
+
+export default MasterKandangPage;

src/app/finance/detail/edit/page.tsx

@@ -5,7 +5,6 @@ import useSWR from 'swr';
 import { FinanceApi } from '@/services/api/finance';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 import FormFinanceAdd from '@/components/pages/finance/add/FormFinanceAdd';
-import FormFinanceAddInitialBalance from '@/components/pages/finance/add/initial-balance/FormFinanceAddInitialBalance';
 
 const EditFinanceTransactionPage = () => {
   const router = useRouter();

src/app/finance/detail/page.tsx

@@ -4,7 +4,7 @@ import FinanceDetail from '@/components/pages/finance/FinanceDetail';
 import useSWR from 'swr';
 import { useRouter, useSearchParams } from 'next/navigation';
 import { FinanceApi } from '@/services/api/finance';
-import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
+import { isResponseSuccess } from '@/lib/api-helper';
 
 const FinanceDetailPage = () => {
   const router = useRouter();

src/app/finance/page.tsx

@@ -3,12 +3,7 @@
 import FinanceTable from '@/components/pages/finance/FinanceTable';
 
 const Finance = () => {
-  return (
-    <section className='size-full p-6'>
-      <div className='flex flex-row gap-4'></div>
-      <FinanceTable />
-    </section>
-  );
+  return <FinanceTable />;
 };
 
 export default Finance;

src/app/globals.css

@@ -68,6 +68,8 @@
 
   --shadow-button-soft:
     0 3px 2px -2px var(--color-base-200), 0 4px 3px -2px var(--color-base-200);
+
+  --shadow-bg: 0px -2px 4px 0px #00000014;
 }
 
 html {

src/app/inventory/adjustment/page.tsx

@@ -2,7 +2,7 @@ import InventoryAdjustmentTable from '@/components/pages/inventory/adjustment/In
 
 const InventoryAdjustment = () => {
   return (
-    <section className='w-full p-4'>
+    <section className='w-full'>
       <InventoryAdjustmentTable />
     </section>
   );

src/app/marketing/add/delivery-orders/layout.tsx

@@ -1,11 +0,0 @@
-import SuspenseHelper from '@/components/helper/SuspenseHelper';
-
-const Layout = ({
-  children,
-}: Readonly<{
-  children: React.ReactNode;
-}>) => {
-  return <SuspenseHelper>{children}</SuspenseHelper>;
-};
-
-export default Layout;

src/app/marketing/add/delivery-orders/page.tsx

@@ -1,54 +0,0 @@
-'use client';
-
-import MarketingForm from '@/components/pages/marketing/form/MarketingForm';
-import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
-import { MarketingApi } from '@/services/api/marketing/marketing';
-import { useRouter, useSearchParams } from 'next/navigation';
-import toast from 'react-hot-toast';
-import useSWR from 'swr';
-
-const EditMarketingDelivery = () => {
-  const router = useRouter();
-  const searchParams = useSearchParams();
-
-  const soId = searchParams.get('marketingId');
-
-  const {
-    data: marketing,
-    isLoading: isLoading,
-    mutate: refreshMarketing,
-  } = useSWR(`get-so-${soId}`, () =>
-    MarketingApi.getSingle(soId ? parseInt(soId) : 0)
-  );
-
-  if (!soId) {
-    router.back();
-
-    return (
-      <div className='w-full flex flex-row justify-center items-center p-4'>
-        <span className='loading loading-spinner loading-xl' />
-      </div>
-    );
-  }
-
-  if (!isLoading && (!marketing || isResponseError(marketing))) {
-    router.replace('/404');
-    return;
-  }
-
-  return (
-    <div className='w-full p-4'>
-      {isLoading && <span className='loading loading-spinner loading-xl' />}
-      {!isLoading && isResponseSuccess(marketing) && (
-        <MarketingForm
-          formType='add_deliver'
-          initialValues={marketing.data}
-          afterSubmit={() => {
-            refreshMarketing();
-          }}
-        />
-      )}
-    </div>
-  );
-};
-export default EditMarketingDelivery;

src/app/marketing/add/sales-orders/page.tsx

@@ -1,11 +0,0 @@
-import MarketingForm from '@/components/pages/marketing/form/MarketingForm';
-
-const AddSalesOrder = () => {
-  return (
-    <div className='size-full p-4'>
-      <MarketingForm formType='add' />
-    </div>
-  );
-};
-
-export default AddSalesOrder;

src/app/marketing/detail/delivery-orders/edit/layout.tsx

@@ -1,11 +0,0 @@
-import SuspenseHelper from '@/components/helper/SuspenseHelper';
-
-const Layout = ({
-  children,
-}: Readonly<{
-  children: React.ReactNode;
-}>) => {
-  return <SuspenseHelper>{children}</SuspenseHelper>;
-};
-
-export default Layout;

src/app/marketing/detail/delivery-orders/edit/page.tsx

@@ -1,62 +0,0 @@
-'use client';
-
-import MarketingForm from '@/components/pages/marketing/form/MarketingForm';
-import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
-import { MarketingApi } from '@/services/api/marketing/marketing';
-import { useRouter, useSearchParams } from 'next/navigation';
-import toast from 'react-hot-toast';
-import useSWR from 'swr';
-
-const EditMarketingDelivery = () => {
-  const router = useRouter();
-  const searchParams = useSearchParams();
-
-  const soId = searchParams.get('marketingId');
-
-  const {
-    data: marketing,
-    isLoading: isLoading,
-    mutate: refreshMarketing,
-  } = useSWR(`get-so-${soId}`, () =>
-    MarketingApi.getSingle(soId ? parseInt(soId) : 0)
-  );
-
-  if (!soId) {
-    router.back();
-
-    return (
-      <div className='w-full flex flex-row justify-center items-center p-4'>
-        <span className='loading loading-spinner loading-xl' />
-      </div>
-    );
-  }
-
-  if (!isLoading && (!marketing || isResponseError(marketing))) {
-    router.replace('/404');
-    return;
-  }
-
-  if (
-    isResponseSuccess(marketing) &&
-    marketing.data.latest_approval.step_number != 3
-  ) {
-    toast.error('Data Marketing perlu dilakukan approval terlebih dahulu!');
-    router.back();
-  }
-
-  return (
-    <div className='w-full p-4'>
-      {isLoading && <span className='loading loading-spinner loading-xl' />}
-      {!isLoading && isResponseSuccess(marketing) && (
-        <MarketingForm
-          formType='edit_deliver'
-          initialValues={marketing.data}
-          afterSubmit={() => {
-            refreshMarketing();
-          }}
-        />
-      )}
-    </div>
-  );
-};
-export default EditMarketingDelivery;

src/app/marketing/detail/layout.tsx

@@ -1,11 +0,0 @@
-import SuspenseHelper from '@/components/helper/SuspenseHelper';
-
-const Layout = ({
-  children,
-}: Readonly<{
-  children: React.ReactNode;
-}>) => {
-  return <SuspenseHelper>{children}</SuspenseHelper>;
-};
-
-export default Layout;

src/app/marketing/detail/page.tsx

@@ -1,49 +0,0 @@
-'use client';
-
-import MarketingDetail from '@/components/pages/marketing/detail/MarketingDetail';
-import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
-import { MarketingApi } from '@/services/api/marketing/marketing';
-import { useRouter, useSearchParams } from 'next/navigation';
-import useSWR from 'swr';
-
-const DetailMarketing = () => {
-  const router = useRouter();
-  const searchParams = useSearchParams();
-
-  const soId = searchParams.get('marketingId');
-
-  const {
-    data: marketing,
-    isLoading: isLoading,
-    mutate: refreshMarketing,
-  } = useSWR(soId, (id: number) => MarketingApi.getSingle(id));
-
-  if (!soId) {
-    router.back();
-
-    return (
-      <div className='w-full flex flex-row justify-center items-center p-4'>
-        <span className='loading loading-spinner loading-xl' />
-      </div>
-    );
-  }
-
-  if (!isLoading && (!marketing || isResponseError(marketing))) {
-    router.replace('/404');
-    return;
-  }
-
-  return (
-    <div className='w-full p-4'>
-      {isLoading && <span className='loading loading-spinner loading-xl' />}
-      {!isLoading && isResponseSuccess(marketing) && (
-        <MarketingDetail
-          initialValues={marketing.data}
-          refresh={refreshMarketing}
-        />
-      )}
-    </div>
-  );
-};
-
-export default DetailMarketing;

src/app/marketing/detail/sales-orders/edit/layout.tsx

@@ -1,11 +0,0 @@
-import SuspenseHelper from '@/components/helper/SuspenseHelper';
-
-const Layout = ({
-  children,
-}: Readonly<{
-  children: React.ReactNode;
-}>) => {
-  return <SuspenseHelper>{children}</SuspenseHelper>;
-};
-
-export default Layout;

src/app/marketing/detail/sales-orders/edit/page.tsx

@@ -1,52 +0,0 @@
-'use client';
-
-import MarketingForm from '@/components/pages/marketing/form/MarketingForm';
-import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
-import { MarketingApi } from '@/services/api/marketing/marketing';
-import { useRouter, useSearchParams } from 'next/navigation';
-import useSWR from 'swr';
-
-const EditSalesOrder = () => {
-  const router = useRouter();
-  const searchParams = useSearchParams();
-
-  const soId = searchParams.get('marketingId');
-
-  const {
-    data: marketing,
-    isLoading: isLoading,
-    mutate: refreshMarketing,
-  } = useSWR(`get-so-${soId}`, () =>
-    MarketingApi.getSingle(soId ? parseInt(soId) : 0)
-  );
-
-  if (!soId) {
-    router.back();
-
-    return (
-      <div className='w-full flex flex-row justify-center items-center p-4'>
-        <span className='loading loading-spinner loading-xl' />
-      </div>
-    );
-  }
-
-  if (!isLoading && (!marketing || isResponseError(marketing))) {
-    router.replace('/404');
-    return;
-  }
-  return (
-    <div className='w-full p-4'>
-      {isLoading && <span className='loading loading-spinner loading-xl' />}
-      {!isLoading && isResponseSuccess(marketing) && (
-        <MarketingForm
-          formType='edit'
-          initialValues={marketing.data}
-          afterSubmit={() => {
-            refreshMarketing();
-          }}
-        />
-      )}
-    </div>
-  );
-};
-export default EditSalesOrder;

src/app/master-data/area/page.tsx

@@ -1,11 +1,7 @@
 import AreasTable from '@/components/pages/master-data/area/AreasTable';
 
 const Nonstock = () => {
-  return (
-    <section className='w-full p-4'>
-      <AreasTable />
-    </section>
-  );
+  return <AreasTable />;
 };
 
 export default Nonstock;

src/app/master-data/bank/page.tsx

@@ -1,11 +1,7 @@
 import BanksTable from '@/components/pages/master-data/bank/BanksTable';
 
 const Bank = () => {
-  return (
-    <section className='w-full p-4'>
-      <BanksTable />
-    </section>
-  );
+  return <BanksTable />;
 };
 
 export default Bank;

src/app/master-data/customer/page.tsx

@@ -1,11 +1,7 @@
 import CustomersTable from '@/components/pages/master-data/customer/CustomersTable';
 
 const Customer = () => {
-  return (
-    <section className='w-full p-4'>
-      <CustomersTable />
-    </section>
-  );
+  return <CustomersTable />;
 };
 
 export default Customer;

src/app/master-data/fcr/add/page.tsx

@@ -1,11 +0,0 @@
-import FcrForm from '@/components/pages/master-data/fcr/form/FcrForm';
-
-const AddFcr = () => {
-  return (
-    <div className='w-full p-4 flex flex-row justify-center'>
-      <FcrForm />
-    </div>
-  );
-};
-
-export default AddFcr;

src/app/master-data/fcr/detail/edit/page.tsx

@@ -1,52 +0,0 @@
-'use client';
-
-import { useRouter, useSearchParams } from 'next/navigation';
-import useSWR from 'swr';
-
-import FcrForm from '@/components/pages/master-data/fcr/form/FcrForm';
-
-import { FcrApi } from '@/services/api/master-data';
-import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
-import { BaseApiResponse } from '@/types/api/api-general';
-import { FcrWithStandards } from '@/types/api/master-data/fcr';
-
-const FcrEdit = () => {
-  const router = useRouter();
-  const searchParams = useSearchParams();
-
-  const fcrId = searchParams.get('fcrId');
-
-  const { data: fcr, isLoading: isLoadingFcr } = useSWR(
-    fcrId,
-    (id: number) =>
-      FcrApi.getSingle(id) as Promise<
-        BaseApiResponse<FcrWithStandards> | undefined
-      >
-  );
-
-  if (!fcrId) {
-    router.back();
-
-    return (
-      <div className='w-full flex flex-row justify-center items-center p-4'>
-        <span className='loading loading-spinner loading-xl' />
-      </div>
-    );
-  }
-
-  if (!isLoadingFcr && (!fcr || isResponseError(fcr))) {
-    router.replace('/404');
-    return;
-  }
-
-  return (
-    <div className='w-full p-4 flex flex-row justify-center'>
-      {isLoadingFcr && <span className='loading loading-spinner loading-xl' />}
-      {!isLoadingFcr && isResponseSuccess(fcr) && (
-        <FcrForm type='edit' initialValues={fcr.data} />
-      )}
-    </div>
-  );
-};
-
-export default FcrEdit;

src/app/master-data/fcr/detail/layout.tsx

@@ -1,11 +0,0 @@
-import SuspenseHelper from '@/components/helper/SuspenseHelper';
-
-const Layout = ({
-  children,
-}: Readonly<{
-  children: React.ReactNode;
-}>) => {
-  return <SuspenseHelper>{children}</SuspenseHelper>;
-};
-
-export default Layout;

src/app/master-data/fcr/detail/page.tsx

@@ -1,52 +0,0 @@
-'use client';
-
-import { useRouter, useSearchParams } from 'next/navigation';
-import useSWR from 'swr';
-
-import FcrForm from '@/components/pages/master-data/fcr/form/FcrForm';
-
-import { FcrApi } from '@/services/api/master-data';
-import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
-import { FcrWithStandards } from '@/types/api/master-data/fcr';
-import { BaseApiResponse } from '@/types/api/api-general';
-
-const FcrDetail = () => {
-  const router = useRouter();
-  const searchParams = useSearchParams();
-
-  const fcrId = searchParams.get('fcrId');
-
-  const { data: fcr, isLoading: isLoadingFcr } = useSWR(
-    fcrId,
-    (id: number) =>
-      FcrApi.getSingle(id) as Promise<
-        BaseApiResponse<FcrWithStandards> | undefined
-      >
-  );
-
-  if (!fcrId) {
-    router.back();
-
-    return (
-      <div className='w-full flex flex-row justify-center items-center p-4'>
-        <span className='loading loading-spinner loading-xl' />
-      </div>
-    );
-  }
-
-  if (!isLoadingFcr && (!fcr || isResponseError(fcr))) {
-    router.replace('/404');
-    return;
-  }
-
-  return (
-    <div className='w-full p-4 flex flex-row justify-center'>
-      {isLoadingFcr && <span className='loading loading-spinner loading-xl' />}
-      {!isLoadingFcr && isResponseSuccess(fcr) && (
-        <FcrForm type='detail' initialValues={fcr.data} />
-      )}
-    </div>
-  );
-};
-
-export default FcrDetail;

src/app/master-data/fcr/page.tsx

@@ -1,11 +0,0 @@
-import FcrsTable from '@/components/pages/master-data/fcr/FcrsTable';
-
-const Fcr = () => {
-  return (
-    <section className='w-full p-4'>
-      <FcrsTable />
-    </section>
-  );
-};
-
-export default Fcr;

src/app/master-data/flock/page.tsx

@@ -1,11 +1,7 @@
 import FlockTable from '@/components/pages/master-data/flock/FlocksTable';
 
 const Flock = () => {
-  return (
-    <section className='w-full p-4'>
-      <FlockTable />
-    </section>
-  );
+  return <FlockTable />;
 };
 
 export default Flock;

src/app/master-data/kandang/page.tsx

@@ -1,11 +1,7 @@
 import KandangsTable from '@/components/pages/master-data/kandang/KandangsTable';
 
 const Nonstock = () => {
-  return (
-    <section className='w-full p-4'>
-      <KandangsTable />
-    </section>
-  );
+  return <KandangsTable />;
 };
 
 export default Nonstock;

src/app/master-data/location/page.tsx

@@ -1,11 +1,7 @@
 import LocationsTable from '@/components/pages/master-data/location/LocationsTable';
 
 const Nonstock = () => {
-  return (
-    <section className='w-full p-4'>
-      <LocationsTable />
-    </section>
-  );
+  return <LocationsTable />;
 };
 
 export default Nonstock;

src/app/master-data/nonstock/page.tsx

@@ -1,11 +1,7 @@
 import NonstocksTable from '@/components/pages/master-data/nonstock/NonstocksTable';
 
 const Nonstock = () => {
-  return (
-    <section className='w-full p-4'>
-      <NonstocksTable />
-    </section>
-  );
+  return <NonstocksTable />;
 };
 
 export default Nonstock;

src/app/master-data/product-category/page.tsx

@@ -1,11 +1,7 @@
 import ProductCategoryTable from '@/components/pages/master-data/product-category/ProductCategoryTable';
 
 const ProductCategory = () => {
-  return (
-    <section className='w-full p-4'>
-      <ProductCategoryTable />
-    </section>
-  );
+  return <ProductCategoryTable />;
 };
 
 export default ProductCategory;

src/app/master-data/product/page.tsx

@@ -1,11 +1,7 @@
 import ProductsTable from '@/components/pages/master-data/product/ProductTable';
 
 const Product = () => {
-  return (
-    <section className='w-full p-4'>
-      <ProductsTable />
-    </section>
-  );
+  return <ProductsTable />;
 };
 
 export default Product;

src/app/master-data/production-standard/page.tsx

@@ -1,11 +1,7 @@
 import ProductionStandardTable from '@/components/pages/master-data/production-standard/ProductionStandardTable';
 
 const ProductionStandardPage = () => {
-  return (
-    <div className='w-full'>
-      <ProductionStandardTable />
-    </div>
-  );
+  return <ProductionStandardTable />;
 };
 
 export default ProductionStandardPage;

src/app/master-data/supplier/page.tsx

@@ -1,11 +1,7 @@
 import SuppliersTable from '@/components/pages/master-data/supplier/SupplierTable';
 
 const Supplier = () => {
-  return (
-    <section className='w-full p-4'>
-      <SuppliersTable />
-    </section>
-  );
+  return <SuppliersTable />;
 };
 
 export default Supplier;

src/app/master-data/uom/page.tsx

@@ -1,11 +1,7 @@
 import UomsTable from '@/components/pages/master-data/uom/UomsTable';
 
 const Nonstock = () => {
-  return (
-    <section className='w-full p-4'>
-      <UomsTable />
-    </section>
-  );
+  return <UomsTable />;
 };
 
 export default Nonstock;

src/app/master-data/warehouse/page.tsx

@@ -1,11 +1,7 @@
 import WarehousesTable from '@/components/pages/master-data/warehouse/WarehousesTable';
 
 const Warehouse = () => {
-  return (
-    <section className='w-full p-4'>
-      <WarehousesTable />
-    </section>
-  );
+  return <WarehousesTable />;
 };
 
 export default Warehouse;

src/app/page.tsx

@@ -3,10 +3,9 @@
 import { useEffect } from 'react';
 import { usePathname, useRouter } from 'next/navigation';
 import { useAuth } from '@/services/hooks/useAuth';
-import { redirectToSSO } from '@/lib/auth-helper';
 
 export default function Home() {
-  const { user, isLoadingUser } = useAuth();
+  const { isLoadingUser } = useAuth();
 
   const router = useRouter();
   const pathname = usePathname();

src/app/production/project-flock/add/page.tsx

@@ -1,8 +1,8 @@
 'use client';
 
 import ProjectFlockForm from '@/components/pages/production/project-flock/form/ProjectFlockForm';
-import React, { useImperativeHandle } from 'react';
-import toast from 'react-hot-toast';
+import React from 'react';
+// import React, { useImperativeHandle } from 'react';
 
 const AddProjectFlock = () => {
   // useImperativeHandle(ref, () => ({

src/app/production/project-flock/detail/edit/page.tsx

@@ -12,11 +12,10 @@ const ProjectFlockEdit = () => {
 
   const projectFlockId = searchParams.get('projectFlockId');
 
-  const {
-    data: projectFlock,
-    isLoading: isLoadingProjectFlock,
-    mutate: refreshProjectFlocks,
-  } = useSWR(projectFlockId, (id: number) => ProjectFlockApi.getSingle(id));
+  const { data: projectFlock, isLoading: isLoadingProjectFlock } = useSWR(
+    projectFlockId,
+    (id: number) => ProjectFlockApi.getSingle(id)
+  );
 
   if (!projectFlockId) {
     router.back();

src/app/production/project-flock/detail/page.tsx

@@ -1,7 +1,6 @@
 'use client';
 
 import ProjectFlockDetail from '@/components/pages/production/project-flock/detail/ProjectFlockDetail';
-import ProjectFlockForm from '@/components/pages/production/project-flock/form/ProjectFlockForm';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 import { ProjectFlockApi } from '@/services/api/production/project-flock';
 import { useRouter, useSearchParams } from 'next/navigation';
@@ -13,11 +12,10 @@ const ProjectFlockDetailPage = () => {
 
   const projectFlockId = searchParams.get('projectFlockId');
 
-  const {
-    data: projectFlock,
-    isLoading: isLoadingProjectFlock,
-    mutate: refreshProjectFlock,
-  } = useSWR(projectFlockId, (id: number) => ProjectFlockApi.getSingle(id));
+  const { data: projectFlock, isLoading: isLoadingProjectFlock } = useSWR(
+    projectFlockId,
+    (id: number) => ProjectFlockApi.getSingle(id)
+  );
 
   if (!projectFlockId) {
     router.back();

src/app/production/project-flock/layout.tsx

@@ -1,10 +1,10 @@
 'use client';
 
 import { usePathname, useRouter } from 'next/navigation';
-import Drawer from '@/components/Drawer';
-import React, { ReactNode } from 'react';
+import React, { ReactNode, useEffect } from 'react';
 import ProjectFlockTable from '@/components/pages/production/project-flock/ProjectFlockTable';
 import { useUiStore } from '@/stores/ui/ui.store';
+import Modal, { useModal } from '@/components/Modal';
 
 export default function ProjectFlockLayout({
   children,
@@ -23,9 +23,12 @@ export default function ProjectFlockLayout({
 
   const isOpen = isAdd || isEdit || isDetail || isChickin || isClosing;
 
+  const formModal = useModal();
+
   const handleBackdropClick = () => {
     const unsub = useUiStore.getState().subscribeIsValid((isValid) => {
       if (isValid) {
+        formModal.closeModal();
         unsub(); // berhenti listen
         router.push('/production/project-flock');
       }
@@ -34,6 +37,14 @@ export default function ProjectFlockLayout({
     toggleValidate();
   };
 
+  useEffect(() => {
+    if (isOpen && !formModal.open) {
+      formModal.openModal();
+    } else {
+      formModal.closeModal();
+    }
+  }, [isOpen]);
+
   return (
     <>
       {/* List page always rendered */}
@@ -43,18 +54,19 @@ export default function ProjectFlockLayout({
         />
       </div>
 
-      {/* Render Drawer only on /add */}
-      <Drawer
-        open={isOpen}
-        setOpen={(v) => {
-          if (!v) router.push('/production/project-flock');
-        }}
-        closeOnBackdropClick={isDetail ? true : false}
+      {/* Render Modal only on /add */}
+      <Modal
+        ref={formModal.ref}
+        position='end'
         onBackdropClick={handleBackdropClick}
-        variant='right'
-        zIndex='99999'
-        sidebarContent={isOpen && <div className=''>{children}</div>}
-      />
+        className={{
+          modalBox: 'w-full sm:w-fit p-3 rounded-xl bg-transparent shadow-none',
+        }}
+      >
+        <div className='w-full sm:w-[446px] h-full flex flex-col sm:flex-row items-stretch bg-base-100 rounded-xl overflow-hidden'>
+          {isOpen && children}
+        </div>
+      </Modal>
     </>
   );
 }

src/app/production/recording/page.tsx

@@ -2,7 +2,7 @@ import RecordingTable from '@/components/pages/production/recording/RecordingTab
 
 const Recording = () => {
   return (
-    <section className='w-full p-4 sm:p-0'>
+    <section className='w-full'>
       <RecordingTable />
     </section>
   );

src/app/report/expense/page.tsx

@@ -1,13 +1,9 @@
 'use client';
 
-import ReportExpenseTable from '@/components/pages/report/expense/ReportExpenseTable';
+import ReportExpenseTabs from '@/components/pages/report/expense/ReportExpenseTabs';
 
 const ReportExpense = () => {
-  return (
-    <div className='w-full p-4'>
-      <ReportExpenseTable />
-    </div>
-  );
+  return <ReportExpenseTabs />;
 };
 
 export default ReportExpense;

src/app/report/marketing/page.tsx

@@ -1,11 +1,7 @@
-import MarketingReportContent from '@/components/pages/report/MarketingReportContent';
+import MarketingReportContent from '@/components/pages/report/marketing/MarketingTabs';
 
 const MarketingReportPage = () => {
-  return (
-    <section className='w-full p-4'>
-      <MarketingReportContent />
-    </section>
-  );
+  return <MarketingReportContent />;
 };
 
 export default MarketingReportPage;

src/app/report/production-result/page.tsx

@@ -1,9 +1,9 @@
-import ProductionResultContent from '@/components/pages/report/production-result/ProductionResultContent';
+import ProductionResultTabs from '@/components/pages/report/production-result/ProductionResultTabs';
 
 const ProductionResultReportPage = () => {
   return (
-    <section className='w-full max-w-7xl pb-16'>
-      <ProductionResultContent />
+    <section className='w-full max-w-full'>
+      <ProductionResultTabs />
     </section>
   );
 };

src/components/Alert.tsx

@@ -1,15 +1,16 @@
-import { ReactNode } from 'react';
+import { ReactNode, Ref } from 'react';
 
 import { cn } from '@/lib/helper';
 
 interface AlertProps {
+  ref?: Ref<HTMLDivElement> | undefined;
   variant?: 'outline' | 'dash' | 'soft';
   color?: 'info' | 'success' | 'warning' | 'error';
   children?: ReactNode;
   className?: string;
 }
 
-const Alert = ({ children, variant, color, className }: AlertProps) => {
+const Alert = ({ children, ref, variant, color, className }: AlertProps) => {
   const alertBaseClassName = cn('alert', {
     'alert-soft': variant === 'soft',
     'alert-outline': variant === 'outline',
@@ -21,7 +22,11 @@ const Alert = ({ children, variant, color, className }: AlertProps) => {
     'alert-error': color === 'error',
   });
 
-  return <div className={cn(alertBaseClassName, className)}>{children}</div>;
+  return (
+    <div ref={ref} className={cn(alertBaseClassName, className)}>
+      {children}
+    </div>
+  );
 };
 
 export default Alert;

src/components/Drawer.tsx

@@ -108,7 +108,9 @@ const Drawer = ({
     if (closeOnBackdropClick) {
       setOpen(false);
     }
-    onBackdropClick && onBackdropClick();
+    if (onBackdropClick) {
+      onBackdropClick();
+    }
   };
 
   return (

src/components/MainDrawer.tsx

@@ -1,6 +1,5 @@
 'use client';
 
-import { useCallback } from 'react';
 import { usePathname } from 'next/navigation';
 
 import Image from 'next/image';
@@ -13,7 +12,6 @@ import PermissionNotFound from '@/components/helper/PermissionNotFound';
 
 import { useUiStore } from '@/stores/ui/ui.store';
 import { MAIN_DRAWER_LINKS } from '@/config/constant';
-import { isPathActive } from '@/lib/helper';
 import { ROUTE_PERMISSIONS } from '@/config/route-permission';
 import { useAuth } from '@/services/hooks/useAuth';
 

src/components/Modal.tsx

@@ -31,7 +31,11 @@ export const useModal = (isNestingModal = false) => {
   }, []);
 
   const toggle = useCallback(() => {
-    open ? closeModal() : openModal();
+    if (open) {
+      closeModal();
+    } else {
+      openModal();
+    }
   }, [open, closeModal, openModal]);
 
   useEffect(() => {

src/components/Navbar.tsx

@@ -26,13 +26,17 @@ const Navbar = ({ toggleSidebar }: NavbarProps) => {
 
   const logoutClickHandler = async () => {
     const logoutRes = await AuthApi.logout();
-
     if (isResponseError(logoutRes)) {
       toast.error('Gagal logout! Coba lagi!');
       return;
     }
 
     setUser(undefined);
+    const redirect = (logoutRes as { redirect?: string })?.redirect;
+    if (redirect) {
+      window.location.href = redirect;
+      return;
+    }
     router.replace(process.env.NEXT_PUBLIC_SSO_LOGIN_URL as string);
   };
 

src/components/Table.tsx

@@ -85,8 +85,8 @@ const DUMMY_SKELETON_DATA = Array.from({ length: 10 }, (_, index) => ({
 }));
 
 const emptyContentDefaultValue = (
-  <div className='w-full p-5 text-center'>
-    <span className='text-lg opacity-50'>
+  <div className='w-full text-center py-4'>
+    <span className='text-sm opacity-50'>
       Tidak ada data yang dapat ditampilkan...
     </span>
   </div>
@@ -452,6 +452,20 @@ const Table = <TData extends object>({
                 </Fragment>
               );
             })}
+
+            {(data.length === 0 || table.getRowModel().rows.length === 0) &&
+              !isLoading && (
+                <tr>
+                  <td
+                    colSpan={
+                      table.getAllLeafColumns().length + (withCheckbox ? 1 : 0)
+                    }
+                    className='p-0'
+                  >
+                    {emptyContent}
+                  </td>
+                </tr>
+              )}
           </tbody>
           <tfoot
             className={cn(
@@ -489,10 +503,6 @@ const Table = <TData extends object>({
         </table>
       </div>
 
-      {(data.length === 0 || table.getRowModel().rows.length === 0) &&
-        !isLoading &&
-        emptyContent}
-
       {data.length > 0 &&
         table.getRowModel().rows.length > 0 &&
         !isLoading &&

src/components/Tabs.tsx

@@ -1,4 +1,4 @@
-import { HTMLAttributes, ReactNode, useEffect, useState } from 'react';
+import { HTMLAttributes, ReactNode, useState } from 'react';
 import { cn } from '@/lib/helper';
 
 export interface TabItem {

src/components/helper/ApprovalStepsV2.tsx

@@ -9,6 +9,7 @@ import Button from '@/components/Button';
 import { cn, formatDate } from '@/lib/helper';
 
 interface ApprovalStepsV2Props {
+  title?: string;
   approvals?: BaseApproval[];
   steps: {
     step_number: number;
@@ -23,6 +24,7 @@ interface ApprovalStepsV2Props {
 }
 
 const ApprovalStepsV2 = ({
+  title = 'Progress Details',
   approvals,
   steps,
   maxVisibleSteps = 2,
@@ -99,7 +101,7 @@ const ApprovalStepsV2 = ({
       )}
     >
       <h4 className='text-base font-medium text-base-content/50 font-roboto'>
-        Progress Details
+        {title}
       </h4>
 
       <div

src/components/helper/ButtonFilter.tsx

@@ -3,15 +3,51 @@ import { getFilledFormikValuesCount } from '@/lib/formik-helper';
 import { cn } from '@/lib/helper';
 import { Icon } from '@iconify/react';
 import { FormikValues } from 'formik';
+import { useMemo } from 'react';
 
 export type ButtonFilterProps = ButtonProps & {
   values: FormikValues;
   onClick: () => void;
+  excludeFields?: string[];
+  fieldGroups?: string[][];
 };
 
 // 'bg-gradient-to-t from-blue-50 to-blue-100 border-blue-500 text-blue-600 hover:from-blue-100 hover:to-blue-200
 
-const ButtonFilter = ({ values, onClick, ...props }: ButtonFilterProps) => {
+const ButtonFilter = ({
+  values,
+  onClick,
+  excludeFields = [],
+  fieldGroups = [],
+  ...props
+}: ButtonFilterProps) => {
+  const activeCount = useMemo(() => {
+    const filteredValues: FormikValues = {};
+    Object.keys(values).forEach((key) => {
+      if (!excludeFields.includes(key)) {
+        filteredValues[key] = values[key];
+      }
+    });
+
+    let count = getFilledFormikValuesCount(filteredValues);
+
+    fieldGroups.forEach((group) => {
+      const groupFields = group.filter(
+        (field) => !excludeFields.includes(field)
+      );
+      const filledGroupFields = groupFields.filter(
+        (field) => filteredValues[field]
+      );
+      if (
+        filledGroupFields.length === groupFields.length &&
+        groupFields.length > 1
+      ) {
+        count -= groupFields.length - 1;
+      }
+    });
+
+    return count;
+  }, [values, excludeFields, fieldGroups]);
   return (
     <Button
       {...props}
@@ -21,7 +57,7 @@ const ButtonFilter = ({ values, onClick, ...props }: ButtonFilterProps) => {
       className={cn(
         'rounded-lg max-h-10 font-semibold text-sm gap-1.5',
         'text-sm text-base-content/50 border border-base-content/10 shadow-button-soft',
-        getFilledFormikValuesCount(values) > 0
+        activeCount > 0
           ? 'border-primary-gradient text-primary rounded-lg!'
           : 'rounded-lg',
         props.className
@@ -31,14 +67,12 @@ const ButtonFilter = ({ values, onClick, ...props }: ButtonFilterProps) => {
         icon='heroicons:funnel'
         width={20}
         height={20}
-        className={
-          getFilledFormikValuesCount(values) > 0 ? 'text-blue-600' : ''
-        }
+        className={activeCount > 0 ? 'text-blue-600' : ''}
       />
       Filter
-      {getFilledFormikValuesCount(values) > 0 && (
+      {activeCount > 0 && (
         <span className='w-5 h-5 text-white bg-[#FF3535] rounded-lg border border-base-300 flex items-center justify-center text-xs'>
-          {getFilledFormikValuesCount(values)}
+          {activeCount}
         </span>
       )}
     </Button>

src/components/helper/StatusBadge.tsx

@@ -1,24 +1,30 @@
+import { ReactNode } from 'react';
+
 import Badge from '@/components/Badge';
+
 import { cn } from '@/lib/helper';
 import { Color } from '@/types/theme';
 
 interface StatusBadgeProps {
   color: Color;
-  text: string;
+  text: ReactNode;
   className?: {
     badge?: string;
     status?: string;
   };
+  onClick?: () => void;
 }
 
 const StatusBadge = ({
   color = 'neutral',
   text,
   className,
+  onClick,
 }: StatusBadgeProps) => {
   return (
     <Badge
       variant='soft'
+      onClick={onClick}
       className={{
         badge: cn(
           'px-2 py-1 w-full flex flex-row justify-start gap-1 rounded-lg border border-base-content/10 text-xs font-medium text-base-content',

src/components/helper/drawer/DrawerHeader.tsx

@@ -27,7 +27,7 @@ export interface DrawerHeaderProps {
 
 const DrawerHeader = ({
   leftIcon = 'mdi:close',
-  leftIconSize = 24,
+  leftIconSize = 20,
   leftIconHref,
   leftIconOnClick,
   leftIconClassName,
@@ -43,7 +43,7 @@ const DrawerHeader = ({
         icon={leftIcon}
         width={leftIconSize}
         height={leftIconSize}
-        className={cn('cursor-pointer', leftIconClassName)}
+        className={cn('cursor-pointer text-base-content ', leftIconClassName)}
       />
     );
 
@@ -73,7 +73,7 @@ const DrawerHeader = ({
   return (
     <div
       className={cn(
-        'flex flex-row justify-between items-center px-4 pt-4 pb-4 border-b border-base-content/10',
+        'flex flex-row justify-between items-center p-4 border-b border-base-content/10',
         className
       )}
     >
@@ -82,7 +82,7 @@ const DrawerHeader = ({
         {renderLeftIcon()}
 
         {showDivider && subtitle && (
-          <div className='divider divider-horizontal p-0 m-0'></div>
+          <div className='w-px h-full border-none bg-base-content/10' />
         )}
 
         {subtitle && (

src/components/helper/form/FormErrors.tsx

@@ -1,8 +1,10 @@
+'use client';
+
 import Alert from '@/components/Alert';
 import Button from '@/components/Button';
 import { cn } from '@/lib/helper';
 import { Icon } from '@iconify/react';
-import { useState } from 'react';
+import { useEffect, useRef } from 'react';
 
 /**
  * Alert Unique Error List
@@ -29,10 +31,22 @@ const AlertErrorList = ({
   onClose: () => void;
   title?: string;
 }) => {
+  const alertRef = useRef<HTMLDivElement | null>(null);
+
+  useEffect(() => {
+    if (formErrorList.length > 0) {
+      alertRef.current?.scrollIntoView({
+        behavior: 'smooth',
+        block: 'start',
+      });
+    }
+  }, [formErrorList.length]);
+
   if (formErrorList.length === 0) return null;
 
   return (
     <Alert
+      ref={alertRef}
       color='error'
       className={cn(
         'w-full flex flex-col gap-2 px-3 rounded-lg',
@@ -57,6 +71,7 @@ const AlertErrorList = ({
           </span>
         </div>
         <Button
+          type='button'
           onClick={onClose}
           variant='link'
           className={cn('ml-auto p-0 w-fit text-white', className?.button)}

src/components/helper/pdf/badge/PdfParamBadge.tsx

@@ -0,0 +1,27 @@
+import { Text, View, StyleSheet } from '@react-pdf/renderer';
+import type { Style } from '@react-pdf/types';
+
+type PdfParamBadgeProps = {
+  children: React.ReactNode;
+  style?: Style;
+};
+
+const styles = StyleSheet.create({
+  parameterBadge: {
+    backgroundColor: '#F5F5F5',
+    color: '#333333',
+    padding: 4,
+    borderRadius: 4,
+    fontSize: 8,
+    marginRight: 8,
+    marginBottom: 4,
+  },
+});
+
+export const PdfParamBadge = ({ children, style }: PdfParamBadgeProps) => {
+  return (
+    <View style={[styles.parameterBadge, ...(style ? [style] : [])]}>
+      <Text>{children}</Text>
+    </View>
+  );
+};

src/components/helper/pdf/badge/PdfStatusBadge.tsx

@@ -0,0 +1,54 @@
+import { Text, View, StyleSheet } from '@react-pdf/renderer';
+import type { Style } from '@react-pdf/types';
+
+type PdfStatusBadgeProps = {
+  children: React.ReactNode;
+  style?: Style;
+};
+
+const styles = StyleSheet.create({
+  statusBadge: {
+    paddingVertical: 2,
+    paddingHorizontal: 4,
+    borderRadius: 12,
+    fontSize: 7,
+    fontWeight: 'bold',
+    borderWidth: 1,
+    borderStyle: 'solid',
+    backgroundColor: '#F5F5F5',
+    borderColor: '#E5E7EB',
+  },
+  statusBadgeText: {
+    fontSize: 7,
+    fontWeight: 'bold',
+    color: '#333333',
+  },
+});
+
+export const PdfStatusBadge = ({ children, style }: PdfStatusBadgeProps) => {
+  const styleRecord = style as Record<string, unknown>;
+  const color = styleRecord?.color as string | undefined;
+
+  const viewStyle = Object.entries(styleRecord || {}).reduce(
+    (acc, [key, value]) => {
+      if (key !== 'color') {
+        acc[key] = value;
+      }
+      return acc;
+    },
+    {} as Record<string, unknown>
+  );
+
+  return (
+    <View
+      style={[
+        styles.statusBadge,
+        ...(Object.keys(viewStyle).length > 0 ? [viewStyle as Style] : []),
+      ]}
+    >
+      <Text style={[styles.statusBadgeText, ...(color ? [{ color }] : [])]}>
+        {children}
+      </Text>
+    </View>
+  );
+};

src/components/helper/pdf/layout/PdfPageNumber.tsx

@@ -0,0 +1,48 @@
+import { Text, View, StyleSheet } from '@react-pdf/renderer';
+import type { Style } from '@react-pdf/types';
+
+type PdfPageNumberProps = {
+  style?: Style;
+  /**
+   * Format template for page number.
+   * Use {pageNumber} and {totalPages} as placeholders.
+   * Default: "{pageNumber} / {totalPages}"
+   */
+  format?: string;
+};
+
+const styles = StyleSheet.create({
+  footer: {
+    width: '100%',
+    display: 'flex',
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    paddingHorizontal: 16,
+    position: 'absolute',
+    fontSize: 8,
+    bottom: 30,
+    left: 0,
+    right: 0,
+    textAlign: 'center',
+    color: 'grey',
+  },
+});
+
+export const PdfPageNumber = ({
+  style,
+  format = '{pageNumber} / {totalPages}',
+}: PdfPageNumberProps) => {
+  return (
+    <View style={style || styles.footer} fixed>
+      <Text
+        render={({ pageNumber, totalPages }) =>
+          format
+            .replace('{pageNumber}', String(pageNumber))
+            .replace('{totalPages}', String(totalPages))
+        }
+        fixed
+      />
+    </View>
+  );
+};

src/components/helper/pdf/table/PdfTable.tsx

@@ -1,9 +1,10 @@
 'use client';
 
 import { View, StyleSheet } from '@react-pdf/renderer';
-import { PdfThead, PdfColumn } from './PdfThead';
-import { PdfTbody, PdfTbodyCell } from './PdfTbody';
-import { PdfTfoot, PdfTfootCell } from './PdfTfoot';
+import type { PdfColumn } from './types';
+import { PdfThead } from './PdfThead';
+import { PdfTbody } from './PdfTbody';
+import { PdfTfoot } from './PdfTfoot';
 
 const styles = StyleSheet.create({
   table: {
@@ -13,10 +14,10 @@ const styles = StyleSheet.create({
   },
 });
 
-interface PdfTableProps {
-  columns: PdfColumn[];
-  data: PdfTbodyCell[][];
-  footer?: PdfTfootCell[];
+interface PdfTableProps<TData = Record<string, unknown>> {
+  columns: PdfColumn<TData>[];
+  data: TData[];
+  showFooter?: boolean;
   footerLabel?: string;
   firstRow?: {
     valueKey: string;
@@ -26,20 +27,26 @@ interface PdfTableProps {
   };
 }
 
-export const PdfTable = ({
+export const PdfTable = <TData = Record<string, unknown>,>({
   columns,
   data,
-  footer,
+  showFooter = false,
   footerLabel = 'Total',
   firstRow,
-}: PdfTableProps) => {
+}: PdfTableProps<TData>) => {
+  // Check if any column has footer defined
+  const hasFooter =
+    showFooter || columns.some((col) => col.footer !== undefined);
+
   return (
     <View style={styles.table}>
-      <PdfThead columns={columns} />
-      <PdfTbody columns={columns} rows={data} firstRow={firstRow} />
-      {footer && footer.length > 0 && (
-        <PdfTfoot columns={columns} cells={footer} label={footerLabel} />
+      <PdfThead columns={columns} data={data} />
+      <PdfTbody columns={columns} data={data} firstRow={firstRow} />
+      {hasFooter && data.length > 0 && (
+        <PdfTfoot columns={columns} data={data} label={footerLabel} />
       )}
     </View>
   );
 };
+
+export type { PdfColumn };

src/components/helper/pdf/table/PdfTbody.tsx

@@ -1,22 +1,8 @@
 'use client';
 
 import { Text, View, StyleSheet } from '@react-pdf/renderer';
-
-export interface PdfColumn {
-  key: string;
-  header: string;
-  flex: number;
-  align?: 'left' | 'center' | 'right';
-}
-
-export interface PdfTbodyCell {
-  key: string;
-  value: string | number | React.ReactNode;
-  align?: 'left' | 'center' | 'right';
-  color?: string;
-  formatAs?: 'text' | 'date' | 'currency' | 'number';
-  formatDate?: string;
-}
+import { ReactNode } from 'react';
+import type { PdfColumn } from './types';
 
 const styles = StyleSheet.create({
   tableRow: {
@@ -71,21 +57,22 @@ const styles = StyleSheet.create({
   },
 });
 
-interface PdfTbodyProps {
-  columns: PdfColumn[];
-  rows: PdfTbodyCell[][];
+interface PdfTbodyProps<TData = Record<string, unknown>> {
+  columns: PdfColumn<TData>[];
+  data: TData[];
   firstRow?: {
     valueKey: string;
     value: number;
     align?: 'right';
     color?: string;
   };
-  formatDate?: (date: string, format: string) => string;
-  formatNumber?: (num: number) => string;
-  formatCurrency?: (num: number) => string;
 }
 
-export const PdfTbody = ({ columns, rows, firstRow }: PdfTbodyProps) => {
+export const PdfTbody = <TData = Record<string, unknown>,>({
+  columns,
+  data,
+  firstRow,
+}: PdfTbodyProps<TData>) => {
   return (
     <>
       {/* First Row */}
@@ -93,17 +80,17 @@ export const PdfTbody = ({ columns, rows, firstRow }: PdfTbodyProps) => {
         <View style={[styles.tableRow, styles.tableBorderBottom]}>
           {columns.map((column, index) => {
             const isLastColumn = index === columns.length - 1;
-            const isfirstRowColumn = column.key === firstRow.valueKey;
-            const align = column.align || 'center';
+            const isFirstRowColumn = column.key === firstRow.valueKey;
+            const align = column.align || 'left';
 
             const cellStyle =
               column.key === 'no'
-                ? [styles.tableCellNo, { flex: column.flex }]
-                : isfirstRowColumn
+                ? [styles.tableCellNo, { flex: column.flex || 1 }]
+                : isFirstRowColumn
                   ? [
                       styles.tableCellRight,
                       {
-                        flex: column.flex,
+                        flex: column.flex || 1,
                         color: firstRow.color || 'black',
                         borderRightWidth: isLastColumn ? 0 : 1,
                       },
@@ -112,7 +99,7 @@ export const PdfTbody = ({ columns, rows, firstRow }: PdfTbodyProps) => {
                     ? [
                         styles.tableCellRight,
                         {
-                          flex: column.flex,
+                          flex: column.flex || 1,
                           borderRightWidth: isLastColumn ? 0 : 1,
                         },
                       ]
@@ -120,7 +107,7 @@ export const PdfTbody = ({ columns, rows, firstRow }: PdfTbodyProps) => {
                       ? [
                           styles.tableCellCenter,
                           {
-                            flex: column.flex,
+                            flex: column.flex || 1,
                             borderRightWidth: isLastColumn ? 0 : 1,
                           },
                         ]
@@ -128,15 +115,15 @@ export const PdfTbody = ({ columns, rows, firstRow }: PdfTbodyProps) => {
                         ? [
                             styles.tableCellLast,
                             {
-                              flex: column.flex,
+                              flex: column.flex || 1,
                               borderRightWidth: 0,
                             },
                           ]
-                        : [styles.tableCell, { flex: column.flex }];
+                        : [styles.tableCell, { flex: column.flex || 1 }];
 
             return (
               <View key={column.key} style={cellStyle}>
-                <Text>{isfirstRowColumn ? firstRow.value : ''}</Text>
+                <Text>{isFirstRowColumn ? firstRow.value : ''}</Text>
               </View>
             );
           })}
@@ -144,8 +131,8 @@ export const PdfTbody = ({ columns, rows, firstRow }: PdfTbodyProps) => {
       )}
 
       {/* Data Rows */}
-      {rows.map((row, rowIndex) => {
-        const isLastRow = rowIndex === rows.length - 1;
+      {data.map((row, rowIndex) => {
+        const isLastRow = rowIndex === data.length - 1;
 
         return (
           <View
@@ -156,19 +143,27 @@ export const PdfTbody = ({ columns, rows, firstRow }: PdfTbodyProps) => {
             ]}
           >
             {columns.map((column, colIndex) => {
-              const cell = row.find((c) => c.key === column.key);
               const isLastColumn = colIndex === columns.length - 1;
-              const align = cell?.align || column.align || 'center';
+              const align = column.align || 'left';
+
+              // Get cell content from column.cell function or fallback to row value
+              let cellContent: ReactNode;
+              if (column.cell) {
+                cellContent = column.cell({ row, index: rowIndex });
+              } else {
+                cellContent =
+                  ((row as Record<string, unknown>)[column.key] as ReactNode) ??
+                  '-';
+              }
 
               const cellStyle =
                 column.key === 'no'
-                  ? [styles.tableCellNo, { flex: column.flex }]
+                  ? [styles.tableCellNo, { flex: column.flex || 1 }]
                   : align === 'right'
                     ? [
                         styles.tableCellRight,
                         {
-                          flex: column.flex,
-                          color: cell?.color || 'black',
+                          flex: column.flex || 1,
                           borderRightWidth: isLastColumn ? 0 : 1,
                         },
                       ]
@@ -176,37 +171,30 @@ export const PdfTbody = ({ columns, rows, firstRow }: PdfTbodyProps) => {
                       ? [
                           styles.tableCellCenter,
                           {
-                            flex: column.flex,
-                            color: cell?.color || 'black',
+                            flex: column.flex || 1,
                             borderRightWidth: isLastColumn ? 0 : 1,
                           },
                         ]
                       : isLastColumn
                         ? [
                             styles.tableCellLast,
-                            { flex: column.flex, borderRightWidth: 0 },
+                            { flex: column.flex || 1, borderRightWidth: 0 },
                           ]
                         : [
                             styles.tableCell,
                             {
-                              flex: column.flex,
-                              color: cell?.color || 'black',
+                              flex: column.flex || 1,
                               borderRightWidth: isLastColumn ? 0 : 1,
                             },
                           ];
 
               return (
                 <View key={column.key} style={cellStyle}>
-                  {cell?.value !== undefined &&
-                  cell?.value !== null &&
-                  cell?.value !== '' ? (
-                    typeof cell.value === 'object' ? (
-                      cell.value
-                    ) : (
-                      <Text>{String(cell.value)}</Text>
-                    )
+                  {typeof cellContent === 'string' ||
+                  typeof cellContent === 'number' ? (
+                    <Text>{String(cellContent)}</Text>
                   ) : (
-                    <Text>-</Text>
+                    cellContent
                   )}
                 </View>
               );
@@ -217,3 +205,5 @@ export const PdfTbody = ({ columns, rows, firstRow }: PdfTbodyProps) => {
     </>
   );
 };
+
+export type { PdfColumn };

src/components/helper/pdf/table/PdfTfoot.tsx

@@ -1,21 +1,8 @@
 'use client';
 
 import { Text, View, StyleSheet } from '@react-pdf/renderer';
-
-export interface PdfColumn {
-  key: string;
-  header: string;
-  flex: number;
-  align?: 'left' | 'center' | 'right';
-}
-
-export interface PdfTfootCell {
-  key: string;
-  value: string | number;
-  align?: 'left' | 'center' | 'right';
-  flex?: number;
-  color?: string;
-}
+import { ReactNode } from 'react';
+import type { PdfColumn } from './types';
 
 const styles = StyleSheet.create({
   tableRow: {
@@ -69,63 +56,86 @@ const styles = StyleSheet.create({
   },
 });
 
-interface PdfTfootProps {
-  columns: PdfColumn[];
-  cells: PdfTfootCell[];
+interface PdfTfootProps<TData = Record<string, unknown>> {
+  columns: PdfColumn<TData>[];
+  data: TData[];
   label?: string;
 }
 
-export const PdfTfoot = ({
+export const PdfTfoot = <TData = Record<string, unknown>,>({
   columns,
-  cells,
+  data,
   label = 'Total',
-}: PdfTfootProps) => {
+}: PdfTfootProps<TData>) => {
   return (
     <View style={[styles.tableRow, styles.summaryRow]}>
       {columns.map((column, index) => {
         const isLastColumn = index === columns.length - 1;
-        const cellData = cells.find((c) => c.key === column.key);
+
+        // Get footer content from column definition
+        let footerContent: ReactNode;
+        if (typeof column.footer === 'function') {
+          footerContent = column.footer(data);
+        } else {
+          footerContent = column.footer;
+        }
+
+        // Use label for first column (usually 'no' column)
+        const displayContent = column.key === 'no' ? label : footerContent;
+
+        // Determine alignment
+        const align = column.footerAlign || column.align || 'left';
+        const color = column.footerColor || 'black';
 
         const cellStyle =
           column.key === 'no'
             ? [
                 styles.tableCellNo,
-                { flex: column.flex, borderRightWidth: isLastColumn ? 0 : 1 },
+                {
+                  flex: column.flex || 1,
+                  borderRightWidth: isLastColumn ? 0 : 1,
+                  color,
+                },
               ]
-            : cellData?.align === 'right'
+            : align === 'right'
               ? [
                   styles.tableCellRight,
                   {
-                    flex: column.flex,
-                    color: cellData?.color || 'black',
+                    flex: column.flex || 1,
+                    color,
                     borderRightWidth: isLastColumn ? 0 : 1,
                   },
                 ]
-              : cellData?.align === 'center'
+              : align === 'center'
                 ? [
                     styles.tableCellCenter,
                     {
-                      flex: column.flex,
-                      color: cellData?.color || 'black',
+                      flex: column.flex || 1,
+                      color,
                       borderRightWidth: isLastColumn ? 0 : 1,
                     },
                   ]
                 : isLastColumn
-                  ? [styles.tableCellLast, { flex: column.flex }]
-                  : [
-                      styles.tableCell,
-                      {
-                        flex: column.flex,
-                        color: cellData?.color || 'black',
-                      },
-                    ];
+                  ? [styles.tableCellLast, { flex: column.flex || 1, color }]
+                  : [styles.tableCell, { flex: column.flex || 1, color }];
 
         return (
           <View key={column.key} style={cellStyle}>
-            <Text>{column.key === 'no' ? label : cellData?.value || ''}</Text>
+            {displayContent !== undefined && displayContent !== null ? (
+              typeof displayContent === 'string' ||
+              typeof displayContent === 'number' ? (
+                <Text>{String(displayContent)}</Text>
+              ) : (
+                displayContent
+              )
+            ) : (
+              <Text>-</Text>
+            )}
           </View>
         );
       })}
     </View>
   );
 };
+
+export type { PdfColumn };

src/components/helper/pdf/table/PdfThead.tsx

@@ -1,13 +1,8 @@
 'use client';
 
 import { Text, View, StyleSheet } from '@react-pdf/renderer';
-
-export interface PdfColumn {
-  key: string;
-  header: string;
-  flex: number;
-  align?: 'left' | 'center' | 'right';
-}
+import { ReactNode } from 'react';
+import type { PdfColumn } from './types';
 
 const styles = StyleSheet.create({
   tableRow: {
@@ -48,23 +43,37 @@ const styles = StyleSheet.create({
   },
 });
 
-interface PdfTheadProps {
-  columns: PdfColumn[];
+interface PdfTheadProps<TData = Record<string, unknown>> {
+  columns: PdfColumn<TData>[];
+  data?: TData[];
 }
 
-export const PdfThead = ({ columns }: PdfTheadProps) => {
+export const PdfThead = <TData = Record<string, unknown>,>({
+  columns,
+  data,
+}: PdfTheadProps<TData>) => {
   return (
     <View style={[styles.tableRow, styles.tableHeader]}>
       {columns.map((column, index) => {
-        const align = column.align || 'center';
         const isLastColumn = index === columns.length - 1;
 
+        // Get header content from column definition
+        let headerContent: ReactNode;
+        if (typeof column.header === 'function') {
+          headerContent = column.header(data || []);
+        } else {
+          headerContent = column.header || column.key;
+        }
+
+        // Determine alignment - columns align right by default for numeric data
+        const align = column.align || 'left';
+
         const cellStyle =
           align === 'right'
             ? [
                 styles.tableCellHeaderRight,
                 {
-                  flex: column.flex,
+                  flex: column.flex || 1,
                   textAlign: 'right' as const,
                   borderRightWidth: isLastColumn ? 0 : 1,
                 },
@@ -72,7 +81,7 @@ export const PdfThead = ({ columns }: PdfTheadProps) => {
             : [
                 styles.tableCellHeader,
                 {
-                  flex: column.flex,
+                  flex: column.flex || 1,
                   textAlign: align as 'left' | 'center' | 'right',
                   borderRightWidth: isLastColumn ? 0 : 1,
                 },
@@ -80,10 +89,16 @@ export const PdfThead = ({ columns }: PdfTheadProps) => {
 
         return (
           <View key={column.key} style={cellStyle}>
-            <Text>{column.header}</Text>
+            {typeof headerContent === 'string' ? (
+              <Text>{headerContent}</Text>
+            ) : (
+              headerContent
+            )}
           </View>
         );
       })}
     </View>
   );
 };
+
+export type { PdfColumn };

src/components/helper/pdf/table/index.ts

@@ -2,6 +2,4 @@ export { PdfTable } from './PdfTable';
 export { PdfThead } from './PdfThead';
 export { PdfTbody } from './PdfTbody';
 export { PdfTfoot } from './PdfTfoot';
-export type { PdfColumn } from './PdfThead';
-export type { PdfTbodyCell } from './PdfTbody';
-export type { PdfTfootCell } from './PdfTfoot';
+export type { PdfColumn } from './types';

src/components/helper/pdf/table/types.ts

@@ -0,0 +1,24 @@
+import { ReactNode } from 'react';
+
+/**
+ * PdfColumn - Mirip dengan ColumnDef di TanStack Table
+ * Mengatur header (thead), body (tbody), dan footer (tfoot) dalam satu definisi
+ */
+export interface PdfColumn<TData = Record<string, unknown>> {
+  key: string;
+  flex?: number;
+
+  // Header configuration (thead)
+  header?: string | ((data: TData[]) => ReactNode);
+
+  // Body configuration (tbody)
+  align?: 'left' | 'center' | 'right';
+  cell?: (props: { row: TData; index: number }) => ReactNode | string | number;
+
+  // Footer configuration (tfoot)
+  footer?: string | number | ((data: TData[]) => ReactNode | string | number);
+  footerAlign?: 'left' | 'center' | 'right';
+  footerColor?: string;
+}
+
+export type { PdfColumn as default };

src/components/helper/pdf/typography/PdfTypography.tsx

@@ -0,0 +1,80 @@
+import { Color } from '@/types/theme';
+import { Text, StyleSheet } from '@react-pdf/renderer';
+import type { Style } from '@react-pdf/types';
+
+type TypographySize = 'h1' | 'h2' | 'h3' | 'h4' | 'p' | 'small' | 'label';
+
+type TypographyVariant = Color | 'default';
+
+type PdfTypographyProps = {
+  children: React.ReactNode;
+  size?: TypographySize;
+  variant?: TypographyVariant;
+  color?: string;
+  style?: Style;
+};
+
+const styles = StyleSheet.create({
+  h1: {
+    fontSize: 14,
+    fontWeight: 'bold',
+    marginBottom: 5,
+  },
+  h2: {
+    fontSize: 12,
+    fontWeight: 'bold',
+    marginBottom: 8,
+  },
+  h3: {
+    fontSize: 10,
+    fontWeight: 'bold',
+    marginBottom: 4,
+  },
+  h4: {
+    fontSize: 9,
+    fontWeight: 'bold',
+    marginBottom: 3,
+  },
+  p: {
+    fontSize: 10,
+    marginBottom: 4,
+  },
+  small: {
+    fontSize: 8,
+    marginBottom: 2,
+  },
+  label: {
+    fontSize: 9,
+    marginBottom: 5,
+  },
+});
+
+const variantColors: Record<TypographyVariant, string> = {
+  default: '#333333',
+  primary: '#1f74bf',
+  secondary: '#6B7280',
+  accent: '#8B5CF6',
+  neutral: '#6B7280',
+  info: '#3B82F6',
+  success: '#065F46',
+  warning: '#92400E',
+  error: '#DC2626',
+  none: '#333333',
+};
+
+export const PdfTypography = ({
+  children,
+  size = 'p',
+  variant = 'default',
+  color,
+  style,
+}: PdfTypographyProps) => {
+  const sizeStyle = styles[size];
+  const textColor = color || variantColors[variant];
+
+  return (
+    <Text style={[sizeStyle, { color: textColor }, ...(style ? [style] : [])]}>
+      {children}
+    </Text>
+  );
+};

src/components/helper/pdf/utils/pdf-badge.ts

@@ -0,0 +1,65 @@
+export type StatusColor = {
+  bg: string;
+  text: string;
+  border: string;
+};
+
+// Due status colors (for debt supplier reports)
+export const dueStatusColors: Record<string, StatusColor> = {
+  'SUDAH JATUH TEMPO': {
+    bg: '#FEE2E2',
+    text: '#991B1B',
+    border: '#F87171',
+  }, // error/red
+  'BELUM JATUH TEMPO': {
+    bg: '#D1FAE5',
+    text: '#065F46',
+    border: '#34D399',
+  }, // success/green
+  'MENDEKATI JATUH TEMPO': {
+    bg: '#FEF3C7',
+    text: '#92400E',
+    border: '#FBBF24',
+  }, // warning/yellow
+};
+
+// Payment status colors (for customer payment & debt supplier reports)
+export const paymentStatusColors: Record<string, StatusColor> = {
+  'BELUM LUNAS': {
+    bg: '#FEF3C7',
+    text: '#92400E',
+    border: '#FBBF24',
+  }, // warning/yellow
+  LUNAS: {
+    bg: '#DBEAFE',
+    text: '#1E40AF',
+    border: '#60A5FA',
+  }, // primary/blue
+  'PEMBAYARAN SEBAGIAN': { bg: '#D1FAE5', text: '#065F46', border: '#34D399' }, // success/green
+  PEMBAYARAN: {
+    bg: '#D1FAE5',
+    text: '#065F46',
+    border: '#34D399',
+  }, // success/green
+};
+
+// Fallback color for unknown statuses
+export const fallbackStatusColor: StatusColor = {
+  bg: '#F3F4F6',
+  text: '#374151',
+  border: '#D1D5DB',
+}; // neutral
+
+export const getPDFBadgeStyle = (
+  statusText: string,
+  type: 'due' | 'payment' = 'payment'
+): StatusColor => {
+  const normalizedStatus = statusText.toUpperCase().trim();
+
+  const colors =
+    type === 'due'
+      ? dueStatusColors[normalizedStatus]
+      : paymentStatusColors[normalizedStatus];
+
+  return colors || fallbackStatusColor;
+};

src/components/helper/skeleton/DataStateSkeleton.tsx

@@ -1,5 +1,4 @@
 import IconSkeleton from '@/components/helper/skeleton/IconSkeleton';
-import { Icon } from '@iconify/react';
 
 const DataStateSkeleton = ({
   icon,

src/components/input/DropFileInput.tsx

@@ -134,14 +134,20 @@ const DropFileInput: React.FC<DropFileInputProps> = ({
 
         {!isError && bottomLabel && (
           <p
-            className={cn('w-full text-sm opacity-60', className?.bottomLabel)}
+            className={cn(
+              'w-full mt-1.5 text-xs opacity-60',
+              className?.bottomLabel
+            )}
           >
             {bottomLabel}
           </p>
         )}
         {isError && (
           <p
-            className={cn('w-full text-sm text-error', className?.errorMessage)}
+            className={cn(
+              'w-full mt-1.5 text-xs text-error',
+              className?.errorMessage
+            )}
           >
             {errorMessage}
           </p>

src/components/input/PatternInput.tsx

@@ -4,7 +4,6 @@ import { ChangeEvent } from 'react';
 import {
   PatternFormat,
   NumberFormatBase,
-  NumberFormatBaseProps,
   OnValueChange,
 } from 'react-number-format';
 import TextInput, { TextInputProps } from '@/components/input/TextInput';

src/components/input/RadioInput.tsx

@@ -144,12 +144,12 @@ export const RadioGroup = ({
 
         {/* Label bawah */}
         {!isError && bottomLabel && (
-          <p className='text-sm opacity-60'>{bottomLabel}</p>
+          <p className='mt-1.5 text-xs opacity-60'>{bottomLabel}</p>
         )}
 
         {/* Pesan error */}
         {isError && errorMessage && (
-          <p className='text-sm text-error'>{errorMessage}</p>
+          <p className='mt-1.5 text-xs text-error'>{errorMessage}</p>
         )}
       </div>
     </RadioGroupContext.Provider>

src/components/input/SelectInput.tsx

@@ -246,8 +246,8 @@ const SelectInput = <T extends OptionType>(props: SelectInputProps<T>) => {
               className={cn(
                 'inline-flex items-center px-3 border border-r-0 border-base-content/10 rounded-l-lg transition-all duration-200',
                 {
-                  'bg-gray-100 border-base-content/10': !isDisabled,
-                  'bg-gray-50 border-base-content/10': isDisabled,
+                  'bg-base-100 border-base-content/10': !isDisabled,
+                  'bg-base-200 border-base-content/10': isDisabled,
                   'border-error': isError,
                 },
                 className?.inputPrefix
@@ -278,28 +278,28 @@ const SelectInput = <T extends OptionType>(props: SelectInputProps<T>) => {
             className={cn('w-full flex-1', className?.select)}
             classNames={{
               control: ({ isFocused, isDisabled }) =>
-                cn('w-full border bg-white transition-shadow', 'rounded-lg!', {
-                  'cursor-pointer!': !readOnly && !isDisabled,
-                  'border-red-500! ring-2 ring-red-200': isError,
-                  'border-indigo-500 ring-2 ring-indigo-200':
-                    isFocused && !startAdornment,
-                  'border-base-content/10!': !isError && !isFocused,
-                  'bg-gray-100 text-gray-400 cursor-not-allowed':
+                cn('w-full border transition-shadow', 'rounded-lg!', {
+                  'bg-base-100!': !isDisabled && !readOnly,
+                  'bg-base-200! text-gray-400 cursor-not-allowed':
                     isDisabled && !readOnly,
                   'bg-transparent! cursor-not-allowed!': readOnly,
+                  'cursor-pointer!': !readOnly && !isDisabled,
+                  'border-error!': isError,
+                  'ring-2 ring-error/20': isError,
+                  'border-indigo-500 ring-2 ring-indigo-200':
+                    isFocused && !startAdornment && !isError,
+                  'border-base-content/10!': !isError && !isFocused,
                   'rounded-l-none!': inputPrefix && !startAdornment,
                   'rounded-r-none!': inputSuffix && !startAdornment,
                 }),
               valueContainer: () => cn('flex-1 px-3! pr-2! py-2.5! gap-1'),
               placeholder: () =>
-                cn({
-                  'text-gray-400 text-sm leading-tight': !isError,
-                  'text-red-300!': isError,
+                cn('text-gray-400 text-sm leading-tight', {
+                  'text-error!': isError,
                 }),
               singleValue: () =>
-                cn({
-                  'm-0! text-gray-900 text-sm leading-tight': !isError,
-                  'text-error!': isError,
+                cn('m-0! text-gray-900 text-sm leading-tight', {
+                  'text-error!': isError && !readOnly,
                   'text-gray-900!': readOnly,
                 }),
               input: () => cn('text-gray-900 m-0! p-0! text-sm leading-tight'),
@@ -370,8 +370,8 @@ const SelectInput = <T extends OptionType>(props: SelectInputProps<T>) => {
               className={cn(
                 'inline-flex items-center px-3 border border-l-0 border-base-content/10 rounded-r-lg transition-all duration-200',
                 {
-                  'bg-gray-100 border-base-content/10': !isDisabled,
-                  'bg-gray-50 border-base-content/10': isDisabled,
+                  'bg-base-100 border-base-content/10': !isDisabled,
+                  'bg-base-200 border-base-content/10': isDisabled,
                   'border-error': isError,
                 },
                 className?.inputSuffix
@@ -403,31 +403,26 @@ const SelectInput = <T extends OptionType>(props: SelectInputProps<T>) => {
           className={cn('w-full', className?.select)}
           classNames={{
             control: ({ isFocused, isDisabled }) =>
-              cn(
-                'w-full border bg-white transition-shadow',
-                // Gunakan rounded-lg untuk semua kasus
-                'rounded-lg!',
-                {
-                  'cursor-pointer!': !readOnly && !isDisabled,
-                  'border-red-500! ring-2 ring-red-200': isError,
-                  'border-indigo-500 ring-2 ring-indigo-200':
-                    isFocused && !startAdornment,
-                  'border-base-content/10!': !isError && !isFocused,
-                  'bg-gray-100 text-gray-400 cursor-not-allowed':
-                    isDisabled && !readOnly,
-                  'bg-transparent! cursor-not-allowed!': readOnly,
-                }
-              ),
+              cn('w-full border transition-shadow rounded-lg!', {
+                'bg-base-100!': !isDisabled && !readOnly,
+                'bg-base-200! text-gray-400 cursor-not-allowed':
+                  isDisabled && !readOnly,
+                'bg-transparent! cursor-not-allowed!': readOnly,
+                'cursor-pointer!': !readOnly && !isDisabled,
+                'border-error!': isError,
+                'ring-2 ring-error/20': isError,
+                'border-indigo-500 ring-2 ring-indigo-200':
+                  isFocused && !startAdornment && !isError,
+                'border-base-content/10!': !isError && !isFocused,
+              }),
             valueContainer: () => cn('flex-1 px-3! pr-2! py-2.5! gap-1'),
             placeholder: () =>
-              cn({
-                'text-gray-400 text-sm leading-tight': !isError,
-                'text-red-300!': isError,
+              cn('text-gray-400 text-sm leading-tight', {
+                'text-error!': isError,
               }),
             singleValue: () =>
-              cn({
-                'm-0! text-gray-900 text-sm leading-tight': !isError,
-                'text-error!': isError,
+              cn('m-0! text-gray-900 text-sm leading-tight', {
+                'text-error!': isError && !readOnly,
                 'text-gray-900!': readOnly,
               }),
             input: () => cn('text-gray-900 m-0! p-0! text-sm leading-tight'),
@@ -493,9 +488,11 @@ const SelectInput = <T extends OptionType>(props: SelectInputProps<T>) => {
         />
       )}
 
-      {isError && <p className='w-full text-sm text-error'>{errorMessage}</p>}
+      {isError && (
+        <p className='w-full mt-1.5 text-xs text-error'>{errorMessage}</p>
+      )}
       {!isError && bottomLabel && (
-        <p className='w-full text-sm opacity-60'>{bottomLabel}</p>
+        <p className='w-full mt-1.5 text-xs opacity-60'>{bottomLabel}</p>
       )}
     </div>
   );

src/components/input/TagInput.tsx

@@ -159,9 +159,11 @@ const TagInput: React.FC<TagInputProps> = ({
 
       {/* Bottom label or error message */}
       {!isError && bottomLabel && (
-        <p className='w-full text-sm opacity-60'>{bottomLabel}</p>
+        <p className='w-full mt-1.5 text-xs opacity-60'>{bottomLabel}</p>
+      )}
+      {isError && (
+        <p className='w-full mt-1.5 text-xs text-error'>{errorMessage}</p>
       )}
-      {isError && <p className='w-full text-sm text-error'>{errorMessage}</p>}
     </div>
   );
 };

src/components/input/TextInput.tsx

@@ -104,8 +104,8 @@ const TextInput = ({
               className={cn(
                 'inline-flex items-center px-3 border border-r-0 border-base-content/10 rounded-l-lg transition-all duration-200',
                 {
-                  'bg-gray-100 border-base-content/10': !disabled,
-                  'bg-gray-50 border-base-content/10': disabled,
+                  'bg-base-100 border-base-content/10': !disabled,
+                  'bg-base-200 border-base-content/10': disabled,
                   'border-error': isError,
                   'border-success!': isValid,
                 },
@@ -118,7 +118,7 @@ const TextInput = ({
 
           <div
             className={cn(
-              'input h-fit px-3 py-2.5 gap-1.5 text-sm font-normal leading-6 flex-1 rounded-lg! outline-none! transition-all duration-200 flex items-center bg-white border-base-content/10',
+              'input h-fit px-3 py-2.5 gap-1.5 text-sm font-normal leading-6 flex-1 rounded-lg! outline-none! transition-all duration-200 flex items-center border-base-content/10',
               {
                 'border-error': isError,
                 'border-success!': isValid,
@@ -126,7 +126,8 @@ const TextInput = ({
                 'rounded-r-none!': inputSuffix,
                 'input-disabled': disabled,
                 'cursor-not-allowed': disabled,
-                'bg-gray-50': disabled,
+                'bg-base-100': !disabled,
+                'bg-base-200': disabled,
               },
               className?.inputWrapper
             )}
@@ -167,8 +168,8 @@ const TextInput = ({
               className={cn(
                 'inline-flex items-center px-3 border border-l-0 border-base-content/10 rounded-r-lg transition-all duration-200',
                 {
-                  'bg-gray-100 border-base-content/10': !disabled,
-                  'bg-gray-50 border-base-content/10': disabled,
+                  'bg-base-100 border-base-content/10': !disabled,
+                  'bg-base-200 border-base-content/10': disabled,
                   'border-error': isError,
                   'border-success!': isValid,
                 },
@@ -182,10 +183,12 @@ const TextInput = ({
       ) : (
         <div
           className={cn(
-            'input h-fit px-3 py-2.5 gap-1.5 text-sm font-normal leading-6 w-full rounded-lg! outline-none! transition-all duration-200 bg-white border-base-content/10',
+            'input h-fit px-3 py-2.5 gap-1.5 text-sm font-normal leading-6 w-full rounded-lg! outline-none! transition-all duration-200 flex items-center border-base-content/10',
             {
               'border-error': isError,
               'border-success!': isValid,
+              'bg-base-100': !disabled,
+              'bg-base-200': disabled,
             },
             className?.inputWrapper
           )}
@@ -201,7 +204,14 @@ const TextInput = ({
             onChange={onChange}
             onBlur={onBlur}
             disabled={disabled}
-            className={cn('grow', className?.input)}
+            className={cn(
+              'grow bg-transparent outline-none',
+              {
+                'cursor-not-allowed': disabled,
+                'text-gray-500': disabled,
+              },
+              className?.input
+            )}
             readOnly={readOnly}
           />
 

src/components/modal/ConfirmationModalWithNotes.tsx

@@ -56,7 +56,7 @@ const ConfirmationModalWithNotes: React.FC<ConfirmationModalWithNotesProps> = ({
       closeOnBackdrop={closeOnBackdrop}
       primaryButton={{
         ...primaryButton,
-        onClick: (e) => {
+        onClick: () => {
           if (primaryButton && primaryButton?.onClick) {
             primaryButton?.onClick?.(notes);
           } else {

src/components/pages/closing/ClosingDetailTabs.tsx

@@ -5,28 +5,23 @@ import { useMemo, useState } from 'react';
 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/ClosingSapronakTabContent';
-import ClosingProductionDataTabContent from '@/components/pages/closing/ClosingProductionDataTabContent';
+import ClosingGeneralInformationTable from '@/components/pages/closing/table/ClosingGeneralInformationTable';
+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/ClosingSapronakCalculationTabContent';
-import ClosingOverheadTabContent from '@/components/pages/closing/ClosingOverheadTabContent';
-import ClosingFinanceTabContent from '@/components/pages/closing/ClosingFinanceTabContent';
-import SalesReportTable from '@/components/pages/closing/sale/SalesReportTable';
-import HppExpeditionReportTable from './hpp-ekspedisi/HppExpeditionReportTable';
+import { ClosingGeneralInformation } from '@/types/api/closing';
+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 SalesClosingTab from '@/components/pages/closing/tab/SalesClosingTab';
+import HppExpeditionClosingTab from '@/components/pages/closing/tab/HppExpeditionClosingTab';
 import ClosingKandangList from '@/components/pages/closing/ClosingKandangList';
 import { ProjectFlock } from '@/types/api/production/project-flock';
 import { ProjectFlockKandang } from '@/types/api/production/project-flock-kandang';
+import { useTabActionsStore } from '@/stores/tab-actions/tab-actions.store';
 interface ClosingDetailProps {
   id: number;
   initialValue?: ClosingGeneralInformation;
-  salesData?: BaseClosingSales;
-  hppExpeditionData?: ClosingHppExpedition;
   projectData?: ProjectFlock;
   kandangData?: ProjectFlockKandang;
 }
@@ -34,25 +29,24 @@ interface ClosingDetailProps {
 const ClosingDetail: React.FC<ClosingDetailProps> = ({
   id,
   initialValue,
-  salesData,
-  hppExpeditionData,
   projectData,
   kandangData,
 }) => {
-  const [activeTab, setActiveTab] = useState<string>('sapronak');
+  const [activeTabId, setActiveTabId] = useState<string>('sapronak');
+  const tabActions = useTabActionsStore((state) => state.tabActions);
 
   const closingDetailTabs = useMemo(() => {
     const validTabs = [
       {
         id: 'sapronak',
         label: 'Sapronak',
-        content: <ClosingSapronakTabContent projectFlockId={id} />,
+        content: <SapronakClosingTab projectFlockId={id} />,
       },
       {
         id: 'perhitunganSapronak',
         label: 'Perhitungan Sapronak',
         content: (
-          <ClosingSapronakCalculationTabContent
+          <SapronakCalculationClosingTab
             closingGeneralInformation={initialValue}
             projectFlockId={id}
           />
@@ -61,13 +55,13 @@ const ClosingDetail: React.FC<ClosingDetailProps> = ({
       {
         id: 'penjualan',
         label: 'Penjualan',
-        content: <SalesReportTable initialValues={salesData} />,
+        content: <SalesClosingTab projectFlockId={id} />,
       },
       {
         id: 'overhead',
         label: 'Overhead',
         content: (
-          <ClosingOverheadTabContent
+          <OverheadClosingTab
             projectFlockId={id}
             generalInformation={initialValue}
             kandangData={kandangData}
@@ -77,26 +71,26 @@ const ClosingDetail: React.FC<ClosingDetailProps> = ({
       {
         id: 'hppEkspedisi',
         label: 'HPP Ekspedisi',
-        content: <HppExpeditionReportTable initialValues={hppExpeditionData} />,
+        content: <HppExpeditionClosingTab projectFlockId={id} />,
       },
       {
         id: 'dataProduksi',
         label: 'Data Produksi',
-        content: <ClosingProductionDataTabContent projectFlockId={id} />,
+        content: <ProductionDataClosingTab projectFlockId={id} />,
       },
       {
         id: 'keuangan',
         label: 'Keuangan',
-        content: <ClosingFinanceTabContent projectFlockId={id} />,
+        content: <FinanceClosingTab projectFlockId={id} />,
       },
     ];
 
     return validTabs;
-  }, [initialValue]);
+  }, [initialValue, kandangData, id]);
 
   return (
     <>
-      <section className='w-full max-w-7xl pb-16'>
+      <section className='w-full'>
         <header className='flex flex-col gap-4'>
           <Button
             href={
@@ -126,13 +120,17 @@ const ClosingDetail: React.FC<ClosingDetailProps> = ({
         )}
 
         <Tabs
-          activeTabId={activeTab}
-          onTabChange={setActiveTab}
+          activeTabId={activeTabId}
+          onTabChange={setActiveTabId}
           tabs={closingDetailTabs}
-          variant='lifted'
+          variant='boxed'
           className={{
-            wrapper: 'w-full mt-4',
+            tabHeaderWrapper:
+              'relative justify-between items-center py-3 before:absolute before:top-0 before:left-0 before:right-0 before:-mx-4 before:border-t before:border-base-content/10 after:absolute after:bottom-0 after:left-0 after:right-0 after:-mx-4 after:border-b after:border-base-content/10',
+            tab: 'w-fit',
+            content: 'p-0 m-0',
           }}
+          sideContent={tabActions[activeTabId] || null}
         />
       </section>
     </>

src/components/pages/closing/ClosingFinanceTabContent.tsx

@@ -1,17 +0,0 @@
-import ClosingFinanceTable from '@/components/pages/closing/ClosingFinanceTable';
-
-const ClosingFinanceTabContent = ({
-  projectFlockId,
-}: {
-  projectFlockId: number;
-}) => {
-  return (
-    <div className='flex flex-col gap-4'>
-      {projectFlockId && (
-        <ClosingFinanceTable projectFlockId={projectFlockId} />
-      )}
-    </div>
-  );
-};
-
-export default ClosingFinanceTabContent;

src/components/pages/closing/ClosingFinanceTable.tsx

@@ -1,399 +0,0 @@
-import Card from '@/components/Card';
-import Table, { TABLE_DEFAULT_STYLING } from '@/components/Table';
-import { isResponseSuccess } from '@/lib/api-helper';
-import { formatCurrency, formatTitleCase } from '@/lib/helper';
-import { ClosingApi } from '@/services/api/closing';
-import { HppItem, ProfitLossItem } from '@/types/api/closing';
-import { useSearchParams } from 'next/navigation';
-import { useMemo } from 'react';
-import useSWR from 'swr';
-
-const ClosingFinanceTable = ({
-  projectFlockId,
-}: {
-  projectFlockId: number;
-}) => {
-  const searchParams = useSearchParams();
-  const kandangId = searchParams.get('kandangId');
-
-  const { data: finance, isLoading } = useSWR(
-    `/closing/finance/${projectFlockId}${kandangId ? `/${kandangId}` : ''}`,
-    () =>
-      ClosingApi.getFinance(
-        projectFlockId,
-        kandangId ? Number(kandangId) : undefined
-      )
-  );
-
-  const hppTableData: HppItem[] = useMemo(() => {
-    if (isResponseSuccess(finance)) {
-      const customItems = {
-        label: 'HPP dan Pengeluaran',
-        code: 'custom_row',
-      } as HppItem;
-      const purchases = finance.data.hpp.items.filter(
-        (item) => item.category === 'purchase'
-      );
-      const totalBudgeting = {
-        label: 'HPP dan Bahan Baku',
-        code: 'custom_row',
-      } as HppItem;
-      const overheads = finance.data.hpp.items.filter(
-        (item) => item.category === 'overhead'
-      );
-      return [customItems, ...purchases, totalBudgeting, ...overheads];
-    }
-    return [];
-  }, [finance]);
-
-  const profitLossTableData: ProfitLossItem[] = useMemo(() => {
-    if (isResponseSuccess(finance)) {
-      const incomes = finance.data.profit_loss.items.filter(
-        (item) => item.type === 'income'
-      );
-      const purchases = finance.data.profit_loss.items.filter(
-        (item) => item.type === 'purchase'
-      );
-      const overheads = finance.data.profit_loss.items.filter(
-        (item) => item.type === 'overhead'
-      );
-      const grossProfit = {
-        label: 'LABA RUGI BRUTO',
-        code: 'custom_row',
-        type: 'gross_profit',
-        rp_per_bird:
-          finance.data.profit_loss.summary.gross_profit.rp_per_bird ?? 0,
-        rp_per_kg: finance.data.profit_loss.summary.gross_profit.rp_per_kg ?? 0,
-        amount: finance.data.profit_loss.summary.gross_profit.amount ?? 0,
-      } as ProfitLossItem;
-      const subtotal = {
-        label: 'Subtotal',
-        code: 'custom_row',
-        type: 'subtotal',
-        rp_per_bird:
-          finance.data.profit_loss.summary.sub_total.rp_per_bird ?? 0,
-        rp_per_kg: finance.data.profit_loss.summary.sub_total.rp_per_kg ?? 0,
-        amount: finance.data.profit_loss.summary.sub_total.amount ?? 0,
-      } as ProfitLossItem;
-      return [...incomes, ...purchases, grossProfit, ...overheads, subtotal];
-    }
-    return [];
-  }, [finance]);
-
-  return (
-    <div className='flex flex-col gap-4'>
-      <>
-        <Card
-          variant='bordered'
-          className={{
-            wrapper: 'w-full',
-          }}
-        >
-          <div className='grid grid-cols-2 gap-6'>
-            <div className='flex flex-col gap-1'>
-              <div>Laba Rugi Brutto</div>
-              <div className='text-lg font-bold'>
-                {isResponseSuccess(finance)
-                  ? formatCurrency(
-                      finance.data.profit_loss.summary.gross_profit.amount
-                    )
-                  : '-'}
-              </div>
-            </div>
-            <div className='flex flex-col gap-1'>
-              <div>Laba Rugi Netto</div>
-              <div className='text-lg font-bold'>
-                {isResponseSuccess(finance)
-                  ? formatCurrency(
-                      finance.data.profit_loss.summary.net_profit.amount
-                    )
-                  : '-'}
-              </div>
-            </div>
-          </div>
-        </Card>
-        <Card
-          title='HPP Purchases'
-          variant='bordered'
-          collapsible
-          className={{
-            wrapper: 'w-full',
-          }}
-        >
-          <div className='mt-6 p-0 mb-0'>
-            <Table<HppItem>
-              data={hppTableData}
-              isLoading={isLoading}
-              columns={[
-                {
-                  header: 'No.',
-                  enableSorting: false,
-                  accessorFn: (item, index) => {
-                    if (item.code === 'custom_row') return '-';
-                    const dataRowsBefore = hppTableData
-                      .slice(0, index)
-                      .filter((row) => row.code !== 'custom_row').length;
-                    return dataRowsBefore + 1;
-                  },
-                  footer: (props) => {
-                    return 'HPP';
-                  },
-                },
-                {
-                  header: 'Jenis',
-                  enableSorting: false,
-                  accessorFn: (item) => formatTitleCase(item.label || '-'),
-                },
-                {
-                  header: 'Budgeting',
-                  enableSorting: false,
-                  columns: [
-                    {
-                      header: 'Rp/Ekor',
-                      id: 'budgeting_rp_per_bird',
-                      enableSorting: false,
-                      accessorFn: (item) =>
-                        formatCurrency(item.budgeting?.rp_per_bird || 0),
-                      footer: (props) => {
-                        return props.column.id === 'budgeting_rp_per_bird' &&
-                          isResponseSuccess(finance)
-                          ? formatCurrency(
-                              finance.data.hpp.summary?.budgeting
-                                ?.rp_per_bird || 0
-                            )
-                          : '-';
-                      },
-                    },
-                    {
-                      header: 'Rp/Kg',
-                      id: 'budgeting_rp_per_kg',
-                      enableSorting: false,
-                      accessorFn: (item) =>
-                        formatCurrency(item.budgeting?.rp_per_kg || 0),
-                      footer: (props) => {
-                        return props.column.id === 'budgeting_rp_per_kg' &&
-                          isResponseSuccess(finance)
-                          ? formatCurrency(
-                              finance.data.hpp.summary?.budgeting?.rp_per_kg ||
-                                0
-                            )
-                          : '-';
-                      },
-                    },
-                    {
-                      header: 'Jumlah (Rp)',
-                      id: 'budgeting_amount',
-                      enableSorting: false,
-                      accessorFn: (item) =>
-                        formatCurrency(item.budgeting?.amount || 0),
-                      footer: (props) => {
-                        return props.column.id === 'budgeting_amount' &&
-                          isResponseSuccess(finance)
-                          ? formatCurrency(
-                              finance.data.hpp.summary?.budgeting?.amount || 0
-                            )
-                          : '-';
-                      },
-                    },
-                  ],
-                },
-                {
-                  header: 'Realization',
-                  enableSorting: false,
-                  columns: [
-                    {
-                      header: 'Rp/Ekor',
-                      id: 'realization_rp_per_bird',
-                      enableSorting: false,
-                      accessorFn: (item) =>
-                        formatCurrency(item.realization?.rp_per_bird || 0),
-                      footer: (props) => {
-                        return props.column.id === 'realization_rp_per_bird' &&
-                          isResponseSuccess(finance)
-                          ? formatCurrency(
-                              finance.data.hpp.summary?.realization
-                                ?.rp_per_bird || 0
-                            )
-                          : '-';
-                      },
-                    },
-                    {
-                      header: 'Rp/Kg',
-                      id: 'realization_rp_per_kg',
-                      enableSorting: false,
-                      accessorFn: (item) =>
-                        formatCurrency(item.realization?.rp_per_kg || 0),
-                      footer: (props) => {
-                        return props.column.id === 'realization_rp_per_kg' &&
-                          isResponseSuccess(finance)
-                          ? formatCurrency(
-                              finance.data.hpp.summary?.realization
-                                ?.rp_per_kg || 0
-                            )
-                          : '-';
-                      },
-                    },
-                    {
-                      header: 'Jumlah (Rp)',
-                      id: 'realization_amount',
-                      enableSorting: false,
-                      accessorFn: (item) =>
-                        formatCurrency(item.realization?.amount || 0),
-                      footer: (props) => {
-                        return props.column.id === 'realization_amount' &&
-                          isResponseSuccess(finance)
-                          ? formatCurrency(
-                              finance.data.hpp.summary?.realization?.amount || 0
-                            )
-                          : '-';
-                      },
-                    },
-                  ],
-                },
-              ]}
-              renderCustomRow={(row) => {
-                const rowData = row.original;
-                if (rowData.code === 'custom_row') {
-                  return (
-                    <tr
-                      key={row.id}
-                      className={TABLE_DEFAULT_STYLING.bodyRowClassName}
-                    >
-                      <td
-                        className={TABLE_DEFAULT_STYLING.bodyColumnClassName}
-                      ></td>
-                      <td
-                        colSpan={7}
-                        className={TABLE_DEFAULT_STYLING.bodyColumnClassName}
-                      >
-                        <div className='font-bold'>
-                          {formatTitleCase(rowData.label ?? '-')}
-                        </div>
-                      </td>
-                    </tr>
-                  );
-                }
-                return null;
-              }}
-              renderFooter={isResponseSuccess(finance)}
-            />
-          </div>
-        </Card>
-        <Card
-          title='Profit/Loss'
-          variant='bordered'
-          collapsible
-          className={{
-            wrapper: 'w-full',
-          }}
-        >
-          <div className='mt-6 p-0 mb-0'>
-            <Table<ProfitLossItem>
-              data={profitLossTableData}
-              isLoading={isLoading}
-              columns={[
-                {
-                  header: 'Jenis',
-                  enableSorting: false,
-                  accessorFn: (item) => item.label,
-                  cell: (item) => (
-                    <div className=''>
-                      {formatTitleCase(item.row.original.label || '-')}
-                    </div>
-                  ),
-                  footer: () => (
-                    <div className='font-bold uppercase'>LABA RUGI NETTO</div>
-                  ),
-                },
-                {
-                  header: 'Rp/Ekor',
-                  enableSorting: false,
-                  accessorFn: (item) => formatCurrency(item.rp_per_bird || 0),
-                  footer: () => (
-                    <div className='font-bold'>
-                      {isResponseSuccess(finance)
-                        ? formatCurrency(
-                            finance.data.profit_loss.summary.net_profit
-                              .rp_per_bird || 0
-                          )
-                        : formatCurrency(0)}
-                    </div>
-                  ),
-                },
-                {
-                  header: 'Rp/Kg',
-                  enableSorting: false,
-                  accessorFn: (item) => formatCurrency(item.rp_per_kg || 0),
-                  footer: () => (
-                    <div className='font-bold'>
-                      {isResponseSuccess(finance)
-                        ? formatCurrency(
-                            finance.data.profit_loss.summary.net_profit
-                              .rp_per_kg || 0
-                          )
-                        : formatCurrency(0)}
-                    </div>
-                  ),
-                },
-                {
-                  header: 'Jumlah (Rp)',
-                  enableSorting: false,
-                  accessorFn: (item) => formatCurrency(item.amount || 0),
-                  footer: () => (
-                    <div className='font-bold'>
-                      {isResponseSuccess(finance)
-                        ? formatCurrency(
-                            finance.data.profit_loss.summary.net_profit
-                              .amount || 0
-                          )
-                        : formatCurrency(0)}
-                    </div>
-                  ),
-                },
-              ]}
-              renderCustomRow={(row) => {
-                const rowData = row.original;
-                if (rowData.code === 'custom_row') {
-                  return (
-                    <tr
-                      key={row.id}
-                      className={TABLE_DEFAULT_STYLING.footerRowClassName}
-                    >
-                      <td className={TABLE_DEFAULT_STYLING.bodyColumnClassName}>
-                        <div className='font-bold ps-6 uppercase'>
-                          {formatTitleCase(rowData.label ?? '-')}
-                        </div>
-                      </td>
-                      <td className={TABLE_DEFAULT_STYLING.bodyColumnClassName}>
-                        <div className='font-bold'>
-                          {formatCurrency(rowData.rp_per_bird ?? 0)}
-                        </div>
-                      </td>
-                      <td className={TABLE_DEFAULT_STYLING.bodyColumnClassName}>
-                        <div className='font-bold'>
-                          {formatCurrency(rowData.rp_per_kg ?? 0)}
-                        </div>
-                      </td>
-                      <td className={TABLE_DEFAULT_STYLING.bodyColumnClassName}>
-                        <div className='font-bold'>
-                          {formatCurrency(rowData.amount ?? 0)}
-                        </div>
-                      </td>
-                    </tr>
-                  );
-                }
-                return null;
-              }}
-              className={{
-                paginationClassName: 'hidden',
-              }}
-              renderFooter={isResponseSuccess(finance)}
-            />
-          </div>
-        </Card>
-      </>
-    </div>
-  );
-};
-
-export default ClosingFinanceTable;

src/components/pages/closing/ClosingKandangList.tsx

@@ -10,18 +10,18 @@ const ClosingKandangList = ({
   projectData?: ProjectFlock;
 }) => {
   return (
-    <div className='w-full my-4 @container'>
+    <div className='w-full py-3 @container relative before:absolute before:top-0 before:left-0 before:right-0 before:-mx-4 before:border-t before:border-base-content/10'>
       <div className='flex flex-col @sm:flex-row gap-4'>
         <div className='w-full'>
           <div className='overflow-x-auto'>
-            <h1 className='font-bold my-4'>Kandang</h1>
-            <div className='flex flex-wrap gap-2 mb-4'>
+            <h1 className='font-bold mb-3'>Kandang</h1>
+            <div className='flex flex-wrap gap-2'>
               {projectData?.kandangs?.map((kandang) => (
                 <Button
                   key={kandang.id}
                   variant='outline'
+                  className='px-3 py-2.5 w-fit text-sm rounded-lg shadow-sm'
                   href={`/closing/detail/?closingId=${initialValue?.flock_id}&kandangId=${kandang.project_flock_kandang_id}`}
-                  className='min-w-32'
                 >
                   {kandang.name}
                 </Button>

src/components/pages/closing/ClosingProductionDataTabContent.tsx

@@ -1,308 +0,0 @@
-'use client';
-
-import { useSearchParams } from 'next/navigation';
-import useSWR from 'swr';
-import { ClosingApi } from '@/services/api/closing';
-import { isResponseSuccess } from '@/lib/api-helper';
-import { formatNumber } from '@/lib/helper';
-
-interface ClosingProductionDataTabContentProps {
-  projectFlockId: number;
-}
-
-const ClosingProductionDataTabContent = ({
-  projectFlockId,
-}: ClosingProductionDataTabContentProps) => {
-  const searchParams = useSearchParams();
-  const kandangId = searchParams.get('kandangId');
-
-  const { data: productionData, isLoading } = useSWR(
-    `${ClosingApi.basePath}/${projectFlockId}/production-data?kandang_id=${kandangId ? `${kandangId}` : ''}`,
-    () => ClosingApi.getProductionData(projectFlockId, Number(kandangId))
-  );
-
-  if (isLoading) {
-    return (
-      <div className='w-full flex justify-center py-8'>
-        <span className='loading loading-spinner loading-lg' />
-      </div>
-    );
-  }
-
-  if (!productionData || !isResponseSuccess(productionData)) {
-    return (
-      <div className='w-full text-center py-8 text-gray-500'>
-        Gagal memuat data produksi.
-      </div>
-    );
-  }
-
-  const { purchase, sales, performance } = productionData.data;
-
-  // Helper for consistent row styling
-  const DataRow = ({
-    label,
-    value,
-    unit = '',
-    valueClassName = 'font-bold text-gray-800',
-    unitClassName = 'text-gray-500 w-12 text-right',
-  }: {
-    label: string;
-    value: string | number;
-    unit?: string;
-    valueClassName?: string;
-    unitClassName?: string;
-  }) => (
-    <div className='flex justify-between items-center py-1'>
-      <span className='text-gray-500 text-sm font-medium w-1/2'>{label}</span>
-      <div className='flex gap-2 w-1/2 justify-end items-center'>
-        <span className={valueClassName}>{value}</span>
-        {unit && <span className={unitClassName}>{unit}</span>}
-      </div>
-    </div>
-  );
-
-  return (
-    <div className='w-full rounded-xl p-8 shadow-sm'>
-      <h2 className='text-lg font-bold mb-8 text-gray-800'>Data Produksi</h2>
-
-      <div className='grid grid-cols-1 lg:grid-cols-2 gap-x-24 gap-y-12 relative'>
-        {/* Left Column */}
-        <div className='space-y-10'>
-          {/* Purchase Section */}
-          <section>
-            <h3 className='font-bold text-gray-700 mb-4 text-base'>
-              Pembelian
-            </h3>
-            <div className='space-y-1'>
-              <DataRow
-                label='Populasi Awal'
-                value={formatNumber(purchase.initial_population)}
-                unit='Ekor'
-              />
-              <DataRow
-                label='Claim Culling'
-                value={formatNumber(purchase.claim_culling)}
-                unit='Ekor'
-              />
-              <DataRow
-                label='Populasi Akhir'
-                value={formatNumber(purchase.final_population)}
-                unit='Ekor'
-              />
-              <DataRow
-                label='Pakan Masuk'
-                value={formatNumber(purchase.feed_in)}
-                unit='Kg'
-              />
-              <DataRow
-                label='Pakan Terpakai'
-                value={formatNumber(purchase.feed_used)}
-                unit='Kg'
-              />
-            </div>
-          </section>
-
-          {/* Sales Section */}
-          <section>
-            <h3 className='font-bold text-gray-700 mb-4 text-base'>
-              Penjualan
-            </h3>
-            <div className='space-y-4'>
-              {/* Chicken Sales */}
-              <div className='space-y-1'>
-                <DataRow
-                  label='Penjualan (Ekor)'
-                  value={formatNumber(sales.chicken.sales_population)}
-                  unit='Ekor'
-                />
-                <DataRow
-                  label='Penjualan (Kg)'
-                  value={formatNumber(sales.chicken.sales_weight)}
-                  unit='Kg'
-                />
-                <DataRow
-                  label='Bobot Rata-Rata'
-                  value={formatNumber(sales.chicken.avg_weight)}
-                  unit='Kg/Ekor'
-                />
-                <DataRow
-                  label='Harga Jual Rata-Rata'
-                  value={formatNumber(sales.chicken.avg_selling_price)}
-                  unit='Rupiah'
-                />
-              </div>
-
-              {/* Egg Sales (if available) */}
-              {sales.egg && (
-                <>
-                  <div className='h-px bg-gray-100 my-2' />
-                  <div className='space-y-1'>
-                    <DataRow
-                      label='Telur (Butir)'
-                      value={formatNumber(sales.egg.egg_pieces)}
-                      unit='Butir'
-                    />
-                    <DataRow
-                      label='Telur (Kg)'
-                      value={formatNumber(sales.egg.egg_mass)}
-                      unit='Kg'
-                    />
-                    <DataRow
-                      label='Berat Telur Rata-Rata'
-                      value={formatNumber(sales.egg.avg_egg_weight)}
-                      unit='Kg'
-                    />
-                    <DataRow
-                      label='Harga Jual Telur Rata-Rata'
-                      value={formatNumber(sales.egg.avg_selling_price)}
-                      unit='Rupiah'
-                    />
-                  </div>
-                </>
-              )}
-            </div>
-          </section>
-        </div>
-
-        {/* Divider Line (Absolute centered) */}
-        <div className='hidden lg:block absolute left-1/2 top-0 bottom-0 w-px bg-gray-200 -translate-x-1/2' />
-
-        {/* Right Column */}
-        <div className='space-y-10 flex flex-col h-full'>
-          {/* Performance Section */}
-          <section>
-            <h3 className='font-bold text-gray-700 mb-4 text-base'>
-              Performance
-            </h3>
-            <div className='space-y-1'>
-              <DataRow
-                label='Deplesi'
-                value={formatNumber(performance.depletion)}
-                unit='Ekor'
-              />
-              <DataRow
-                label='Umur'
-                value={formatNumber(performance.age_day)}
-                unit='Hari'
-              />
-              <DataRow
-                label='Mortalitas Std'
-                value={formatNumber(performance.mor_std)}
-                unitClassName='hidden'
-              />
-              <DataRow
-                label='Mortalitas Act'
-                value={formatNumber(performance.mor_act)}
-                unitClassName='hidden'
-              />
-              <DataRow
-                label='DEFF Mortalitas'
-                value={formatNumber(performance.mor_diff)}
-                unitClassName='hidden'
-              />
-              {/* <DataRow
-                label='AWG Std'
-                value={formatNumber(performance.awg_std)}
-                unit='Gr/Hari'
-              />
-              <DataRow
-                label='AWG Act'
-                value={formatNumber(performance.awg_act)}
-                unit='Gr/Hari'
-              /> */}
-              <DataRow
-                label='Feed Intake Std'
-                value={formatNumber(performance.feed_intake_std)}
-                unitClassName='hidden'
-              />
-              <DataRow
-                label='Feed Intake Act'
-                value={formatNumber(performance.feed_intake)}
-                unitClassName='hidden'
-              />
-              <DataRow
-                label='FCR Std'
-                value={formatNumber(performance.fcr_std)}
-                unitClassName='hidden'
-              />
-              <DataRow
-                label='FCR Act'
-                value={formatNumber(performance.fcr_act)}
-                unitClassName='hidden'
-              />
-              <DataRow
-                label='DEFF FCR'
-                value={formatNumber(performance.fcr_diff)}
-                unitClassName='hidden'
-              />
-
-              {/* Laying Specific Fields */}
-              {performance.hen_day_act !== undefined && (
-                <>
-                  <DataRow
-                    label='Hen Day Std'
-                    value={formatNumber(performance.hen_day_std!)}
-                    unit='%'
-                  />
-                  <DataRow
-                    label='Hen Day Act'
-                    value={formatNumber(performance.hen_day_act)}
-                    unit='%'
-                  />
-                </>
-              )}
-
-              {performance.egg_mass !== undefined && (
-                <>
-                  <DataRow
-                    label='Egg Mass Std'
-                    value={formatNumber(performance.egg_mass_std!)}
-                    unit='Kg'
-                  />
-                  <DataRow
-                    label='Egg Mass Act'
-                    value={formatNumber(performance.egg_mass)}
-                    unit='Kg'
-                  />
-                </>
-              )}
-
-              {performance.egg_weight !== undefined && (
-                <>
-                  <DataRow
-                    label='Egg Weight Std'
-                    value={formatNumber(performance.egg_weight_std!)}
-                    unit='Gr'
-                  />
-                  <DataRow
-                    label='Egg Weight Act'
-                    value={formatNumber(performance.egg_weight)}
-                    unit='Gr'
-                  />
-                </>
-              )}
-
-              {performance.hen_housed_act !== undefined && (
-                <>
-                  <DataRow
-                    label='Hen Housed Std'
-                    value={formatNumber(performance.hen_housed_std!)}
-                    unit='%'
-                  />
-                  <DataRow
-                    label='Hen Housed Act'
-                    value={formatNumber(performance.hen_housed_act)}
-                    unit='%'
-                  />
-                </>
-              )}
-            </div>
-          </section>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default ClosingProductionDataTabContent;

src/components/pages/closing/ClosingSapronakCalculationTable.tsx

@@ -1,268 +0,0 @@
-'use client';
-
-import Card from '@/components/Card';
-
-import Table from '@/components/Table';
-import { formatCurrency, formatDate, formatNumber } from '@/lib/helper';
-import {
-  RowSapronakCalculation,
-  TotalSapronakCalculation,
-} from '@/types/api/closing';
-import { ColumnDef } from '@tanstack/react-table';
-import { useMemo } from 'react';
-import useSWR from 'swr';
-import { ClosingApi } from '@/services/api/closing';
-import { isResponseSuccess } from '@/lib/api-helper';
-import { ClosingGeneralInformation } from '@/types/api/closing';
-import { useSearchParams } from 'next/navigation';
-
-interface ClosingSapronakCalculationTableProps {
-  projectFlockId: number;
-  closingGeneralInformation?: ClosingGeneralInformation;
-}
-
-const ClosingSapronakCalculationTable = ({
-  projectFlockId,
-  closingGeneralInformation,
-}: ClosingSapronakCalculationTableProps) => {
-  const searchParams = useSearchParams();
-  const kandangId = searchParams.get('kandangId');
-
-  const { data: sapronakCalculation, isLoading } = useSWR(
-    `/closing/sapronak-calculation/${projectFlockId}${kandangId ? `/${kandangId}` : ''}`,
-    () => ClosingApi.getPerhitunganSapronak(projectFlockId, Number(kandangId)),
-    {
-      keepPreviousData: true,
-    }
-  );
-
-  // Helper function to create columns with footer support
-  const createColumns = (
-    total?: TotalSapronakCalculation
-  ): ColumnDef<RowSapronakCalculation>[] => [
-    {
-      header: 'Tanggal',
-      accessorKey: 'date',
-      cell: (props) =>
-        props.row.original.date
-          ? formatDate(props.row.original.date, 'DD MMM YYYY')
-          : '-',
-      footer: 'Total',
-    },
-    {
-      header: 'No. Referensi',
-      accessorKey: 'reference_number',
-      cell: (props) => (props.row.original.reference_number as string) || '-',
-      footer: '',
-    },
-    {
-      header: 'QTY Masuk',
-      accessorKey: 'qty_in',
-      cell: (props) =>
-        props.row.original.qty_in
-          ? formatNumber(props.row.original.qty_in as number)
-          : '0',
-      footer: total
-        ? () => (
-            <div className='font-semibold text-gray-900'>
-              {total?.qty_in ? formatNumber(total?.qty_in) : '0'}
-            </div>
-          )
-        : '',
-    },
-    {
-      header: 'QTY Keluar',
-      accessorKey: 'qty_out',
-      cell: (props) =>
-        props.row.original.qty_out
-          ? formatNumber(props.row.original.qty_out as number)
-          : '0',
-      footer: total
-        ? () => (
-            <div className='font-semibold text-gray-900'>
-              {total?.qty_out ? formatNumber(total?.qty_out) : '0'}
-            </div>
-          )
-        : '',
-    },
-    {
-      header: 'QTY Pakai',
-      accessorKey: 'qty_used',
-      cell: (props) =>
-        props.row.original.qty_used
-          ? formatNumber(props.row.original.qty_used as number)
-          : '0',
-      footer: total
-        ? () => (
-            <div className='font-semibold text-gray-900'>
-              {total?.qty_used ? formatNumber(total?.qty_used) : '0'}
-            </div>
-          )
-        : '',
-    },
-    {
-      header: 'Uraian',
-      accessorKey: 'description',
-      cell: (props) => (props.row.original.description as string) || '-',
-      footer: '',
-    },
-    {
-      header: 'Kategori Produk',
-      accessorKey: 'product_category',
-      cell: (props) => (props.row.original.product_category as string) || '-',
-      footer: '',
-    },
-    {
-      header: 'Harga Beli/Qty (Rp)',
-      accessorKey: 'unit_price',
-      cell: (props) =>
-        props.row.original.unit_price
-          ? formatCurrency(props.row.original.unit_price as number)
-          : '-',
-      footer: total
-        ? () => (
-            <div className='font-semibold text-gray-900'>
-              {total?.avg_unit_price
-                ? formatCurrency(total?.avg_unit_price)
-                : '-'}
-            </div>
-          )
-        : '',
-    },
-    {
-      header: 'Total Harga (Rp)',
-      accessorKey: 'total_amount',
-      cell: (props) =>
-        props.row.original.total_amount
-          ? formatCurrency(props.row.original.total_amount as number)
-          : '-',
-      footer: total
-        ? () => (
-            <div className='font-semibold text-gray-900'>
-              {total?.total_amount ? formatCurrency(total?.total_amount) : '-'}
-            </div>
-          )
-        : '',
-    },
-    {
-      header: 'Keterangan',
-      accessorKey: 'notes',
-      cell: (props) => (props.row.original.notes as string) || '-',
-      footer: '',
-    },
-  ];
-
-  // Memoize columns untuk setiap kategori
-  const docColumns = useMemo(
-    () =>
-      isResponseSuccess(sapronakCalculation)
-        ? createColumns(sapronakCalculation.data?.doc?.total)
-        : createColumns(),
-    [sapronakCalculation]
-  );
-
-  const ovkColumns = useMemo(
-    () =>
-      isResponseSuccess(sapronakCalculation)
-        ? createColumns(sapronakCalculation.data?.ovk?.total)
-        : createColumns(),
-    [sapronakCalculation]
-  );
-
-  const pakanColumns = useMemo(
-    () =>
-      isResponseSuccess(sapronakCalculation)
-        ? createColumns(sapronakCalculation.data?.pakan?.total)
-        : createColumns(),
-    [sapronakCalculation]
-  );
-
-  return (
-    <div className='flex flex-col gap-4'>
-      {/* Table DOC jika kategori Project Flock Growing */}
-      <Card
-        title={
-          closingGeneralInformation?.project_type == 'GROWING'
-            ? 'DOC'
-            : 'Pullet'
-        }
-        collapsible
-        defaultCollapsed={false}
-        className={{
-          wrapper: 'w-full',
-          body: 'p-4 shadow',
-        }}
-      >
-        <Table<RowSapronakCalculation>
-          data={
-            isResponseSuccess(sapronakCalculation)
-              ? (sapronakCalculation.data?.doc?.rows ?? [])
-              : []
-          }
-          columns={docColumns}
-          className={{
-            containerClassName: 'my-4',
-          }}
-          renderFooter={
-            isResponseSuccess(sapronakCalculation) &&
-            sapronakCalculation.data?.doc?.rows.length > 0
-          }
-        />
-      </Card>
-
-      <Card
-        title='OVK'
-        variant='bordered'
-        collapsible
-        defaultCollapsed={true}
-        className={{
-          wrapper: 'w-full',
-        }}
-      >
-        <Table<RowSapronakCalculation>
-          data={
-            isResponseSuccess(sapronakCalculation)
-              ? (sapronakCalculation.data?.ovk?.rows ?? [])
-              : []
-          }
-          columns={ovkColumns}
-          className={{
-            containerClassName: 'my-4',
-          }}
-          renderFooter={
-            isResponseSuccess(sapronakCalculation) &&
-            sapronakCalculation.data?.ovk?.rows.length > 0
-          }
-        />
-      </Card>
-
-      <Card
-        title='Pakan'
-        variant='bordered'
-        collapsible
-        defaultCollapsed={true}
-        className={{
-          wrapper: 'w-full',
-        }}
-      >
-        <Table<RowSapronakCalculation>
-          data={
-            isResponseSuccess(sapronakCalculation)
-              ? (sapronakCalculation.data?.pakan?.rows ?? [])
-              : []
-          }
-          columns={pakanColumns}
-          className={{
-            containerClassName: 'my-4',
-          }}
-          renderFooter={
-            isResponseSuccess(sapronakCalculation) &&
-            sapronakCalculation.data?.pakan?.rows.length > 0
-          }
-        />
-      </Card>
-    </div>
-  );
-};
-
-export default ClosingSapronakCalculationTable;

src/components/pages/closing/ClosingSapronakTabContent.tsx

@@ -1,36 +0,0 @@
-'use client';
-
-import ClosingIncomingSapronaksTable from '@/components/pages/closing/ClosingIncomingSapronaksTable';
-import ClosingOutgoingSapronaksTable from '@/components/pages/closing/ClosingOutgoingSapronaksTable';
-import ClosingIncomingSapronaksSummaryTable from '@/components/pages/closing/ClosingIncomingSapronaksSummaryTable';
-import ClosingOutgoingSapronaksSummaryTable from './ClosingOutgoingSapronaksSummaryTable';
-
-interface ClosingSapronakTableProps {
-  projectFlockId?: number;
-}
-
-const ClosingSapronakTabContent = ({
-  projectFlockId,
-}: ClosingSapronakTableProps) => {
-  return (
-    <div className='flex flex-col gap-4'>
-      {projectFlockId && (
-        <>
-          <ClosingIncomingSapronaksTable projectFlockId={projectFlockId} />
-
-          <ClosingIncomingSapronaksSummaryTable
-            projectFlockId={projectFlockId}
-          />
-
-          <ClosingOutgoingSapronaksTable projectFlockId={projectFlockId} />
-
-          <ClosingOutgoingSapronaksSummaryTable
-            projectFlockId={projectFlockId}
-          />
-        </>
-      )}
-    </div>
-  );
-};
-
-export default ClosingSapronakTabContent;

src/components/pages/closing/ClosingsTable.tsx

@@ -1,68 +1,122 @@
 'use client';
 
-import { ChangeEventHandler, useEffect, useState } from 'react';
+import { ChangeEventHandler, useEffect, useState, useMemo } from 'react';
+import { usePathname } from 'next/navigation';
+import { useUiStore } from '@/stores/ui/ui.store';
 import useSWR from 'swr';
 import { CellContext, ColumnDef, SortingState } from '@tanstack/react-table';
+import { useRouter } from 'next/navigation';
 
 import { Icon } from '@iconify/react';
 import Table from '@/components/Table';
 import DebouncedTextInput from '@/components/input/DebouncedTextInput';
 import Button from '@/components/Button';
-import SelectInput, {
-  OptionType,
-  useSelect,
-} from '@/components/input/SelectInput';
-import RowDropdownOptions from '@/components/table/RowDropdownOptions';
-import RowCollapseOptions from '@/components/table/RowCollapseOptions';
-import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper';
+import SelectInput, { useSelect } from '@/components/input/SelectInput';
+import PopoverButton from '@/components/popover/PopoverButton';
+import PopoverContent from '@/components/popover/PopoverContent';
 import RequirePermission from '@/components/helper/RequirePermission';
+import StatusBadge from '@/components/helper/StatusBadge';
+import Modal, { useModal } from '@/components/Modal';
+import SelectInputRadio from '@/components/input/SelectInputRadio';
+import { useFormik } from 'formik';
 
-import { cn, formatCurrency, formatDate } from '@/lib/helper';
+import { cn, formatDate } from '@/lib/helper';
 import { isResponseSuccess } from '@/lib/api-helper';
 import { useTableFilter } from '@/services/hooks/useTableFilter';
 import { LocationApi } from '@/services/api/master-data';
 import { Location } from '@/types/api/master-data/location';
 import { ClosingApi } from '@/services/api/closing';
 import { Closing } from '@/types/api/closing';
-
-const PROJECT_STATUS_OPTIONS = [
-  {
-    value: 1,
-    label: 'Pengajuan',
-  },
-  {
-    value: 2,
-    label: 'Aktif',
-  },
-];
+import { Color } from '@/types/theme';
+import {
+  ClosingFilterSchema,
+  ClosingFilterType,
+} from '@/components/pages/closing/filter/ClosingFilter';
+import ClosingTableSkeleton from '@/components/pages/closing/skeleton/ClosingTableSkeleton';
+import ButtonFilter from '@/components/helper/ButtonFilter';
 
 const RowOptionsMenu = ({
-  type = 'dropdown',
   props,
+  popoverPosition = 'bottom',
+  detailClickHandler,
 }: {
-  type: 'dropdown' | 'collapse';
   props: CellContext<Closing, unknown>;
+  popoverPosition: 'bottom' | 'top';
+  detailClickHandler: (id: number) => void;
 }) => {
+  const popoverId = `closing#${props.row.original.id}`;
+  const popoverAnchorName = `--anchor-closing#${props.row.original.id}`;
+
+  const closePopover = () => {
+    document.getElementById(popoverId)?.hidePopover();
+  };
+
+  const detailClickHandlerWrapper = () => {
+    detailClickHandler(props.row.original.id);
+    closePopover();
+  };
+
   return (
-    <RowOptionsMenuWrapper type={type}>
-      <div className='w-full max-h-40 overflow-auto flex flex-col gap-1'>
-        <RequirePermission permissions='lti.closing.detail'>
-          <Button
-            href={`/closing/detail/?closingId=${props.row.original.id}`}
-            variant='ghost'
-            color='primary'
-            className='justify-start text-sm'
-          >
-            <Icon icon='mdi:eye-outline' width={16} height={16} />
-            Detail
-          </Button>
-        </RequirePermission>
-      </div>
-    </RowOptionsMenuWrapper>
+    <div className='relative'>
+      <PopoverButton
+        tabIndex={0}
+        variant='ghost'
+        color='none'
+        popoverTarget={popoverId}
+        anchorName={popoverAnchorName}
+      >
+        <Icon icon='material-symbols:more-vert' width={16} height={16} />
+      </PopoverButton>
+
+      <PopoverContent
+        id={popoverId}
+        anchorName={popoverAnchorName}
+        position={popoverPosition === 'bottom' ? 'bottom-start' : 'left'}
+        className='w-full max-w-40 rounded-xl border border-base-content/5 shadow-sm'
+      >
+        <div className='flex flex-col bg-base-100 rounded-xl'>
+          <RequirePermission permissions='lti.closing.detail'>
+            <Button
+              variant='ghost'
+              color='none'
+              onClick={detailClickHandlerWrapper}
+              className='p-3 justify-start text-sm font-semibold w-full'
+            >
+              <Icon icon='heroicons:eye' width={20} height={20} />
+              View Details
+            </Button>
+          </RequirePermission>
+        </div>
+      </PopoverContent>
+    </div>
   );
 };
 
 const ClosingsTable = () => {
+  const { searchValue, setSearchValue, setTableState } = useUiStore();
+  const pathname = usePathname();
+
+  // ===== ROUTER =====
+  const router = useRouter();
+
+  // ===== STATUS BADGE COLOR HELPER =====
+  const getProjectStatusBadgeColor = (status: string): Color => {
+    const normalizedValue = status.toLowerCase();
+
+    if (normalizedValue === 'aktif') {
+      return 'success';
+    }
+
+    if (normalizedValue === 'pengajuan') {
+      return 'neutral';
+    }
+
+    return 'neutral';
+  };
+
+  // ===== FILTER MODAL STATE =====
+  const filterModal = useModal();
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -72,36 +126,68 @@ const ClosingsTable = () => {
   } = useTableFilter({
     initial: {
       search: '',
-      nameSort: '',
-      transactionDate: '',
-      realizationDate: '',
-      locationId: '',
-      projectStatus: '',
-      userId: '',
+      // nameSort: '',
+      // transactionDate: '',
+      // realizationDate: '',
+      location_id: '',
+      project_status: '',
+      // userId: '',
     },
     paramMap: {
       page: 'page',
       pageSize: 'limit',
-      nameSort: 'sort_name',
-      transactionDate: 'transaction_date',
-      realizationDate: 'realization_date',
-      locationId: 'location_id',
-      projectStatus: 'project_status',
-      userId: 'user_id',
+      // nameSort: 'sort_name',
+      // transactionDate: 'transaction_date',
+      // realizationDate: 'realization_date',
+      // locationId: 'location_id',
+      // projectStatus: 'project_status',
+      // userId: 'user_id',
+      search: 'search',
+      location_id: 'location_id',
+      project_status: 'project_status',
     },
   });
 
+  // ===== FORMIK SETUP =====
+  const formik = useFormik<ClosingFilterType>({
+    initialValues: {
+      location_id: null,
+      project_status: null,
+    },
+    validationSchema: ClosingFilterSchema,
+    onSubmit: (values, { setSubmitting }) => {
+      updateFilter('location_id', values.location_id || '');
+      updateFilter('project_status', values.project_status || '');
+      filterModal.closeModal();
+      setSubmitting(false);
+    },
+    onReset: () => {
+      updateFilter('location_id', '');
+      updateFilter('project_status', '');
+      filterModal.closeModal();
+    },
+  });
+
+  // ===== DATA FETCHING =====
   const { data: closings, isLoading: isLoadingClosings } = useSWR(
     `${ClosingApi.basePath}${getTableFilterQueryString()}`,
     ClosingApi.getAllFetcher
   );
 
+  const data = useMemo(
+    () =>
+      isResponseSuccess(closings) ? (closings?.data as Closing[]) || [] : [],
+    [closings]
+  );
+
+  // ===== PAGINATION & STATE =====
   const [sorting, setSorting] = useState<SortingState>([]);
   const [rowSelection, setRowSelection] = useState<Record<string, boolean>>({});
 
+  // ===== TABLE COLUMNS =====
   const closingsColumns: ColumnDef<Closing>[] = [
     {
-      header: '#',
+      header: 'No',
       cell: (props) => props.row.index + 1,
     },
     {
@@ -133,6 +219,19 @@ const ClosingsTable = () => {
     {
       accessorKey: 'project_status',
       header: 'Status',
+      cell: (props) => {
+        const status = props.row.original.project_status;
+        const badgeColor = getProjectStatusBadgeColor(status);
+        return (
+          <StatusBadge
+            color={badgeColor}
+            text={status}
+            className={{
+              badge: 'whitespace-nowrap',
+            }}
+          />
+        );
+      },
     },
     {
       header: 'Aksi',
@@ -142,27 +241,24 @@ const ClosingsTable = () => {
         const currentRowRelativeIndex =
           currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
 
-        const isLast2Rows = currentRowRelativeIndex > currentPageSize - 3;
+        const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
+
+        const detailClickHandler = (id: number) => {
+          router.push(`/closing/detail/?closingId=${id}`);
+        };
 
         return (
-          <>
-            {currentPageSize > 3 && (
-              <RowDropdownOptions isLast2Rows={isLast2Rows}>
-                <RowOptionsMenu type='dropdown' props={props} />
-              </RowDropdownOptions>
-            )}
-
-            {currentPageSize <= 3 && (
-              <RowCollapseOptions>
-                <RowOptionsMenu type='collapse' props={props} />
-              </RowCollapseOptions>
-            )}
-          </>
+          <RowOptionsMenu
+            props={props}
+            detailClickHandler={detailClickHandler}
+            popoverPosition={isLast2Rows ? 'top' : 'bottom'}
+          />
         );
       },
     },
   ];
 
+  // ===== LOCATION OPTIONS =====
   const {
     setInputValue: setLocationInputValue,
     options: locationOptions,
@@ -170,115 +266,222 @@ const ClosingsTable = () => {
     loadMore: loadMoreLocations,
   } = useSelect<Location>(LocationApi.basePath, 'id', 'name');
 
-  const [selectedLocation, setSelectedLocation] = useState<OptionType | null>(
-    null
+  // ===== PROJECT STATUS OPTIONS =====
+  const projectStatusOptions = useMemo(
+    () => [
+      { value: '1', label: 'Pengajuan' },
+      { value: '2', label: 'Aktif' },
+    ],
+    []
   );
 
-  const locationChangeHandler = (val: OptionType | OptionType[] | null) => {
-    setSelectedLocation(val as OptionType);
-    updateFilter(
-      'locationId',
-      val ? ((val as OptionType).value as string) : ''
+  // ===== FILTER HELPERS =====
+  const locationIdValue = useMemo(() => {
+    if (!formik.values.location_id) return null;
+    return (
+      locationOptions.find(
+        (opt) => String(opt.value) === formik.values.location_id
+      ) || null
     );
-  };
+  }, [formik.values.location_id, locationOptions]);
 
-  const [selectedProjectStatus, setSelectedProjectStatus] =
-    useState<OptionType | null>(null);
-
-  const projectStatusChangeHandler = (
-    val: OptionType | OptionType[] | null
-  ) => {
-    setSelectedProjectStatus(val as OptionType);
-    updateFilter(
-      'projectStatus',
-      val ? ((val as OptionType).value as string) : ''
+  const projectStatusValue = useMemo(() => {
+    if (!formik.values.project_status) return null;
+    return (
+      projectStatusOptions.find(
+        (opt) => opt.value === formik.values.project_status
+      ) || null
     );
-  };
+  }, [formik.values.project_status, projectStatusOptions]);
 
+  useEffect(() => {
+    updateFilter('search', searchValue);
+  }, [searchValue, updateFilter]);
+
+  useEffect(() => {
+    setTableState('closing-table', pathname);
+  }, [pathname, setTableState]);
+
+  // ===== SEARCH CHANGE HANDLER =====
   const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
+    setSearchValue(e.target.value);
     updateFilter('search', e.target.value);
   };
 
+  // ===== HANDLE FILTER MODAL OPEN =====
+  const handleFilterModalOpen = () => {
+    filterModal.openModal();
+    formik.validateForm();
+  };
+
   // track sorting
   useEffect(() => {
     const isNameSorted = sorting.find((sortItem) => sortItem.id === 'name');
 
     if (!isNameSorted) {
-      updateFilter('nameSort', '');
+      // updateFilter('nameSort', '');
     } else {
-      updateFilter('nameSort', isNameSorted.desc ? 'desc' : 'asc');
+      // updateFilter('nameSort', isNameSorted.desc ? 'desc' : 'asc');
     }
-  }, [sorting, updateFilter]);
+  }, [sorting]);
 
   return (
     <>
-      <div className='w-full p-0 sm:p-4'>
-        <div className='flex flex-col gap-2 mb-4'>
-          <div className='flex flex-col gap-2 mb-4'>
-            <div className='w-full flex flex-col sm:flex-row justify-end items-end sm:items-center gap-4'>
+      <div className='w-full'>
+        <div className='flex flex-col mb-4'>
+          <div className='relative w-full p-3 pt-0 px-0 flex flex-row justify-between gap-3 flex-wrap after:absolute after:bottom-0 after:left-0 after:right-0 after:-mx-4 after:border-b after:border-base-content/10'>
+            <div className='flex flex-1 flex-row justify-start sm:justify-end items-center gap-3 flex-wrap'>
               <DebouncedTextInput
                 name='search'
-                placeholder='Cari Closing'
-                value={tableFilterState.search}
+                placeholder='Search'
+                value={tableFilterState.search ?? ''}
                 onChange={searchChangeHandler}
-                className={{ wrapper: 'sm:max-w-3xs' }}
-              />
-            </div>
-
-            <div className='grid grid-cols-12 justify-end gap-2'>
-              <SelectInput
-                label='Lokasi'
-                options={locationOptions}
-                isLoading={isLoadingLocationOptions}
-                value={selectedLocation}
-                onChange={locationChangeHandler}
-                onInputChange={setLocationInputValue}
-                onMenuScrollToBottom={loadMoreLocations}
-                isClearable
+                startAdornment={
+                  <Icon
+                    icon='heroicons:magnifying-glass'
+                    width={20}
+                    height={20}
+                  />
+                }
                 className={{
-                  wrapper: 'col-span-12 sm:col-span-6',
+                  wrapper: 'w-full min-w-24 max-w-3xs',
+                  inputWrapper: 'rounded-xl! shadow-button-soft',
+                  input:
+                    'placeholder:font-semibold placeholder:text-base-content/50',
                 }}
               />
 
-              <SelectInput
-                label='Status Project'
-                placeholder='Pilih Status'
-                options={PROJECT_STATUS_OPTIONS}
-                value={selectedProjectStatus}
-                onChange={projectStatusChangeHandler}
-                isClearable
-                className={{
-                  wrapper: 'col-span-12 sm:col-span-6',
-                }}
+              <ButtonFilter
+                values={tableFilterState}
+                excludeFields={['page', 'pageSize', 'search']}
+                onClick={handleFilterModalOpen}
+                className='px-3 py-2.5'
               />
             </div>
           </div>
-        </div>
 
-        <Table<Closing>
-          data={isResponseSuccess(closings) ? closings?.data : []}
-          columns={closingsColumns}
-          pageSize={tableFilterState.pageSize}
-          onPageSizeChange={setPageSize}
-          rowOptions={[10, 20, 50, 100]}
-          page={isResponseSuccess(closings) ? closings?.meta?.page : 0}
-          totalItems={
-            isResponseSuccess(closings) ? closings?.meta?.total_results : 0
-          }
-          onPageChange={setPage}
-          isLoading={isLoadingClosings}
-          sorting={sorting}
-          setSorting={setSorting}
-          rowSelection={rowSelection}
-          setRowSelection={setRowSelection}
-          className={{
-            containerClassName: cn({
-              'w-full mb-20':
-                isResponseSuccess(closings) && closings?.data?.length === 0,
-            }),
-          }}
-        />
+          {isLoadingClosings ? (
+            <div className='w-full flex flex-row justify-center items-center p-4'>
+              <span className='loading loading-spinner loading-xl' />
+            </div>
+          ) : data.length === 0 ? (
+            <div className='mt-3'>
+              <ClosingTableSkeleton
+                columns={closingsColumns}
+                icon={
+                  <Icon
+                    icon='heroicons:document-text'
+                    className='text-white'
+                    width={20}
+                    height={20}
+                  />
+                }
+              />
+            </div>
+          ) : (
+            <Table<Closing>
+              data={isResponseSuccess(closings) ? closings?.data : []}
+              columns={closingsColumns}
+              pageSize={tableFilterState.pageSize}
+              onPageSizeChange={setPageSize}
+              rowOptions={[10, 20, 50, 100]}
+              page={isResponseSuccess(closings) ? closings?.meta?.page : 0}
+              totalItems={
+                isResponseSuccess(closings) ? closings?.meta?.total_results : 0
+              }
+              onPageChange={setPage}
+              isLoading={isLoadingClosings}
+              sorting={sorting}
+              setSorting={setSorting}
+              rowSelection={rowSelection}
+              setRowSelection={setRowSelection}
+              className={{
+                containerClassName: cn('mt-3 mb-0'),
+                headerColumnClassName: 'text-nowrap',
+              }}
+            />
+          )}
+        </div>
       </div>
+
+      {/* Filter Modal */}
+      <Modal
+        ref={filterModal.ref}
+        className={{
+          modal: 'p-0',
+          modalBox: 'p-0 rounded-[0.875rem] xl:max-w-4/12 max-w-sm',
+        }}
+      >
+        {/* Modal Header */}
+        <div className='flex items-center justify-between gap-2 border-b border-base-content/10 p-4'>
+          <div className='flex items-center gap-2 text-primary'>
+            <Icon icon='heroicons:funnel' width={20} height={20} />
+            <h3 className='font-medium text-sm'>Filter Data</h3>
+          </div>
+          <Button
+            variant='link'
+            onClick={filterModal.closeModal}
+            className='text-base-content/50 hover:text-base-content transition-colors cursor-pointer'
+          >
+            <Icon icon='heroicons:x-mark' width={20} height={20} />
+          </Button>
+        </div>
+        <form onSubmit={formik.handleSubmit} onReset={formik.handleReset}>
+          <div className='p-4 flex flex-col gap-1.5'>
+            <SelectInput
+              label='Lokasi'
+              placeholder='Pilih Lokasi'
+              options={locationOptions}
+              value={locationIdValue}
+              onChange={(val) => {
+                if (!Array.isArray(val)) {
+                  formik.setFieldValue(
+                    'location_id',
+                    val?.value ? String(val.value) : null
+                  );
+                }
+              }}
+              onInputChange={setLocationInputValue}
+              isLoading={isLoadingLocationOptions}
+              isClearable
+              onMenuScrollToBottom={loadMoreLocations}
+              className={{ wrapper: 'w-full' }}
+            />
+
+            <SelectInputRadio
+              label='Status Project'
+              placeholder='Pilih Status'
+              options={projectStatusOptions}
+              value={projectStatusValue}
+              onChange={(val) => {
+                if (!Array.isArray(val)) {
+                  formik.setFieldValue('project_status', val?.value || null);
+                }
+              }}
+              className={{ wrapper: 'w-full' }}
+              isClearable={true}
+            />
+          </div>
+
+          {/* Modal Footer */}
+          <div className='flex justify-between items-center gap-4 p-4 border-t border-base-content/10 bg-gray-50'>
+            <Button
+              type='reset'
+              variant='soft'
+              className='rounded-lg text-base-content/65 bg-transparent border-none hover:bg-base-content/10 hover:text-base-content/65 transition-colors px-3 py-2'
+            >
+              Reset Filter
+            </Button>
+            <Button
+              type='submit'
+              className='min-w-40 text-sm rounded-lg py-3 text-white font-semibold'
+              disabled={!formik.isValid || formik.isSubmitting}
+            >
+              Apply Filter
+            </Button>
+          </div>
+        </form>
+      </Modal>
     </>
   );
 };

src/components/pages/closing/filter/ClosingFilter.ts

@@ -0,0 +1,13 @@
+import * as yup from 'yup';
+
+export type ClosingFilterType = {
+  location_id: string | null;
+  project_status: string | null;
+};
+
+export const ClosingFilterSchema = yup.object({
+  location_id: yup.string().nullable(),
+  project_status: yup.string().nullable(),
+});
+
+export type ClosingFilterValues = yup.InferType<typeof ClosingFilterSchema>;

src/components/pages/closing/hpp-ekspedisi/HppExpeditionReportTable.tsx

@@ -1,109 +0,0 @@
-'use client';
-
-import React, { useMemo } from 'react';
-import { ColumnDef } from '@tanstack/react-table';
-import Table from '@/components/Table';
-import Card from '@/components/Card';
-import { formatCurrency } from '@/lib/helper';
-import { BaseHppExpedition, BaseExpeditionCost } from '@/types/api/closing';
-
-interface HppExpeditionReportTableProps {
-  type?: 'detail';
-  initialValues?: BaseHppExpedition;
-}
-
-const HppExpeditionReportTable = ({
-  initialValues,
-}: HppExpeditionReportTableProps) => {
-  const costOfRevenueExpeditionData: BaseExpeditionCost[] = useMemo(() => {
-    return initialValues?.expedition_costs || [];
-  }, [initialValues]);
-
-  const totals = useMemo(() => {
-    const totalHpp = initialValues?.total_hpp_amount || 0;
-
-    return {
-      totalHpp,
-    };
-  }, [initialValues]);
-
-  const costOfRevenueExpeditionColumns: ColumnDef<BaseExpeditionCost>[] =
-    useMemo(
-      () => [
-        {
-          id: 'id',
-          accessorKey: 'id',
-          header: 'No',
-          cell: (props) => {
-            return <div>{props.row.index + 1}</div>;
-          },
-          footer: () => (
-            <div className='font-semibold text-gray-900'>
-              Total HPP Ekspedisi
-            </div>
-          ),
-        },
-        {
-          id: 'expedition_vendor_name',
-          accessorKey: 'expedition_vendor_name',
-          header: 'Nama Ekspedisi',
-          cell: (props) => props.getValue() || '-',
-        },
-        {
-          id: 'hpp_amount',
-          accessorKey: 'hpp_amount',
-          header: 'HPP Ekspedisi',
-          cell: (props) => {
-            const value = props.getValue() as number;
-            return <div className='text-right'>{formatCurrency(value)}</div>;
-          },
-          footer: () => (
-            <div className='text-right font-semibold text-gray-900'>
-              {formatCurrency(totals.totalHpp)}
-            </div>
-          ),
-        },
-      ],
-      [totals]
-    );
-
-  return (
-    <>
-      <section className='w-full'>
-        <div className='p-4'>
-          <h2 className='text-xl font-semibold mb-4'>HPP Ekspedisi</h2>
-          <Card
-            className={{
-              wrapper: 'w-full bg-base-100',
-              body: 'p-0',
-            }}
-          >
-            <Table
-              data={costOfRevenueExpeditionData}
-              columns={costOfRevenueExpeditionColumns}
-              renderFooter={costOfRevenueExpeditionData.length > 0}
-              className={{
-                tableWrapperClassName: 'overflow-x-auto',
-                tableClassName: 'w-full table-auto text-sm',
-                headerRowClassName: 'border-b border-b-gray-200',
-                headerColumnClassName:
-                  'px-4 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end whitespace-nowrap',
-                bodyRowClassName:
-                  'hover:bg-gray-50 transition-colors border-b border-l border-r border-b-gray-200 border-l-gray-200 border-r-gray-200',
-                bodyColumnClassName:
-                  'px-4 py-3 text-xs text-gray-900 whitespace-nowrap',
-                tableFooterClassName:
-                  'bg-gray-100 font-semibold border border-gray-200',
-                footerRowClassName: 'border-t-2 border-gray-300',
-                footerColumnClassName:
-                  'px-4 py-3 text-xs text-gray-900 whitespace-nowrap',
-              }}
-            />
-          </Card>
-        </div>
-      </section>
-    </>
-  );
-};
-
-export default HppExpeditionReportTable;

src/components/pages/closing/skeleton/ClosingTabSkeleton.tsx

@@ -0,0 +1,36 @@
+import DataStateSkeleton from '@/components/helper/skeleton/DataStateSkeleton';
+import Table from '@/components/Table';
+import { ColumnDef } from '@tanstack/react-table';
+
+const ClosingTabSkeleton = <T extends object>({
+  columns,
+  icon,
+  title,
+  subtitle,
+}: {
+  columns: ColumnDef<T, unknown>[];
+  icon: React.ReactNode;
+  title: string;
+  subtitle: string;
+}) => {
+  return (
+    <div className='relative size-full'>
+      <Table
+        data={[]}
+        columns={columns}
+        isLoading={true}
+        className={{
+          skeletonCellClassName: 'animate-none w-full h-5 bg-base-content/4',
+          headerColumnClassName: 'whitespace-nowrap',
+          containerClassName: 'mb-0 overflow-hidden',
+          tableWrapperClassName: 'overflow-hidden',
+        }}
+      />
+      <div className='absolute inset-0 flex items-center justify-center'>
+        <DataStateSkeleton icon={icon} title={title} description={subtitle} />
+      </div>
+    </div>
+  );
+};
+
+export default ClosingTabSkeleton;

src/components/pages/closing/skeleton/ClosingTableSkeleton.tsx

@@ -0,0 +1,37 @@
+import DataStateSkeleton from '@/components/helper/skeleton/DataStateSkeleton';
+import Table from '@/components/Table';
+import { Closing } from '@/types/api/closing';
+import { ColumnDef } from '@tanstack/react-table';
+
+const ClosingTableSkeleton = ({
+  columns,
+  icon,
+  title = 'No Data Available',
+  subtitle = 'There is no closing data displayed. Enter closing data to get started.',
+}: {
+  columns: ColumnDef<Closing>[];
+  icon: React.ReactNode;
+  title?: string;
+  subtitle?: string;
+}) => {
+  return (
+    <div className='relative size-full'>
+      <Table
+        data={[]}
+        columns={columns}
+        isLoading={true}
+        className={{
+          skeletonCellClassName: 'animate-none w-full h-5 bg-base-content/4',
+          headerColumnClassName: 'whitespace-nowrap',
+          containerClassName: 'mb-0 overflow-hidden',
+          tableWrapperClassName: 'overflow-hidden',
+        }}
+      />
+      <div className='absolute inset-0 flex items-center justify-center'>
+        <DataStateSkeleton icon={icon} title={title} description={subtitle} />
+      </div>
+    </div>
+  );
+};
+
+export default ClosingTableSkeleton;

src/components/pages/closing/skeleton/FinanceClosingSkeleton.tsx

@@ -0,0 +1,40 @@
+import { Icon } from '@iconify/react';
+import Card from '@/components/Card';
+import DataStateSkeleton from '@/components/helper/skeleton/DataStateSkeleton';
+
+const FinanceClosingSkeleton = ({
+  title = 'Data Keuangan Belum Tersedia',
+  subtitle = 'Tidak ada data keuangan untuk periode ini.',
+  iconName = 'heroicons:chart-bar',
+}: {
+  title?: string;
+  subtitle?: string;
+  iconName?: string;
+}) => {
+  return (
+    <Card
+      variant='bordered'
+      className={{
+        wrapper: 'w-full',
+        body: 'p-8',
+      }}
+    >
+      <div className='flex items-center justify-center p-8'>
+        <DataStateSkeleton
+          icon={
+            <Icon
+              icon={iconName}
+              className='text-white'
+              width={20}
+              height={20}
+            />
+          }
+          title={title}
+          description={subtitle}
+        />
+      </div>
+    </Card>
+  );
+};
+
+export default FinanceClosingSkeleton;

src/components/pages/closing/skeleton/HppExpeditionClosingSkeleton.tsx

@@ -0,0 +1,29 @@
+import { Icon } from '@iconify/react';
+import ClosingTabSkeleton from './ClosingTabSkeleton';
+import { BaseExpeditionCost } from '@/types/api/closing';
+import { ColumnDef } from '@tanstack/react-table';
+
+const HppExpeditionClosingSkeleton = ({
+  columns,
+  title = 'Data HPP Ekspedisi Belum Tersedia',
+  subtitle = 'Tidak ada data HPP ekspedisi untuk periode ini.',
+  iconName = 'heroicons:chart-bar',
+}: {
+  columns: ColumnDef<BaseExpeditionCost>[];
+  title?: string;
+  subtitle?: string;
+  iconName?: string;
+}) => {
+  return (
+    <ClosingTabSkeleton<BaseExpeditionCost>
+      columns={columns}
+      icon={
+        <Icon icon={iconName} className='text-white' width={20} height={20} />
+      }
+      title={title}
+      subtitle={subtitle}
+    />
+  );
+};
+
+export default HppExpeditionClosingSkeleton;

src/components/pages/closing/skeleton/OverheadClosingSkeleton.tsx

@@ -0,0 +1,29 @@
+import { Icon } from '@iconify/react';
+import ClosingTabSkeleton from './ClosingTabSkeleton';
+import { Overhead } from '@/types/api/closing';
+import { ColumnDef } from '@tanstack/react-table';
+
+const OverheadClosingSkeleton = ({
+  columns,
+  title = 'Data Overhead Belum Tersedia',
+  subtitle = 'Tidak ada data overhead untuk periode ini.',
+  iconName = 'heroicons:chart-bar',
+}: {
+  columns: ColumnDef<Overhead>[];
+  title?: string;
+  subtitle?: string;
+  iconName?: string;
+}) => {
+  return (
+    <ClosingTabSkeleton<Overhead>
+      columns={columns}
+      icon={
+        <Icon icon={iconName} className='text-white' width={20} height={20} />
+      }
+      title={title}
+      subtitle={subtitle}
+    />
+  );
+};
+
+export default OverheadClosingSkeleton;

src/components/pages/closing/skeleton/ProductionDataClosingSkeleton.tsx

@@ -0,0 +1,33 @@
+import { Icon } from '@iconify/react';
+import DataStateSkeleton from '@/components/helper/skeleton/DataStateSkeleton';
+
+const ProductionDataClosingSkeleton = ({
+  title = 'Data Produksi Belum Tersedia',
+  subtitle = 'Tidak ada data produksi untuk periode ini.',
+  iconName = 'heroicons:chart-bar',
+}: {
+  title?: string;
+  subtitle?: string;
+  iconName?: string;
+}) => {
+  return (
+    <div className='w-full rounded-xl p-8 shadow-sm'>
+      <div className='flex items-center justify-center p-12'>
+        <DataStateSkeleton
+          icon={
+            <Icon
+              icon={iconName}
+              className='text-white'
+              width={20}
+              height={20}
+            />
+          }
+          title={title}
+          description={subtitle}
+        />
+      </div>
+    </div>
+  );
+};
+
+export default ProductionDataClosingSkeleton;

src/components/pages/closing/skeleton/SalesClosingSkeleton.tsx

@@ -0,0 +1,29 @@
+import { Icon } from '@iconify/react';
+import ClosingTabSkeleton from './ClosingTabSkeleton';
+import { BaseSales } from '@/types/api/closing';
+import { ColumnDef } from '@tanstack/react-table';
+
+const SalesClosingSkeleton = ({
+  columns,
+  title = 'Data Penjualan Belum Tersedia',
+  subtitle = 'Tidak ada data penjualan untuk periode ini.',
+  iconName = 'heroicons:chart-bar',
+}: {
+  columns: ColumnDef<BaseSales>[];
+  title?: string;
+  subtitle?: string;
+  iconName?: string;
+}) => {
+  return (
+    <ClosingTabSkeleton<BaseSales>
+      columns={columns}
+      icon={
+        <Icon icon={iconName} className='text-white' width={20} height={20} />
+      }
+      title={title}
+      subtitle={subtitle}
+    />
+  );
+};
+
+export default SalesClosingSkeleton;

src/components/pages/closing/skeleton/SapronakCalculationClosingSkeleton.tsx

@@ -0,0 +1,29 @@
+import { Icon } from '@iconify/react';
+import ClosingTabSkeleton from './ClosingTabSkeleton';
+import { RowSapronakCalculation } from '@/types/api/closing';
+import { ColumnDef } from '@tanstack/react-table';
+
+const SapronakCalculationClosingSkeleton = ({
+  columns,
+  title = 'Data Perhitungan Sapronak Belum Tersedia',
+  subtitle = 'Tidak ada data perhitungan sapronak untuk periode ini.',
+  iconName = 'heroicons:chart-bar',
+}: {
+  columns: ColumnDef<RowSapronakCalculation>[];
+  title?: string;
+  subtitle?: string;
+  iconName?: string;
+}) => {
+  return (
+    <ClosingTabSkeleton<RowSapronakCalculation>
+      columns={columns}
+      icon={
+        <Icon icon={iconName} className='text-white' width={20} height={20} />
+      }
+      title={title}
+      subtitle={subtitle}
+    />
+  );
+};
+
+export default SapronakCalculationClosingSkeleton;

src/components/pages/closing/skeleton/SapronakClosingSkeleton.tsx

@@ -0,0 +1,40 @@
+import { Icon } from '@iconify/react';
+import ClosingTabSkeleton from './ClosingTabSkeleton';
+import { ColumnDef } from '@tanstack/react-table';
+
+const SapronakClosingSkeleton = <T extends object>({
+  columns,
+  type = 'incoming',
+  title,
+  subtitle,
+  iconName = 'heroicons:chart-bar',
+}: {
+  columns: ColumnDef<T, unknown>[];
+  type?: 'incoming' | 'outgoing';
+  title?: string;
+  subtitle?: string;
+  iconName?: string;
+}) => {
+  const defaultTitle =
+    type === 'incoming'
+      ? 'Data Sapronak Masuk Belum Tersedia'
+      : 'Data Sapronak Keluar Belum Tersedia';
+
+  const defaultSubtitle =
+    type === 'incoming'
+      ? 'Tidak ada data sapronak masuk untuk periode ini.'
+      : 'Tidak ada data sapronak keluar untuk periode ini.';
+
+  return (
+    <ClosingTabSkeleton<T>
+      columns={columns}
+      icon={
+        <Icon icon={iconName} className='text-white' width={20} height={20} />
+      }
+      title={title || defaultTitle}
+      subtitle={subtitle || defaultSubtitle}
+    />
+  );
+};
+
+export default SapronakClosingSkeleton;

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 (
+    <div className='flex flex-col gap-4'>
+      {projectFlockId && (
+        <FinanceClosingTable projectFlockId={projectFlockId} />
+      )}
+    </div>
+  );
+};
+
+export default FinanceClosingTab;

src/components/pages/closing/tab/HppExpeditionClosingTab.tsx

@@ -0,0 +1,19 @@
+import HppExpeditionClosingTable from '@/components/pages/closing/table/HppExpeditionClosingTable';
+
+interface HppExpeditionClosingTabProps {
+  projectFlockId: number;
+}
+
+const HppExpeditionClosingTab = ({
+  projectFlockId,
+}: HppExpeditionClosingTabProps) => {
+  return (
+    <div className='flex flex-col gap-4'>
+      {projectFlockId && (
+        <HppExpeditionClosingTable projectFlockId={projectFlockId} />
+      )}
+    </div>
+  );
+};
+
+export default HppExpeditionClosingTab;

src/components/pages/closing/tab/OverheadClosingTab.tsx

@@ -1,22 +1,22 @@
-import ClosingOverheadTable from '@/components/pages/closing/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 (
     <div className='flex flex-col gap-4'>
       {projectFlockId && (
-        <ClosingOverheadTable
+        <OverheadClosingTable
           projectFlockId={projectFlockId}
           generalInformation={generalInformation}
           kandangData={kandangData}
@@ -26,4 +26,4 @@ const ClosingOverheadTabContent = ({
   );
 };
 
-export default ClosingOverheadTabContent;
+export default OverheadClosingTab;